nostr-idb 2.1.6 → 2.2.0

package/README.md

@@ -149,6 +149,11 @@ const db = await openDB("events");
 
 const cacheRelay = new CacheRelay(db);
 
+// optionally filter out events before they are written to the database
+cacheRelay.core.writeQueue.processEvents = async (events) => {
+  return events.filter((event) => event.content.includes("gm"));
+};
+
 for (let event of events) {
   cacheRelay.publish(event);
 }

package/dist/cache/write-queue.d.ts

@@ -5,6 +5,8 @@ export declare class WriteQueue {
     private queuedIds;
     private eventQueue;
     private lastUsedQueue;
+    /** Called for each chunk of events before they are written to the database */
+    processEvents: ((events: NostrEvent[]) => Promise<NostrEvent[] | void>) | null;
     constructor(db: NostrIDB);
     addEvent(event: NostrEvent): void;
     addEvents(events: NostrEvent[]): void;

package/dist/cache/write-queue.js

@@ -7,6 +7,8 @@ export class WriteQueue {
     queuedIds = new Set();
     eventQueue = [];
     lastUsedQueue = new Set();
+    /** Called for each chunk of events before they are written to the database */
+    processEvents = null;
     constructor(db) {
         this.db = db;
     }
@@ -36,7 +38,7 @@ export class WriteQueue {
     }
     async flush(count = 1000) {
         if (this.eventQueue.length > 0) {
-            const events = [];
+            let events = [];
             for (let i = 0; i < count; i++) {
                 const event = this.eventQueue.shift();
                 if (!event)
@@ -44,6 +46,9 @@ export class WriteQueue {
                 events.push(event);
                 this.queuedIds.delete(event.id);
             }
+            if (this.processEvents) {
+                events = (await this.processEvents(events)) || events;
+            }
             await addEvents(this.db, events);
             log(`Wrote ${events.length} to database`);
             if (this.eventQueue.length > 0)

package/dist/relay/relay-core.d.ts

@@ -1,4 +1,6 @@
 import { Event, Filter } from "nostr-tools";
+import { WriteQueue } from "../cache/write-queue.js";
+import { IndexCache } from "../cache/index-cache.js";
 import { NostrIDB } from "../database/schema.js";
 export type SubscriptionOptions = {
     id?: string;
@@ -26,17 +28,18 @@ export type RelayCoreOptions = {
 };
 /** Main class that implements the relay logic */
 export declare class RelayCore {
-    private options;
-    private writeInterval?;
+    options: Required<RelayCoreOptions>;
+    running: boolean;
+    private writeTimeout?;
     private pruneInterval?;
-    get running(): boolean;
-    private eventMap;
-    private writeQueue;
-    private indexCache;
+    eventMap: Map<string, Event>;
+    writeQueue: WriteQueue;
+    indexCache: IndexCache;
     db: NostrIDB;
     baseEoseTimeout: number;
     private subscriptions;
     constructor(db: NostrIDB, opts?: RelayCoreOptions);
+    private flush;
     start(): Promise<void>;
     stop(): Promise<void>;
     publish(event: Event): Promise<string>;

package/dist/relay/relay-core.js

@@ -18,11 +18,9 @@ const log = logger.extend("relay");
 /** Main class that implements the relay logic */
 export class RelayCore {
     options;
-    writeInterval;
+    running = false;
+    writeTimeout;
     pruneInterval;
-    get running() {
-        return !!this.writeInterval;
-    }
     eventMap = new Map();
     writeQueue;
     indexCache;
@@ -36,19 +34,27 @@ export class RelayCore {
         this.indexCache = new IndexCache();
         this.indexCache.max = this.options.cacheIndexes;
     }
+    async flush() {
+        await this.writeQueue.flush();
+        // start next
+        this.writeTimeout = self.setTimeout(this.flush.bind(this), this.options.writeInterval);
+    }
     async start() {
+        if (this.running)
+            return;
         log("Starting");
-        this.writeInterval = self.setInterval(() => {
-            this.writeQueue.flush(this.options.batchWrite);
-        }, this.options.writeInterval);
+        this.running = true;
+        await this.flush();
         this.pruneInterval = self.setInterval(() => {
             pruneLastUsed(this.db, this.options.maxEvents);
         }, this.options.pruneInterval);
     }
     async stop() {
-        if (this.writeInterval) {
-            self.clearInterval(this.writeInterval);
-            this.writeInterval = undefined;
+        if (!this.running)
+            return;
+        if (this.writeTimeout) {
+            self.clearTimeout(this.writeTimeout);
+            this.writeTimeout = undefined;
         }
         if (this.pruneInterval) {
             self.clearInterval(this.pruneInterval);

package/dist/worker/shared.js

@@ -1,5 +1,5 @@
-import require$$0$1 from 'tty';
-import require$$1 from 'util';
+import require$$1 from 'tty';
+import require$$1$1 from 'util';
 import require$$0 from 'os';
 
 const instanceOfAny = (object, constructors) => constructors.some((c) => object instanceof c);
@@ -4324,8 +4324,8 @@ function getEventHash(event) {
   return bytesToHex(eventHash);
 }
 var i = new JS();
-i.generateSecretKey;
-i.getPublicKey;
+var generateSecretKey = i.generateSecretKey;
+var getPublicKey = i.getPublicKey;
 var finalizeEvent = i.finalizeEvent;
 var verifyEvent = i.verifyEvent;
 
@@ -4355,17 +4355,18 @@ __export(kinds_exports, {
   CreateOrUpdateStall: () => CreateOrUpdateStall,
   Curationsets: () => Curationsets,
   Date: () => Date2,
+  DirectMessageRelaysList: () => DirectMessageRelaysList,
   DraftClassifiedListing: () => DraftClassifiedListing,
   DraftLong: () => DraftLong,
   Emojisets: () => Emojisets,
   EncryptedDirectMessage: () => EncryptedDirectMessage,
-  EncryptedDirectMessages: () => EncryptedDirectMessages,
   EventDeletion: () => EventDeletion,
   FileMetadata: () => FileMetadata,
   FileServerPreference: () => FileServerPreference,
   Followsets: () => Followsets,
   GenericRepost: () => GenericRepost,
   Genericlists: () => Genericlists,
+  GiftWrap: () => GiftWrap,
   HTTPAuth: () => HTTPAuth,
   Handlerinformation: () => Handlerinformation,
   Handlerrecommendation: () => Handlerrecommendation,
@@ -4388,6 +4389,7 @@ __export(kinds_exports, {
   NostrConnect: () => NostrConnect,
   OpenTimestamps: () => OpenTimestamps,
   Pinlist: () => Pinlist,
+  PrivateDirectMessage: () => PrivateDirectMessage,
   ProblemTracker: () => ProblemTracker,
   ProfileBadges: () => ProfileBadges,
   PublicChatsList: () => PublicChatsList,
@@ -4398,6 +4400,7 @@ __export(kinds_exports, {
   Report: () => Report,
   Reporting: () => Reporting,
   Repost: () => Repost,
+  Seal: () => Seal,
   SearchRelaysList: () => SearchRelaysList,
   ShortTextNote: () => ShortTextNote,
   Time: () => Time,
@@ -4440,11 +4443,12 @@ var ShortTextNote = 1;
 var RecommendRelay = 2;
 var Contacts = 3;
 var EncryptedDirectMessage = 4;
-var EncryptedDirectMessages = 4;
 var EventDeletion = 5;
 var Repost = 6;
 var Reaction = 7;
 var BadgeAward = 8;
+var Seal = 13;
+var PrivateDirectMessage = 14;
 var GenericRepost = 16;
 var ChannelCreation = 40;
 var ChannelMetadata = 41;
@@ -4452,6 +4456,7 @@ var ChannelMessage = 42;
 var ChannelHideMessage = 43;
 var ChannelMuteUser = 44;
 var OpenTimestamps = 1040;
+var GiftWrap = 1059;
 var FileMetadata = 1063;
 var LiveChatMessage = 1311;
 var ProblemTracker = 1971;
@@ -4476,6 +4481,7 @@ var BlockedRelaysList = 10006;
 var SearchRelaysList = 10007;
 var InterestsList = 10015;
 var UserEmojiList = 10030;
+var DirectMessageRelaysList = 10050;
 var FileServerPreference = 10096;
 var NWCWalletInfo = 13194;
 var LightningPubRPC = 21e3;
@@ -4627,6 +4633,7 @@ var nip19_exports = {};
 __export(nip19_exports, {
   BECH32_REGEX: () => BECH32_REGEX,
   Bech32MaxSize: () => Bech32MaxSize,
+  NostrTypeGuard: () => NostrTypeGuard,
   decode: () => decode,
   encodeBytes: () => encodeBytes,
   naddrEncode: () => naddrEncode,
@@ -4634,9 +4641,18 @@ __export(nip19_exports, {
   noteEncode: () => noteEncode,
   nprofileEncode: () => nprofileEncode,
   npubEncode: () => npubEncode,
-  nrelayEncode: () => nrelayEncode,
   nsecEncode: () => nsecEncode
 });
+var NostrTypeGuard = {
+  isNProfile: (value) => /^nprofile1[a-z\d]+$/.test(value || ""),
+  isNRelay: (value) => /^nrelay1[a-z\d]+$/.test(value || ""),
+  isNEvent: (value) => /^nevent1[a-z\d]+$/.test(value || ""),
+  isNAddr: (value) => /^naddr1[a-z\d]+$/.test(value || ""),
+  isNSec: (value) => /^nsec1[a-z\d]{58}$/.test(value || ""),
+  isNPub: (value) => /^npub1[a-z\d]{58}$/.test(value || ""),
+  isNote: (value) => /^note1[a-z\d]+$/.test(value || ""),
+  isNcryptsec: (value) => /^ncryptsec1[a-z\d]+$/.test(value || "")
+};
 var Bech32MaxSize = 5e3;
 var BECH32_REGEX = /[\x21-\x7E]{1,83}1[023456789acdefghjklmnpqrstuvwxyz]{6,}/;
 function integerToUint8Array(number) {
@@ -4707,15 +4723,6 @@ function decode(nip19) {
         }
       };
     }
-    case "nrelay": {
-      let tlv = parseTLV(data);
-      if (!tlv[0]?.[0])
-        throw new Error("missing TLV 0 for nrelay");
-      return {
-        type: "nrelay",
-        data: utf8Decoder.decode(tlv[0][0])
-      };
-    }
     case "nsec":
       return { type: prefix, data };
     case "npub":
@@ -4787,12 +4794,6 @@ function naddrEncode(addr) {
   });
   return encodeBech32("naddr", data);
 }
-function nrelayEncode(url) {
-  let data = encodeTLV({
-    0: [utf8Encoder.encode(url)]
-  });
-  return encodeBech32("nrelay", data);
-}
 function encodeTLV(tlv) {
   let entries = [];
   Object.entries(tlv).reverse().forEach(([t, vs]) => {
@@ -4842,12 +4843,14 @@ function getNormalizedX(key) {
 var nip05_exports = {};
 __export(nip05_exports, {
   NIP05_REGEX: () => NIP05_REGEX,
+  isNip05: () => isNip05,
   isValid: () => isValid,
   queryProfile: () => queryProfile,
   searchDomain: () => searchDomain,
   useFetchImplementation: () => useFetchImplementation
 });
 var NIP05_REGEX = /^(?:([\w.+-]+)@)?([\w_-]+(\.[\w_-]+)+)$/;
+var isNip05 = (value) => NIP05_REGEX.test(value || "");
 var _fetch;
 try {
   _fetch = fetch;
@@ -4988,10 +4991,10 @@ function minePow(unsigned, difficulty) {
   const tag = ["nonce", count.toString(), difficulty.toString()];
   event.tags.push(tag);
   while (true) {
-    const now = Math.floor(new Date().getTime() / 1e3);
-    if (now !== event.created_at) {
+    const now2 = Math.floor(new Date().getTime() / 1e3);
+    if (now2 !== event.created_at) {
       count = 0;
-      event.created_at = now;
+      event.created_at = now2;
     }
     tag[1] = (++count).toString();
     event.id = getEventHash(event);
@@ -5575,6 +5578,65 @@ function makeZapReceipt({
   return zap;
 }
 
+// nip59.ts
+var nip59_exports = {};
+__export(nip59_exports, {
+  createRumor: () => createRumor,
+  createSeal: () => createSeal,
+  createWrap: () => createWrap,
+  unwrapEvent: () => unwrapEvent,
+  wrapEvent: () => wrapEvent
+});
+var TWO_DAYS = 2 * 24 * 60 * 60;
+var now = () => Math.round(Date.now() / 1e3);
+var randomNow = () => Math.round(now() - Math.random() * TWO_DAYS);
+var nip44ConversationKey = (privateKey, publicKey) => getConversationKey(privateKey, publicKey);
+var nip44Encrypt = (data, privateKey, publicKey) => encrypt2(JSON.stringify(data), nip44ConversationKey(privateKey, publicKey));
+var nip44Decrypt = (data, privateKey) => JSON.parse(decrypt2(data.content, nip44ConversationKey(privateKey, data.pubkey)));
+function createRumor(event, privateKey) {
+  const rumor = {
+    created_at: now(),
+    content: "",
+    tags: [],
+    ...event,
+    pubkey: getPublicKey(privateKey)
+  };
+  rumor.id = getEventHash(rumor);
+  return rumor;
+}
+function createSeal(rumor, privateKey, recipientPublicKey) {
+  return finalizeEvent(
+    {
+      kind: Seal,
+      content: nip44Encrypt(rumor, privateKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: []
+    },
+    privateKey
+  );
+}
+function createWrap(seal, recipientPublicKey) {
+  const randomKey = generateSecretKey();
+  return finalizeEvent(
+    {
+      kind: GiftWrap,
+      content: nip44Encrypt(seal, randomKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: [["p", recipientPublicKey]]
+    },
+    randomKey
+  );
+}
+function wrapEvent(event, senderPrivateKey, recipientPublicKey) {
+  const rumor = createRumor(event, senderPrivateKey);
+  const seal = createSeal(rumor, senderPrivateKey, recipientPublicKey);
+  return createWrap(seal, recipientPublicKey);
+}
+function unwrapEvent(wrap, recipientPrivateKey) {
+  const unwrappedSeal = nip44Decrypt(wrap, recipientPrivateKey);
+  return nip44Decrypt(unwrappedSeal, recipientPrivateKey);
+}
+
 // nip98.ts
 var nip98_exports = {};
 __export(nip98_exports, {
@@ -5795,7 +5857,7 @@ function requireMs () {
 	 * @api public
 	 */
 
-	ms = function(val, options) {
+	ms = function (val, options) {
 	  options = options || {};
 	  var type = typeof val;
 	  if (type === 'string' && val.length > 0) {
@@ -6506,12 +6568,12 @@ var hasRequiredHasFlag;
 function requireHasFlag () {
 	if (hasRequiredHasFlag) return hasFlag;
 	hasRequiredHasFlag = 1;
-	hasFlag = (flag, argv) => {
-		argv = argv || process.argv;
+
+	hasFlag = (flag, argv = process.argv) => {
 		const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-		const pos = argv.indexOf(prefix + flag);
-		const terminatorPos = argv.indexOf('--');
-		return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+		const position = argv.indexOf(prefix + flag);
+		const terminatorPosition = argv.indexOf('--');
+		return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 	};
 	return hasFlag;
 }
@@ -6523,23 +6585,32 @@ function requireSupportsColor () {
 	if (hasRequiredSupportsColor) return supportsColor_1;
 	hasRequiredSupportsColor = 1;
 	const os = require$$0;
+	const tty = require$$1;
 	const hasFlag = requireHasFlag();
 
-	const env = process.env;
+	const {env} = process;
 
 	let forceColor;
 	if (hasFlag('no-color') ||
 		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		forceColor = false;
+		hasFlag('color=false') ||
+		hasFlag('color=never')) {
+		forceColor = 0;
 	} else if (hasFlag('color') ||
 		hasFlag('colors') ||
 		hasFlag('color=true') ||
 		hasFlag('color=always')) {
-		forceColor = true;
+		forceColor = 1;
 	}
+
 	if ('FORCE_COLOR' in env) {
-		forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+		if (env.FORCE_COLOR === 'true') {
+			forceColor = 1;
+		} else if (env.FORCE_COLOR === 'false') {
+			forceColor = 0;
+		} else {
+			forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+		}
 	}
 
 	function translateLevel(level) {
@@ -6555,8 +6626,8 @@ function requireSupportsColor () {
 		};
 	}
 
-	function supportsColor(stream) {
-		if (forceColor === false) {
+	function supportsColor(haveStream, streamIsTTY) {
+		if (forceColor === 0) {
 			return 0;
 		}
 
@@ -6570,22 +6641,21 @@ function requireSupportsColor () {
 			return 2;
 		}
 
-		if (stream && !stream.isTTY && forceColor !== true) {
+		if (haveStream && !streamIsTTY && forceColor === undefined) {
 			return 0;
 		}
 
-		const min = forceColor ? 1 : 0;
+		const min = forceColor || 0;
+
+		if (env.TERM === 'dumb') {
+			return min;
+		}
 
 		if (process.platform === 'win32') {
-			// Node.js 7.5.0 is the first version of Node.js to include a patch to
-			// libuv that enables 256 color output on Windows. Anything earlier and it
-			// won't work. However, here we target Node.js 8 at minimum as it is an LTS
-			// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-			// release that supports 256 colors. Windows 10 build 14931 is the first release
-			// that supports 16m/TrueColor.
+			// Windows 10 build 10586 is the first Windows release that supports 256 colors.
+			// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
 			const osRelease = os.release().split('.');
 			if (
-				Number(process.versions.node.split('.')[0]) >= 8 &&
 				Number(osRelease[0]) >= 10 &&
 				Number(osRelease[2]) >= 10586
 			) {
@@ -6596,7 +6666,7 @@ function requireSupportsColor () {
 		}
 
 		if ('CI' in env) {
-			if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 				return 1;
 			}
 
@@ -6635,22 +6705,18 @@ function requireSupportsColor () {
 			return 1;
 		}
 
-		if (env.TERM === 'dumb') {
-			return min;
-		}
-
 		return min;
 	}
 
 	function getSupportLevel(stream) {
-		const level = supportsColor(stream);
+		const level = supportsColor(stream, stream && stream.isTTY);
 		return translateLevel(level);
 	}
 
 	supportsColor_1 = {
 		supportsColor: getSupportLevel,
-		stdout: getSupportLevel(process.stdout),
-		stderr: getSupportLevel(process.stderr)
+		stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+		stderr: translateLevel(supportsColor(true, tty.isatty(2)))
 	};
 	return supportsColor_1;
 }
@@ -6665,8 +6731,8 @@ function requireNode () {
 	if (hasRequiredNode) return node.exports;
 	hasRequiredNode = 1;
 	(function (module, exports) {
-		const tty = require$$0$1;
-		const util = require$$1;
+		const tty = require$$1;
+		const util = require$$1$1;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -6950,6 +7016,8 @@ class WriteQueue {
     queuedIds = new Set();
     eventQueue = [];
     lastUsedQueue = new Set();
+    /** Called for each chunk of events before they are written to the database */
+    processEvents = null;
     constructor(db) {
         this.db = db;
     }
@@ -6979,7 +7047,7 @@ class WriteQueue {
     }
     async flush(count = 1000) {
         if (this.eventQueue.length > 0) {
-            const events = [];
+            let events = [];
             for (let i = 0; i < count; i++) {
                 const event = this.eventQueue.shift();
                 if (!event)
@@ -6987,6 +7055,9 @@ class WriteQueue {
                 events.push(event);
                 this.queuedIds.delete(event.id);
             }
+            if (this.processEvents) {
+                events = (await this.processEvents(events)) || events;
+            }
             await addEvents(this.db, events);
             log$4(`Wrote ${events.length} to database`);
             if (this.eventQueue.length > 0)
@@ -7376,11 +7447,9 @@ const log$1 = logger.extend("relay");
 /** Main class that implements the relay logic */
 class RelayCore {
     options;
-    writeInterval;
+    running = false;
+    writeTimeout;
     pruneInterval;
-    get running() {
-        return !!this.writeInterval;
-    }
     eventMap = new Map();
     writeQueue;
     indexCache;
@@ -7394,19 +7463,27 @@ class RelayCore {
         this.indexCache = new IndexCache();
         this.indexCache.max = this.options.cacheIndexes;
     }
+    async flush() {
+        await this.writeQueue.flush();
+        // start next
+        this.writeTimeout = self.setTimeout(this.flush.bind(this), this.options.writeInterval);
+    }
     async start() {
+        if (this.running)
+            return;
         log$1("Starting");
-        this.writeInterval = self.setInterval(() => {
-            this.writeQueue.flush(this.options.batchWrite);
-        }, this.options.writeInterval);
+        this.running = true;
+        await this.flush();
         this.pruneInterval = self.setInterval(() => {
             pruneLastUsed(this.db, this.options.maxEvents);
         }, this.options.pruneInterval);
     }
     async stop() {
-        if (this.writeInterval) {
-            self.clearInterval(this.writeInterval);
-            this.writeInterval = undefined;
+        if (!this.running)
+            return;
+        if (this.writeTimeout) {
+            self.clearTimeout(this.writeTimeout);
+            this.writeTimeout = undefined;
         }
         if (this.pruneInterval) {
             self.clearInterval(this.pruneInterval);

package/dist/worker/worker.js

@@ -1,5 +1,5 @@
-import require$$0$1 from 'tty';
-import require$$1 from 'util';
+import require$$1 from 'tty';
+import require$$1$1 from 'util';
 import require$$0 from 'os';
 
 const instanceOfAny = (object, constructors) => constructors.some((c) => object instanceof c);
@@ -355,7 +355,7 @@ function requireMs () {
 	 * @api public
 	 */
 
-	ms = function(val, options) {
+	ms = function (val, options) {
 	  options = options || {};
 	  var type = typeof val;
 	  if (type === 'string' && val.length > 0) {
@@ -1066,12 +1066,12 @@ var hasRequiredHasFlag;
 function requireHasFlag () {
 	if (hasRequiredHasFlag) return hasFlag;
 	hasRequiredHasFlag = 1;
-	hasFlag = (flag, argv) => {
-		argv = argv || process.argv;
+
+	hasFlag = (flag, argv = process.argv) => {
 		const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
-		const pos = argv.indexOf(prefix + flag);
-		const terminatorPos = argv.indexOf('--');
-		return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
+		const position = argv.indexOf(prefix + flag);
+		const terminatorPosition = argv.indexOf('--');
+		return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 	};
 	return hasFlag;
 }
@@ -1083,23 +1083,32 @@ function requireSupportsColor () {
 	if (hasRequiredSupportsColor) return supportsColor_1;
 	hasRequiredSupportsColor = 1;
 	const os = require$$0;
+	const tty = require$$1;
 	const hasFlag = requireHasFlag();
 
-	const env = process.env;
+	const {env} = process;
 
 	let forceColor;
 	if (hasFlag('no-color') ||
 		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
-		forceColor = false;
+		hasFlag('color=false') ||
+		hasFlag('color=never')) {
+		forceColor = 0;
 	} else if (hasFlag('color') ||
 		hasFlag('colors') ||
 		hasFlag('color=true') ||
 		hasFlag('color=always')) {
-		forceColor = true;
+		forceColor = 1;
 	}
+
 	if ('FORCE_COLOR' in env) {
-		forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+		if (env.FORCE_COLOR === 'true') {
+			forceColor = 1;
+		} else if (env.FORCE_COLOR === 'false') {
+			forceColor = 0;
+		} else {
+			forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+		}
 	}
 
 	function translateLevel(level) {
@@ -1115,8 +1124,8 @@ function requireSupportsColor () {
 		};
 	}
 
-	function supportsColor(stream) {
-		if (forceColor === false) {
+	function supportsColor(haveStream, streamIsTTY) {
+		if (forceColor === 0) {
 			return 0;
 		}
 
@@ -1130,22 +1139,21 @@ function requireSupportsColor () {
 			return 2;
 		}
 
-		if (stream && !stream.isTTY && forceColor !== true) {
+		if (haveStream && !streamIsTTY && forceColor === undefined) {
 			return 0;
 		}
 
-		const min = forceColor ? 1 : 0;
+		const min = forceColor || 0;
+
+		if (env.TERM === 'dumb') {
+			return min;
+		}
 
 		if (process.platform === 'win32') {
-			// Node.js 7.5.0 is the first version of Node.js to include a patch to
-			// libuv that enables 256 color output on Windows. Anything earlier and it
-			// won't work. However, here we target Node.js 8 at minimum as it is an LTS
-			// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-			// release that supports 256 colors. Windows 10 build 14931 is the first release
-			// that supports 16m/TrueColor.
+			// Windows 10 build 10586 is the first Windows release that supports 256 colors.
+			// Windows 10 build 14931 is the first release that supports 16m/TrueColor.
 			const osRelease = os.release().split('.');
 			if (
-				Number(process.versions.node.split('.')[0]) >= 8 &&
 				Number(osRelease[0]) >= 10 &&
 				Number(osRelease[2]) >= 10586
 			) {
@@ -1156,7 +1164,7 @@ function requireSupportsColor () {
 		}
 
 		if ('CI' in env) {
-			if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 				return 1;
 			}
 
@@ -1195,22 +1203,18 @@ function requireSupportsColor () {
 			return 1;
 		}
 
-		if (env.TERM === 'dumb') {
-			return min;
-		}
-
 		return min;
 	}
 
 	function getSupportLevel(stream) {
-		const level = supportsColor(stream);
+		const level = supportsColor(stream, stream && stream.isTTY);
 		return translateLevel(level);
 	}
 
 	supportsColor_1 = {
 		supportsColor: getSupportLevel,
-		stdout: getSupportLevel(process.stdout),
-		stderr: getSupportLevel(process.stderr)
+		stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+		stderr: translateLevel(supportsColor(true, tty.isatty(2)))
 	};
 	return supportsColor_1;
 }
@@ -1225,8 +1229,8 @@ function requireNode () {
 	if (hasRequiredNode) return node.exports;
 	hasRequiredNode = 1;
 	(function (module, exports) {
-		const tty = require$$0$1;
-		const util = require$$1;
+		const tty = require$$1;
+		const util = require$$1$1;
 
 		/**
 		 * This is the Node.js implementation of `debug()`.
@@ -5512,8 +5516,8 @@ function getEventHash(event) {
   return bytesToHex(eventHash);
 }
 var i = new JS();
-i.generateSecretKey;
-i.getPublicKey;
+var generateSecretKey = i.generateSecretKey;
+var getPublicKey = i.getPublicKey;
 var finalizeEvent = i.finalizeEvent;
 var verifyEvent = i.verifyEvent;
 
@@ -5543,17 +5547,18 @@ __export(kinds_exports, {
   CreateOrUpdateStall: () => CreateOrUpdateStall,
   Curationsets: () => Curationsets,
   Date: () => Date2,
+  DirectMessageRelaysList: () => DirectMessageRelaysList,
   DraftClassifiedListing: () => DraftClassifiedListing,
   DraftLong: () => DraftLong,
   Emojisets: () => Emojisets,
   EncryptedDirectMessage: () => EncryptedDirectMessage,
-  EncryptedDirectMessages: () => EncryptedDirectMessages,
   EventDeletion: () => EventDeletion,
   FileMetadata: () => FileMetadata,
   FileServerPreference: () => FileServerPreference,
   Followsets: () => Followsets,
   GenericRepost: () => GenericRepost,
   Genericlists: () => Genericlists,
+  GiftWrap: () => GiftWrap,
   HTTPAuth: () => HTTPAuth,
   Handlerinformation: () => Handlerinformation,
   Handlerrecommendation: () => Handlerrecommendation,
@@ -5576,6 +5581,7 @@ __export(kinds_exports, {
   NostrConnect: () => NostrConnect,
   OpenTimestamps: () => OpenTimestamps,
   Pinlist: () => Pinlist,
+  PrivateDirectMessage: () => PrivateDirectMessage,
   ProblemTracker: () => ProblemTracker,
   ProfileBadges: () => ProfileBadges,
   PublicChatsList: () => PublicChatsList,
@@ -5586,6 +5592,7 @@ __export(kinds_exports, {
   Report: () => Report,
   Reporting: () => Reporting,
   Repost: () => Repost,
+  Seal: () => Seal,
   SearchRelaysList: () => SearchRelaysList,
   ShortTextNote: () => ShortTextNote,
   Time: () => Time,
@@ -5628,11 +5635,12 @@ var ShortTextNote = 1;
 var RecommendRelay = 2;
 var Contacts = 3;
 var EncryptedDirectMessage = 4;
-var EncryptedDirectMessages = 4;
 var EventDeletion = 5;
 var Repost = 6;
 var Reaction = 7;
 var BadgeAward = 8;
+var Seal = 13;
+var PrivateDirectMessage = 14;
 var GenericRepost = 16;
 var ChannelCreation = 40;
 var ChannelMetadata = 41;
@@ -5640,6 +5648,7 @@ var ChannelMessage = 42;
 var ChannelHideMessage = 43;
 var ChannelMuteUser = 44;
 var OpenTimestamps = 1040;
+var GiftWrap = 1059;
 var FileMetadata = 1063;
 var LiveChatMessage = 1311;
 var ProblemTracker = 1971;
@@ -5664,6 +5673,7 @@ var BlockedRelaysList = 10006;
 var SearchRelaysList = 10007;
 var InterestsList = 10015;
 var UserEmojiList = 10030;
+var DirectMessageRelaysList = 10050;
 var FileServerPreference = 10096;
 var NWCWalletInfo = 13194;
 var LightningPubRPC = 21e3;
@@ -5815,6 +5825,7 @@ var nip19_exports = {};
 __export(nip19_exports, {
   BECH32_REGEX: () => BECH32_REGEX,
   Bech32MaxSize: () => Bech32MaxSize,
+  NostrTypeGuard: () => NostrTypeGuard,
   decode: () => decode,
   encodeBytes: () => encodeBytes,
   naddrEncode: () => naddrEncode,
@@ -5822,9 +5833,18 @@ __export(nip19_exports, {
   noteEncode: () => noteEncode,
   nprofileEncode: () => nprofileEncode,
   npubEncode: () => npubEncode,
-  nrelayEncode: () => nrelayEncode,
   nsecEncode: () => nsecEncode
 });
+var NostrTypeGuard = {
+  isNProfile: (value) => /^nprofile1[a-z\d]+$/.test(value || ""),
+  isNRelay: (value) => /^nrelay1[a-z\d]+$/.test(value || ""),
+  isNEvent: (value) => /^nevent1[a-z\d]+$/.test(value || ""),
+  isNAddr: (value) => /^naddr1[a-z\d]+$/.test(value || ""),
+  isNSec: (value) => /^nsec1[a-z\d]{58}$/.test(value || ""),
+  isNPub: (value) => /^npub1[a-z\d]{58}$/.test(value || ""),
+  isNote: (value) => /^note1[a-z\d]+$/.test(value || ""),
+  isNcryptsec: (value) => /^ncryptsec1[a-z\d]+$/.test(value || "")
+};
 var Bech32MaxSize = 5e3;
 var BECH32_REGEX = /[\x21-\x7E]{1,83}1[023456789acdefghjklmnpqrstuvwxyz]{6,}/;
 function integerToUint8Array(number) {
@@ -5895,15 +5915,6 @@ function decode(nip19) {
         }
       };
     }
-    case "nrelay": {
-      let tlv = parseTLV(data);
-      if (!tlv[0]?.[0])
-        throw new Error("missing TLV 0 for nrelay");
-      return {
-        type: "nrelay",
-        data: utf8Decoder.decode(tlv[0][0])
-      };
-    }
     case "nsec":
       return { type: prefix, data };
     case "npub":
@@ -5975,12 +5986,6 @@ function naddrEncode(addr) {
   });
   return encodeBech32("naddr", data);
 }
-function nrelayEncode(url) {
-  let data = encodeTLV({
-    0: [utf8Encoder.encode(url)]
-  });
-  return encodeBech32("nrelay", data);
-}
 function encodeTLV(tlv) {
   let entries = [];
   Object.entries(tlv).reverse().forEach(([t, vs]) => {
@@ -6030,12 +6035,14 @@ function getNormalizedX(key) {
 var nip05_exports = {};
 __export(nip05_exports, {
   NIP05_REGEX: () => NIP05_REGEX,
+  isNip05: () => isNip05,
   isValid: () => isValid,
   queryProfile: () => queryProfile,
   searchDomain: () => searchDomain,
   useFetchImplementation: () => useFetchImplementation
 });
 var NIP05_REGEX = /^(?:([\w.+-]+)@)?([\w_-]+(\.[\w_-]+)+)$/;
+var isNip05 = (value) => NIP05_REGEX.test(value || "");
 var _fetch;
 try {
   _fetch = fetch;
@@ -6176,10 +6183,10 @@ function minePow(unsigned, difficulty) {
   const tag = ["nonce", count.toString(), difficulty.toString()];
   event.tags.push(tag);
   while (true) {
-    const now = Math.floor(new Date().getTime() / 1e3);
-    if (now !== event.created_at) {
+    const now2 = Math.floor(new Date().getTime() / 1e3);
+    if (now2 !== event.created_at) {
       count = 0;
-      event.created_at = now;
+      event.created_at = now2;
     }
     tag[1] = (++count).toString();
     event.id = getEventHash(event);
@@ -6763,6 +6770,65 @@ function makeZapReceipt({
   return zap;
 }
 
+// nip59.ts
+var nip59_exports = {};
+__export(nip59_exports, {
+  createRumor: () => createRumor,
+  createSeal: () => createSeal,
+  createWrap: () => createWrap,
+  unwrapEvent: () => unwrapEvent,
+  wrapEvent: () => wrapEvent
+});
+var TWO_DAYS = 2 * 24 * 60 * 60;
+var now = () => Math.round(Date.now() / 1e3);
+var randomNow = () => Math.round(now() - Math.random() * TWO_DAYS);
+var nip44ConversationKey = (privateKey, publicKey) => getConversationKey(privateKey, publicKey);
+var nip44Encrypt = (data, privateKey, publicKey) => encrypt2(JSON.stringify(data), nip44ConversationKey(privateKey, publicKey));
+var nip44Decrypt = (data, privateKey) => JSON.parse(decrypt2(data.content, nip44ConversationKey(privateKey, data.pubkey)));
+function createRumor(event, privateKey) {
+  const rumor = {
+    created_at: now(),
+    content: "",
+    tags: [],
+    ...event,
+    pubkey: getPublicKey(privateKey)
+  };
+  rumor.id = getEventHash(rumor);
+  return rumor;
+}
+function createSeal(rumor, privateKey, recipientPublicKey) {
+  return finalizeEvent(
+    {
+      kind: Seal,
+      content: nip44Encrypt(rumor, privateKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: []
+    },
+    privateKey
+  );
+}
+function createWrap(seal, recipientPublicKey) {
+  const randomKey = generateSecretKey();
+  return finalizeEvent(
+    {
+      kind: GiftWrap,
+      content: nip44Encrypt(seal, randomKey, recipientPublicKey),
+      created_at: randomNow(),
+      tags: [["p", recipientPublicKey]]
+    },
+    randomKey
+  );
+}
+function wrapEvent(event, senderPrivateKey, recipientPublicKey) {
+  const rumor = createRumor(event, senderPrivateKey);
+  const seal = createSeal(rumor, senderPrivateKey, recipientPublicKey);
+  return createWrap(seal, recipientPublicKey);
+}
+function unwrapEvent(wrap, recipientPrivateKey) {
+  const unwrappedSeal = nip44Decrypt(wrap, recipientPrivateKey);
+  return nip44Decrypt(unwrappedSeal, recipientPrivateKey);
+}
+
 // nip98.ts
 var nip98_exports = {};
 __export(nip98_exports, {
@@ -6950,6 +7016,8 @@ class WriteQueue {
     queuedIds = new Set();
     eventQueue = [];
     lastUsedQueue = new Set();
+    /** Called for each chunk of events before they are written to the database */
+    processEvents = null;
     constructor(db) {
         this.db = db;
     }
@@ -6979,7 +7047,7 @@ class WriteQueue {
     }
     async flush(count = 1000) {
         if (this.eventQueue.length > 0) {
-            const events = [];
+            let events = [];
             for (let i = 0; i < count; i++) {
                 const event = this.eventQueue.shift();
                 if (!event)
@@ -6987,6 +7055,9 @@ class WriteQueue {
                 events.push(event);
                 this.queuedIds.delete(event.id);
             }
+            if (this.processEvents) {
+                events = (await this.processEvents(events)) || events;
+            }
             await addEvents(this.db, events);
             log$4(`Wrote ${events.length} to database`);
             if (this.eventQueue.length > 0)
@@ -7376,11 +7447,9 @@ const log$1 = logger.extend("relay");
 /** Main class that implements the relay logic */
 class RelayCore {
     options;
-    writeInterval;
+    running = false;
+    writeTimeout;
     pruneInterval;
-    get running() {
-        return !!this.writeInterval;
-    }
     eventMap = new Map();
     writeQueue;
     indexCache;
@@ -7394,19 +7463,27 @@ class RelayCore {
         this.indexCache = new IndexCache();
         this.indexCache.max = this.options.cacheIndexes;
     }
+    async flush() {
+        await this.writeQueue.flush();
+        // start next
+        this.writeTimeout = self.setTimeout(this.flush.bind(this), this.options.writeInterval);
+    }
     async start() {
+        if (this.running)
+            return;
         log$1("Starting");
-        this.writeInterval = self.setInterval(() => {
-            this.writeQueue.flush(this.options.batchWrite);
-        }, this.options.writeInterval);
+        this.running = true;
+        await this.flush();
         this.pruneInterval = self.setInterval(() => {
             pruneLastUsed(this.db, this.options.maxEvents);
         }, this.options.pruneInterval);
     }
     async stop() {
-        if (this.writeInterval) {
-            self.clearInterval(this.writeInterval);
-            this.writeInterval = undefined;
+        if (!this.running)
+            return;
+        if (this.writeTimeout) {
+            self.clearTimeout(this.writeTimeout);
+            this.writeTimeout = undefined;
         }
         if (this.pruneInterval) {
             self.clearInterval(this.pruneInterval);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nostr-idb",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "A collection of helper methods for storing nostr events in IndexedDB",
   "author": "hzrd149",
   "license": "MIT",
@@ -37,14 +37,6 @@
       "types": "./dist/worker/index.d.ts"
     }
   },
-  "scripts": {
-    "dev": "vite serve",
-    "prebuild": "rm -rf dist",
-    "build": "tsc && rollup -c",
-    "build:examples": "vite build && cp examples/index.html public/index.html",
-    "prepare": "tsc && rollup -c",
-    "format": "prettier -w ."
-  },
   "dependencies": {
     "debug": "^4.3.6",
     "idb": "^8.0.0",
@@ -77,5 +69,12 @@
   "funding": {
     "type": "lightning",
     "url": "lightning:hzrd149@getalby.com"
+  },
+  "scripts": {
+    "dev": "vite serve",
+    "prebuild": "rm -rf dist",
+    "build": "tsc && rollup -c",
+    "build:examples": "vite build && cp examples/index.html public/index.html",
+    "format": "prettier -w ."
   }
-}
+}

package/CHANGELOG.md

@@ -1,78 +0,0 @@
-# nostr-idb
-
-## 2.1.6
-
-### Patch Changes
-
-- Add error handler for onevent callback
-
-## 2.1.5
-
-### Patch Changes
-
-- Add timeout for subscriptions
-
-## 2.1.4
-
-### Patch Changes
-
-- Add missing fire method to subscription type
-
-## 2.1.1
-
-### Patch Changes
-
-- 890f64a: don't rebroadcast duplicate events
-
-## 2.1.0
-
-### Minor Changes
-
-- 55e853c: Add in memory eventMap to relay core
-
-## 2.0.1
-
-### Patch Changes
-
-- e4ec1d1: Fix multiple filters being interpreted as and
-
-## 2.0.0
-
-### Major Changes
-
-- d7c74fb: Remove single `addEvent` method
-- e09e98c: Add `WebSocket` class
-- e09e98c: Add `LocalWebSocket` class
-- e09e98c: Add `WorkerWebSocket` class
-- e09e98c: Add `SharedWorkerWebSocket` class
-- e09e98c: Add `NostrIDBWorker` and `NostrIDBSharedWorker` classes
-
-## 1.1.1
-
-### Patch Changes
-
-- ec4b4e2: Fix event UID
-
-## 1.1.0
-
-### Minor Changes
-
-- 7004c24: Add simple prune methods
-
-## 1.0.0
-
-### Major Changes
-
-- 9bbdbc7: Upgrade nostr-tools to v2
-
-### Minor Changes
-
-- 9bbdbc7: Support ephemeral events
-- 446cb1e: Support replaceable and parameterized replaceable events
-
-## 0.2.0
-
-### Minor Changes
-
-- f223129: Added `CacheRelay` class
-- 6c04558: Add `IndexCache` for relay