rename packages

sandwichfarm · Dec 16, 2023 · 3c10849 · 3c10849
1 parent 041fa0d
commit 3c10849
Show file tree

Hide file tree

Showing 66 changed files with 8 additions and 60 deletions.
diff --git a/packages/controlflow/src/retry.js b/packages/controlflow/src/retry.js
@@ -1,4 +1,4 @@
-import relaycache from '@nostrwatch/relaycache'
+import relaycache from '@nostrwatch/nwcache'
 import { capitalize, loadConfig } from "@nostrwatch/utils"
 
 const rcache = relaycache(process.env.NWCACHE_PATH)
@@ -16,7 +16,6 @@ export class RetryManager {
     this.retries = []
     this.config = config?.[caller]?.[action]
   }
-
 
   cacheId(url){
     return `${capitalize(this.caller)}:${url}`

diff --git a/packages/nocapd/src/daemon.js b/packages/nocapd/src/daemon.js
@@ -1,7 +1,7 @@
 import schedule from 'node-schedule'
 
-import relaycache from '@nostrwatch/relaycache'
-import { NocapdQueue, BullMQ, Scheduler } from '@nostrwatch/controlflow'
+import relaycache from '@nostrwatch/nwcache'
+import { NocapdQueue, BullMQ } from '@nostrwatch/controlflow'
 import { RedisConnectionDetails } from '@nostrwatch/utils'
 
 import { NocapdQueues } from './classes/NocapdQueues.js'

diff --git a/packages/nocapd/src/managers/welcome.js b/packages/nocapd/src/managers/welcome.js
@@ -1,6 +1,6 @@
 
 import { WorkerManager } from '../classes/WorkerManager.js'
-import { ParseSelect, RelayRecord } from '@nostrwatch/relaycache'
+import { ParseSelect, RelayRecord } from '@nostrwatch/nwcache'
 const parseSelect = ParseSelect(RelayRecord, "Relay")
 
 export class WelcomeManager extends WorkerManager {

diff --git a/packages/relaydb/defaults.js → packages/nwcache/defaults.js b/packages/relaydb/defaults.js → packages/nwcache/defaults.js
diff --git a/packages/relaydb/index.js → packages/nwcache/index.js b/packages/relaydb/index.js → packages/nwcache/index.js
diff --git a/...ges/relaydb/migrations/find_weird_urls.js → ...ges/nwcache/migrations/find_weird_urls.js b/...ges/relaydb/migrations/find_weird_urls.js → ...ges/nwcache/migrations/find_weird_urls.js
diff --git a/...es/relaydb/migrations/fix_cachetime_kv.js → ...es/nwcache/migrations/fix_cachetime_kv.js b/...es/relaydb/migrations/fix_cachetime_kv.js → ...es/nwcache/migrations/fix_cachetime_kv.js
diff --git a/...es/relaydb/migrations/fix_note_indices.js → ...es/nwcache/migrations/fix_note_indices.js b/...es/relaydb/migrations/fix_note_indices.js → ...es/nwcache/migrations/fix_note_indices.js
diff --git a/...s/relaydb/migrations/fix_relay_records.js → ...s/nwcache/migrations/fix_relay_records.js b/...s/relaydb/migrations/fix_relay_records.js → ...s/nwcache/migrations/fix_relay_records.js
diff --git a/...elaydb/migrations/normalize_relay_urls.js → ...wcache/migrations/normalize_relay_urls.js b/...elaydb/migrations/normalize_relay_urls.js → ...wcache/migrations/normalize_relay_urls.js
diff --git a/...ges/relaydb/migrations/remove_url_hash.js → ...ges/nwcache/migrations/remove_url_hash.js b/...ges/relaydb/migrations/remove_url_hash.js → ...ges/nwcache/migrations/remove_url_hash.js
diff --git a/packages/relaydb/mixins/.template.js → packages/nwcache/mixins/.template.js b/packages/relaydb/mixins/.template.js → packages/nwcache/mixins/.template.js
diff --git a/packages/relaydb/mixins/cachetime.js → packages/nwcache/mixins/cachetime.js b/packages/relaydb/mixins/cachetime.js → packages/nwcache/mixins/cachetime.js
diff --git a/packages/relaydb/mixins/checks.js → packages/nwcache/mixins/checks.js b/packages/relaydb/mixins/checks.js → packages/nwcache/mixins/checks.js
diff --git a/packages/relaydb/mixins/info.js → packages/nwcache/mixins/info.js b/packages/relaydb/mixins/info.js → packages/nwcache/mixins/info.js
diff --git a/packages/relaydb/mixins/note.js → packages/nwcache/mixins/note.js b/packages/relaydb/mixins/note.js → packages/nwcache/mixins/note.js
diff --git a/packages/relaydb/mixins/relay.js → packages/nwcache/mixins/relay.js b/packages/relaydb/mixins/relay.js → packages/nwcache/mixins/relay.js
diff --git a/packages/relaydb/mixins/retry.js → packages/nwcache/mixins/retry.js b/packages/relaydb/mixins/retry.js → packages/nwcache/mixins/retry.js
diff --git a/packages/relaydb/mixins/service.js → packages/nwcache/mixins/service.js b/packages/relaydb/mixins/service.js → packages/nwcache/mixins/service.js
diff --git a/packages/relaydb/mixins/stat.js → packages/nwcache/mixins/stat.js b/packages/relaydb/mixins/stat.js → packages/nwcache/mixins/stat.js
diff --git a/packages/relaydb/package.json → packages/nwcache/package.json b/packages/relaydb/package.json → packages/nwcache/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@nostrwatch/relaycache",
+  "name": "@nostrwatch/nwcache",
   "version": "0.0.1",
   "type": "module",
   "main": "index.js",

diff --git a/packages/relaydb/schemas.js → packages/nwcache/schemas.js b/packages/relaydb/schemas.js → packages/nwcache/schemas.js
diff --git a/packages/relaydb/utils.js → packages/nwcache/utils.js b/packages/relaydb/utils.js → packages/nwcache/utils.js
diff --git a/packages/relaydb.new/.gitignore → packages/nwdb/.gitignore b/packages/relaydb.new/.gitignore → packages/nwdb/.gitignore
diff --git a/packages/relaydb.new/Dockerfile → packages/nwdb/Dockerfile b/packages/relaydb.new/Dockerfile → packages/nwdb/Dockerfile
diff --git a/packages/relaydb.new/docker-compose.yaml → packages/nwdb/docker-compose.yaml b/packages/relaydb.new/docker-compose.yaml → packages/nwdb/docker-compose.yaml
diff --git a/packages/relaydb.new/package.json → packages/nwdb/package.json b/packages/relaydb.new/package.json → packages/nwdb/package.json
diff --git a/...ew/src/associations/AssociateCheckMeta.js → ...db/src/associations/AssociateCheckMeta.js b/...ew/src/associations/AssociateCheckMeta.js → ...db/src/associations/AssociateCheckMeta.js
diff --git a/...db.new/src/associations/AssociateRelay.js → ...s/nwdb/src/associations/AssociateRelay.js b/...db.new/src/associations/AssociateRelay.js → ...s/nwdb/src/associations/AssociateRelay.js
diff --git a/...ges/relaydb.new/src/associations/index.js → packages/nwdb/src/associations/index.js b/...ges/relaydb.new/src/associations/index.js → packages/nwdb/src/associations/index.js
diff --git a/packages/relaydb.new/src/config/config.json → packages/nwdb/src/config/config.json b/packages/relaydb.new/src/config/config.json → packages/nwdb/src/config/config.json
diff --git a/...relaydb.new/src/config/config.sample.json → packages/nwdb/src/config/config.sample.json b/...relaydb.new/src/config/config.sample.json → packages/nwdb/src/config/config.sample.json
diff --git a/packages/relaydb.new/src/connect/index.js → packages/nwdb/src/connect/index.js b/packages/relaydb.new/src/connect/index.js → packages/nwdb/src/connect/index.js
diff --git a/packages/relaydb.new/src/connect/postgres.js → packages/nwdb/src/connect/postgres.js b/packages/relaydb.new/src/connect/postgres.js → packages/nwdb/src/connect/postgres.js
diff --git a/packages/relaydb.new/src/daemon.js → packages/nwdb/src/daemon.js b/packages/relaydb.new/src/daemon.js → packages/nwdb/src/daemon.js
diff --git a/packages/relaydb.new/src/daemon/index.js → packages/nwdb/src/daemon/index.js b/packages/relaydb.new/src/daemon/index.js → packages/nwdb/src/daemon/index.js
diff --git a/...rc/daemon/jobs/meta-create-ifnotexists.js → ...rc/daemon/jobs/meta-create-ifnotexists.js b/...rc/daemon/jobs/meta-create-ifnotexists.js → ...rc/daemon/jobs/meta-create-ifnotexists.js
diff --git a/...on/jobs/relay-batch-create-ifnotexists.js → ...on/jobs/relay-batch-create-ifnotexists.js b/...on/jobs/relay-batch-create-ifnotexists.js → ...on/jobs/relay-batch-create-ifnotexists.js
diff --git a/...c/daemon/jobs/relay-create-ifnotexists.js → ...c/daemon/jobs/relay-create-ifnotexists.js b/...c/daemon/jobs/relay-create-ifnotexists.js → ...c/daemon/jobs/relay-create-ifnotexists.js
diff --git a/...laydb.new/src/daemon/jobs/relay-create.js → ...ages/nwdb/src/daemon/jobs/relay-create.js b/...laydb.new/src/daemon/jobs/relay-create.js → ...ages/nwdb/src/daemon/jobs/relay-create.js
diff --git a/...aydb.new/src/daemon/jobs/status-create.js → ...ges/nwdb/src/daemon/jobs/status-create.js b/...aydb.new/src/daemon/jobs/status-create.js → ...ges/nwdb/src/daemon/jobs/status-create.js
diff --git a/...rc/daemon/routines/find-and-relate-ips.js → ...rc/daemon/routines/find-and-relate-ips.js b/...rc/daemon/routines/find-and-relate-ips.js → ...rc/daemon/routines/find-and-relate-ips.js
diff --git a/...mon/routines/infer-relay-relationships.js → ...mon/routines/infer-relay-relationships.js b/...mon/routines/infer-relay-relationships.js → ...mon/routines/infer-relay-relationships.js
diff --git a/...es/relaydb.new/src/helpers/BaseHelpers.js → packages/nwdb/src/helpers/BaseHelpers.js b/...es/relaydb.new/src/helpers/BaseHelpers.js → packages/nwdb/src/helpers/BaseHelpers.js
diff --git a/...s/relaydb.new/src/helpers/RelayHelpers.js → packages/nwdb/src/helpers/RelayHelpers.js b/...s/relaydb.new/src/helpers/RelayHelpers.js → packages/nwdb/src/helpers/RelayHelpers.js
diff --git a/packages/relaydb.new/src/helpers/index.js → packages/nwdb/src/helpers/index.js b/packages/relaydb.new/src/helpers/index.js → packages/nwdb/src/helpers/index.js
diff --git a/packages/relaydb.new/src/index.js → packages/nwdb/src/index.js b/packages/relaydb.new/src/index.js → packages/nwdb/src/index.js
diff --git a/packages/relaydb.new/src/init.js → packages/nwdb/src/init.js b/packages/relaydb.new/src/init.js → packages/nwdb/src/init.js
diff --git a/packages/relaydb.new/src/migrations/.gitkeep → packages/nwdb/src/migrations/.gitkeep b/packages/relaydb.new/src/migrations/.gitkeep → packages/nwdb/src/migrations/.gitkeep
diff --git a/packages/relaydb.new/src/models/AppMeta.js → packages/nwdb/src/models/AppMeta.js b/packages/relaydb.new/src/models/AppMeta.js → packages/nwdb/src/models/AppMeta.js
diff --git a/packages/relaydb.new/src/models/CheckMeta.js → packages/nwdb/src/models/CheckMeta.js b/packages/relaydb.new/src/models/CheckMeta.js → packages/nwdb/src/models/CheckMeta.js
diff --git a/...ges/relaydb.new/src/models/CheckStatus.js → packages/nwdb/src/models/CheckStatus.js b/...ges/relaydb.new/src/models/CheckStatus.js → packages/nwdb/src/models/CheckStatus.js
diff --git a/packages/relaydb.new/src/models/Ip.js → packages/nwdb/src/models/Ip.js b/packages/relaydb.new/src/models/Ip.js → packages/nwdb/src/models/Ip.js
diff --git a/packages/relaydb.new/src/models/MetaDns.js → packages/nwdb/src/models/MetaDns.js b/packages/relaydb.new/src/models/MetaDns.js → packages/nwdb/src/models/MetaDns.js
diff --git a/packages/relaydb.new/src/models/MetaGeo.js → packages/nwdb/src/models/MetaGeo.js b/packages/relaydb.new/src/models/MetaGeo.js → packages/nwdb/src/models/MetaGeo.js
diff --git a/packages/relaydb.new/src/models/MetaInfo.js → packages/nwdb/src/models/MetaInfo.js b/packages/relaydb.new/src/models/MetaInfo.js → packages/nwdb/src/models/MetaInfo.js
diff --git a/packages/relaydb.new/src/models/MetaSsl.js → packages/nwdb/src/models/MetaSsl.js b/packages/relaydb.new/src/models/MetaSsl.js → packages/nwdb/src/models/MetaSsl.js
diff --git a/packages/relaydb.new/src/models/Publisher.js → packages/nwdb/src/models/Publisher.js b/packages/relaydb.new/src/models/Publisher.js → packages/nwdb/src/models/Publisher.js
diff --git a/packages/relaydb.new/src/models/Relay.js → packages/nwdb/src/models/Relay.js b/packages/relaydb.new/src/models/Relay.js → packages/nwdb/src/models/Relay.js
diff --git a/packages/relaydb.new/src/models/RelayIp.js → packages/nwdb/src/models/RelayIp.js b/packages/relaydb.new/src/models/RelayIp.js → packages/nwdb/src/models/RelayIp.js
diff --git a/packages/relaydb.new/src/models/index.js → packages/nwdb/src/models/index.js b/packages/relaydb.new/src/models/index.js → packages/nwdb/src/models/index.js
diff --git a/packages/relaydb.new/src/seeds/.gitkeep → packages/nwdb/src/seeds/.gitkeep b/packages/relaydb.new/src/seeds/.gitkeep → packages/nwdb/src/seeds/.gitkeep
diff --git a/packages/relaydb/sandbox.js b/packages/relaydb/sandbox.js
diff --git a/packages/seed/src/index.js b/packages/seed/src/index.js
@@ -86,7 +86,7 @@ export const relaysFromEvents = async (opts) => {
 }
 
 export const relaysOnlineFromCache = async (opts) => {
-  const { default: nwcache } = await import("@nostrwatch/relaycache")
+  const { default: nwcache } = await import("@nostrwatch/nwcache")
   const $nwcache = nwcache(process.env.NWCACHE_PATH)
   return $nwcache.relay.get.online('url').map( relay => relay.url )
 }

diff --git a/packages/seed/src/nwcache.js b/packages/seed/src/nwcache.js
@@ -1,4 +1,4 @@
-import rcache from '@nostrwatch/relaycache'
+import rcache from '@nostrwatch/nwcache'
 import config from './config.js'
 
 let $rcache

diff --git a/packages/trawler/src/relaydb.js b/packages/trawler/src/relaydb.js
@@ -1,4 +1,4 @@
-import rcache from '@nostrwatch/relaycache'
+import rcache from '@nostrwatch/nwcache'
 import config from "./config.js"
 
 let $rcache