diff --git a/packages/controlflow/src/retry.js b/packages/controlflow/src/retry.js index 033ed7cf..9f402614 100644 --- 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 index 5f2ab3ec..abf82a03 100644 --- 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 index 4e45e07b..cec036de 100644 --- 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 b/packages/nwcache/defaults.js similarity index 100% rename from packages/relaydb/defaults.js rename to packages/nwcache/defaults.js diff --git a/packages/relaydb/index.js b/packages/nwcache/index.js similarity index 100% rename from packages/relaydb/index.js rename to packages/nwcache/index.js diff --git a/packages/relaydb/migrations/find_weird_urls.js b/packages/nwcache/migrations/find_weird_urls.js similarity index 100% rename from packages/relaydb/migrations/find_weird_urls.js rename to packages/nwcache/migrations/find_weird_urls.js diff --git a/packages/relaydb/migrations/fix_cachetime_kv.js b/packages/nwcache/migrations/fix_cachetime_kv.js similarity index 100% rename from packages/relaydb/migrations/fix_cachetime_kv.js rename to packages/nwcache/migrations/fix_cachetime_kv.js diff --git a/packages/relaydb/migrations/fix_note_indices.js b/packages/nwcache/migrations/fix_note_indices.js similarity index 100% rename from packages/relaydb/migrations/fix_note_indices.js rename to packages/nwcache/migrations/fix_note_indices.js diff --git a/packages/relaydb/migrations/fix_relay_records.js b/packages/nwcache/migrations/fix_relay_records.js similarity index 100% rename from packages/relaydb/migrations/fix_relay_records.js rename to packages/nwcache/migrations/fix_relay_records.js diff --git a/packages/relaydb/migrations/normalize_relay_urls.js b/packages/nwcache/migrations/normalize_relay_urls.js similarity index 100% rename from packages/relaydb/migrations/normalize_relay_urls.js rename to packages/nwcache/migrations/normalize_relay_urls.js diff --git a/packages/relaydb/migrations/remove_url_hash.js b/packages/nwcache/migrations/remove_url_hash.js similarity index 100% rename from packages/relaydb/migrations/remove_url_hash.js rename to packages/nwcache/migrations/remove_url_hash.js diff --git a/packages/relaydb/mixins/.template.js b/packages/nwcache/mixins/.template.js similarity index 100% rename from packages/relaydb/mixins/.template.js rename to packages/nwcache/mixins/.template.js diff --git a/packages/relaydb/mixins/cachetime.js b/packages/nwcache/mixins/cachetime.js similarity index 100% rename from packages/relaydb/mixins/cachetime.js rename to packages/nwcache/mixins/cachetime.js diff --git a/packages/relaydb/mixins/checks.js b/packages/nwcache/mixins/checks.js similarity index 100% rename from packages/relaydb/mixins/checks.js rename to packages/nwcache/mixins/checks.js diff --git a/packages/relaydb/mixins/info.js b/packages/nwcache/mixins/info.js similarity index 100% rename from packages/relaydb/mixins/info.js rename to packages/nwcache/mixins/info.js diff --git a/packages/relaydb/mixins/note.js b/packages/nwcache/mixins/note.js similarity index 100% rename from packages/relaydb/mixins/note.js rename to packages/nwcache/mixins/note.js diff --git a/packages/relaydb/mixins/relay.js b/packages/nwcache/mixins/relay.js similarity index 100% rename from packages/relaydb/mixins/relay.js rename to packages/nwcache/mixins/relay.js diff --git a/packages/relaydb/mixins/retry.js b/packages/nwcache/mixins/retry.js similarity index 100% rename from packages/relaydb/mixins/retry.js rename to packages/nwcache/mixins/retry.js diff --git a/packages/relaydb/mixins/service.js b/packages/nwcache/mixins/service.js similarity index 100% rename from packages/relaydb/mixins/service.js rename to packages/nwcache/mixins/service.js diff --git a/packages/relaydb/mixins/stat.js b/packages/nwcache/mixins/stat.js similarity index 100% rename from packages/relaydb/mixins/stat.js rename to packages/nwcache/mixins/stat.js diff --git a/packages/relaydb/package.json b/packages/nwcache/package.json similarity index 87% rename from packages/relaydb/package.json rename to packages/nwcache/package.json index 1bf948fb..68d4b284 100644 --- a/packages/relaydb/package.json +++ b/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 b/packages/nwcache/schemas.js similarity index 100% rename from packages/relaydb/schemas.js rename to packages/nwcache/schemas.js diff --git a/packages/relaydb/utils.js b/packages/nwcache/utils.js similarity index 100% rename from packages/relaydb/utils.js rename to packages/nwcache/utils.js diff --git a/packages/relaydb.new/.gitignore b/packages/nwdb/.gitignore similarity index 100% rename from packages/relaydb.new/.gitignore rename to packages/nwdb/.gitignore diff --git a/packages/relaydb.new/Dockerfile b/packages/nwdb/Dockerfile similarity index 100% rename from packages/relaydb.new/Dockerfile rename to packages/nwdb/Dockerfile diff --git a/packages/relaydb.new/docker-compose.yaml b/packages/nwdb/docker-compose.yaml similarity index 100% rename from packages/relaydb.new/docker-compose.yaml rename to packages/nwdb/docker-compose.yaml diff --git a/packages/relaydb.new/package.json b/packages/nwdb/package.json similarity index 100% rename from packages/relaydb.new/package.json rename to packages/nwdb/package.json diff --git a/packages/relaydb.new/src/associations/AssociateCheckMeta.js b/packages/nwdb/src/associations/AssociateCheckMeta.js similarity index 100% rename from packages/relaydb.new/src/associations/AssociateCheckMeta.js rename to packages/nwdb/src/associations/AssociateCheckMeta.js diff --git a/packages/relaydb.new/src/associations/AssociateRelay.js b/packages/nwdb/src/associations/AssociateRelay.js similarity index 100% rename from packages/relaydb.new/src/associations/AssociateRelay.js rename to packages/nwdb/src/associations/AssociateRelay.js diff --git a/packages/relaydb.new/src/associations/index.js b/packages/nwdb/src/associations/index.js similarity index 100% rename from packages/relaydb.new/src/associations/index.js rename to packages/nwdb/src/associations/index.js diff --git a/packages/relaydb.new/src/config/config.json b/packages/nwdb/src/config/config.json similarity index 100% rename from packages/relaydb.new/src/config/config.json rename to packages/nwdb/src/config/config.json diff --git a/packages/relaydb.new/src/config/config.sample.json b/packages/nwdb/src/config/config.sample.json similarity index 100% rename from packages/relaydb.new/src/config/config.sample.json rename to packages/nwdb/src/config/config.sample.json diff --git a/packages/relaydb.new/src/connect/index.js b/packages/nwdb/src/connect/index.js similarity index 100% rename from packages/relaydb.new/src/connect/index.js rename to packages/nwdb/src/connect/index.js diff --git a/packages/relaydb.new/src/connect/postgres.js b/packages/nwdb/src/connect/postgres.js similarity index 100% rename from packages/relaydb.new/src/connect/postgres.js rename to packages/nwdb/src/connect/postgres.js diff --git a/packages/relaydb.new/src/daemon.js b/packages/nwdb/src/daemon.js similarity index 100% rename from packages/relaydb.new/src/daemon.js rename to packages/nwdb/src/daemon.js diff --git a/packages/relaydb.new/src/daemon/index.js b/packages/nwdb/src/daemon/index.js similarity index 100% rename from packages/relaydb.new/src/daemon/index.js rename to packages/nwdb/src/daemon/index.js diff --git a/packages/relaydb.new/src/daemon/jobs/meta-create-ifnotexists.js b/packages/nwdb/src/daemon/jobs/meta-create-ifnotexists.js similarity index 100% rename from packages/relaydb.new/src/daemon/jobs/meta-create-ifnotexists.js rename to packages/nwdb/src/daemon/jobs/meta-create-ifnotexists.js diff --git a/packages/relaydb.new/src/daemon/jobs/relay-batch-create-ifnotexists.js b/packages/nwdb/src/daemon/jobs/relay-batch-create-ifnotexists.js similarity index 100% rename from packages/relaydb.new/src/daemon/jobs/relay-batch-create-ifnotexists.js rename to packages/nwdb/src/daemon/jobs/relay-batch-create-ifnotexists.js diff --git a/packages/relaydb.new/src/daemon/jobs/relay-create-ifnotexists.js b/packages/nwdb/src/daemon/jobs/relay-create-ifnotexists.js similarity index 100% rename from packages/relaydb.new/src/daemon/jobs/relay-create-ifnotexists.js rename to packages/nwdb/src/daemon/jobs/relay-create-ifnotexists.js diff --git a/packages/relaydb.new/src/daemon/jobs/relay-create.js b/packages/nwdb/src/daemon/jobs/relay-create.js similarity index 100% rename from packages/relaydb.new/src/daemon/jobs/relay-create.js rename to packages/nwdb/src/daemon/jobs/relay-create.js diff --git a/packages/relaydb.new/src/daemon/jobs/status-create.js b/packages/nwdb/src/daemon/jobs/status-create.js similarity index 100% rename from packages/relaydb.new/src/daemon/jobs/status-create.js rename to packages/nwdb/src/daemon/jobs/status-create.js diff --git a/packages/relaydb.new/src/daemon/routines/find-and-relate-ips.js b/packages/nwdb/src/daemon/routines/find-and-relate-ips.js similarity index 100% rename from packages/relaydb.new/src/daemon/routines/find-and-relate-ips.js rename to packages/nwdb/src/daemon/routines/find-and-relate-ips.js diff --git a/packages/relaydb.new/src/daemon/routines/infer-relay-relationships.js b/packages/nwdb/src/daemon/routines/infer-relay-relationships.js similarity index 100% rename from packages/relaydb.new/src/daemon/routines/infer-relay-relationships.js rename to packages/nwdb/src/daemon/routines/infer-relay-relationships.js diff --git a/packages/relaydb.new/src/helpers/BaseHelpers.js b/packages/nwdb/src/helpers/BaseHelpers.js similarity index 100% rename from packages/relaydb.new/src/helpers/BaseHelpers.js rename to packages/nwdb/src/helpers/BaseHelpers.js diff --git a/packages/relaydb.new/src/helpers/RelayHelpers.js b/packages/nwdb/src/helpers/RelayHelpers.js similarity index 100% rename from packages/relaydb.new/src/helpers/RelayHelpers.js rename to packages/nwdb/src/helpers/RelayHelpers.js diff --git a/packages/relaydb.new/src/helpers/index.js b/packages/nwdb/src/helpers/index.js similarity index 100% rename from packages/relaydb.new/src/helpers/index.js rename to packages/nwdb/src/helpers/index.js diff --git a/packages/relaydb.new/src/index.js b/packages/nwdb/src/index.js similarity index 100% rename from packages/relaydb.new/src/index.js rename to packages/nwdb/src/index.js diff --git a/packages/relaydb.new/src/init.js b/packages/nwdb/src/init.js similarity index 100% rename from packages/relaydb.new/src/init.js rename to packages/nwdb/src/init.js diff --git a/packages/relaydb.new/src/migrations/.gitkeep b/packages/nwdb/src/migrations/.gitkeep similarity index 100% rename from packages/relaydb.new/src/migrations/.gitkeep rename to packages/nwdb/src/migrations/.gitkeep diff --git a/packages/relaydb.new/src/models/AppMeta.js b/packages/nwdb/src/models/AppMeta.js similarity index 100% rename from packages/relaydb.new/src/models/AppMeta.js rename to packages/nwdb/src/models/AppMeta.js diff --git a/packages/relaydb.new/src/models/CheckMeta.js b/packages/nwdb/src/models/CheckMeta.js similarity index 100% rename from packages/relaydb.new/src/models/CheckMeta.js rename to packages/nwdb/src/models/CheckMeta.js diff --git a/packages/relaydb.new/src/models/CheckStatus.js b/packages/nwdb/src/models/CheckStatus.js similarity index 100% rename from packages/relaydb.new/src/models/CheckStatus.js rename to packages/nwdb/src/models/CheckStatus.js diff --git a/packages/relaydb.new/src/models/Ip.js b/packages/nwdb/src/models/Ip.js similarity index 100% rename from packages/relaydb.new/src/models/Ip.js rename to packages/nwdb/src/models/Ip.js diff --git a/packages/relaydb.new/src/models/MetaDns.js b/packages/nwdb/src/models/MetaDns.js similarity index 100% rename from packages/relaydb.new/src/models/MetaDns.js rename to packages/nwdb/src/models/MetaDns.js diff --git a/packages/relaydb.new/src/models/MetaGeo.js b/packages/nwdb/src/models/MetaGeo.js similarity index 100% rename from packages/relaydb.new/src/models/MetaGeo.js rename to packages/nwdb/src/models/MetaGeo.js diff --git a/packages/relaydb.new/src/models/MetaInfo.js b/packages/nwdb/src/models/MetaInfo.js similarity index 100% rename from packages/relaydb.new/src/models/MetaInfo.js rename to packages/nwdb/src/models/MetaInfo.js diff --git a/packages/relaydb.new/src/models/MetaSsl.js b/packages/nwdb/src/models/MetaSsl.js similarity index 100% rename from packages/relaydb.new/src/models/MetaSsl.js rename to packages/nwdb/src/models/MetaSsl.js diff --git a/packages/relaydb.new/src/models/Publisher.js b/packages/nwdb/src/models/Publisher.js similarity index 100% rename from packages/relaydb.new/src/models/Publisher.js rename to packages/nwdb/src/models/Publisher.js diff --git a/packages/relaydb.new/src/models/Relay.js b/packages/nwdb/src/models/Relay.js similarity index 100% rename from packages/relaydb.new/src/models/Relay.js rename to packages/nwdb/src/models/Relay.js diff --git a/packages/relaydb.new/src/models/RelayIp.js b/packages/nwdb/src/models/RelayIp.js similarity index 100% rename from packages/relaydb.new/src/models/RelayIp.js rename to packages/nwdb/src/models/RelayIp.js diff --git a/packages/relaydb.new/src/models/index.js b/packages/nwdb/src/models/index.js similarity index 100% rename from packages/relaydb.new/src/models/index.js rename to packages/nwdb/src/models/index.js diff --git a/packages/relaydb.new/src/seeds/.gitkeep b/packages/nwdb/src/seeds/.gitkeep similarity index 100% rename from packages/relaydb.new/src/seeds/.gitkeep rename to packages/nwdb/src/seeds/.gitkeep diff --git a/packages/relaydb/sandbox.js b/packages/relaydb/sandbox.js deleted file mode 100644 index 0dd687ae..00000000 --- a/packages/relaydb/sandbox.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * used for ad-hoc testing. Will go away soon :) - * - */ - -import { operators, IDS } from "lmdb-oql"; -import lmdb from './index.js' -import { Relay, RelayCheckInfo } from "./schemas.js" -import { parseRelayNetwork } from "@nostrwatch/utils" -import { delay } from "../trawler/src/utils.js"; - -import { inspect } from 'util' -const log = obj => console.log(inspect(obj, false, null, true)) - -import Logger from "@nostrwatch/logger" -const logger = new Logger('lmdb') - -import { ParseSelect } from '@nostrwatch/relaydb' - - -const { $and, $gt, $lt, $eq, $includes, $type, $notDefined, $isDefined, $isNull, $isFalsy, $isTruthy, $isUndefined } = operators - -// const db = withExtensions(open('/Users/sandwich/Develop/nostr-watch/packages/trawler/lmdb/nw.mdb', {indexOptions:{fulltext:true}})) - -await delay(1000) - -const db = lmdb('/Users/sandwich/Develop/nostr-watch/.lmdb/nw.mdb') //{indexOptions:{fulltext:true}} -const start = new Date().getTime() - -let $it = db.$.select( ).from( RelayCheckInfo ).where({ RelayCheckInfo: { data: $type('object') } } ) - -for await (const item of $it) { - // Process each item - log(item); -} - -console.log(db.relay.count.online(), 'online') - -console.log('RELAYS') -console.log(db.relay.count.network('clearnet'), 'clearnet relays') -console.log(db.relay.count.network('tor'), 'tor relays') -console.log(db.relay.count.network('i2p'), 'i2p relays') -console.log(db.relay.count.network('cjdns'), 'cjdns relays') -console.log(db.relay.count.online(), 'online relays') -console.log(db.relay.count.public(), 'public relays') -// console.log(db.relay.count.paid(), 'paid relays') -// console.log('NOTES') -// console.log(db.note.count.all(), 'notes') -// console.log('STAT') -const duration = new Date().getTime() - start -console.log(`${duration}ms`) \ No newline at end of file diff --git a/packages/seed/src/index.js b/packages/seed/src/index.js index 1eb5df09..e419a3ea 100644 --- 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 index bfa1ee22..5dbf4090 100644 --- 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 index a8beb9a4..2482305d 100644 --- 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