@welshman/net 0.0.42 → 0.0.44

package/build/src/Connection.d.ts

@@ -1,15 +1,14 @@
-import { Emitter } from '@welshman/lib';
-import { Socket } from './Socket';
-import type { Message } from './Socket';
-import { ConnectionEvent } from './ConnectionEvent';
-import { ConnectionState } from './ConnectionState';
-import { ConnectionStats } from './ConnectionStats';
-import { ConnectionAuth } from './ConnectionAuth';
-import { ConnectionSender } from './ConnectionSender';
+import { Emitter } from "@welshman/lib";
+import { Socket } from "./Socket.js";
+import type { Message } from "./Socket.js";
+import { ConnectionEvent } from "./ConnectionEvent.js";
+import { ConnectionState } from "./ConnectionState.js";
+import { ConnectionStats } from "./ConnectionStats.js";
+import { ConnectionAuth } from "./ConnectionAuth.js";
+import { ConnectionSender } from "./ConnectionSender.js";
 export declare enum ConnectionStatus {
-    Ready = "ready",
-    Closed = "Closed",
-    Closing = "Closing"
+    Open = "open",
+    Closed = "Closed"
 }
 export declare class Connection extends Emitter {
     url: string;
@@ -22,5 +21,7 @@ export declare class Connection extends Emitter {
     constructor(url: string);
     emit: (type: ConnectionEvent, ...args: any[]) => boolean;
     send: (message: Message) => Promise<void>;
-    close: () => Promise<void>;
+    open: () => void;
+    close: () => void;
+    cleanup: () => void;
 }

package/build/src/Connection.js

@@ -0,0 +1,57 @@
+import { Emitter } from "@welshman/lib";
+import { normalizeRelayUrl } from "@welshman/util";
+import { Socket } from "./Socket.js";
+import { ConnectionState } from "./ConnectionState.js";
+import { ConnectionStats } from "./ConnectionStats.js";
+import { ConnectionAuth } from "./ConnectionAuth.js";
+import { ConnectionSender } from "./ConnectionSender.js";
+export var ConnectionStatus;
+(function (ConnectionStatus) {
+    ConnectionStatus["Open"] = "open";
+    ConnectionStatus["Closed"] = "Closed";
+})(ConnectionStatus || (ConnectionStatus = {}));
+const { Open, Closed } = ConnectionStatus;
+export class Connection extends Emitter {
+    url;
+    socket;
+    sender;
+    state;
+    stats;
+    auth;
+    status = Open;
+    constructor(url) {
+        super();
+        if (url !== normalizeRelayUrl(url)) {
+            console.warn(`Attempted to open connection to non-normalized url ${url}`);
+        }
+        this.url = url;
+        this.socket = new Socket(this);
+        this.sender = new ConnectionSender(this);
+        this.state = new ConnectionState(this);
+        this.stats = new ConnectionStats(this);
+        this.auth = new ConnectionAuth(this);
+        this.setMaxListeners(100);
+    }
+    emit = (type, ...args) => super.emit(type, this, ...args);
+    send = async (message) => {
+        if (this.status !== Open) {
+            throw new Error(`Attempted to send message on ${this.status} connection`);
+        }
+        this.sender.push(message);
+    };
+    open = () => {
+        this.status = Open;
+        this.socket.open();
+        this.sender.worker.resume();
+    };
+    close = () => {
+        this.status = Closed;
+        this.socket.close();
+        this.sender.worker.pause();
+    };
+    cleanup = () => {
+        this.close();
+        this.removeAllListeners();
+    };
+}
+//# sourceMappingURL=Connection.js.map

package/build/src/Connection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Connection.js","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAA;AACrC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAGlC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAA;AAEtD,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,qCAAiB,CAAA;AACnB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,gBAAgB,CAAA;AAEvC,MAAM,OAAO,UAAW,SAAQ,OAAO;IACrC,GAAG,CAAQ;IACX,MAAM,CAAQ;IACd,MAAM,CAAkB;IACxB,KAAK,CAAiB;IACtB,KAAK,CAAiB;IACtB,IAAI,CAAgB;IACpB,MAAM,GAAG,IAAI,CAAA;IAEb,YAAY,GAAW;QACrB,KAAK,EAAE,CAAA;QAEP,IAAI,GAAG,KAAK,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,sDAAsD,GAAG,EAAE,CAAC,CAAA;QAC3E,CAAC;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,GAAG,CAAC,IAAqB,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;IAEjF,IAAI,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,aAAa,CAAC,CAAA;QAC3E,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC,CAAA;IAED,IAAI,GAAG,GAAG,EAAE;QACV,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;IAC7B,CAAC,CAAA;IAED,KAAK,GAAG,GAAG,EAAE;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC5B,CAAC,CAAA;IAED,OAAO,GAAG,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC3B,CAAC,CAAA;CACF"}

package/build/src/ConnectionAuth.d.ts

@@ -1,4 +1,4 @@
-import type { Connection } from './Connection';
+import type { Connection } from "./Connection.js";
 export declare enum AuthMode {
     Implicit = "implicit",
     Explicit = "explicit"

package/build/src/ConnectionAuth.js

@@ -0,0 +1,99 @@
+import { ctx, sleep } from "@welshman/lib";
+import { CLIENT_AUTH, createEvent } from "@welshman/util";
+import { ConnectionEvent } from "./ConnectionEvent.js";
+export var AuthMode;
+(function (AuthMode) {
+    AuthMode["Implicit"] = "implicit";
+    AuthMode["Explicit"] = "explicit";
+})(AuthMode || (AuthMode = {}));
+export var AuthStatus;
+(function (AuthStatus) {
+    AuthStatus["None"] = "none";
+    AuthStatus["Requested"] = "requested";
+    AuthStatus["PendingSignature"] = "pending_signature";
+    AuthStatus["DeniedSignature"] = "denied_signature";
+    AuthStatus["PendingResponse"] = "pending_response";
+    AuthStatus["Forbidden"] = "forbidden";
+    AuthStatus["Ok"] = "ok";
+})(AuthStatus || (AuthStatus = {}));
+const { None, Requested, PendingSignature, DeniedSignature, PendingResponse, Forbidden, Ok } = AuthStatus;
+export class ConnectionAuth {
+    cxn;
+    challenge;
+    request;
+    message;
+    status = None;
+    constructor(cxn) {
+        this.cxn = cxn;
+        this.cxn.on(ConnectionEvent.Close, this.#onClose);
+        this.cxn.on(ConnectionEvent.Receive, this.#onReceive);
+    }
+    #onReceive = (cxn, [verb, ...extra]) => {
+        if (verb === "OK") {
+            const [id, ok, message] = extra;
+            if (id === this.request) {
+                this.message = message;
+                this.status = ok ? Ok : Forbidden;
+            }
+        }
+        if (verb === "AUTH" && extra[0] !== this.challenge) {
+            this.challenge = extra[0];
+            this.request = undefined;
+            this.message = undefined;
+            this.status = Requested;
+            if (ctx.net.authMode === AuthMode.Implicit) {
+                this.respond();
+            }
+        }
+    };
+    #onClose = (cxn) => {
+        this.challenge = undefined;
+        this.request = undefined;
+        this.message = undefined;
+        this.status = None;
+    };
+    waitFor = async (condition, timeout = 300) => {
+        const start = Date.now();
+        while (Date.now() - timeout <= start) {
+            await sleep(100);
+            if (condition()) {
+                break;
+            }
+        }
+    };
+    waitForChallenge = async (timeout = 300) => this.waitFor(() => Boolean(this.challenge), timeout);
+    waitForResolution = async (timeout = 300) => this.waitFor(() => [None, DeniedSignature, Forbidden, Ok].includes(this.status), timeout);
+    respond = async () => {
+        if (!this.challenge) {
+            throw new Error("Attempted to authenticate with no challenge");
+        }
+        if (this.status !== Requested) {
+            throw new Error(`Attempted to authenticate when auth is already ${this.status}`);
+        }
+        this.status = PendingSignature;
+        const template = createEvent(CLIENT_AUTH, {
+            tags: [
+                ["relay", this.cxn.url],
+                ["challenge", this.challenge],
+            ],
+        });
+        const [event] = await Promise.all([ctx.net.signEvent(template), this.cxn.socket.open()]);
+        if (event) {
+            this.request = event.id;
+            this.cxn.send(["AUTH", event]);
+            this.status = PendingResponse;
+        }
+        else {
+            this.status = DeniedSignature;
+        }
+    };
+    attempt = async (timeout = 300) => {
+        await this.cxn.socket.open();
+        await this.waitForChallenge(timeout);
+        if (this.status === Requested) {
+            await this.respond();
+        }
+        await this.waitForResolution(timeout);
+    };
+}
+//# sourceMappingURL=ConnectionAuth.js.map

package/build/src/ConnectionAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionAuth.js","sourceRoot":"","sources":["../../src/ConnectionAuth.ts"],"names":[],"mappings":"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"}

package/build/src/{ConnectionEvent.mjs → ConnectionEvent.js}

@@ -10,4 +10,4 @@ export var ConnectionEvent;
     ConnectionEvent["Notice"] = "receive:notice";
     ConnectionEvent["Send"] = "send:message";
 })(ConnectionEvent || (ConnectionEvent = {}));
-//# sourceMappingURL=ConnectionEvent.mjs.map
+//# sourceMappingURL=ConnectionEvent.js.map

package/build/src/ConnectionEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionEvent.js","sourceRoot":"","sources":["../../src/ConnectionEvent.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,eAUX;AAVD,WAAY,eAAe;IACzB,6CAA0B,CAAA;IAC1B,6DAA0C,CAAA;IAC1C,uCAAoB,CAAA;IACpB,yCAAsB,CAAA;IACtB,yCAAsB,CAAA;IACtB,yCAAsB,CAAA;IACtB,8CAA2B,CAAA;IAC3B,4CAAyB,CAAA;IACzB,wCAAqB,CAAA;AACvB,CAAC,EAVW,eAAe,KAAf,eAAe,QAU1B"}

package/build/src/ConnectionSender.d.ts

@@ -1,10 +1,9 @@
-import { Worker } from '@welshman/lib';
-import type { Message } from './Socket';
-import type { Connection } from './Connection';
+import { Worker } from "@welshman/lib";
+import type { Message } from "./Socket.js";
+import type { Connection } from "./Connection.js";
 export declare class ConnectionSender {
     readonly cxn: Connection;
     worker: Worker<Message>;
     constructor(cxn: Connection);
     push: (message: Message) => void;
-    close: () => Promise<void>;
 }

package/build/src/ConnectionSender.js

@@ -0,0 +1,48 @@
+import { Worker } from "@welshman/lib";
+import { AUTH_JOIN } from "@welshman/util";
+import { SocketStatus } from "./Socket.js";
+import { AuthStatus } from "./ConnectionAuth.js";
+export class ConnectionSender {
+    cxn;
+    worker;
+    constructor(cxn) {
+        this.cxn = cxn;
+        this.worker = new Worker({
+            shouldDefer: ([verb, ...extra]) => {
+                // Always send CLOSE to clean up pending requests, even if the connection is closed
+                if (verb === "CLOSE")
+                    return false;
+                // If we're not connected, nothing we can do
+                if (cxn.socket.status !== SocketStatus.Open)
+                    return true;
+                // Always allow sending AUTH
+                if (verb === "AUTH")
+                    return false;
+                // Always allow sending join requests
+                if (verb === "EVENT" && extra[0].kind === AUTH_JOIN)
+                    return false;
+                // Wait for auth
+                if (![AuthStatus.None, AuthStatus.Ok].includes(cxn.auth.status))
+                    return true;
+                // Limit concurrent requests
+                if (verb === "REQ")
+                    return cxn.state.pendingRequests.size >= 8;
+                return false;
+            },
+        });
+        this.worker.addGlobalHandler(([verb, ...extra]) => {
+            // If we ended up handling a CLOSE before we handled the REQ, don't send the REQ
+            if (verb === "CLOSE") {
+                this.worker.buffer = this.worker.buffer.filter(m => !(m[0] === "REQ" && m[1] === extra[0]));
+            }
+            // Re-check socket status since we let CLOSE through
+            if (cxn.socket.status === SocketStatus.Open) {
+                cxn.socket.send([verb, ...extra]);
+            }
+        });
+    }
+    push = (message) => {
+        this.worker.push(message);
+    };
+}
+//# sourceMappingURL=ConnectionSender.js.map

package/build/src/ConnectionSender.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionSender.js","sourceRoot":"","sources":["../../src/ConnectionSender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAA;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAA;AAGxC,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAA;AAE9C,MAAM,OAAO,gBAAgB;IAGN;IAFrB,MAAM,CAAiB;IAEvB,YAAqB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YACvB,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,CAAU,EAAE,EAAE;gBACzC,mFAAmF;gBACnF,IAAI,IAAI,KAAK,OAAO;oBAAE,OAAO,KAAK,CAAA;gBAElC,4CAA4C;gBAC5C,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAA;gBAExD,4BAA4B;gBAC5B,IAAI,IAAI,KAAK,MAAM;oBAAE,OAAO,KAAK,CAAA;gBAEjC,qCAAqC;gBACrC,IAAI,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS;oBAAE,OAAO,KAAK,CAAA;gBAEjE,gBAAgB;gBAChB,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;oBAAE,OAAO,IAAI,CAAA;gBAE5E,4BAA4B;gBAC5B,IAAI,IAAI,KAAK,KAAK;oBAAE,OAAO,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAA;gBAE9D,OAAO,KAAK,CAAA;YACd,CAAC;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,CAAU,EAAE,EAAE;YACzD,gFAAgF;YAChF,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC7F,CAAC;YAED,oDAAoD;YACpD,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;gBAC5C,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAA;YACnC,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,OAAgB,EAAE,EAAE;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC,CAAA;CACF"}

package/build/src/ConnectionState.d.ts

@@ -1,5 +1,5 @@
-import type { SignedEvent, Filter } from '@welshman/util';
-import type { Connection } from './Connection';
+import type { SignedEvent, Filter } from "@welshman/util";
+import type { Connection } from "./Connection.js";
 export type PublishState = {
     sent: number;
     event: SignedEvent;

package/build/src/ConnectionState.js

@@ -0,0 +1,80 @@
+import { sleep } from "@welshman/lib";
+import { AUTH_JOIN } from "@welshman/util";
+import { ConnectionEvent } from "./ConnectionEvent.js";
+export class ConnectionState {
+    cxn;
+    pendingPublishes = new Map();
+    pendingRequests = new Map();
+    constructor(cxn) {
+        this.cxn = cxn;
+        cxn.sender.worker.addGlobalHandler(([verb, ...extra]) => {
+            if (verb === "REQ") {
+                const [reqId, ...filters] = extra;
+                this.pendingRequests.set(reqId, { filters, sent: Date.now() });
+            }
+            if (verb === "CLOSE") {
+                const [reqId] = extra;
+                this.pendingRequests.delete(reqId);
+            }
+            if (verb === "EVENT") {
+                const [event] = extra;
+                this.pendingPublishes.set(event.id, { sent: Date.now(), event });
+            }
+        });
+        cxn.socket.worker.addGlobalHandler(([verb, ...extra]) => {
+            if (verb === "OK") {
+                const [eventId, _ok, notice] = extra;
+                const pub = this.pendingPublishes.get(eventId);
+                if (!pub)
+                    return;
+                // Re-enqueue pending events when auth challenge is received
+                if (notice?.startsWith("auth-required:") && pub.event.kind !== AUTH_JOIN) {
+                    this.cxn.send(["EVENT", pub.event]);
+                }
+                else {
+                    this.pendingPublishes.delete(eventId);
+                }
+            }
+            if (verb === "EOSE") {
+                const [reqId] = extra;
+                const req = this.pendingRequests.get(reqId);
+                if (req) {
+                    req.eose = true;
+                }
+            }
+            if (verb === "CLOSED") {
+                const [reqId] = extra;
+                // Re-enqueue pending reqs when auth challenge is received
+                if (extra[1]?.startsWith("auth-required:")) {
+                    const req = this.pendingRequests.get(reqId);
+                    if (req) {
+                        this.cxn.send(["REQ", reqId, ...req.filters]);
+                    }
+                    if (extra[1]) {
+                        this.cxn.emit(ConnectionEvent.Notice, extra[1]);
+                    }
+                }
+                this.pendingRequests.delete(reqId);
+            }
+            if (verb === "NOTICE") {
+                const [notice] = extra;
+                this.cxn.emit(ConnectionEvent.Notice, notice);
+            }
+        });
+        // Whenever we reconnect, re-enqueue pending stuff. Delay this so that if a connection
+        // is flapping we're not sending too much noise.
+        cxn.on(ConnectionEvent.Close, async (cxn) => {
+            await sleep(10_000);
+            if (this.pendingRequests.size > 0 || this.pendingPublishes.size > 0) {
+                this.cxn.open();
+            }
+            for (const [reqId, req] of this.pendingRequests.entries()) {
+                this.cxn.send(["REQ", reqId, ...req.filters]);
+            }
+            for (const [_, pub] of this.pendingPublishes.entries()) {
+                this.cxn.send(["EVENT", pub.event]);
+            }
+        });
+    }
+}
+//# sourceMappingURL=ConnectionState.js.map

package/build/src/ConnectionState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionState.js","sourceRoot":"","sources":["../../src/ConnectionState.ts"],"names":[],"mappings":"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"}

package/build/src/ConnectionStats.d.ts

@@ -1,4 +1,4 @@
-import type { Connection } from './Connection';
+import type { Connection } from "./Connection.js";
 export declare class ConnectionStats {
     readonly cxn: Connection;
     openCount: number;

package/build/src/{ConnectionStats.mjs → ConnectionStats.js}

@@ -1,28 +1,27 @@
-import { ConnectionEvent } from "./ConnectionEvent.mjs";
+import { ConnectionEvent } from "./ConnectionEvent.js";
 export class ConnectionStats {
+    cxn;
+    openCount = 0;
+    closeCount = 0;
+    errorCount = 0;
+    publishCount = 0;
+    requestCount = 0;
+    eventCount = 0;
+    lastOpen = 0;
+    lastClose = 0;
+    lastError = 0;
+    lastPublish = 0;
+    lastRequest = 0;
+    lastEvent = 0;
+    lastAuth = 0;
+    publishTimer = 0;
+    publishSuccessCount = 0;
+    publishFailureCount = 0;
+    eoseCount = 0;
+    eoseTimer = 0;
+    noticeCount = 0;
     constructor(cxn) {
         this.cxn = cxn;
-        this.openCount = 0;
-        this.closeCount = 0;
-        this.errorCount = 0;
-        this.publishCount = 0;
-        this.requestCount = 0;
-        this.eventCount = 0;
-        this.lastOpen = 0;
-        this.lastClose = 0;
-        this.lastError = 0;
-        this.lastPublish = 0;
-        this.lastRequest = 0;
-        this.lastEvent = 0;
-        this.lastAuth = 0;
-        this.publishTimer = 0;
-        this.publishSuccessCount = 0;
-        this.publishFailureCount = 0;
-        this.eoseCount = 0;
-        this.eoseTimer = 0;
-        this.noticeCount = 0;
-        this.getRequestSpeed = () => this.eoseCount ? this.eoseTimer / this.eoseCount : 0;
-        this.getPublishSpeed = () => this.publishSuccessCount ? this.publishTimer / this.publishSuccessCount : 0;
         cxn.on(ConnectionEvent.Open, (cxn) => {
             this.openCount++;
             this.lastOpen = Date.now();
@@ -36,17 +35,17 @@ export class ConnectionStats {
             this.lastError = Date.now();
         });
         cxn.on(ConnectionEvent.Send, (cxn, [verb]) => {
-            if (verb === 'REQ') {
+            if (verb === "REQ") {
                 this.requestCount++;
                 this.lastRequest = Date.now();
             }
-            if (verb === 'EVENT') {
+            if (verb === "EVENT") {
                 this.publishCount++;
                 this.lastPublish = Date.now();
             }
         });
         cxn.on(ConnectionEvent.Receive, (cxn, [verb, ...extra]) => {
-            if (verb === 'OK') {
+            if (verb === "OK") {
                 const pub = this.cxn.state.pendingPublishes.get(extra[0]);
                 if (pub) {
                     this.publishTimer += Date.now() - pub.sent;
@@ -58,14 +57,14 @@ export class ConnectionStats {
                     this.publishFailureCount++;
                 }
             }
-            if (verb === 'AUTH') {
+            if (verb === "AUTH") {
                 this.lastAuth = Date.now();
             }
-            if (verb === 'EVENT') {
+            if (verb === "EVENT") {
                 this.eventCount++;
                 this.lastEvent = Date.now();
             }
-            if (verb === 'EOSE') {
+            if (verb === "EOSE") {
                 const request = this.cxn.state.pendingRequests.get(extra[0]);
                 // Only count the first eose
                 if (request && !request.eose) {
@@ -73,10 +72,12 @@ export class ConnectionStats {
                     this.eoseTimer += Date.now() - request.sent;
                 }
             }
-            if (verb === 'NOTICE') {
+            if (verb === "NOTICE") {
                 this.noticeCount++;
             }
         });
     }
+    getRequestSpeed = () => (this.eoseCount ? this.eoseTimer / this.eoseCount : 0);
+    getPublishSpeed = () => this.publishSuccessCount ? this.publishTimer / this.publishSuccessCount : 0;
 }
-//# sourceMappingURL=ConnectionStats.mjs.map
+//# sourceMappingURL=ConnectionStats.js.map

package/build/src/ConnectionStats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConnectionStats.js","sourceRoot":"","sources":["../../src/ConnectionStats.ts"],"names":[],"mappings":"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"}

package/build/src/Context.d.ts

@@ -1,8 +1,8 @@
-import type { StampedEvent, SignedEvent, Filter, TrustedEvent } from '@welshman/util';
-import { Pool } from "./Pool";
-import { Executor } from "./Executor";
-import { AuthMode } from "./ConnectionAuth";
-import type { Subscription, RelaysAndFilters } from "./Subscribe";
+import type { StampedEvent, SignedEvent, Filter, TrustedEvent } from "@welshman/util";
+import { Pool } from "./Pool.js";
+import { Executor } from "./Executor.js";
+import { AuthMode } from "./ConnectionAuth.js";
+import type { Subscription, RelaysAndFilters } from "./Subscribe.js";
 export type NetContext = {
     pool: Pool;
     authMode: AuthMode;
@@ -23,8 +23,8 @@ export declare const isEventValid: (url: string, event: TrustedEvent) => boolean
 export declare const getDefaultNetContext: (overrides?: Partial<NetContext>) => {
     pool: Pool;
     authMode: AuthMode;
-    onEvent: ((url: string, event: TrustedEvent) => void) | ((...args: unknown[]) => undefined);
-    signEvent: ((event: StampedEvent) => Promise<SignedEvent | undefined>) | ((...args: unknown[]) => undefined);
+    onEvent: ((...args: unknown[]) => undefined) | ((url: string, event: TrustedEvent) => void);
+    signEvent: ((...args: unknown[]) => undefined) | ((event: StampedEvent) => Promise<SignedEvent | undefined>);
     getExecutor: (relays: string[]) => Executor;
     isDeleted: (url: string, event: TrustedEvent) => boolean;
     isValid: (url: string, event: TrustedEvent) => boolean;

package/build/src/{Context.mjs → Context.js}

@@ -1,11 +1,10 @@
-import { ctx, randomInt, uniq, noop, always } from '@welshman/lib';
-import { LOCAL_RELAY_URL, matchFilters, unionFilters, isSignedEvent, hasValidSignature } from '@welshman/util';
-import { Pool } from "./Pool.mjs";
-import { Executor } from "./Executor.mjs";
-import { AuthMode } from "./ConnectionAuth.mjs";
-import { Relays } from "./target/Relays.mjs";
-export const defaultOptimizeSubscriptions = (subs) => uniq(subs.flatMap(sub => sub.request.relays || []))
-    .map(relay => {
+import { ctx, randomInt, uniq, noop, always } from "@welshman/lib";
+import { LOCAL_RELAY_URL, matchFilters, unionFilters, isSignedEvent, hasValidSignature, } from "@welshman/util";
+import { Pool } from "./Pool.js";
+import { Executor } from "./Executor.js";
+import { AuthMode } from "./ConnectionAuth.js";
+import { Relays } from "./target/Relays.js";
+export const defaultOptimizeSubscriptions = (subs) => uniq(subs.flatMap(sub => sub.request.relays || [])).map(relay => {
     const relaySubs = subs.filter(sub => sub.request.relays.includes(relay));
     const filters = unionFilters(relaySubs.flatMap(sub => sub.request.filters));
     return { relays: [relay], filters };
@@ -38,4 +37,4 @@ export const getDefaultNetContext = (overrides = {}) => ({
     optimizeSubscriptions: defaultOptimizeSubscriptions,
     ...overrides,
 });
-//# sourceMappingURL=Context.mjs.map
+//# sourceMappingURL=Context.js.map

package/build/src/Context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Context.js","sourceRoot":"","sources":["../../src/Context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,eAAe,CAAA;AAChE,OAAO,EACL,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,iBAAiB,GAClB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAA;AACtC,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAA;AAezC,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,IAAoB,EAAE,EAAE,CACnE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IACxE,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IAE3E,OAAO,EAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAC,CAAA;AACnC,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAA;AAE9D,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,KAAmB,EAAE,EAAE;IAC/D,IAAI,GAAG,KAAK,eAAe;QAAE,OAAO,IAAI,CAAA;IAExC,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAEtD,sFAAsF;IACtF,IAAI,UAAU,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC;QAAE,IAAI,CAAA;IAE3C,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAEhE,uEAAuE;IACvE,6EAA6E;IAC7E,IAAI,CAAC,OAAO,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QACjC,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAiC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5E,IAAI,EAAE,IAAI,IAAI,EAAE;IAChB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;IAC3B,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC;IACxB,OAAO,EAAE,YAAY;IACrB,WAAW,EAAE,CAAC,MAAgB,EAAE,EAAE,CAChC,IAAI,QAAQ,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClF,YAAY,EAAE,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAmB,EAAE,EAAE,CACpE,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC;IAC9B,qBAAqB,EAAE,4BAA4B;IACnD,GAAG,SAAS;CACb,CAAC,CAAA"}

package/build/src/Executor.d.ts

@@ -1,10 +1,10 @@
-import type { Emitter } from '@welshman/lib';
-import type { SignedEvent, TrustedEvent, Filter } from '@welshman/util';
-import type { Message } from './Socket';
-import type { Connection } from './Connection';
+import type { Emitter } from "@welshman/lib";
+import type { SignedEvent, TrustedEvent, Filter } from "@welshman/util";
+import type { Message } from "./Socket.js";
+import type { Connection } from "./Connection.js";
 export type Target = Emitter & {
     connections: Connection[];
-    send: (...args: Message) => void;
+    send: (...args: Message) => Promise<void>;
     cleanup: () => void;
 };
 export type NegentropyMessage = {
@@ -16,10 +16,11 @@ type EoseCallback = (url: string) => void;
 type CloseCallback = () => void;
 type OkCallback = (url: string, id: string, ...extra: any[]) => void;
 type ErrorCallback = (url: string, id: string, ...extra: any[]) => void;
-type DiffMessageCallback = (url: string, { have, need }: {
+type DiffMessage = {
     have: string[];
     need: string[];
-}) => void;
+};
+type DiffMessageCallback = (url: string, { have, need }: DiffMessage) => void;
 type SubscribeOpts = {
     onEvent?: EventCallback;
     onEose?: EoseCallback;