@snort/system - npm Package Compare versions

Comparing version 1.0.22 to 1.1.0

dist/cache/index.d.ts

@@ -32,2 +32,4 @@ import { FullRelaySettings, HexKey, NostrEvent, UserMetadata } from "..";
     events: number;
+    connects: number;
+    lastSeen: number;
     disconnects: number;
@@ -34,0 +36,0 @@ latency: number[];

dist/cache/index.js

@@ -28,2 +28,2 @@ "use strict";
 exports.mapEventToProfile = mapEventToProfile;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FjaGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMENBQXVFO0FBK0N2RSxTQUFnQixpQkFBaUIsQ0FBQyxFQUFjO0lBQzlDLElBQUk7UUFDRixNQUFNLElBQUksR0FBaUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEQsSUFBSSxHQUFHLEdBQUc7WUFDUixHQUFHLElBQUk7WUFDUCxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU07WUFDakIsSUFBSSxFQUFFLElBQUEsb0JBQVcsRUFBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQztZQUNwQyxPQUFPLEVBQUUsRUFBRSxDQUFDLFVBQVU7WUFDdEIsTUFBTSxFQUFFLElBQUEsa0JBQVMsR0FBRTtTQUNILENBQUM7UUFFbkIsNkJBQTZCO1FBQzdCLEtBQUssTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3hDLElBQUksT0FBTyxDQUFDLEtBQUssUUFBUSxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVEsRUFBRTtnQkFDakQsR0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQzthQUM3QjtTQUNGO1FBQ0QsT0FBTyxHQUFHLENBQUM7S0FDWjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsT0FBTyxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDOUM7QUFDSCxDQUFDO0FBckJELDhDQXFCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FjaGUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMENBQXVFO0FBaUR2RSxTQUFnQixpQkFBaUIsQ0FBQyxFQUFjO0lBQzlDLElBQUk7UUFDRixNQUFNLElBQUksR0FBaUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEQsSUFBSSxHQUFHLEdBQUc7WUFDUixHQUFHLElBQUk7WUFDUCxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU07WUFDakIsSUFBSSxFQUFFLElBQUEsb0JBQVcsRUFBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQztZQUNwQyxPQUFPLEVBQUUsRUFBRSxDQUFDLFVBQVU7WUFDdEIsTUFBTSxFQUFFLElBQUEsa0JBQVMsR0FBRTtTQUNILENBQUM7UUFFbkIsNkJBQTZCO1FBQzdCLEtBQUssTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3hDLElBQUksT0FBTyxDQUFDLEtBQUssUUFBUSxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVEsRUFBRTtnQkFDakQsR0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQzthQUM3QjtTQUNGO1FBQ0QsT0FBTyxHQUFHLENBQUM7S0FDWjtJQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ1YsT0FBTyxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUM7S0FDOUM7QUFDSCxDQUFDO0FBckJELDhDQXFCQyJ9

dist/cache/user-metadata.js

@@ -74,3 +74,3 @@ "use strict";
     takeSnapshot() {
-        return [];
+        return [...this.cache.values()];
     }
@@ -130,2 +130,2 @@ async #processZapperQueue() {
 exports.UserProfileCache = UserProfileCache;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci1tZXRhZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWNoZS91c2VyLW1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDBDQUFtRjtBQUVuRixNQUFhLGdCQUFpQixTQUFRLGtCQUF3QjtJQUM1RCxZQUFZLEdBQTZDLEVBQUUsQ0FBQztJQUM1RCxVQUFVLEdBQTZDLEVBQUUsQ0FBQztJQUUxRCxZQUFZLEtBQXFDO1FBQy9DLEtBQUssQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDM0IsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELEdBQUcsQ0FBQyxFQUFpQjtRQUNuQixPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDbkIsQ0FBQztJQUVRLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBdUI7UUFDNUMsTUFBTSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDdEIsd0JBQXdCO1FBQ3hCLElBQUksT0FBTyxFQUFFO1lBQ1gsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzVCO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBUztRQUNwQixJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDZCwyQ0FBMkM7WUFDM0MsT0FBTyxDQUNMLE1BQU0sSUFBSSxDQUFDLEtBQUs7aUJBQ2IsS0FBSyxDQUFDLE1BQU0sQ0FBQztpQkFDYixvQkFBb0IsQ0FBQyxDQUFDLENBQUM7aUJBQ3ZCLEVBQUUsQ0FBQyxNQUFNLENBQUM7aUJBQ1Ysb0JBQW9CLENBQUMsQ0FBQyxDQUFDO2lCQUN2QixFQUFFLENBQUMsY0FBYyxDQUFDO2lCQUNsQixvQkFBb0IsQ0FBQyxDQUFDLENBQUM7aUJBQ3ZCLEVBQUUsQ0FBQyxPQUFPLENBQUM7aUJBQ1gsb0JBQW9CLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci1tZXRhZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWNoZS91c2VyLW1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDBDQUFtRjtBQUVuRixNQUFhLGdCQUFpQixTQUFRLGtCQUF3QjtJQUM1RCxZQUFZLEdBQTZDLEVBQUUsQ0FBQztJQUM1RCxVQUFVLEdBQTZDLEVBQUUsQ0FBQztJQUUxRCxZQUFZLEtBQXFDO1FBQy9DLEtBQUssQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDM0IsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELEdBQUcsQ0FBQyxFQUFpQjtRQUNuQixPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDbkIsQ0FBQztJQUVRLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBdUI7UUFDNUMsTUFBTSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDdEIsd0JBQXdCO1FBQ3hCLElBQUksT0FBTyxFQUFFO1lBQ1gsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzVCO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBUztRQUNwQixJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDZCwyQ0FBMkM7WUFDM0MsT0FBTyxDQUNMLE1BQU0sSUFBSSxDQUFDLEtBQUs7aUJBQ2IsS0FBSyxDQUFDLE1BQU0sQ0FBQztpQkFDYixvQkFBb0IsQ0FBQyxDQUFDLENBQUM7aUJBQ3ZCLEVBQUUsQ0FBQyxNQUFNLENBQUM7aUJBQ1Ysb0JBQW9CLENBQUMsQ0FBQyxDQUFDO2lCQUN2QixFQUFFLENBQUMsY0FBYyxDQUFDO2lCQUNsQixvQkFBb0IsQ0FBQyxDQUFDLENBQUM7aUJBQ3ZCLEVBQUUsQ0FBQyxPQUFPLENBQUM7aUJBQ1gsb0JBQW9CLENB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

dist/connection.d.ts

 /// <reference types="ws" />
 import WebSocket from "isomorphic-ws";
-import { ExternalStore } from "@snort/shared";
+import EventEmitter from "eventemitter3";
 import { ConnectionStats } from "./connection-stats";
 import { NostrEvent, ReqCommand, TaggedNostrEvent, u256 } from "./nostr";
 import { RelayInfo } from "./relay-info";
-export type AuthHandler = (challenge: string, relay: string) => Promise<NostrEvent | undefined>;
 /**
@@ -40,3 +39,12 @@ * Relay settings
 }
-export declare class Connection extends ExternalStore<ConnectionStateSnapshot> {
+interface ConnectionEvents {
+    change: (snapshot: ConnectionStateSnapshot) => void;
+    connected: (wasReconnect: boolean) => void;
+    event: (sub: string, e: TaggedNostrEvent) => void;
+    eose: (sub: string) => void;
+    disconnect: (code: number) => void;
+    auth: (challenge: string, relay: string, cb: (ev: NostrEvent) => void) => void;
+    notice: (msg: string) => void;
+}
+export declare class Connection extends EventEmitter<ConnectionEvents> {
     #private;
@@ -60,12 +68,8 @@ Id: string;
     EventsCallback: Map<u256, (msg: Array<string | boolean>) => void>;
-    OnConnected?: (wasReconnect: boolean) => void;
-    OnEvent?: (sub: string, e: TaggedNostrEvent) => void;
-    OnEose?: (sub: string) => void;
-    OnDisconnect?: (code: number) => void;
-    Auth?: AuthHandler;
     AwaitingAuth: Map<string, boolean>;
     Authed: boolean;
-    Ephemeral: boolean;
     Down: boolean;
-    constructor(addr: string, options: RelaySettings, auth?: AuthHandler, ephemeral?: boolean);
+    constructor(addr: string, options: RelaySettings, ephemeral?: boolean);
+    get Ephemeral(): boolean;
+    set Ephemeral(v: boolean);
     Connect(): Promise<void>;
@@ -96,3 +100,5 @@ Close(): void;
     takeSnapshot(): ConnectionStateSnapshot;
+    notifyChange(): void;
 }
+export {};
 //# sourceMappingURL=connection.d.ts.map

dist/connection.js

@@ -11,6 +11,7 @@ "use strict";
 const shared_1 = require("@snort/shared");
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const const_1 = require("./const");
 const connection_stats_1 = require("./connection-stats");
 const event_kind_1 = __importDefault(require("./event-kind"));
-class Connection extends shared_1.ExternalStore {
+class Connection extends eventemitter3_1.default {
     #log;
@@ -20,2 +21,3 @@ #ephemeralCheck;
     #expectAuth = false;
+    #ephemeral;
     Id;
@@ -35,12 +37,6 @@ Address;
     EventsCallback;
-    OnConnected;
-    OnEvent;
-    OnEose;
-    OnDisconnect;
-    Auth;
     AwaitingAuth;
     Authed = false;
-    Ephemeral;
     Down = true;
-    constructor(addr, options, auth, ephemeral = false) {
+    constructor(addr, options, ephemeral = false) {
         super();
@@ -53,6 +49,12 @@ this.Id = (0, uuid_1.v4)();
         this.AwaitingAuth = new Map();
-        this.Auth = auth;
-        this.Ephemeral = ephemeral;
+        this.#ephemeral = ephemeral;
         this.#log = (0, debug_1.default)("Connection").extend(addr);
     }
+    get Ephemeral() {
+        return this.#ephemeral;
+    }
+    set Ephemeral(v) {
+        this.#ephemeral = v;
+        this.#setupEphemeral();
+    }
     async Connect() {
@@ -107,3 +109,3 @@ try {
         this.#setupEphemeral();
-        this.OnConnected?.(wasReconnect);
+        this.emit("connected", wasReconnect);
         this.#sendPendingRaw();
@@ -125,3 +127,8 @@ }
             this.ReconnectTimer = setTimeout(() => {
-                this.Connect();
+                try {
+                    this.Connect();
+                }
+                catch {
+                    this.emit("disconnect", -1);
+                }
             }, this.ConnectTimeout);
@@ -134,3 +141,3 @@ this.Stats.Disconnects++;
         }
-        this.OnDisconnect?.(e.code);
+        this.emit("disconnect", e.code);
         this.#reset();
@@ -159,3 +166,3 @@ this.notifyChange();
                 case "EVENT": {
-                    this.OnEvent?.(msg[1], {
+                    this.emit("event", msg[1], {
                         ...msg[2],
@@ -169,3 +176,3 @@ relays: [this.Address],
                 case "EOSE": {
-                    this.OnEose?.(msg[1]);
+                    this.emit("eose", msg[1]);
                     break;
@@ -185,2 +192,3 @@ }
                 case "NOTICE": {
+                    this.emit("notice", msg[1]);
                     this.#log(`NOTICE: ${msg[1]}`);
@@ -292,3 +300,3 @@ break;
             this.#sendJson(["CLOSE", id]);
-            this.OnEose?.(id);
+            this.emit("eose", id);
             this.#SendQueuedRequests();
@@ -373,7 +381,5 @@ }
         };
-        if (!this.Auth) {
-            throw new Error("Auth hook not registered");
-        }
         this.AwaitingAuth.set(challenge, true);
-        const authEvent = await this.Auth(challenge, this.Address);
+        const authEvent = await new Promise((resolve, reject) => this.emit("auth", challenge, this.Address, resolve));
+        this.#log("Auth result: %o", authEvent);
         if (!authEvent) {
@@ -403,7 +409,7 @@ authCleanup();
     #setupEphemeral() {
+        if (this.#ephemeralCheck) {
+            clearInterval(this.#ephemeralCheck);
+            this.#ephemeralCheck = undefined;
+        }
         if (this.Ephemeral) {
-            if (this.#ephemeralCheck) {
-                clearInterval(this.#ephemeralCheck);
-                this.#ephemeralCheck = undefined;
-            }
             this.#ephemeralCheck = setInterval(() => {
@@ -422,4 +428,7 @@ const lastActivity = (0, shared_1.unixNowMs)() - this.#activity;
     }
+    notifyChange() {
+        this.emit("change", this.takeSnapshot());
+    }
 }
 exports.Connection = Connection;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}

dist/const.d.ts

@@ -10,2 +10,6 @@ /**
 /**
+ * Legacy tag reference regex
+ */
+export declare const TagRefRegex: RegExp;
+/**
  * How long profile cache should be considered valid for
@@ -12,0 +16,0 @@ */

dist/const.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MarkdownCodeRegex = exports.MentionNostrEntityRegex = exports.CashuRegex = exports.InvoiceRegex = exports.FileExtensionRegex = exports.ProfileCacheExpire = exports.HashtagRegex = exports.DefaultConnectTimeout = void 0;
+exports.MarkdownCodeRegex = exports.MentionNostrEntityRegex = exports.CashuRegex = exports.InvoiceRegex = exports.FileExtensionRegex = exports.ProfileCacheExpire = exports.TagRefRegex = exports.HashtagRegex = exports.DefaultConnectTimeout = void 0;
 /**
@@ -14,2 +14,6 @@ * Websocket re-connect timeout
 /**
+ * Legacy tag reference regex
+ */
+exports.TagRefRegex = /(#\[\d+\])/gm;
+/**
  * How long profile cache should be considered valid for
@@ -39,2 +43,2 @@ */
 exports.MarkdownCodeRegex = /(```.+?```)/gms;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUE7O0dBRUc7QUFDVSxRQUFBLHFCQUFxQixHQUFHLElBQUksQ0FBQztBQUUxQzs7R0FFRztBQUNILDZDQUE2QztBQUNoQyxRQUFBLFlBQVksR0FBRyx5Q0FBeUMsQ0FBQztBQUV0RTs7R0FFRztBQUNVLFFBQUEsa0JBQWtCLEdBQUcsS0FBSyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBRXREOztHQUVHO0FBQ0gsNkNBQTZDO0FBQ2hDLFFBQUEsa0JBQWtCLEdBQUcsaUJBQWlCLENBQUM7QUFFcEQ7O0dBRUc7QUFDVSxRQUFBLFlBQVksR0FBRyxZQUFZLENBQUM7QUFFekM7O0dBRUc7QUFDVSxRQUFBLFVBQVUsR0FBRyx1Q0FBdUMsQ0FBQztBQUVsRTs7R0FFRztBQUNVLFFBQUEsdUJBQXVCLEdBQUcsc0VBQXNFLENBQUM7QUFFOUc7O0dBRUc7QUFDVSxRQUFBLGlCQUFpQixHQUFHLGdCQUFnQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUE7O0dBRUc7QUFDVSxRQUFBLHFCQUFxQixHQUFHLElBQUksQ0FBQztBQUUxQzs7R0FFRztBQUNILDZDQUE2QztBQUNoQyxRQUFBLFlBQVksR0FBRyx5Q0FBeUMsQ0FBQztBQUV0RTs7R0FFRztBQUNVLFFBQUEsV0FBVyxHQUFHLGNBQWMsQ0FBQztBQUUxQzs7R0FFRztBQUNVLFFBQUEsa0JBQWtCLEdBQUcsS0FBSyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0FBRXREOztHQUVHO0FBQ0gsNkNBQTZDO0FBQ2hDLFFBQUEsa0JBQWtCLEdBQUcsaUJBQWlCLENBQUM7QUFFcEQ7O0dBRUc7QUFDVSxRQUFBLFlBQVksR0FBRyxZQUFZLENBQUM7QUFFekM7O0dBRUc7QUFDVSxRQUFBLFVBQVUsR0FBRyx1Q0FBdUMsQ0FBQztBQUVsRTs7R0FFRztBQUNVLFFBQUEsdUJBQXVCLEdBQUcsc0VBQXNFLENBQUM7QUFFOUc7O0dBRUc7QUFDVSxRQUFBLGlCQUFpQixHQUFHLGdCQUFnQixDQUFDIn0=

dist/event-kind.d.ts

@@ -27,5 +27,6 @@ declare enum EventKind {
     Auth = 22242,
-    PubkeyLists = 30000,
-    NoteLists = 30001,
-    TagLists = 30002,
+    MuteList = 10000,
+    PinList = 10001,
+    CategorizedPeople = 30000,
+    CategorizedBookmarks = 30001,
     Badge = 30009,
@@ -32,0 +33,0 @@ ProfileBadges = 30008,

dist/event-kind.js

@@ -30,5 +30,6 @@ "use strict";
     EventKind[EventKind["Auth"] = 22242] = "Auth";
-    EventKind[EventKind["PubkeyLists"] = 30000] = "PubkeyLists";
-    EventKind[EventKind["NoteLists"] = 30001] = "NoteLists";
-    EventKind[EventKind["TagLists"] = 30002] = "TagLists";
+    EventKind[EventKind["MuteList"] = 10000] = "MuteList";
+    EventKind[EventKind["PinList"] = 10001] = "PinList";
+    EventKind[EventKind["CategorizedPeople"] = 30000] = "CategorizedPeople";
+    EventKind[EventKind["CategorizedBookmarks"] = 30001] = "CategorizedBookmarks";
     EventKind[EventKind["Badge"] = 30009] = "Badge";
@@ -47,2 +48,2 @@ EventKind[EventKind["ProfileBadges"] = 30008] = "ProfileBadges";
 exports.default = EventKind;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnQta2luZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ldmVudC1raW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsSUFBSyxTQXdDSjtBQXhDRCxXQUFLLFNBQVM7SUFDWixnREFBWSxDQUFBO0lBQ1osdURBQWUsQ0FBQTtJQUNmLGlEQUFZLENBQUE7SUFDWiwrREFBbUIsQ0FBQTtJQUNuQix1REFBZSxDQUFBO0lBQ2YsMkRBQWlCLENBQUE7SUFDakIsaURBQVksQ0FBQTtJQUNaLDZDQUFVLENBQUE7SUFDVixpREFBWSxDQUFBO0lBQ1oscURBQWMsQ0FBQTtJQUNkLG1FQUFxQixDQUFBO0lBQ3JCLHdEQUFnQixDQUFBO0lBQ2hCLG9EQUFjLENBQUE7SUFDZCxvRUFBc0IsQ0FBQTtJQUN0QixzRUFBdUIsQ0FBQTtJQUN2QixvRUFBc0IsQ0FBQTtJQUN0Qiw0RUFBMEIsQ0FBQTtJQUMxQixzRUFBdUIsQ0FBQTtJQUN2Qix3RUFBeUIsQ0FBQTtJQUN6Qiw4Q0FBWSxDQUFBO0lBQ1osb0RBQWUsQ0FBQTtJQUNmLHdEQUFpQixDQUFBO0lBQ2pCLGlEQUFjLENBQUE7SUFDZCx1REFBa0IsQ0FBQTtJQUNsQiw2Q0FBWSxDQUFBO0lBQ1osMkRBQW1CLENBQUE7SUFDbkIsdURBQWlCLENBQUE7SUFDakIscURBQWdCLENBQUE7SUFDaEIsK0NBQWEsQ0FBQTtJQUNiLCtEQUFxQixDQUFBO0lBQ3JCLHFFQUF3QixDQUFBO0lBQ3hCLG1EQUFnQixDQUFBO0lBQ2hCLHVEQUFpQixDQUFBO0lBQ2pCLHlEQUFrQixDQUFBO0lBQ2xCLDJEQUFtQixDQUFBO0lBQ25CLHlFQUEyQixDQUFBO0lBQzNCLHdEQUFpQixDQUFBO0lBQ2pCLHdEQUFpQixDQUFBO0lBQ2pCLHlFQUEwQixDQUFBO0FBQzVCLENBQUMsRUF4Q0ksU0FBUyxLQUFULFNBQVMsUUF3Q2I7QUFFRCxrQkFBZSxTQUFTLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnQta2luZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ldmVudC1raW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsSUFBSyxTQTZDSjtBQTdDRCxXQUFLLFNBQVM7SUFDWixnREFBWSxDQUFBO0lBQ1osdURBQWUsQ0FBQTtJQUNmLGlEQUFZLENBQUE7SUFDWiwrREFBbUIsQ0FBQTtJQUNuQix1REFBZSxDQUFBO0lBQ2YsMkRBQWlCLENBQUE7SUFDakIsaURBQVksQ0FBQTtJQUNaLDZDQUFVLENBQUE7SUFDVixpREFBWSxDQUFBO0lBQ1oscURBQWMsQ0FBQTtJQUNkLG1FQUFxQixDQUFBO0lBQ3JCLHdEQUFnQixDQUFBO0lBQ2hCLG9EQUFjLENBQUE7SUFDZCxvRUFBc0IsQ0FBQTtJQUN0QixzRUFBdUIsQ0FBQTtJQUN2QixvRUFBc0IsQ0FBQTtJQUN0Qiw0RUFBMEIsQ0FBQTtJQUMxQixzRUFBdUIsQ0FBQTtJQUN2Qix3RUFBeUIsQ0FBQTtJQUN6Qiw4Q0FBWSxDQUFBO0lBQ1osb0RBQWUsQ0FBQTtJQUNmLHdEQUFpQixDQUFBO0lBQ2pCLGlEQUFjLENBQUE7SUFDZCx1REFBa0IsQ0FBQTtJQUNsQiw2Q0FBWSxDQUFBO0lBRVoscURBQWlCLENBQUE7SUFDakIsbURBQWdCLENBQUE7SUFFaEIsdUVBQXlCLENBQUE7SUFDekIsNkVBQTRCLENBQUE7SUFFNUIsK0NBQWEsQ0FBQTtJQUNiLCtEQUFxQixDQUFBO0lBRXJCLHFFQUF3QixDQUFBO0lBQ3hCLG1EQUFnQixDQUFBO0lBQ2hCLHVEQUFpQixDQUFBO0lBQ2pCLHlEQUFrQixDQUFBO0lBQ2xCLDJEQUFtQixDQUFBO0lBQ25CLHlFQUEyQixDQUFBO0lBQzNCLHdEQUFpQixDQUFBO0lBQ2pCLHdEQUFpQixDQUFBO0lBQ2pCLHlFQUEwQixDQUFBO0FBQzVCLENBQUMsRUE3Q0ksU0FBUyxLQUFULFNBQVMsUUE2Q2I7QUFFRCxrQkFBZSxTQUFTLENBQUMifQ==

dist/event-publisher.d.ts

@@ -1,2 +0,2 @@
-import { EventKind, EventSigner, FullRelaySettings, HexKey, Lists, NostrEvent, NostrLink, NotSignedNostrEvent, PowMiner, RelaySettings, SignerSupports, TaggedNostrEvent, u256, UserMetadata } from ".";
+import { EventKind, EventSigner, FullRelaySettings, HexKey, NostrEvent, NostrLink, NotSignedNostrEvent, PowMiner, RelaySettings, SignerSupports, TaggedNostrEvent, ToNostrEventTag, u256, UserMetadata } from ".";
 import { EventBuilder } from "./event-builder";
@@ -24,5 +24,17 @@ type EventBuilderHook = (ev: EventBuilder) => EventBuilder;
     nip42Auth(challenge: string, relay: string): Promise<NostrEvent>;
-    muted(keys: HexKey[], priv: HexKey[]): Promise<NostrEvent>;
-    noteList(notes: u256[], list: Lists): Promise<NostrEvent>;
-    tags(tags: string[]): Promise<NostrEvent>;
+    /**
+     * Build a mute list event using lists of pubkeys
+     * @param pub Public mute list
+     * @param priv Private mute list
+     */
+    muted(pub: Array<string>, priv: Array<string>): Promise<NostrEvent>;
+    /**
+     * Build a pin list event using lists of event links
+     */
+    pinned(notes: Array<ToNostrEventTag>): Promise<NostrEvent>;
+    /**
+     * Build a categorized bookmarks event with a given label
+     * @param notes List of bookmarked links
+     */
+    bookmarks(notes: Array<ToNostrEventTag>, list: "bookmark" | "follow"): Promise<NostrEvent>;
     metadata(obj: UserMetadata): Promise<NostrEvent>;
@@ -47,3 +59,3 @@ /**
     relayList(relays: Array<FullRelaySettings> | Record<string, RelaySettings>): Promise<NostrEvent>;
-    contactList(follows: Array<HexKey>, relays: Record<string, RelaySettings>): Promise<NostrEvent>;
+    contactList(tags: Array<[string, string]>): Promise<NostrEvent>;
     /**
@@ -64,2 +76,3 @@ * Delete an event (NIP-09)
     generic(fnHook: EventBuilderHook): Promise<NostrEvent>;
+    appData(data: object, id: string): Promise<NostrEvent>;
     /**
@@ -66,0 +79,0 @@ * NIP-59 Gift Wrap event with ephemeral key

dist/event-publisher.js

@@ -98,6 +98,10 @@ "use strict";
     }
-    async muted(keys, priv) {
-        const eb = this.#eb(_1.EventKind.PubkeyLists);
-        eb.tag(["d", _1.Lists.Muted]);
-        keys.forEach(p => {
+    /**
+     * Build a mute list event using lists of pubkeys
+     * @param pub Public mute list
+     * @param priv Private mute list
+     */
+    async muted(pub, priv) {
+        const eb = this.#eb(_1.EventKind.MuteList);
+        pub.forEach(p => {
             eb.tag(["p", p]);
@@ -112,15 +116,21 @@ });
     }
-    async noteList(notes, list) {
-        const eb = this.#eb(_1.EventKind.NoteLists);
-        eb.tag(["d", list]);
+    /**
+     * Build a pin list event using lists of event links
+     */
+    async pinned(notes) {
+        const eb = this.#eb(_1.EventKind.PinList);
         notes.forEach(n => {
-            eb.tag(["e", n]);
+            eb.tag((0, shared_1.unwrap)(n.toEventTag()));
         });
         return await this.#sign(eb);
     }
-    async tags(tags) {
-        const eb = this.#eb(_1.EventKind.TagLists);
-        eb.tag(["d", _1.Lists.Followed]);
-        tags.forEach(t => {
-            eb.tag(["t", t]);
+    /**
+     * Build a categorized bookmarks event with a given label
+     * @param notes List of bookmarked links
+     */
+    async bookmarks(notes, list) {
+        const eb = this.#eb(_1.EventKind.CategorizedBookmarks);
+        eb.tag(["d", list]);
+        notes.forEach(n => {
+            eb.tag((0, shared_1.unwrap)(n.toEventTag()));
         });
@@ -155,3 +165,4 @@ return await this.#sign(eb);
         if (note) {
-            eb.tag((0, shared_1.unwrap)(note.toEventTag()));
+            // HACK: remove relay tag, some zap services dont like relay tags
+            eb.tag((0, shared_1.unwrap)(note.toEventTag()).slice(0, 2));
         }
@@ -194,4 +205,2 @@ eb.tag(["p", author]);
         }
-        // Big E/A tag
-        eb.tag((0, shared_1.unwrap)(link.toEventTag()).map((v, i) => (i === 0 ? v.toUpperCase() : v)));
         eb.processContent();
@@ -230,7 +239,5 @@ fnExtra?.(eb);
     }
-    async contactList(follows, relays) {
+    async contactList(tags) {
         const eb = this.#eb(_1.EventKind.ContactList);
-        eb.content(JSON.stringify(relays));
-        const temp = new Set(follows.filter(a => a.length === 64).map(a => a.toLowerCase()));
-        temp.forEach(a => eb.tag(["p", a]));
+        tags.forEach(a => eb.tag(a));
         return await this.#sign(eb);
@@ -296,2 +303,8 @@ }
     }
+    async appData(data, id) {
+        const eb = this.#eb(_1.EventKind.AppData);
+        eb.content(await this.nip4Encrypt(JSON.stringify(data), this.#pubKey));
+        eb.tag(["d", id]);
+        return await this.#sign(eb);
+    }
     /**
@@ -350,2 +363,2 @@ * NIP-59 Gift Wrap event with ephemeral key
 exports.EventPublisher = EventPublisher;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"event-publisher.js","sourceRoot":"","sources":["../src/event-publisher.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"event-publisher.js","sourceRoot":"","sources":["../src/event-publisher.ts"],"names":[],"mappings":"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"}

dist/impl/nip46.js

@@ -58,6 +58,6 @@ "use strict";
             this.#conn = new connection_1.Connection(this.#relay, { read: true, write: true });
-            this.#conn.OnEvent = async (sub, e) => {
+            this.#conn.on("event", async (sub, e) => {
                 await this.#onReply(e);
-            };
-            this.#conn.OnConnected = async () => {
+            });
+            this.#conn.on("connected", async () => {
                 this.#conn.QueueReq([
@@ -81,3 +81,3 @@ "REQ",
                 }
-            };
+            });
             this.#conn.Connect();
@@ -186,2 +186,2 @@ this.#didInit = true;
 exports.Nip46Signer = Nip46Signer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmlwNDYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW1wbC9uaXA0Ni50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwQ0FBb0Q7QUFDcEQsdURBQW9EO0FBQ3BELCtCQUFrQztBQUNsQyxrREFBMEI7QUFFMUIsOENBQTJDO0FBQzNDLHNDQUEwRDtBQUUxRCxvREFBZ0Q7QUFHaEQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO0FBMEIxQixNQUFhLFdBQVc7SUFDdEIsS0FBSyxDQUFjO0lBQ25CLE1BQU0sQ0FBUztJQUNmLFlBQVksQ0FBUztJQUNyQixhQUFhLENBQVU7SUFDdkIsTUFBTSxDQUFVO0lBQ2hCLGFBQWEsQ0FBYztJQUMzQixhQUFhLEdBQTBCLElBQUksR0FBRyxFQUFFLENBQUM7SUFDakQsSUFBSSxHQUFHLElBQUEsZUFBSyxFQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZCLE1BQU0sQ0FBUztJQUNmLFFBQVEsR0FBWSxLQUFLLENBQUM7SUFFMUIsWUFBWSxNQUFjLEVBQUUsWUFBMEI7UUFDcEQsTUFBTSxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFNUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNuQztRQUNELElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDeEMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmlwNDYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW1wbC9uaXA0Ni50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwQ0FBb0Q7QUFDcEQsdURBQW9EO0FBQ3BELCtCQUFrQztBQUNsQyxrREFBMEI7QUFFMUIsOENBQTJDO0FBQzNDLHNDQUEwRDtBQUUxRCxvREFBZ0Q7QUFHaEQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO0FBMEIxQixNQUFhLFdBQVc7SUFDdEIsS0FBSyxDQUFjO0lBQ25CLE1BQU0sQ0FBUztJQUNmLFlBQVksQ0FBUztJQUNyQixhQUFhLENBQVU7SUFDdkIsTUFBTSxDQUFVO0lBQ2hCLGFBQWEsQ0FBYztJQUMzQixhQUFhLEdBQTBCLElBQUksR0FBRyxFQUFFLENBQUM7SUFDakQsSUFBSSxHQUFHLElBQUEsZUFBSyxFQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3ZCLE1BQU0sQ0FBUztJQUNmLFFBQVEsR0FBWSxLQUFLLENBQUM7SUFFMUIsWUFBWSxNQUFjLEVBQUUsWUFBMEI7UUFDcEQsTUFBTSxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFNUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNuQztRQUNELElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDeEMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1NBQ3BEO1FBRUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFBLGVBQU0sRUFBQyxDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxhQUFhLEdBQUcsWUFBWSxJQUFJLElBQUkseUJBQWdCLENBQUMscUJBQVMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO0lBQ2hHLENBQUM7SUFFRCxJQUFJLFFBQVE7UUFDVixPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztJQUVELElBQUksTUFBTTtRQUNSLE9BQU8sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdkIsQ0FBQztJQUVELElBQUksVUFBVTtRQUNaLElBQUksSUFBSSxDQUFDLGFBQWEsWUFBWSx5QkFBZ0IsRUFBRTtZQUNsRCxPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDO1NBQ3RDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxJQUFJO1FBQ1IsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sS0FBSyxTQUFTLENBQUM7UUFDM0MsSUFBSSxRQUFRLEVBQUU7WUFDWixJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUM7WUFDdkMsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxFQUFFLENBQUM7U0FDMUQ7UUFDRCxPQUFPLE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDakQsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLHVCQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDdEUsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3RDLE1BQU0sSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN6QixDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFdBQVcsRUFBRSxLQUFLLElBQUksRUFBRTtnQkFDcEMsSUFBSSxDQUFDLEtBQU0sQ0FBQyxRQUFRLENBQ2xCO29CQUNFLEtBQUs7b0JBQ0wsT0FBTztvQkFDUDt3QkFDRSxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUM7d0JBQ25CLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUM7cUJBQzFCO2lCQUNGLEVBQ0QsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUNULENBQUM7Z0JBRUYsSUFBSSxRQUFRLEVBQUU7b0JBQ1osTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUEsZUFBTSxFQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO29CQUNoRCxPQUFPLEVBQUUsQ0FBQztpQkFDWDtxQkFBTTtvQkFDTCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUU7d0JBQ2hDLE1BQU07d0JBQ04sT0FBTztxQkFDUixDQUFDLENBQUM7aUJBQ0o7WUFDSCxDQUFDLENBQUMsQ0FBQztZQUNILElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDckIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDdkIsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUs7UUFDVCxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDZCxNQUFNLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN6QixJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM3QixJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDO1lBQ3ZCLElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFDO1NBQ3ZCO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxRQUFRO1FBQ1osT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQWdCLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVM7UUFDYixPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBUyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFlLEVBQUUsUUFBZ0I7UUFDakQsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQVMsZUFBZSxFQUFFLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDdkUsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBZSxFQUFFLFFBQWdCO1FBQ2pELE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFTLGVBQWUsRUFBRSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFFRCxZQUFZLENBQUMsT0FBZSxFQUFFLEdBQVc7UUFDdkMsTUFBTSxJQUFJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxZQUFZLENBQUMsT0FBZSxFQUFFLFFBQWdCO1FBQzVDLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFjO1FBQ3ZCLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBUyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMxRSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXO1FBQ2YsT0FBTyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUSxDQUFDLEVBQVU7UUFDdkIsTUFBTSxhQUFhLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMzQixJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDZixhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUNqQztRQUNELE9BQU8sTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFTLFNBQVMsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFhO1FBQzFCLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUU7WUFDekIsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1NBQ3ZDO1FBRUQsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ25GLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQWlDLENBQUM7UUFFM0UsSUFBSSxFQUFFLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNsQixJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM3QixJQUFJLFFBQVEsSUFBSSxLQUFLLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxTQUFTLEVBQUU7WUFDbkQsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3JDLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FDckI7Z0JBQ0UsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFO2dCQUNaLE1BQU0sRUFBRSxLQUFLO2dCQUNiLEtBQUssRUFBRSxFQUFFO2FBQ1YsRUFDRCxJQUFBLGVBQU0sRUFBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQzNCLENBQUM7WUFDRixFQUFFLEdBQUcsU0FBUyxDQUFDO1NBQ2hCO1FBQ0QsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDM0MsSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUNaLE1BQU0sSUFBSSxLQUFLLENBQUMsMEJBQTBCLENBQUMsQ0FBQztTQUM3QztRQUVELE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdkIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxLQUFLLENBQUMsSUFBSSxDQUFJLE1BQWMsRUFBRSxNQUFrQjtRQUM5QyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixNQUFNLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUNuQjtRQUNELElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUVyRCxNQUFNLE9BQU8sR0FBRztZQUNkLEVBQUUsRUFBRSxJQUFBLFNBQUksR0FBRTtZQUNWLE1BQU07WUFDTixNQUFNO1NBQ1MsQ0FBQztRQUVsQixJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxJQUFBLGVBQU0sRUFBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUN2RCxPQUFPLE1BQU0sSUFBSSxPQUFPLENBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDOUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRTtnQkFDakMsT0FBTyxFQUFFLEtBQUssRUFBRSxDQUFnQixFQUFFLEVBQUU7b0JBQ2xDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBVyxDQUFDLENBQUM7Z0JBQ3pCLENBQUM7Z0JBQ0QsTUFBTTthQUNQLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELEtBQUssQ0FBQyxZQUFZLENBQUMsT0FBcUMsRUFBRSxNQUFjO1FBQ3RFLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU87UUFFeEIsTUFBTSxFQUFFLEdBQUcsSUFBSSw0QkFBWSxFQUFFLENBQUM7UUFDOUIsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUF1QixDQUFDO2FBQzdCLE9BQU8sQ0FBQyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7YUFDOUUsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFFdEIsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDL0IsTUFBTSxTQUFTLEdBQUcsTUFBTSxFQUFFLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUM1RCxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDRjtBQXRNRCxrQ0FzTUMifQ==

dist/index.d.ts

@@ -1,2 +0,2 @@
-import { AuthHandler, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
+import { RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
 import { RequestBuilder } from "./request-builder";
@@ -44,6 +44,2 @@ import { NoteStore, NoteStoreSnapshotData } from "./note-collection";
     /**
-     * Handler function for NIP-42
-     */
-    HandleAuth?: AuthHandler;
-    /**
      * Get a snapshot of the relay connections
@@ -50,0 +46,0 @@ */

dist/index.js

@@ -61,2 +61,10 @@ "use strict";
     }
+    else if (p.includes("?iv=")) {
+        const [ciphertext, nonce] = p.split("?iv=");
+        return {
+            v: 0 /* MessageEncryptorVersion.Nip4 */,
+            nonce: base_1.base64.decode(nonce),
+            ciphertext: base_1.base64.decode(ciphertext),
+        };
+    }
     else {
@@ -76,2 +84,2 @@ const buf = base_1.base64.decode(p);
 exports.encodeEncryptionPayload = encodeEncryptionPayload;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFRQSxzQ0FBcUM7QUFFckMsaURBQStCO0FBQy9CLDJDQUFvRDtBQUEzQyx3SEFBQSxPQUFPLE9BQWE7QUFDN0IsMENBQXdCO0FBQ3hCLDBDQUF3QjtBQUN4Qix5Q0FBdUI7QUFDdkIsK0NBQTZCO0FBQzdCLDhDQUE0QjtBQUM1QiwrQ0FBNkI7QUFDN0Isb0RBQWtDO0FBQ2xDLG9EQUFrQztBQUNsQyxvREFBa0M7QUFDbEMsa0RBQWdDO0FBQ2hDLCtDQUE2QjtBQUM3QixrREFBZ0M7QUFDaEMseUNBQXVCO0FBQ3ZCLDJDQUF5QjtBQUN6Qix5Q0FBdUI7QUFDdkIsd0NBQXNCO0FBQ3RCLDZDQUEyQjtBQUMzQixvREFBa0M7QUFDbEMsOENBQTRCO0FBRTVCLDhDQUE0QjtBQUM1QiwrQ0FBNkI7QUFDN0IsOENBQTRCO0FBQzVCLCtDQUE2QjtBQUU3QixnREFBOEI7QUFDOUIsc0RBQW9DO0FBQ3BDLHdEQUFzQztBQUN0Qyx1REFBcUM7QUEwR3JDLFNBQWdCLHVCQUF1QixDQUFDLENBQVM7SUFDL0MsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDeEMsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQXFELENBQUM7UUFDN0UsT0FBTztZQUNMLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUNQLEtBQUssRUFBRSxhQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUM7WUFDOUIsVUFBVSxFQUFFLGFBQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQztTQUNkLENBQUM7S0FDOUI7U0FBTTtRQUNMLE1BQU0sR0FBRyxHQUFHLGFBQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0IsT0FBTztZQUNMLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ1QsS0FBSyxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUMxQixVQUFVLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7U0FDRixDQUFDO0tBQzlCO0FBQ0gsQ0FBQztBQWhCRCwwREFnQkM7QUFFRCxTQUFnQix1QkFBdUIsQ0FBQyxDQUEwQjtJQUNoRSxPQUFPLGFBQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDM0UsQ0FBQztBQUZELDBEQUVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFRQSxzQ0FBcUM7QUFFckMsaURBQStCO0FBQy9CLDJDQUFvRDtBQUEzQyx3SEFBQSxPQUFPLE9BQWE7QUFDN0IsMENBQXdCO0FBQ3hCLDBDQUF3QjtBQUN4Qix5Q0FBdUI7QUFDdkIsK0NBQTZCO0FBQzdCLDhDQUE0QjtBQUM1QiwrQ0FBNkI7QUFDN0Isb0RBQWtDO0FBQ2xDLG9EQUFrQztBQUNsQyxvREFBa0M7QUFDbEMsa0RBQWdDO0FBQ2hDLCtDQUE2QjtBQUM3QixrREFBZ0M7QUFDaEMseUNBQXVCO0FBQ3ZCLDJDQUF5QjtBQUN6Qix5Q0FBdUI7QUFDdkIsd0NBQXNCO0FBQ3RCLDZDQUEyQjtBQUMzQixvREFBa0M7QUFDbEMsOENBQTRCO0FBRTVCLDhDQUE0QjtBQUM1QiwrQ0FBNkI7QUFDN0IsOENBQTRCO0FBQzVCLCtDQUE2QjtBQUU3QixnREFBOEI7QUFDOUIsc0RBQW9DO0FBQ3BDLHdEQUFzQztBQUN0Qyx1REFBcUM7QUFxR3JDLFNBQWdCLHVCQUF1QixDQUFDLENBQVM7SUFDL0MsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDeEMsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQXFELENBQUM7UUFDN0UsT0FBTztZQUNMLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUNQLEtBQUssRUFBRSxhQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUM7WUFDOUIsVUFBVSxFQUFFLGFBQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQztTQUN6QyxDQUFDO0tBQ0g7U0FBTSxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7UUFDN0IsTUFBTSxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzVDLE9BQU87WUFDTCxDQUFDLHNDQUE4QjtZQUMvQixLQUFLLEVBQUUsYUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7WUFDM0IsVUFBVSxFQUFFLGFBQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDO1NBQ3RDLENBQUM7S0FDSDtTQUFNO1FBQ0wsTUFBTSxHQUFHLEdBQUcsYUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM3QixPQUFPO1lBQ0wsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDVCxLQUFLLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQzFCLFVBQVUsRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztTQUM3QixDQUFDO0tBQ0g7QUFDSCxDQUFDO0FBdkJELDBEQXVCQztBQUVELFNBQWdCLHVCQUF1QixDQUFDLENBQTBCO0lBQ2hFLE9BQU8sYUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUMzRSxDQUFDO0FBRkQsMERBRUMifQ==

dist/links.d.ts

@@ -9,3 +9,4 @@ import { HexKey } from "./nostr";
     Relay = "nrelay",
-    Address = "naddr"
+    Address = "naddr",
+    Req = "nreq"
 }
@@ -23,5 +24,5 @@ export declare enum TLVEntryType {
 }
-export declare function encodeTLV(prefix: NostrPrefix, id: string, relays?: string[], kind?: number, author?: string): `npub1${string}` | `nsec1${string}` | `note1${string}` | `nprofile1${string}` | `nevent1${string}` | `nrelay1${string}` | `naddr1${string}`;
-export declare function encodeTLVEntries(prefix: NostrPrefix, ...entries: Array<TLVEntry>): `npub1${string}` | `nsec1${string}` | `note1${string}` | `nprofile1${string}` | `nevent1${string}` | `nrelay1${string}` | `naddr1${string}`;
+export declare function encodeTLV(prefix: NostrPrefix, id: string, relays?: string[], kind?: number, author?: string): `npub1${string}` | `nsec1${string}` | `note1${string}` | `nprofile1${string}` | `nevent1${string}` | `nrelay1${string}` | `naddr1${string}` | `nreq1${string}`;
+export declare function encodeTLVEntries(prefix: NostrPrefix, ...entries: Array<TLVEntry>): `npub1${string}` | `nsec1${string}` | `note1${string}` | `nprofile1${string}` | `nevent1${string}` | `nrelay1${string}` | `naddr1${string}` | `nreq1${string}`;
 export declare function decodeTLV(str: string): TLVEntry[];
 //# sourceMappingURL=links.d.ts.map

dist/links.js

@@ -57,3 +57,5 @@ "use strict";
             case TLVEntryType.Special: {
-                const buf = prefix === "naddr" /* NostrPrefix.Address */ ? enc.encode(v.value) : utils.hexToBytes(v.value);
+                const buf = prefix === "naddr" /* NostrPrefix.Address */ || prefix === "nreq" /* NostrPrefix.Req */
+                    ? enc.encode(v.value)
+                    : utils.hexToBytes(v.value);
                 buffers.push(0, buf.length, ...buf);
@@ -106,4 +108,4 @@ break;
         case TLVEntryType.Special: {
-            if (prefix === "naddr" /* NostrPrefix.Address */) {
-                return new TextDecoder("ASCII").decode(data);
+            if (prefix === "naddr" /* NostrPrefix.Address */ || prefix === "nreq" /* NostrPrefix.Req */) {
+                return new TextDecoder().decode(data);
             }
@@ -121,6 +123,6 @@ else {
         case TLVEntryType.Relay: {
-            return new TextDecoder("ASCII").decode(data);
+            return new TextDecoder().decode(data);
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlua3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbGlua3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvRUFBc0Q7QUFDdEQsc0NBQXFDO0FBZXJDLElBQVksWUFLWDtBQUxELFdBQVksWUFBWTtJQUN0QixxREFBVyxDQUFBO0lBQ1gsaURBQVMsQ0FBQTtJQUNULG1EQUFVLENBQUE7SUFDViwrQ0FBUSxDQUFBO0FBQ1YsQ0FBQyxFQUxXLFlBQVksNEJBQVosWUFBWSxRQUt2QjtBQVFELFNBQWdCLFNBQVMsQ0FBQyxNQUFtQixFQUFFLEVBQVUsRUFBRSxNQUFpQixFQUFFLElBQWEsRUFBRSxNQUFlO0lBQzFHLE1BQU0sR0FBRyxHQUFHLElBQUksV0FBVyxFQUFFLENBQUM7SUFDOUIsTUFBTSxHQUFHLEdBQUcsTUFBTSxzQ0FBd0IsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUVuRixNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLENBQUM7SUFDcEMsTUFBTSxHQUFHLEdBQ1AsTUFBTTtRQUNKLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ1IsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzQixPQUFPLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUNuQyxDQUFDLENBQUM7U0FDRCxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFFbEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsR0FBRyxLQUFL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlua3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbGlua3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvRUFBc0Q7QUFDdEQsc0NBQXFDO0FBZ0JyQyxJQUFZLFlBS1g7QUFMRCxXQUFZLFlBQVk7SUFDdEIscURBQVcsQ0FBQTtJQUNYLGlEQUFTLENBQUE7SUFDVCxtREFBVSxDQUFBO0lBQ1YsK0NBQVEsQ0FBQTtBQUNWLENBQUMsRUFMVyxZQUFZLDRCQUFaLFlBQVksUUFLdkI7QUFRRCxTQUFnQixTQUFTLENBQUMsTUFBbUIsRUFBRSxFQUFVLEVBQUUsTUFBaUIsRUFBRSxJQUFhLEVBQUUsTUFBZTtJQUMxRyxNQUFNLEdBQUcsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFDO0lBQzlCLE1BQU0sR0FBRyxHQUFHLE1BQU0sc0NBQXdCLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLENBQUM7SUFFbkYsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sR0FBRyxHQUNQLE1BQU07UUFDSixFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUNSLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDM0IsT0FBTyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDbkMsQ0FBQyxDQUFDO1NBQ0QsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDO0lBRWxCLE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsS0FB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

dist/nostr-link.d.ts

@@ -1,3 +0,11 @@
-import { NostrPrefix, NostrEvent, TaggedNostrEvent, Tag } from ".";
-export declare class NostrLink {
+import { NostrEvent, NostrPrefix, Tag, TaggedNostrEvent } from ".";
+export interface ToNostrEventTag {
+    toEventTag(): Array<string> | undefined;
+}
+export declare class NostrHashtagLink implements ToNostrEventTag {
+    readonly tag: string;
+    constructor(tag: string);
+    toEventTag(): string[] | undefined;
+}
+export declare class NostrLink implements ToNostrEventTag {
     readonly type: NostrPrefix;
@@ -9,3 +17,3 @@ readonly id: string;
     constructor(type: NostrPrefix, id: string, kind?: number | undefined, author?: string | undefined, relays?: string[] | undefined);
-    encode(): string;
+    encode(type?: NostrPrefix): string;
     toEventTag(): string[] | undefined;
@@ -24,2 +32,3 @@ matchesEvent(ev: NostrEvent): boolean;
     static fromTag(tag: Array<string>): NostrLink;
+    static fromTags(tags: Array<Array<string>>): NostrLink[];
     static fromEvent(ev: TaggedNostrEvent | NostrEvent): NostrLink;
@@ -26,0 +35,0 @@ }

dist/nostr-link.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNostrLink = exports.tryParseNostrLink = exports.validateNostrLink = exports.NostrLink = void 0;
+exports.parseNostrLink = exports.tryParseNostrLink = exports.validateNostrLink = exports.NostrLink = exports.NostrHashtagLink = void 0;
 const shared_1 = require("@snort/shared");
 const _1 = require(".");
 const utils_1 = require("./utils");
+class NostrHashtagLink {
+    tag;
+    constructor(tag) {
+        this.tag = tag;
+    }
+    toEventTag() {
+        return ["t", this.tag];
+    }
+}
+exports.NostrHashtagLink = NostrHashtagLink;
 class NostrLink {
@@ -19,9 +29,20 @@ type;
         this.relays = relays;
+        if (type !== "naddr" /* NostrPrefix.Address */ && !(0, shared_1.isHex)(id)) {
+            throw new Error("ID must be hex");
+        }
     }
-    encode() {
-        if (this.type === "note" /* NostrPrefix.Note */ || this.type === "nsec" /* NostrPrefix.PrivateKey */ || this.type === "npub" /* NostrPrefix.PublicKey */) {
-            return (0, shared_1.hexToBech32)(this.type, this.id);
+    encode(type) {
+        try {
+            // cant encode 'naddr' to 'note'/'nevent' because 'id' is not hex
+            let newType = this.type === "naddr" /* NostrPrefix.Address */ ? this.type : type ?? this.type;
+            if (newType === "note" /* NostrPrefix.Note */ || newType === "nsec" /* NostrPrefix.PrivateKey */ || newType === "npub" /* NostrPrefix.PublicKey */) {
+                return (0, shared_1.hexToBech32)(newType, this.id);
+            }
+            else {
+                return (0, _1.encodeTLV)(newType, this.id, this.relays, this.kind, this.author);
+            }
         }
-        else {
-            return (0, _1.encodeTLV)(this.type, this.id, this.relays, this.kind, this.author);
+        catch (e) {
+            console.error("Invalid data", this, e);
+            throw e;
         }
@@ -31,4 +52,4 @@ }
         const relayEntry = this.relays ? [this.relays[0]] : [];
-        if (this.type === "npub" /* NostrPrefix.PublicKey */) {
-            return ["p", this.id];
+        if (this.type === "npub" /* NostrPrefix.PublicKey */ || this.type === "nprofile" /* NostrPrefix.Profile */) {
+            return ["p", this.id, ...relayEntry];
         }
@@ -153,2 +174,12 @@ else if (this.type === "note" /* NostrPrefix.Note */ || this.type === "nevent" /* NostrPrefix.Event */) {
     }
+    static fromTags(tags) {
+        return (0, shared_1.removeUndefined)(tags.map(a => {
+            try {
+                return NostrLink.fromTag(a);
+            }
+            catch {
+                // ignored, cant be mapped
+            }
+        }));
+    }
     static fromEvent(ev) {
@@ -190,3 +221,5 @@ const relays = "relays" in ev ? ev.relays : undefined;
 function parseNostrLink(link, prefixHint) {
-    const entity = link.startsWith("web+nostr:") || link.startsWith("nostr:") ? link.split(":")[1] : link;
+    let entity = link.startsWith("web+nostr:") || link.startsWith("nostr:") ? link.split(":")[1] : link;
+    // trim any non-bech32 chars
+    entity = entity.match(/(n(?:pub|profile|event|ote|addr|req)1[acdefghjklmnpqrstuvwxyz023456789]+)/)?.[0] ?? entity;
     const isPrefix = (prefix) => {
@@ -207,3 +240,6 @@ return entity.startsWith(prefix);
     }
-    else if (isPrefix("nprofile" /* NostrPrefix.Profile */) || isPrefix("nevent" /* NostrPrefix.Event */) || isPrefix("naddr" /* NostrPrefix.Address */)) {
+    else if (isPrefix("nprofile" /* NostrPrefix.Profile */) ||
+        isPrefix("nevent" /* NostrPrefix.Event */) ||
+        isPrefix("naddr" /* NostrPrefix.Address */) ||
+        isPrefix("nreq" /* NostrPrefix.Req */)) {
         const decoded = (0, _1.decodeTLV)(entity);
@@ -227,2 +263,5 @@ const id = decoded.find(a => a.type === _1.TLVEntryType.Special)?.value;
         }
+        else if (isPrefix("nreq" /* NostrPrefix.Req */)) {
+            return new NostrLink("nreq" /* NostrPrefix.Req */, id);
+        }
     }
@@ -235,2 +274,2 @@ else if (prefixHint) {
 exports.parseNostrLink = parseNostrLink;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nostr-link.js","sourceRoot":"","sources":["../src/nostr-link.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nostr-link.js","sourceRoot":"","sources":["../src/nostr-link.ts"],"names":[],"mappings":"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"}

dist/nostr-system.d.ts

@@ -1,4 +0,5 @@
-import { ExternalStore, FeedCache } from "@snort/shared";
+import EventEmitter from "eventemitter3";
+import { FeedCache } from "@snort/shared";
 import { NostrEvent, TaggedNostrEvent } from "./nostr";
-import { AuthHandler, Connection, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
+import { Connection, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
 import { Query } from "./query";
@@ -10,6 +11,11 @@ import { NoteStore, NoteStoreSnapshotData } from "./note-collection";
 import { QueryOptimizer } from "./query-optimizer";
+interface NostrSystemEvents {
+    change: (state: SystemSnapshot) => void;
+    auth: (challenge: string, relay: string, cb: (ev: NostrEvent) => void) => void;
+    event: (ev: TaggedNostrEvent) => void;
+}
 /**
  * Manages nostr content retrieval system
  */
-export declare class NostrSystem extends ExternalStore<SystemSnapshot> implements SystemInterface {
+export declare class NostrSystem extends EventEmitter<NostrSystemEvents> implements SystemInterface {
     #private;
@@ -25,3 +31,2 @@ /**
     constructor(props: {
-        authHandler?: AuthHandler;
         relayCache?: FeedCache<UsersRelays>;
@@ -35,3 +40,2 @@ profileCache?: FeedCache<MetadataCache>;
     });
-    HandleAuth?: AuthHandler | undefined;
     get ProfileLoader(): ProfileLoaderService;
@@ -63,25 +67,3 @@ get Sockets(): ConnectionStateSnapshot[];
     }, req: RequestBuilder): Query;
-    SendQuery(q: Query, qSend: BuiltRawReqFilter): Promise<{
-        readonly id: string;
-        readonly start: number;
-        sent?: number | undefined;
-        eose?: number | undefined;
-        close?: number | undefined;
-        "__#11@#wasForceClosed": boolean;
-        readonly "__#11@#fnClose": (id: string) => void;
-        readonly "__#11@#fnProgress": () => void;
-        readonly relay: string;
-        readonly filters: import("./nostr").ReqFilter[];
-        readonly connId: string;
-        sentToRelay(): void;
-        gotEose(): void;
-        forceEose(): void; /**
-         * All currently connected websockets
-         */
-        sendClose(): void;
-        readonly queued: number;
-        readonly runtime: number;
-        readonly responseTime: number;
-        readonly finished: boolean;
-    }[] | undefined>;
+    SendQuery(q: Query, qSend: BuiltRawReqFilter): Promise<import("./query").QueryTrace[] | undefined>;
     /**
@@ -96,3 +78,5 @@ * Send events to writable relays
     takeSnapshot(): SystemSnapshot;
+    notifyChange(): void;
 }
+export {};
 //# sourceMappingURL=nostr-system.d.ts.map

dist/nostr-system.js

@@ -8,2 +8,3 @@ "use strict";
 const debug_1 = __importDefault(require("debug"));
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const shared_1 = require("@snort/shared");
@@ -22,3 +23,3 @@ const connection_1 = require("./connection");
  */
-class NostrSystem extends shared_1.ExternalStore {
+class NostrSystem extends eventemitter3_1.default {
     #log = (0, debug_1.default)("System");
@@ -34,6 +35,2 @@ /**
     /**
-     * NIP-42 Auth handler
-     */
-    #handleAuth;
-    /**
      * Storage class for user relay lists
@@ -72,3 +69,2 @@ */
         super();
-        this.#handleAuth = props.authHandler;
         this.#relayCache = props.relayCache ?? new _1.UserRelaysCache(props.db?.userRelays);
@@ -84,3 +80,2 @@ this.#profileCache = props.profileCache ?? new _1.UserProfileCache(props.db?.users);
     }
-    HandleAuth;
     get ProfileLoader() {
@@ -90,3 +85,3 @@ return this.#profileLoader;
     get Sockets() {
-        return [...this.#sockets.values()].map(a => a.snapshot());
+        return [...this.#sockets.values()].map(a => a.takeSnapshot());
     }
@@ -115,11 +110,13 @@ get RelayCache() {
     async ConnectToRelay(address, options) {
+        const addr = (0, shared_1.unwrap)((0, shared_1.sanitizeRelayUrl)(address));
         try {
-            const addr = (0, shared_1.unwrap)((0, shared_1.sanitizeRelayUrl)(address));
-            if (!this.#sockets.has(addr)) {
-                const c = new connection_1.Connection(addr, options, this.#handleAuth?.bind(this));
+            const existing = this.#sockets.get(addr);
+            if (!existing) {
+                const c = new connection_1.Connection(addr, options);
                 this.#sockets.set(addr, c);
-                c.OnEvent = (s, e) => this.#onEvent(s, e);
-                c.OnEose = s => this.#onEndOfStoredEvents(c, s);
-                c.OnDisconnect = code => this.#onRelayDisconnect(c, code);
-                c.OnConnected = r => this.#onRelayConnected(c, r);
+                c.on("event", (s, e) => this.#onEvent(s, e));
+                c.on("eose", s => this.#onEndOfStoredEvents(c, s));
+                c.on("disconnect", code => this.#onRelayDisconnect(c, code));
+                c.on("connected", r => this.#onRelayConnected(c, r));
+                c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
                 await c.Connect();
@@ -129,3 +126,4 @@ }
                 // update settings if already connected
-                (0, shared_1.unwrap)(this.#sockets.get(addr)).Settings = options;
+                existing.Settings = options;
+                existing.Ephemeral = false;
             }
@@ -135,5 +133,7 @@ }
             console.error(e);
+            this.#relayMetrics.onDisconnect(addr, 0);
         }
     }
     #onRelayConnected(c, wasReconnect) {
+        this.#relayMetrics.onConnect(c.Address);
         if (wasReconnect) {
@@ -146,3 +146,3 @@ for (const [, q] of this.Queries) {
     #onRelayDisconnect(c, code) {
-        this.#relayMetrics.onDisconnect(c, code);
+        this.#relayMetrics.onDisconnect(c.Address, code);
         for (const [, q] of this.Queries) {
@@ -158,2 +158,4 @@ q.connectionLost(c.Id);
     #onEvent(sub, ev) {
+        this.#relayMetrics.onEvent(ev.relays[0]);
+        this.emit("event", ev);
         if (!_1.EventExt.isValid(ev)) {
@@ -179,8 +181,9 @@ this.#log("Rejecting invalid event %O", ev);
             if (!this.#sockets.has(addr)) {
-                const c = new connection_1.Connection(addr, { read: true, write: true }, this.#handleAuth?.bind(this), true);
+                const c = new connection_1.Connection(addr, { read: true, write: true }, true);
                 this.#sockets.set(addr, c);
-                c.OnEvent = (s, e) => this.#onEvent(s, e);
-                c.OnEose = s => this.#onEndOfStoredEvents(c, s);
-                c.OnDisconnect = code => this.#onRelayDisconnect(c, code);
-                c.OnConnected = r => this.#onRelayConnected(c, r);
+                c.on("event", (s, e) => this.#onEvent(s, e));
+                c.on("eose", s => this.#onEndOfStoredEvents(c, s));
+                c.on("disconnect", code => this.#onRelayDisconnect(c, code));
+                c.on("connected", r => this.#onRelayConnected(c, r));
+                c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
                 await c.Connect();
@@ -259,2 +262,3 @@ return c;
             const q = new query_1.Query(req.id, req.instance, store, req.options?.leaveOpen);
+            q.on("trace", r => this.#relayMetrics.onTraceReport(r));
             if (filters.some(a => a.filters.some(b => b.ids))) {
@@ -368,5 +372,5 @@ const expectIds = new Set(filters.flatMap(a => a.filters).flatMap(a => a.ids ?? []));
             return await new Promise((resolve, reject) => {
-                const c = new connection_1.Connection(address, { write: true, read: true }, this.#handleAuth?.bind(this), true);
+                const c = new connection_1.Connection(address, { write: true, read: true }, true);
                 const t = setTimeout(reject, 10_000);
-                c.OnConnected = async () => {
+                c.once("connected", async () => {
                     clearTimeout(t);
@@ -376,3 +380,3 @@ const rsp = await c.SendAsync(ev);
                     resolve(rsp);
-                };
+                });
                 c.Connect();
@@ -393,2 +397,5 @@ });
     }
+    notifyChange() {
+        this.emit("change", this.takeSnapshot());
+    }
     #cleanup() {
@@ -411,2 +418,2 @@ let changed = false;
 exports.NostrSystem = NostrSystem;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nostr-system.js","sourceRoot":"","sources":["../src/nostr-system.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nostr-system.js","sourceRoot":"","sources":["../src/nostr-system.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,kEAAyC;AAEzC,0CAAqF;AAErF,6CAA8F;AAC9F,mCAAgC;AAChC,uDAAqF;AACrF,uDAAuF;AACvF,iEAA4D;AAC5D,wBAYW;AACX,2CAA6C;AAE7C,uDAA0E;AAC1E,iDAA6C;AAQ7C;;GAEG;AACH,MAAa,WAAY,SAAQ,uBAA+B;IAC9D,IAAI,GAAG,IAAA,eAAK,EAAC,QAAQ,CAAC,CAAC;IAEvB;;OAEG;IACH,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IAEzC;;OAEG;IACH,OAAO,GAAuB,IAAI,GAAG,EAAE,CAAC;IAExC;;OAEG;IACH,WAAW,CAAyB;IAEpC;;OAEG;IACH,aAAa,CAA2B;IAExC;;OAEG;IACH,kBAAkB,CAA0B;IAE5C;;OAEG;IACH,cAAc,CAAuB;IAErC;;OAEG;IACH,aAAa,CAAqB;IAElC;;OAEG;IACH,YAAY,CAAwB;IAEpC;;OAEG;IACH,eAAe,CAAiB;IAEhC;;OAEG;IACH,SAAS,CAAU;IAEnB,YAAY,KAQX;QACC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,kBAAe,CAAC,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACjF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,YAAY,IAAI,IAAI,mBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACjF,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,YAAY,IAAI,IAAI,mBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,WAAW,IAAI,IAAI,oBAAW,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC3E,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,cAAc,IAAI,uCAAqB,CAAC;QAErE,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACzE,IAAI,CAAC,aAAa,GAAG,IAAI,yCAAkB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,CAAC,GAAG;YACR,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YAC1B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YAC5B,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;SAC5B,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,OAAsB;QAC1D,MAAM,IAAI,GAAG,IAAA,eAAM,EAAC,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;QAC/C,IAAI;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,CAAC,GAAG,IAAI,uBAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC3B,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC7C,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnD,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC7D,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACrD,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;aACnB;iBAAM;gBACL,uCAAuC;gBACvC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC;gBAC5B,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;aAC5B;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,iBAAiB,CAAC,CAAa,EAAE,YAAqB;QACpD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;aACzB;SACF;IACH,CAAC;IAED,kBAAkB,CAAC,CAAa,EAAE,IAAY;QAC5C,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACxB;IACH,CAAC;IAED,oBAAoB,CAAC,CAAuB,EAAE,GAAW;QACvD,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAChB;IACH,CAAC;IAED,QAAQ,CAAC,GAAW,EAAE,EAAoB;QACxC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEvB,IAAI,CAAC,WAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAC;YAC5C,OAAO;SACR;QACD,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,WAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;YAChC,OAAO;SACR;QAED,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YAChC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;SACxB;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,qBAAqB,CAAC,OAAe;QACzC,IAAI;YACF,MAAM,IAAI,GAAG,IAAA,eAAM,EAAC,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;YAC/C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC5B,MAAM,CAAC,GAAG,IAAI,uBAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;gBAClE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC3B,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC7C,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnD,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC7D,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACrD,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;gBAClB,OAAO,CAAC,CAAC;aACV;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;IAED;;OAEG;IACH,eAAe,CAAC,OAAe;QAC7B,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,KAAK,EAAE,CAAC;SACX;IACH,CAAC;IAED,QAAQ,CAAC,EAAU;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,GAAmB,EAAE,EAA2C;QACpE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,gCAAc,EAAE,GAAG,CAAC,CAAC;QAC1C,OAAO,IAAI,OAAO,CAAwB,OAAO,CAAC,EAAE;YAClD,IAAI,CAA4C,CAAC;YACjD,IAAI,IAAI,GAA4B,EAAE,CAAC;YACvC,MAAM,cAAc,GAAG,EAAE;gBACvB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACnB,IAAI,CAAC,CAAC,EAAE;wBACN,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;wBAChB,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE;4BAClB,CAAC,GAAG,SAAS,CAAC;4BACd,EAAE,CAAC,IAAI,CAAC,CAAC;wBACX,CAAC,EAAE,GAAG,CAAC,CAAC;qBACT;yBAAM;wBACL,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;qBACnB;gBACH,CAAC,CAAC;gBACJ,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvC,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,EAAE;oBACpB,cAAc,EAAE,EAAE,CAAC;oBACnB,eAAe,EAAE,CAAC;oBAClB,CAAC,CAAC,MAAM,EAAE,CAAC;oBACX,OAAO,CAAC,IAAA,eAAM,EAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;iBACvC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAsB,IAAmB,EAAE,GAAmB;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACZ,sCAAsC;YACtC,IAAI,QAAQ,CAAC,YAAY,KAAK,GAAG,CAAC,QAAQ,EAAE;gBAC1C,OAAO,QAAQ,CAAC;aACjB;YACD,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE;gBACnD,OAAO,QAAQ,CAAC;aACjB;iBAAM;gBACL,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;oBAC1B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBAChC;gBACD,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,OAAO,QAAQ,CAAC;aACjB;SACF;aAAM;YACL,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;YAEzB,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,CAAC,GAAG,IAAI,aAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACzE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YAExD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;gBACjD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;gBACrF,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;oBACzB,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC;oBACzG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;wBACpB,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACxC;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC5B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;gBAC1B,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;aACzB;YACD,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,CAAQ,EAAE,KAAwB;QAChD,2BAA2B;QAC3B,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE;YAC7B,IAAI,CAAC,CAAC,GAAG,EAAE;gBACT,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC5D,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBACvD,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7C,CAAC,CAAC,oBAAoB,CACpB;wBACE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;wBACxC,QAAQ,EAAE,iCAAe,CAAC,cAAc;wBACxC,KAAK,EAAE,KAAK,CAAC,KAAK;qBACnB,EACD,YAAuC,CACxC,CAAC;iBACH;aACF;SACF;QAED,0BAA0B;QAC1B,MAAM,IAAI,GAAG,IAAA,0BAAW,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO;SACR;QACD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QAErB,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACxD,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzC,IAAI,CAAC,EAAE;gBACL,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACnC,IAAI,EAAE,EAAE;oBACN,OAAO,CAAC,EAAE,CAAC,CAAC;iBACb;aACF;iBAAM;gBACL,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzD,IAAI,EAAE,EAAE;oBACN,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBACpC,IAAI,EAAE,EAAE;wBACN,OAAO,CAAC,EAAE,CAAC,CAAC;qBACb;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;iBACrE;aACF;SACF;aAAM;YACL,MAAM,GAAG,GAAG,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAClC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE;oBAChB,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC9C,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;oBACnC,IAAI,EAAE,EAAE;wBACN,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;qBACd;iBACF;aACF;YACD,OAAO,GAAG,CAAC;SACZ;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,EAAc,EAAE,EAA8B;QACjE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACxF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;YAClB,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAClC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;gBACV,OAAO,GAAG,CAAC;aACZ;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO;QACT,CAAC,CAAC,CACH,CAAC;QACF,OAAO,IAAA,wBAAe,EAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB,CAAC,OAAe,EAAE,EAAc;QACpD,MAAM,SAAS,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,QAAQ,EAAE;YACZ,OAAO,MAAM,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SACrC;aAAM;YACL,OAAO,MAAM,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACvD,MAAM,CAAC,GAAG,IAAI,uBAAU,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;gBAErE,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACrC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;oBAC7B,YAAY,CAAC,CAAC,CAAC,CAAC;oBAChB,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;oBAClC,CAAC,CAAC,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,GAAG,CAAC,CAAC;gBACf,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,YAAY;QACV,OAAO;YACL,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC1C,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,EAAE;oBACR,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,UAAU,EAAE,EAAE;iBACf,CAAC;YACJ,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ;QACN,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;gBACjB,CAAC,CAAC,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;gBACjC,OAAO,GAAG,IAAI,CAAC;aAChB;SACF;QACD,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,YAAY,EAAE,CAAC;SACrB;QACD,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF;AAraD,kCAqaC"}

dist/nostr.d.ts

@@ -15,3 +15,7 @@ import { RelaySettings } from "./connection";
      */
-    relays: string[];
+    relays: Array<string>;
+    /**
+     * Additional context
+     */
+    context?: object;
 }
@@ -65,12 +69,2 @@ /**
 };
-/**
- * NIP-51 list types
- */
-export declare enum Lists {
-    Muted = "mute",
-    Pinned = "pin",
-    Bookmarked = "bookmark",
-    Followed = "follow",
-    Badges = "profile_badges"
-}
 export interface FullRelaySettings {
@@ -77,0 +71,0 @@ url: string;

dist/nostr.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lists = void 0;
-/**
- * NIP-51 list types
- */
-var Lists;
-(function (Lists) {
-    Lists["Muted"] = "mute";
-    Lists["Pinned"] = "pin";
-    Lists["Bookmarked"] = "bookmark";
-    Lists["Followed"] = "follow";
-    Lists["Badges"] = "profile_badges";
-})(Lists || (exports.Lists = Lists = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9zdHIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbm9zdHIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBd0VBOztHQUVHO0FBQ0gsSUFBWSxLQU1YO0FBTkQsV0FBWSxLQUFLO0lBQ2YsdUJBQWMsQ0FBQTtJQUNkLHVCQUFjLENBQUE7SUFDZCxnQ0FBdUIsQ0FBQTtJQUN2Qiw0QkFBbUIsQ0FBQTtJQUNuQixrQ0FBeUIsQ0FBQTtBQUMzQixDQUFDLEVBTlcsS0FBSyxxQkFBTCxLQUFLLFFBTWhCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9zdHIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvbm9zdHIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

dist/note-collection.d.ts

@@ -78,2 +78,3 @@ import { TaggedNostrEvent } from ".";
         relays: string[];
+        context?: object | undefined;
         id: string;
@@ -80,0 +81,0 @@ pubkey: string;

dist/query.d.ts

@@ -0,8 +1,14 @@
+import EventEmitter from "eventemitter3";
 import { Connection, ReqFilter, TaggedNostrEvent } from ".";
 import { NoteStore } from "./note-collection";
 import { BuiltRawReqFilter } from "./request-builder";
+interface QueryTraceEvents {
+    change: () => void;
+    close: (id: string) => void;
+    eose: (id: string, connId: string, wasForced: boolean) => void;
+}
 /**
  * Tracing for relay query status
  */
-declare class QueryTrace {
+export declare class QueryTrace extends EventEmitter<QueryTraceEvents> {
     #private;
@@ -17,3 +23,3 @@ readonly relay: string;
     close?: number;
-    constructor(relay: string, filters: Array<ReqFilter>, connId: string, fnClose: (id: string) => void, fnProgress: () => void);
+    constructor(relay: string, filters: Array<ReqFilter>, connId: string);
     sentToRelay(): void;
@@ -54,6 +60,16 @@ gotEose(): void;
 }
+export interface TraceReport {
+    id: string;
+    conn: Connection;
+    wasForced: boolean;
+    queued: number;
+    responseTime: number;
+}
+interface QueryEvents {
+    trace: (report: TraceReport) => void;
+}
 /**
  * Active or queued query on the system
  */
-export declare class Query implements QueryBase {
+export declare class Query extends EventEmitter<QueryEvents> implements QueryBase {
     #private;
@@ -60,0 +76,0 @@ /**

dist/query.js

@@ -6,5 +6,6 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
+exports.Query = exports.QueryTrace = void 0;
 const uuid_1 = require("uuid");
 const debug_1 = __importDefault(require("debug"));
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
 const shared_1 = require("@snort/shared");
@@ -16,3 +17,3 @@ const _1 = require(".");
  */
-class QueryTrace {
+class QueryTrace extends eventemitter3_1.default {
     relay;
@@ -27,5 +28,4 @@ filters;
     #wasForceClosed = false;
-    #fnClose;
-    #fnProgress;
-    constructor(relay, filters, connId, fnClose, fnProgress) {
+    constructor(relay, filters, connId) {
+        super();
         this.relay = relay;
@@ -36,22 +36,23 @@ this.filters = filters;
         this.start = (0, shared_1.unixNowMs)();
-        this.#fnClose = fnClose;
-        this.#fnProgress = fnProgress;
     }
     sentToRelay() {
         this.sent = (0, shared_1.unixNowMs)();
-        this.#fnProgress();
+        this.emit("change");
     }
     gotEose() {
         this.eose = (0, shared_1.unixNowMs)();
-        this.#fnProgress();
+        this.emit("change");
+        this.emit("eose", this.id, this.connId, false);
     }
     forceEose() {
+        this.sent ??= (0, shared_1.unixNowMs)();
         this.eose = (0, shared_1.unixNowMs)();
         this.#wasForceClosed = true;
         this.sendClose();
+        this.emit("eose", this.id, this.connId, true);
     }
     sendClose() {
         this.close = (0, shared_1.unixNowMs)();
-        this.#fnClose(this.id);
-        this.#fnProgress();
+        this.emit("close", this.id);
+        this.emit("change");
     }
@@ -83,6 +84,7 @@ /**
 }
+exports.QueryTrace = QueryTrace;
 /**
  * Active or queued query on the system
  */
-class Query {
+class Query extends eventemitter3_1.default {
     /**
@@ -118,2 +120,3 @@ * Uniquie ID of this query
     constructor(id, instance, feed, leaveOpen) {
+        super();
         this.id = id;
@@ -147,3 +150,3 @@ this.#feed = feed;
                 else {
-                    this.#log("Event did not match filter, rejecting %O", e);
+                    this.#log("Event did not match filter, rejecting %O %O", e, t);
                 }
@@ -170,7 +173,3 @@ break;
     insertCompletedTrace(subq, data) {
-        const qt = new QueryTrace(subq.relay, subq.filters, "", () => {
-            // nothing to close
-        }, () => {
-            // nothing to progress
-        });
+        const qt = new QueryTrace(subq.relay, subq.filters, "");
         qt.sentToRelay();
@@ -260,3 +259,12 @@ qt.gotEose();
     #sendQueryInternal(c, q) {
-        const qt = new QueryTrace(c.Address, q.filters, c.Id, x => c.CloseReq(x), () => this.#onProgress());
+        const qt = new QueryTrace(c.Address, q.filters, c.Id);
+        qt.on("close", x => c.CloseReq(x));
+        qt.on("change", () => this.#onProgress());
+        qt.on("eose", (id, connId, forced) => this.emit("trace", {
+            id,
+            conn: c,
+            wasForced: forced,
+            queued: qt.queued,
+            responseTime: qt.responseTime,
+        }));
         this.#tracing.push(qt);
@@ -268,2 +276,2 @@ c.QueueReq(["REQ", qt.id, ...qt.filters], () => qt.sentToRelay());
 exports.Query = Query;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAkC;AAClC,kDAA0B;AAC1B,kEAAyC;AACzC,0CAAkD;AAElD,wBAAkE;AAGlE,uDAAuD;AAQvD;;GAEG;AACH,MAAa,UAAW,SAAQ,uBAA8B;IASjD;IACA;IACA;IAVF,EAAE,CAAS;IACX,KAAK,CAAS;IACvB,IAAI,CAAU;IACd,IAAI,CAAU;IACd,KAAK,CAAU;IACf,eAAe,GAAG,KAAK,CAAC;IAExB,YACW,KAAa,EACb,OAAyB,EACzB,MAAc;QAEvB,KAAK,EAAE,CAAC;QAJC,UAAK,GAAL,KAAK,CAAQ;QACb,YAAO,GAAP,OAAO,CAAkB;QACzB,WAAM,GAAN,MAAM,CAAQ;QAGvB,IAAI,CAAC,EAAE,GAAG,IAAA,SAAI,GAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,CAAC;IAED,WAAW;QACT,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAS,GAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAS,GAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,SAAS;QACP,IAAI,CAAC,IAAI,KAAK,IAAA,kBAAS,GAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAS,GAAE,CAAC;QACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,SAAS;QACP,IAAI,CAAC,KAAK,GAAG,IAAA,kBAAS,GAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAS,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IACrH,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAS,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;IAC1E,CAAC;IAED;;OAEG;IACH,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IACjC,CAAC;CACF;AAtED,gCAsEC;AA+BD;;GAEG;AACH,MAAa,KAAM,SAAQ,uBAAyB;IAClD;;OAEG;IACH,EAAE,CAAS;IAEX;;OAEG;IACH,YAAY,CAAS;IAErB;;OAEG;IACH,QAAQ,GAAsB,EAAE,CAAC;IAEjC;;OAEG;IACH,UAAU,GAAG,KAAK,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAU;IAEnB;;OAEG;IACH,WAAW,CAAkC;IAE7C;;OAEG;IACH,KAAK,CAAY;IAEjB,IAAI,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;IAEtB,YAAY,EAAU,EAAE,QAAgB,EAAE,IAAe,EAAE,SAAmB;QAC5E,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,SAAS,IAAI,KAAK,CAAC;QACrC,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC;IACzD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAA,kBAAS,GAAE,CAAC;IACtE,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,CAAmB;QAC1C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,EAAE;gBAChB,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,oCAAkB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;oBACjD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAClB;qBAAM;oBACL,IAAI,CAAC,IAAI,CAAC,6CAA6C,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;iBAChE;gBACD,MAAM;aACP;SACF;IACH,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,IAAI,CAAC,SAAS,GAAG,IAAA,kBAAS,GAAE,GAAG,KAAK,CAAC;IACvC,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,IAAuB,EAAE,IAAuC;QACnF,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACxD,EAAE,CAAC,WAAW,EAAE,CAAC;QACjB,EAAE,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,WAAW,CAAC,CAAa,EAAE,IAAuB;QAChD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;YAChC,OAAO;SACR;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,cAAc,CAAC,EAAU;QACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,kBAAkB,CAAC,CAAa;QAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACjB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC9B,IAAI,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE;oBAC1B,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;iBACnE;aACF;SACF;IACH,CAAC;IAED,SAAS;QACP,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC9B,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,IAAI,CAAC,GAAW,EAAE,IAA0B;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;QACzE,EAAE,EAAE,OAAO,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,EAAE,EAAE,SAAS,EAAE,CAAC;SACjB;IACH,CAAC;IAED;;OAEG;IACH,IAAI,QAAQ;QACV,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC7G,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC;SACV;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,WAAW;QACT,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;QACvC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,uCAAuC,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7G,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;SAChC;IACH,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACjC;IACH,CAAC;IAED,YAAY;QACV,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;gBAC7B,IAAI,CAAC,CAAC,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;oBACpC,CAAC,CAAC,SAAS,EAAE,CAAC;iBACf;aACF;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAED,aAAa,CAAC,CAAa,EAAE,CAAoB;QAC/C,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,6DAA6D,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,OAAI,CAAC,MAAM,CAAC,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,mCAAmC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kBAAkB,CAAC,CAAa,EAAE,CAAoB;QACpD,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACtD,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,EAAE;YACF,IAAI,EAAE,CAAC;YACP,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,EAAE,CAAC,MAAM;YACjB,YAAY,EAAE,EAAE,CAAC,YAAY;SACf,CAAC,CAClB,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAlND,sBAkNC"}

dist/relay-info.d.ts

@@ -16,3 +16,7 @@ export interface RelayInfo {
     };
+    relay_countries?: Array<string>;
+    language_tags?: Array<string>;
+    tags?: Array<string>;
+    posting_policy?: string;
 }
 //# sourceMappingURL=relay-info.d.ts.map

dist/relay-metric-handler.d.ts

 import { FeedCache } from "@snort/shared";
-import { Connection } from "connection";
 import { RelayMetrics } from "cache";
+import { TraceReport } from "query";
 export declare class RelayMetricHandler {
     #private;
     constructor(cache: FeedCache<RelayMetrics>);
-    onDisconnect(c: Connection, code: number): void;
+    onEvent(addr: string): Promise<void>;
+    onConnect(addr: string): Promise<void>;
+    onDisconnect(addr: string, code: number): Promise<void>;
+    onTraceReport(t: TraceReport): void;
 }
 //# sourceMappingURL=relay-metric-handler.d.ts.map

dist/relay-metric-handler.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelayMetricHandler = void 0;
+const shared_1 = require("@snort/shared");
 class RelayMetricHandler {
@@ -8,6 +9,59 @@ #cache;
         this.#cache = cache;
+        setInterval(() => {
+            this.#flush();
+        }, 10_000);
     }
-    onDisconnect(c, code) { }
+    async onEvent(addr) {
+        const v = await this.#cache.get(addr);
+        if (v) {
+            v.events++;
+            v.lastSeen = (0, shared_1.unixNowMs)();
+        }
+    }
+    async onConnect(addr) {
+        const v = await this.#cache.get(addr);
+        if (v) {
+            v.connects++;
+            v.lastSeen = (0, shared_1.unixNowMs)();
+        }
+        else {
+            await this.#cache.set({
+                addr: addr,
+                connects: 1,
+                disconnects: 0,
+                events: 0,
+                lastSeen: (0, shared_1.unixNowMs)(),
+                latency: [],
+            });
+        }
+    }
+    async onDisconnect(addr, code) {
+        const v = await this.#cache.get(addr);
+        if (v) {
+            v.disconnects++;
+        }
+        else {
+            await this.#cache.set({
+                addr: addr,
+                connects: 0,
+                disconnects: 1,
+                events: 0,
+                lastSeen: (0, shared_1.unixNowMs)(),
+                latency: [],
+            });
+        }
+    }
+    onTraceReport(t) {
+        const v = this.#cache.getFromCache(t.conn.Address);
+        if (v) {
+            v.latency.push(t.responseTime);
+            v.latency = v.latency.slice(-50);
+        }
+    }
+    async #flush() {
+        const data = this.#cache.snapshot();
+        await this.#cache.bulkSet(data);
+    }
 }
 exports.RelayMetricHandler = RelayMetricHandler;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsYXktbWV0cmljLWhhbmRsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVsYXktbWV0cmljLWhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEsTUFBYSxrQkFBa0I7SUFDcEIsTUFBTSxDQUEwQjtJQUV6QyxZQUFZLEtBQThCO1FBQ3hDLElBQUksQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZLENBQUMsQ0FBYSxFQUFFLElBQVksSUFBRyxDQUFDO0NBQzdDO0FBUkQsZ0RBUUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVsYXktbWV0cmljLWhhbmRsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVsYXktbWV0cmljLWhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMENBQXFEO0FBS3JELE1BQWEsa0JBQWtCO0lBQ3BCLE1BQU0sQ0FBMEI7SUFFekMsWUFBWSxLQUE4QjtRQUN4QyxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztRQUVwQixXQUFXLENBQUMsR0FBRyxFQUFFO1lBQ2YsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2hCLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNiLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLElBQVk7UUFDeEIsTUFBTSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0QyxJQUFJLENBQUMsRUFBRTtZQUNMLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxRQUFRLEdBQUcsSUFBQSxrQkFBUyxHQUFFLENBQUM7U0FDMUI7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVMsQ0FBQyxJQUFZO1FBQzFCLE1BQU0sQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsSUFBSSxDQUFDLEVBQUU7WUFDTCxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDYixDQUFDLENBQUMsUUFBUSxHQUFHLElBQUEsa0JBQVMsR0FBRSxDQUFDO1NBQzFCO2FBQU07WUFDTCxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDO2dCQUNwQixJQUFJLEVBQUUsSUFBSTtnQkFDVixRQUFRLEVBQUUsQ0FBQztnQkFDWCxXQUFXLEVBQUUsQ0FBQztnQkFDZCxNQUFNLEVBQUUsQ0FBQztnQkFDVCxRQUFRLEVBQUUsSUFBQSxrQkFBUyxHQUFFO2dCQUNyQixPQUFPLEVBQUUsRUFBRTthQUNaLENBQUMsQ0FBQztTQUNKO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBWSxFQUFFLElBQVk7UUFDM0MsTUFBTSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0QyxJQUFJLENBQUMsRUFBRTtZQUNMLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztTQUNqQjthQUFNO1lBQ0wsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQztnQkFDcEIsSUFBSSxFQUFFLElBQUk7Z0JBQ1YsUUFBUSxFQUFFLENBQUM7Z0JBQ1gsV0FBVyxFQUFFLENBQUM7Z0JBQ2QsTUFBTSxFQUFFLENBQUM7Z0JBQ1QsUUFBUSxFQUFFLElBQUEsa0JBQVMsR0FBRTtnQkFDckIsT0FBTyxFQUFFLEVBQUU7YUFDWixDQUFDLENBQUM7U0FDSjtJQUNILENBQUM7SUFFRCxhQUFhLENBQUMsQ0FBYztRQUMxQixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25ELElBQUksQ0FBQyxFQUFFO1lBQ0wsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQy9CLENBQUMsQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztTQUNsQztJQUNILENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTTtRQUNWLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDcEMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNsQyxDQUFDO0NBQ0Y7QUFoRUQsZ0RBZ0VDIn0=

dist/request-builder.d.ts

@@ -88,3 +88,3 @@ import EventKind from "./event-kind";
      */
-    relay(u: string): this;
+    relay(u: string | Array<string>): this;
     ids(ids: Array<u256>): this;
@@ -91,0 +91,0 @@ authors(authors?: Array<HexKey>): this;

dist/request-builder.js

@@ -145,5 +145,8 @@ "use strict";
     relay(u) {
-        const uClean = (0, shared_1.sanitizeRelayUrl)(u);
-        if (uClean) {
-            this.#relays.add(uClean);
+        const relays = Array.isArray(u) ? u : [u];
+        for (const r of relays) {
+            const uClean = (0, shared_1.sanitizeRelayUrl)(r);
+            if (uClean) {
+                this.#relays.add(uClean);
+            }
         }
@@ -259,2 +262,2 @@ return this;
 exports.RequestFilterBuilder = RequestFilterBuilder;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"request-builder.js","sourceRoot":"","sources":["../src/request-builder.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"request-builder.js","sourceRoot":"","sources":["../src/request-builder.ts"],"names":[],"mappings":"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"}

dist/text.js

@@ -147,2 +147,23 @@ "use strict";
 }
+function extractTagRefs(fragments, tags) {
+    return fragments
+        .map(f => {
+        if (typeof f === "string") {
+            return f.split(const_1.TagRefRegex).map(i => {
+                if (i.startsWith("#")) {
+                    const tag = tags[Number(i.slice(2, -1))];
+                    if (tag) {
+                        return {
+                            type: "mention",
+                            content: `nostr:${nostr_link_1.NostrLink.fromTag(tag).encode()}`,
+                        };
+                    }
+                }
+                return i;
+            });
+        }
+        return f;
+    })
+        .flat();
+}
 function extractCustomEmoji(fragments, tags) {
@@ -195,2 +216,3 @@ return fragments
     fragments = extractMentions(fragments);
+    fragments = extractTagRefs(fragments, tags);
     fragments = extractHashtags(fragments);
@@ -214,2 +236,2 @@ fragments = extractInvoices(fragments);
 exports.transformText = transformText;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDBDQUFnRDtBQUVoRCxtQ0FPaUI7QUFDakIsNkNBQWlEO0FBQ2pELG1DQUFxQztBQXFCckMsU0FBUyxZQUFZLENBQUMsU0FBcUI7SUFDekMsT0FBTyxTQUFTO1NBQ2IsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ1AsSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRLEVBQUU7WUFDekIsT0FBTyxJQUFBLGtCQUFVLEVBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFO2dCQUMzQixNQUFNLFlBQVksR0FBRyxHQUFHLEVBQUU7b0JBQ3hCLE1BQU0sYUFBYSxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztvQkFFdEMsSUFBSSxhQUFhLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxJQUFJLGFBQWEsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUU7d0JBQ2hGLE9BQU8sSUFBQSw4QkFBaUIsRUFBQyxhQUFhLENBQUMsQ0FBQztxQkFDekM7b0JBRUQsT0FBTyxDQUNMLGFBQWEsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO3dCQUNqQyxhQUFhLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQzt3QkFDbEMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FDcEMsQ0FBQztnQkFDSixDQUFDLENBQUM7Z0JBRUYsSUFBSSxZQUFZLEVBQUUsRUFBRTtvQkFDbEIsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3ZCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLDBCQUFrQixDQUFDLENBQUM7b0JBRXpELElBQUksU0FBUyxJQUFJLFNBQVMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO3dCQUNyQyxNQUFNLFNB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"text.js","sourceRoot":"","sources":["../src/text.ts"],"names":[],"mappings":"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"}

dist/zaps.js

@@ -64,6 +64,6 @@ "use strict";
             }
-            if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
-                ret.valid = false;
-                ret.errors.push("zap service pubkey doesn't match");
-            }
+            /*if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
+              ret.valid = false;
+              ret.errors.push("zap service pubkey doesn't match");
+            }*/
             if (!ret.valid) {
@@ -93,2 +93,2 @@ Log("Invalid zap %O", ret);
 exports.parseZap = parseZap;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy96YXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDBDQUE4RDtBQUU5RCxtQ0FBa0M7QUFFbEMsMkNBQXVDO0FBQ3ZDLDZDQUF5QztBQUN6QyxrREFBMEI7QUFFMUIsTUFBTSxHQUFHLEdBQUcsSUFBQSxlQUFLLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUIsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLEVBQXFCLENBQUM7QUFFcEQsU0FBUyxVQUFVLENBQUMsR0FBZTtJQUNqQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGVBQU8sRUFBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdEMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztLQUNwRDtJQUNELE9BQU8sSUFBQSxzQkFBYSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixRQUFRLENBQUMsVUFBc0IsRUFBRSxTQUFtQyxFQUFFLE9BQW9CO0lBQ3hHLE1BQU0sUUFBUSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25ELElBQUksUUFBUSxFQUFFO1FBQ1osT0FBTyxRQUFRLENBQUM7S0FDakI7SUFFRCxJQUFJLFlBQVksR0FBRyxJQUFBLGVBQU8sRUFBQyxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDdEQsSUFBSSxZQUFZLEVBQUU7UUFDaEIsSUFBSTtZQUNGLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUN2QyxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ2hDLFlBQVksR0FBRyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsQ0FBQzthQUNqRDtZQUNELE1BQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy96YXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDBDQUE4RDtBQUU5RCxtQ0FBa0M7QUFFbEMsMkNBQXVDO0FBQ3ZDLDZDQUF5QztBQUN6QyxrREFBMEI7QUFFMUIsTUFBTSxHQUFHLEdBQUcsSUFBQSxlQUFLLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUIsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLEVBQXFCLENBQUM7QUFFcEQsU0FBUyxVQUFVLENBQUMsR0FBZTtJQUNqQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGVBQU8sRUFBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdEMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztLQUNwRDtJQUNELE9BQU8sSUFBQSxzQkFBYSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixRQUFRLENBQUMsVUFBc0IsRUFBRSxTQUFtQyxFQUFFLE9BQW9CO0lBQ3hHLE1BQU0sUUFBUSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25ELElBQUksUUFBUSxFQUFFO1FBQ1osT0FBTyxRQUFRLENBQUM7S0FDakI7SUFFRCxJQUFJLFlBQVksR0FBRyxJQUFBLGVBQU8sRUFBQyxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDdEQsSUFBSSxZQUFZLEVBQUU7UUFDaEIsSUFBSTtZQUNGLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUN2QyxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ2hDLFlBQVksR0FBRyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsQ0FBQzthQUNqRDtZQUNELE1BQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxL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

package.json

 {
   "name": "@snort/system",
-  "version": "1.0.22",
+  "version": "1.1.0",
   "description": "Snort nostr system package",
@@ -36,5 +36,6 @@ "main": "dist/index.js",
     "@scure/base": "^1.1.2",
-    "@snort/shared": "^1.0.7",
+    "@snort/shared": "^1.0.9",
     "@stablelib/xchacha20": "^1.0.1",
     "debug": "^4.3.4",
+    "eventemitter3": "^5.0.1",
     "isomorphic-ws": "^5.0.0",
@@ -41,0 +42,0 @@ "uuid": "^9.0.0",

src/cache/index.ts

@@ -39,2 +39,4 @@ import { FullRelaySettings, HexKey, NostrEvent, UserMetadata } from "..";
   events: number;
+  connects: number;
+  lastSeen: number;
   disconnects: number;
@@ -41,0 +43,0 @@ latency: number[];

src/cache/user-metadata.ts

@@ -82,3 +82,3 @@ import { MetadataCache } from ".";
   takeSnapshot(): MetadataCache[] {
-    return [];
+    return [...this.cache.values()];
   }
@@ -85,0 +85,0 @@

src/connection.ts

 import { v4 as uuid } from "uuid";
 import debug from "debug";
 import WebSocket from "isomorphic-ws";
-import { unwrap, ExternalStore, unixNowMs, dedupe } from "@snort/shared";
+import { unixNowMs, dedupe } from "@snort/shared";
+import EventEmitter from "eventemitter3";
 
@@ -12,4 +13,2 @@ import { DefaultConnectTimeout } from "./const";
 
-export type AuthHandler = (challenge: string, relay: string) => Promise<NostrEvent | undefined>;
-
 /**
@@ -50,3 +49,13 @@ * Relay settings
 
-export class Connection extends ExternalStore<ConnectionStateSnapshot> {
+interface ConnectionEvents {
+  change: (snapshot: ConnectionStateSnapshot) => void;
+  connected: (wasReconnect: boolean) => void;
+  event: (sub: string, e: TaggedNostrEvent) => void;
+  eose: (sub: string) => void;
+  disconnect: (code: number) => void;
+  auth: (challenge: string, relay: string, cb: (ev: NostrEvent) => void) => void;
+  notice: (msg: string) => void;
+}
+
+export class Connection extends EventEmitter<ConnectionEvents> {
   #log: debug.Debugger;
@@ -56,2 +65,3 @@ #ephemeralCheck?: ReturnType<typeof setInterval>;
   #expectAuth = false;
+  #ephemeral: boolean;
 
@@ -77,13 +87,8 @@ Id: string;
   EventsCallback: Map<u256, (msg: Array<string | boolean>) => void>;
-  OnConnected?: (wasReconnect: boolean) => void;
-  OnEvent?: (sub: string, e: TaggedNostrEvent) => void;
-  OnEose?: (sub: string) => void;
-  OnDisconnect?: (code: number) => void;
-  Auth?: AuthHandler;
+
   AwaitingAuth: Map<string, boolean>;
   Authed = false;
-  Ephemeral: boolean;
   Down = true;
 
-  constructor(addr: string, options: RelaySettings, auth?: AuthHandler, ephemeral: boolean = false) {
+  constructor(addr: string, options: RelaySettings, ephemeral: boolean = false) {
     super();
@@ -96,7 +101,15 @@ this.Id = uuid();
     this.AwaitingAuth = new Map();
-    this.Auth = auth;
-    this.Ephemeral = ephemeral;
+    this.#ephemeral = ephemeral;
     this.#log = debug("Connection").extend(addr);
   }
 
+  get Ephemeral() {
+    return this.#ephemeral;
+  }
+
+  set Ephemeral(v: boolean) {
+    this.#ephemeral = v;
+    this.#setupEphemeral();
+  }
+
   async Connect() {
@@ -153,3 +166,3 @@ try {
     this.#setupEphemeral();
-    this.OnConnected?.(wasReconnect);
+    this.emit("connected", wasReconnect);
     this.#sendPendingRaw();
@@ -174,3 +187,7 @@ }
       this.ReconnectTimer = setTimeout(() => {
-        this.Connect();
+        try {
+          this.Connect();
+        } catch {
+          this.emit("disconnect", -1);
+        }
       }, this.ConnectTimeout);
@@ -183,3 +200,3 @@ this.Stats.Disconnects++;
 
-    this.OnDisconnect?.(e.code);
+    this.emit("disconnect", e.code);
     this.#reset();
@@ -208,3 +225,3 @@ this.notifyChange();
         case "EVENT": {
-          this.OnEvent?.(msg[1] as string, {
+          this.emit("event", msg[1] as string, {
             ...(msg[2] as NostrEvent),
@@ -218,3 +235,3 @@ relays: [this.Address],
         case "EOSE": {
-          this.OnEose?.(msg[1] as string);
+          this.emit("eose", msg[1] as string);
           break;
@@ -234,2 +251,3 @@ }
         case "NOTICE": {
+          this.emit("notice", msg[1] as string);
           this.#log(`NOTICE: ${msg[1]}`);
@@ -351,3 +369,3 @@ break;
       this.#sendJson(["CLOSE", id]);
-      this.OnEose?.(id);
+      this.emit("eose", id);
       this.#SendQueuedRequests();
@@ -441,7 +459,7 @@ }
     };
-    if (!this.Auth) {
-      throw new Error("Auth hook not registered");
-    }
     this.AwaitingAuth.set(challenge, true);
-    const authEvent = await this.Auth(challenge, this.Address);
+    const authEvent = await new Promise<NostrEvent>((resolve, reject) =>
+      this.emit("auth", challenge, this.Address, resolve),
+    );
+    this.#log("Auth result: %o", authEvent);
     if (!authEvent) {
@@ -476,7 +494,7 @@ authCleanup();
   #setupEphemeral() {
+    if (this.#ephemeralCheck) {
+      clearInterval(this.#ephemeralCheck);
+      this.#ephemeralCheck = undefined;
+    }
     if (this.Ephemeral) {
-      if (this.#ephemeralCheck) {
-        clearInterval(this.#ephemeralCheck);
-        this.#ephemeralCheck = undefined;
-      }
       this.#ephemeralCheck = setInterval(() => {
@@ -494,2 +512,6 @@ const lastActivity = unixNowMs() - this.#activity;
   }
+
+  notifyChange() {
+    this.emit("change", this.takeSnapshot());
+  }
 }

src/const.ts

@@ -13,2 +13,7 @@ /**
 /**
+ * Legacy tag reference regex
+ */
+export const TagRefRegex = /(#\[\d+\])/gm;
+
+/**
  * How long profile cache should be considered valid for
@@ -15,0 +20,0 @@ */

src/event-kind.ts

@@ -27,7 +27,12 @@ enum EventKind {
   Auth = 22242, // NIP-42
-  PubkeyLists = 30000, // NIP-51a
-  NoteLists = 30001, // NIP-51b
-  TagLists = 30002, // NIP-51c
+
+  MuteList = 10_000, // NIP-51
+  PinList = 10_001, // NIP-51
+
+  CategorizedPeople = 30000, // NIP-51a
+  CategorizedBookmarks = 30001, // NIP-51b
+
   Badge = 30009, // NIP-58
   ProfileBadges = 30008, // NIP-58
+
   LongFormTextNote = 30023, // NIP-23
@@ -41,5 +46,5 @@ AppData = 30_078, // NIP-78
   ZapReceipt = 9735, // NIP 57
-  HttpAuthentication = 27235, // NIP XX - HTTP Authentication
+  HttpAuthentication = 27235, // NIP 98 - HTTP Authentication
 }
 
 export default EventKind;

src/event-publisher.ts

 import * as secp from "@noble/curves/secp256k1";
 import * as utils from "@noble/curves/abstract/utils";
-import { unwrap, getPublicKey, unixNow } from "@snort/shared";
+import { unwrap } from "@snort/shared";
 
@@ -11,3 +11,2 @@ import {
   HexKey,
-  Lists,
   MessageEncryptorVersion,
@@ -22,2 +21,3 @@ NostrEvent,
   TaggedNostrEvent,
+  ToNostrEventTag,
   u256,
@@ -109,7 +109,10 @@ UserMetadata,
 
-  async muted(keys: HexKey[], priv: HexKey[]) {
-    const eb = this.#eb(EventKind.PubkeyLists);
-
-    eb.tag(["d", Lists.Muted]);
-    keys.forEach(p => {
+  /**
+   * Build a mute list event using lists of pubkeys
+   * @param pub Public mute list
+   * @param priv Private mute list
+   */
+  async muted(pub: Array<string>, priv: Array<string>) {
+    const eb = this.#eb(EventKind.MuteList);
+    pub.forEach(p => {
       eb.tag(["p", p]);
@@ -125,7 +128,9 @@ });
 
-  async noteList(notes: u256[], list: Lists) {
-    const eb = this.#eb(EventKind.NoteLists);
-    eb.tag(["d", list]);
+  /**
+   * Build a pin list event using lists of event links
+   */
+  async pinned(notes: Array<ToNostrEventTag>) {
+    const eb = this.#eb(EventKind.PinList);
     notes.forEach(n => {
-      eb.tag(["e", n]);
+      eb.tag(unwrap(n.toEventTag()));
     });
@@ -135,7 +140,11 @@ return await this.#sign(eb);
 
-  async tags(tags: string[]) {
-    const eb = this.#eb(EventKind.TagLists);
-    eb.tag(["d", Lists.Followed]);
-    tags.forEach(t => {
-      eb.tag(["t", t]);
+  /**
+   * Build a categorized bookmarks event with a given label
+   * @param notes List of bookmarked links
+   */
+  async bookmarks(notes: Array<ToNostrEventTag>, list: "bookmark" | "follow") {
+    const eb = this.#eb(EventKind.CategorizedBookmarks);
+    eb.tag(["d", list]);
+    notes.forEach(n => {
+      eb.tag(unwrap(n.toEventTag()));
     });
@@ -180,3 +189,4 @@ return await this.#sign(eb);
     if (note) {
-      eb.tag(unwrap(note.toEventTag()));
+      // HACK: remove relay tag, some zap services dont like relay tags
+      eb.tag(unwrap(note.toEventTag()).slice(0, 2));
     }
@@ -221,4 +231,2 @@ eb.tag(["p", author]);
     }
-    // Big E/A tag
-    eb.tag(unwrap(link.toEventTag()).map((v, i) => (i === 0 ? v.toUpperCase() : v)));
     eb.processContent();
@@ -260,8 +268,5 @@ fnExtra?.(eb);
 
-  async contactList(follows: Array<HexKey>, relays: Record<string, RelaySettings>) {
+  async contactList(tags: Array<[string, string]>) {
     const eb = this.#eb(EventKind.ContactList);
-    eb.content(JSON.stringify(relays));
-
-    const temp = new Set(follows.filter(a => a.length === 64).map(a => a.toLowerCase()));
-    temp.forEach(a => eb.tag(["p", a]));
+    tags.forEach(a => eb.tag(a));
     return await this.#sign(eb);
@@ -278,2 +283,3 @@ }
   }
+
   /**
@@ -336,2 +342,9 @@ * Repost a note (NIP-18)
 
+  async appData(data: object, id: string) {
+    const eb = this.#eb(EventKind.AppData);
+    eb.content(await this.nip4Encrypt(JSON.stringify(data), this.#pubKey));
+    eb.tag(["d", id]);
+    return await this.#sign(eb);
+  }
+
   /**
@@ -338,0 +351,0 @@ * NIP-59 Gift Wrap event with ephemeral key

src/impl/nip46.ts

@@ -88,6 +88,6 @@ import { unwrap, bech32ToHex } from "@snort/shared";
       this.#conn = new Connection(this.#relay, { read: true, write: true });
-      this.#conn.OnEvent = async (sub, e) => {
+      this.#conn.on("event", async (sub, e) => {
         await this.#onReply(e);
-      };
-      this.#conn.OnConnected = async () => {
+      });
+      this.#conn.on("connected", async () => {
         this.#conn!.QueueReq(
@@ -114,3 +114,3 @@ [
         }
-      };
+      });
       this.#conn.Connect();
@@ -117,0 +117,0 @@ this.#didInit = true;

src/index.ts

@@ -1,2 +0,2 @@
-import { AuthHandler, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
+import { RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
 import { RequestBuilder } from "./request-builder";
@@ -50,7 +50,2 @@ import { NoteStore, NoteStoreSnapshotData } from "./note-collection";
   /**
-   * Handler function for NIP-42
-   */
-  HandleAuth?: AuthHandler;
-
-  /**
    * Get a snapshot of the relay connections
@@ -148,3 +143,3 @@ */
 
-export function decodeEncryptionPayload(p: string) {
+export function decodeEncryptionPayload(p: string): MessageEncryptorPayload {
   if (p.startsWith("{") && p.endsWith("}")) {
@@ -156,3 +151,10 @@ const pj = JSON.parse(p) as { v: number; nonce: string; ciphertext: string };
       ciphertext: base64.decode(pj.ciphertext),
-    } as MessageEncryptorPayload;
+    };
+  } else if (p.includes("?iv=")) {
+    const [ciphertext, nonce] = p.split("?iv=");
+    return {
+      v: MessageEncryptorVersion.Nip4,
+      nonce: base64.decode(nonce),
+      ciphertext: base64.decode(ciphertext),
+    };
   } else {
@@ -164,3 +166,3 @@ const buf = base64.decode(p);
       ciphertext: buf.subarray(25),
-    } as MessageEncryptorPayload;
+    };
   }
@@ -167,0 +169,0 @@ }

src/links.ts

@@ -15,2 +15,3 @@ import * as utils from "@noble/curves/abstract/utils";
   Address = "naddr",
+  Req = "nreq",
 }
@@ -58,3 +59,5 @@
         const buf =
-          prefix === NostrPrefix.Address ? enc.encode(v.value as string) : utils.hexToBytes(v.value as string);
+          prefix === NostrPrefix.Address || prefix === NostrPrefix.Req
+            ? enc.encode(v.value as string)
+            : utils.hexToBytes(v.value as string);
         buffers.push(0, buf.length, ...buf);
@@ -106,4 +109,4 @@ break;
     case TLVEntryType.Special: {
-      if (prefix === NostrPrefix.Address) {
-        return new TextDecoder("ASCII").decode(data);
+      if (prefix === NostrPrefix.Address || prefix === NostrPrefix.Req) {
+        return new TextDecoder().decode(data);
       } else {
@@ -120,5 +123,5 @@ return utils.bytesToHex(data);
     case TLVEntryType.Relay: {
-      return new TextDecoder("ASCII").decode(data);
+      return new TextDecoder().decode(data);
     }
   }
 }

src/nostr-link.ts

@@ -1,16 +0,28 @@
-import { bech32ToHex, hexToBech32, unwrap } from "@snort/shared";
+import { bech32ToHex, hexToBech32, isHex, removeUndefined, unwrap } from "@snort/shared";
 import {
-  NostrPrefix,
   decodeTLV,
-  TLVEntryType,
   encodeTLV,
+  EventExt,
+  EventKind,
   NostrEvent,
+  NostrPrefix,
+  Tag,
   TaggedNostrEvent,
-  EventExt,
-  Tag,
-  EventKind,
+  TLVEntryType,
 } from ".";
 import { findTag } from "./utils";
 
-export class NostrLink {
+export interface ToNostrEventTag {
+  toEventTag(): Array<string> | undefined;
+}
+
+export class NostrHashtagLink implements ToNostrEventTag {
+  constructor(readonly tag: string) {}
+
+  toEventTag(): string[] | undefined {
+    return ["t", this.tag];
+  }
+}
+
+export class NostrLink implements ToNostrEventTag {
   constructor(
@@ -22,9 +34,20 @@ readonly type: NostrPrefix,
     readonly relays?: Array<string>,
-  ) {}
+  ) {
+    if (type !== NostrPrefix.Address && !isHex(id)) {
+      throw new Error("ID must be hex");
+    }
+  }
 
-  encode(): string {
-    if (this.type === NostrPrefix.Note || this.type === NostrPrefix.PrivateKey || this.type === NostrPrefix.PublicKey) {
-      return hexToBech32(this.type, this.id);
-    } else {
-      return encodeTLV(this.type, this.id, this.relays, this.kind, this.author);
+  encode(type?: NostrPrefix): string {
+    try {
+      // cant encode 'naddr' to 'note'/'nevent' because 'id' is not hex
+      let newType = this.type === NostrPrefix.Address ? this.type : type ?? this.type;
+      if (newType === NostrPrefix.Note || newType === NostrPrefix.PrivateKey || newType === NostrPrefix.PublicKey) {
+        return hexToBech32(newType, this.id);
+      } else {
+        return encodeTLV(newType, this.id, this.relays, this.kind, this.author);
+      }
+    } catch (e) {
+      console.error("Invalid data", this, e);
+      throw e;
     }
@@ -35,4 +58,4 @@ }
     const relayEntry = this.relays ? [this.relays[0]] : [];
-    if (this.type === NostrPrefix.PublicKey) {
-      return ["p", this.id];
+    if (this.type === NostrPrefix.PublicKey || this.type === NostrPrefix.Profile) {
+      return ["p", this.id, ...relayEntry];
     } else if (this.type === NostrPrefix.Note || this.type === NostrPrefix.Event) {
@@ -168,2 +191,14 @@ return ["e", this.id, ...relayEntry];
 
+  static fromTags(tags: Array<Array<string>>) {
+    return removeUndefined(
+      tags.map(a => {
+        try {
+          return NostrLink.fromTag(a);
+        } catch {
+          // ignored, cant be mapped
+        }
+      }),
+    );
+  }
+
   static fromEvent(ev: TaggedNostrEvent | NostrEvent) {
@@ -205,4 +240,7 @@ const relays = "relays" in ev ? ev.relays : undefined;
 export function parseNostrLink(link: string, prefixHint?: NostrPrefix): NostrLink {
-  const entity = link.startsWith("web+nostr:") || link.startsWith("nostr:") ? link.split(":")[1] : link;
+  let entity = link.startsWith("web+nostr:") || link.startsWith("nostr:") ? link.split(":")[1] : link;
 
+  // trim any non-bech32 chars
+  entity = entity.match(/(n(?:pub|profile|event|ote|addr|req)1[acdefghjklmnpqrstuvwxyz023456789]+)/)?.[0] ?? entity;
+
   const isPrefix = (prefix: NostrPrefix) => {
@@ -220,3 +258,8 @@ return entity.startsWith(prefix);
     return new NostrLink(NostrPrefix.Note, id);
-  } else if (isPrefix(NostrPrefix.Profile) || isPrefix(NostrPrefix.Event) || isPrefix(NostrPrefix.Address)) {
+  } else if (
+    isPrefix(NostrPrefix.Profile) ||
+    isPrefix(NostrPrefix.Event) ||
+    isPrefix(NostrPrefix.Address) ||
+    isPrefix(NostrPrefix.Req)
+  ) {
     const decoded = decodeTLV(entity);
@@ -237,2 +280,4 @@
       return new NostrLink(NostrPrefix.Address, id, kind, author, relays);
+    } else if (isPrefix(NostrPrefix.Req)) {
+      return new NostrLink(NostrPrefix.Req, id);
     }
@@ -239,0 +284,0 @@ } else if (prefixHint) {

src/nostr-system.ts

 import debug from "debug";
+import EventEmitter from "eventemitter3";
 
-import { unwrap, sanitizeRelayUrl, ExternalStore, FeedCache, removeUndefined } from "@snort/shared";
+import { unwrap, sanitizeRelayUrl, FeedCache, removeUndefined } from "@snort/shared";
 import { NostrEvent, TaggedNostrEvent } from "./nostr";
-import { AuthHandler, Connection, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
+import { Connection, RelaySettings, ConnectionStateSnapshot, OkResponse } from "./connection";
 import { Query } from "./query";
@@ -28,6 +29,12 @@ import { NoteCollection, NoteStore, NoteStoreSnapshotData } from "./note-collection";
 
+interface NostrSystemEvents {
+  change: (state: SystemSnapshot) => void;
+  auth: (challenge: string, relay: string, cb: (ev: NostrEvent) => void) => void;
+  event: (ev: TaggedNostrEvent) => void;
+}
+
 /**
  * Manages nostr content retrieval system
  */
-export class NostrSystem extends ExternalStore<SystemSnapshot> implements SystemInterface {
+export class NostrSystem extends EventEmitter<NostrSystemEvents> implements SystemInterface {
   #log = debug("System");
@@ -46,7 +53,2 @@
   /**
-   * NIP-42 Auth handler
-   */
-  #handleAuth?: AuthHandler;
-
-  /**
    * Storage class for user relay lists
@@ -92,3 +94,2 @@ */
   constructor(props: {
-    authHandler?: AuthHandler;
     relayCache?: FeedCache<UsersRelays>;
@@ -103,3 +104,2 @@ profileCache?: FeedCache<MetadataCache>;
     super();
-    this.#handleAuth = props.authHandler;
     this.#relayCache = props.relayCache ?? new UserRelaysCache(props.db?.userRelays);
@@ -117,4 +117,2 @@ this.#profileCache = props.profileCache ?? new UserProfileCache(props.db?.users);
 
-  HandleAuth?: AuthHandler | undefined;
-
   get ProfileLoader() {
@@ -125,3 +123,3 @@ return this.#profileLoader;
   get Sockets(): ConnectionStateSnapshot[] {
-    return [...this.#sockets.values()].map(a => a.snapshot());
+    return [...this.#sockets.values()].map(a => a.takeSnapshot());
   }
@@ -154,18 +152,22 @@
   async ConnectToRelay(address: string, options: RelaySettings) {
+    const addr = unwrap(sanitizeRelayUrl(address));
     try {
-      const addr = unwrap(sanitizeRelayUrl(address));
-      if (!this.#sockets.has(addr)) {
-        const c = new Connection(addr, options, this.#handleAuth?.bind(this));
+      const existing = this.#sockets.get(addr);
+      if (!existing) {
+        const c = new Connection(addr, options);
         this.#sockets.set(addr, c);
-        c.OnEvent = (s, e) => this.#onEvent(s, e);
-        c.OnEose = s => this.#onEndOfStoredEvents(c, s);
-        c.OnDisconnect = code => this.#onRelayDisconnect(c, code);
-        c.OnConnected = r => this.#onRelayConnected(c, r);
+        c.on("event", (s, e) => this.#onEvent(s, e));
+        c.on("eose", s => this.#onEndOfStoredEvents(c, s));
+        c.on("disconnect", code => this.#onRelayDisconnect(c, code));
+        c.on("connected", r => this.#onRelayConnected(c, r));
+        c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
         await c.Connect();
       } else {
         // update settings if already connected
-        unwrap(this.#sockets.get(addr)).Settings = options;
+        existing.Settings = options;
+        existing.Ephemeral = false;
       }
     } catch (e) {
       console.error(e);
+      this.#relayMetrics.onDisconnect(addr, 0);
     }
@@ -175,2 +177,3 @@ }
   #onRelayConnected(c: Connection, wasReconnect: boolean) {
+    this.#relayMetrics.onConnect(c.Address);
     if (wasReconnect) {
@@ -184,3 +187,3 @@ for (const [, q] of this.Queries) {
   #onRelayDisconnect(c: Connection, code: number) {
-    this.#relayMetrics.onDisconnect(c, code);
+    this.#relayMetrics.onDisconnect(c.Address, code);
     for (const [, q] of this.Queries) {
@@ -198,2 +201,5 @@ q.connectionLost(c.Id);
   #onEvent(sub: string, ev: TaggedNostrEvent) {
+    this.#relayMetrics.onEvent(ev.relays[0]);
+    this.emit("event", ev);
+
     if (!EventExt.isValid(ev)) {
@@ -221,8 +227,9 @@ this.#log("Rejecting invalid event %O", ev);
       if (!this.#sockets.has(addr)) {
-        const c = new Connection(addr, { read: true, write: true }, this.#handleAuth?.bind(this), true);
+        const c = new Connection(addr, { read: true, write: true }, true);
         this.#sockets.set(addr, c);
-        c.OnEvent = (s, e) => this.#onEvent(s, e);
-        c.OnEose = s => this.#onEndOfStoredEvents(c, s);
-        c.OnDisconnect = code => this.#onRelayDisconnect(c, code);
-        c.OnConnected = r => this.#onRelayConnected(c, r);
+        c.on("event", (s, e) => this.#onEvent(s, e));
+        c.on("eose", s => this.#onEndOfStoredEvents(c, s));
+        c.on("disconnect", code => this.#onRelayDisconnect(c, code));
+        c.on("connected", r => this.#onRelayConnected(c, r));
+        c.on("auth", (c, r, cb) => this.emit("auth", c, r, cb));
         await c.Connect();
@@ -302,2 +309,4 @@ return c;
       const q = new Query(req.id, req.instance, store, req.options?.leaveOpen);
+      q.on("trace", r => this.#relayMetrics.onTraceReport(r));
+
       if (filters.some(a => a.filters.some(b => b.ids))) {
@@ -417,6 +426,6 @@ const expectIds = new Set(filters.flatMap(a => a.filters).flatMap(a => a.ids ?? []));
       return await new Promise<OkResponse>((resolve, reject) => {
-        const c = new Connection(address, { write: true, read: true }, this.#handleAuth?.bind(this), true);
+        const c = new Connection(address, { write: true, read: true }, true);
 
         const t = setTimeout(reject, 10_000);
-        c.OnConnected = async () => {
+        c.once("connected", async () => {
           clearTimeout(t);
@@ -426,3 +435,3 @@ const rsp = await c.SendAsync(ev);
           resolve(rsp);
-        };
+        });
         c.Connect();
@@ -445,2 +454,6 @@ });
 
+  notifyChange() {
+    this.emit("change", this.takeSnapshot());
+  }
+
   #cleanup() {
@@ -447,0 +460,0 @@ let changed = false;

src/nostr.ts

@@ -17,3 +17,8 @@ import { RelaySettings } from "./connection";
    */
-  relays: string[];
+  relays: Array<string>;
+
+  /**
+   * Additional context
+   */
+  context?: object;
 }
@@ -74,13 +79,2 @@
 
-/**
- * NIP-51 list types
- */
-export enum Lists {
-  Muted = "mute",
-  Pinned = "pin",
-  Bookmarked = "bookmark",
-  Followed = "follow",
-  Badges = "profile_badges",
-}
-
 export interface FullRelaySettings {
@@ -87,0 +81,0 @@ url: string;

src/query.ts

 import { v4 as uuid } from "uuid";
 import debug from "debug";
+import EventEmitter from "eventemitter3";
 import { unixNowMs, unwrap } from "@snort/shared";
@@ -10,6 +11,12 @@
 
+interface QueryTraceEvents {
+  change: () => void;
+  close: (id: string) => void;
+  eose: (id: string, connId: string, wasForced: boolean) => void;
+}
+
 /**
  * Tracing for relay query status
  */
-class QueryTrace {
+export class QueryTrace extends EventEmitter<QueryTraceEvents> {
   readonly id: string;
@@ -21,4 +28,2 @@ readonly start: number;
   #wasForceClosed = false;
-  readonly #fnClose: (id: string) => void;
-  readonly #fnProgress: () => void;
 
@@ -29,9 +34,6 @@ constructor(
     readonly connId: string,
-    fnClose: (id: string) => void,
-    fnProgress: () => void,
   ) {
+    super();
     this.id = uuid();
     this.start = unixNowMs();
-    this.#fnClose = fnClose;
-    this.#fnProgress = fnProgress;
   }
@@ -41,3 +43,3 @@
     this.sent = unixNowMs();
-    this.#fnProgress();
+    this.emit("change");
   }
@@ -47,9 +49,12 @@
     this.eose = unixNowMs();
-    this.#fnProgress();
+    this.emit("change");
+    this.emit("eose", this.id, this.connId, false);
   }
 
   forceEose() {
+    this.sent ??= unixNowMs();
     this.eose = unixNowMs();
     this.#wasForceClosed = true;
     this.sendClose();
+    this.emit("eose", this.id, this.connId, true);
   }
@@ -59,4 +64,4 @@
     this.close = unixNowMs();
-    this.#fnClose(this.id);
-    this.#fnProgress();
+    this.emit("close", this.id);
+    this.emit("change");
   }
@@ -110,6 +115,18 @@
 
+export interface TraceReport {
+  id: string;
+  conn: Connection;
+  wasForced: boolean;
+  queued: number;
+  responseTime: number;
+}
+
+interface QueryEvents {
+  trace: (report: TraceReport) => void;
+}
+
 /**
  * Active or queued query on the system
  */
-export class Query implements QueryBase {
+export class Query extends EventEmitter<QueryEvents> implements QueryBase {
   /**
@@ -153,2 +170,3 @@ * Uniquie ID of this query
   constructor(id: string, instance: string, feed: NoteStore, leaveOpen?: boolean) {
+    super();
     this.id = id;
@@ -186,3 +204,3 @@ this.#feed = feed;
         } else {
-          this.#log("Event did not match filter, rejecting %O", e);
+          this.#log("Event did not match filter, rejecting %O %O", e, t);
         }
@@ -213,13 +231,3 @@ break;
   insertCompletedTrace(subq: BuiltRawReqFilter, data: Readonly<Array<TaggedNostrEvent>>) {
-    const qt = new QueryTrace(
-      subq.relay,
-      subq.filters,
-      "",
-      () => {
-        // nothing to close
-      },
-      () => {
-        // nothing to progress
-      },
-    );
+    const qt = new QueryTrace(subq.relay, subq.filters, "");
     qt.sentToRelay();
@@ -320,8 +328,13 @@ qt.gotEose();
   #sendQueryInternal(c: Connection, q: BuiltRawReqFilter) {
-    const qt = new QueryTrace(
-      c.Address,
-      q.filters,
-      c.Id,
-      x => c.CloseReq(x),
-      () => this.#onProgress(),
+    const qt = new QueryTrace(c.Address, q.filters, c.Id);
+    qt.on("close", x => c.CloseReq(x));
+    qt.on("change", () => this.#onProgress());
+    qt.on("eose", (id, connId, forced) =>
+      this.emit("trace", {
+        id,
+        conn: c,
+        wasForced: forced,
+        queued: qt.queued,
+        responseTime: qt.responseTime,
+      } as TraceReport),
     );
@@ -328,0 +341,0 @@ this.#tracing.push(qt);

src/relay-info.ts

@@ -16,2 +16,6 @@ export interface RelayInfo {
   };
+  relay_countries?: Array<string>;
+  language_tags?: Array<string>;
+  tags?: Array<string>;
+  posting_policy?: string;
 }

src/relay-metric-handler.ts

@@ -1,4 +0,5 @@
-import { FeedCache } from "@snort/shared";
+import { FeedCache, unixNowMs } from "@snort/shared";
 import { Connection } from "connection";
 import { RelayMetrics } from "cache";
+import { TraceReport } from "query";
 
@@ -10,5 +11,61 @@ export class RelayMetricHandler {
     this.#cache = cache;
+
+    setInterval(() => {
+      this.#flush();
+    }, 10_000);
   }
 
-  onDisconnect(c: Connection, code: number) {}
+  async onEvent(addr: string) {
+    const v = await this.#cache.get(addr);
+    if (v) {
+      v.events++;
+      v.lastSeen = unixNowMs();
+    }
+  }
+
+  async onConnect(addr: string) {
+    const v = await this.#cache.get(addr);
+    if (v) {
+      v.connects++;
+      v.lastSeen = unixNowMs();
+    } else {
+      await this.#cache.set({
+        addr: addr,
+        connects: 1,
+        disconnects: 0,
+        events: 0,
+        lastSeen: unixNowMs(),
+        latency: [],
+      });
+    }
+  }
+
+  async onDisconnect(addr: string, code: number) {
+    const v = await this.#cache.get(addr);
+    if (v) {
+      v.disconnects++;
+    } else {
+      await this.#cache.set({
+        addr: addr,
+        connects: 0,
+        disconnects: 1,
+        events: 0,
+        lastSeen: unixNowMs(),
+        latency: [],
+      });
+    }
+  }
+
+  onTraceReport(t: TraceReport) {
+    const v = this.#cache.getFromCache(t.conn.Address);
+    if (v) {
+      v.latency.push(t.responseTime);
+      v.latency = v.latency.slice(-50);
+    }
+  }
+
+  async #flush() {
+    const data = this.#cache.snapshot();
+    await this.#cache.bulkSet(data);
+  }
 }

src/request-builder.ts

@@ -179,6 +179,9 @@ import debug from "debug";
    */
-  relay(u: string) {
-    const uClean = sanitizeRelayUrl(u);
-    if (uClean) {
-      this.#relays.add(uClean);
+  relay(u: string | Array<string>) {
+    const relays = Array.isArray(u) ? u : [u];
+    for (const r of relays) {
+      const uClean = sanitizeRelayUrl(r);
+      if (uClean) {
+        this.#relays.add(uClean);
+      }
     }
@@ -185,0 +188,0 @@ return this;

src/text.ts

@@ -10,4 +10,5 @@ import { removeUndefined } from "@snort/shared";
   MentionNostrEntityRegex,
+  TagRefRegex,
 } from "./const";
-import { validateNostrLink } from "./nostr-link";
+import { NostrLink, validateNostrLink } from "./nostr-link";
 import { splitByUrl } from "./utils";
@@ -180,2 +181,24 @@
 
+function extractTagRefs(fragments: Fragment[], tags: Array<Array<string>>) {
+  return fragments
+    .map(f => {
+      if (typeof f === "string") {
+        return f.split(TagRefRegex).map(i => {
+          if (i.startsWith("#")) {
+            const tag = tags[Number(i.slice(2, -1))];
+            if (tag) {
+              return {
+                type: "mention",
+                content: `nostr:${NostrLink.fromTag(tag).encode()}`,
+              } as ParsedFragment;
+            }
+          }
+          return i;
+        });
+      }
+      return f;
+    })
+    .flat();
+}
+
 function extractCustomEmoji(fragments: Fragment[], tags: Array<Array<string>>) {
@@ -230,2 +253,3 @@ return fragments
   fragments = extractMentions(fragments);
+  fragments = extractTagRefs(fragments, tags);
   fragments = extractHashtags(fragments);
@@ -232,0 +256,0 @@ fragments = extractInvoices(fragments);

src/zaps.ts

@@ -66,6 +66,6 @@ import { FeedCache } from "@snort/shared";
       }
-      if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
+      /*if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
         ret.valid = false;
         ret.errors.push("zap service pubkey doesn't match");
-      }
+      }*/
 
@@ -72,0 +72,0 @@ if (!ret.valid) {

No alert changes

Improved metrics

Total package byte prevSize

586014

increased by3.49%

Lines of code

11010

increased by3.51%

Worsened metrics

Dependency count

10

increased by11.11%

Dependency changes

• + Addedeventemitter3@^5.0.1

• Updated@snort/shared@^1.0.9