@welshman/net 0.1.1 → 0.1.2

package/{build → dist/net}/src/policy.js

@@ -1,99 +1,63 @@
-import { on, call, sleep, spec, ago, now } from "@welshman/lib";
+import { on, nthEq, always, call, sleep, ago, now } from "@welshman/lib";
 import { AUTH_JOIN } from "@welshman/util";
-import { isClientAuth, isClientClose, isClientEvent, isClientReq, ClientMessageType, isRelayOk, isRelayClosed, } from "./message.js";
+import { isClientAuth, isClientClose, isClientEvent, isClientReq, isClientNegClose, isRelayOk, isRelayEose, isRelayClosed, } from "./message.js";
 import { SocketStatus, SocketEvent } from "./socket.js";
-import { AuthState, AuthStatus, AuthStateEvent } from "./auth.js";
+import { AuthStatus, AuthStateEvent } from "./auth.js";
 /**
- * Defers sending messages when a challenge has been presented and not answered yet
+ * Handles auth-related message management:
+ * - Defers sending messages when a challenge is pending
+ * - Re-enqueues event/req messages once if rejected due to auth-required
  * @param socket - a Socket object
  * @return a cleanup function
  */
-export const socketPolicyDeferOnAuth = (socket) => {
-    const buffer = [];
-    const authState = new AuthState(socket);
-    const okStatuses = [AuthStatus.None, AuthStatus.Ok];
+export const socketPolicyAuthBuffer = (socket) => {
+    const { None, Ok, DeniedSignature, Forbidden } = AuthStatus;
+    const terminalStatuses = [Ok, DeniedSignature, Forbidden];
+    let buffer = [];
     const unsubscribers = [
-        // Pause sending certain messages when we're not authenticated
-        on(socket, SocketEvent.Enqueue, (message) => {
-            // If we're closing a request, but it never got sent, remove both from the queue
-            // Otherwise, always send CLOSE
-            if (isClientClose(message)) {
-                const req = buffer.find(spec([ClientMessageType.Req, message[1]]));
-                if (req) {
-                    socket._sendQueue.remove(req);
-                    socket._sendQueue.remove(message);
-                }
-                return;
-            }
+        on(socket, SocketEvent.Sending, (message) => {
             // Always allow sending auth
             if (isClientAuth(message))
                 return;
             // Always allow sending join requests
             if (isClientEvent(message) && message[1].kind === AUTH_JOIN)
                 return;
-            // If we're not ok, remove the message and save it for later
-            if (!okStatuses.includes(authState.status)) {
-                buffer.push(message);
-                socket._sendQueue.remove(message);
+            // If the auth flow is complete, no need to buffer anymore
+            if (terminalStatuses.includes(socket.auth.status))
+                return;
+            // If the client is closing a req, remove both from our buffer
+            // Otherwise, if auth isn't done, hang on to recent messages in case we need to replay them
+            if (isClientClose(message) || isClientNegClose(message)) {
+                buffer = buffer.filter(nthEq(1, message[1]));
             }
-        }),
-        // Send buffered messages when we get successful auth
-        on(authState, AuthStateEvent.Status, (status) => {
-            if (okStatuses.includes(status) && buffer.length > 0) {
-                for (const message of buffer.splice(0)) {
-                    socket.send(message);
-                }
+            else {
+                buffer = buffer.slice(-50).concat([message]);
             }
         }),
-    ];
-    return () => {
-        unsubscribers.forEach(call);
-        authState.cleanup();
-    };
-};
-/**
- * Re-enqueues event/req messages once if rejected due to auth-required
- * @param socket - a Socket object
- * @return a cleanup function
- */
-export const socketPolicyRetryAuthRequired = (socket) => {
-    const retried = new Set();
-    const pending = new Map();
-    const unsubscribers = [
-        // Watch outgoing events and requests and keep a copy
-        on(socket, SocketEvent.Send, (message) => {
-            if (isClientEvent(message)) {
-                const [_, event] = message;
-                if (!retried.has(event.id) && event.kind !== AUTH_JOIN) {
-                    pending.set(event.id, message);
-                }
+        on(socket, SocketEvent.Receiving, (message) => {
+            // If the client is closing a request during auth, don't tell the caller, we'll retry it
+            if (isRelayClosed(message) && message[2]?.startsWith("auth-required:")) {
+                socket._recvQueue.remove(message);
             }
-            if (isClientReq(message)) {
-                const [_, id] = message;
-                if (!retried.has(id)) {
-                    pending.set(id, message);
-                }
+            // If we get an eose but we're in the middle of authenticating, wait
+            if (isRelayEose(message) && ![None, Ok].includes(socket.auth.status)) {
+                socket._recvQueue.remove(message);
+            }
+            // If the client is rejecting an event during auth, don't tell the caller, we'll retry it
+            if (isRelayOk(message) && !message[2] && message[3]?.startsWith("auth-required:")) {
+                socket._recvQueue.remove(message);
             }
         }),
-        // If a message is rejected with auth-required, re-enqueue it one time
-        on(socket, SocketEvent.Receive, (message) => {
-            if (isRelayOk(message)) {
-                const [_, id, ok, detail] = message;
-                const pendingMessage = pending.get(id);
-                if (pendingMessage && !ok && detail?.startsWith("auth-required:")) {
-                    socket.send(pendingMessage);
-                    retried.add(id);
-                }
-                pending.delete(id);
-            }
-            if (isRelayClosed(message)) {
-                const [_, id, detail] = message;
-                const pendingMessage = pending.get(id);
-                if (pendingMessage && detail?.startsWith("auth-required:")) {
-                    socket.send(pendingMessage);
-                    retried.add(id);
+        on(socket.auth, AuthStateEvent.Status, (status) => {
+            // Send buffered messages when we get successful auth. In any case, clear them out
+            // if the auth flow is complete
+            if (status === Ok) {
+                for (const message of buffer.splice(0)) {
+                    socket.send(message);
                 }
-                pending.delete(id);
+            }
+            else if (terminalStatuses.includes(socket.auth.status)) {
+                buffer = [];
             }
         }),
     ];
@@ -106,19 +70,16 @@ export const socketPolicyRetryAuthRequired = (socket) => {
  */
 export const socketPolicyConnectOnSend = (socket) => {
     let lastError = 0;
-    let currentStatus = SocketStatus.Closed;
     const unsubscribers = [
         on(socket, SocketEvent.Status, (newStatus) => {
             // Keep track of the most recent error
             if (newStatus === SocketStatus.Error) {
                 lastError = now();
             }
-            // Keep track of the current status
-            currentStatus = newStatus;
         }),
-        on(socket, SocketEvent.Enqueue, (message) => {
+        on(socket, SocketEvent.Sending, (message) => {
             // When a new message is sent, make sure the socket is open (unless there was a recent error)
-            if (currentStatus === SocketStatus.Closed && lastError < ago(30)) {
+            if (socket.status === SocketStatus.Closed && lastError < ago(30)) {
                 socket.open();
             }
         }),
@@ -192,9 +153,26 @@ export const socketPolicyReopenActive = (socket) => {
     ];
     return () => unsubscribers.forEach(call);
 };
+/**
+ * Factory function for a policy which may authenticate the socket
+ * @param options - SocketPolicyAuthOptions object
+ * @return a socket policy
+ */
+export const makeSocketPolicyAuth = (options) => (socket) => {
+    const shouldAuth = options.shouldAuth || always(true);
+    const unsubscribers = [
+        on(socket.auth, AuthStateEvent.Status, (status) => {
+            if (status === AuthStatus.Requested && shouldAuth(socket)) {
+                socket.auth.authenticate(options.sign);
+            }
+        }),
+    ];
+    return () => {
+        unsubscribers.forEach(call);
+    };
+};
 export const defaultSocketPolicies = [
-    socketPolicyDeferOnAuth,
-    socketPolicyRetryAuthRequired,
+    socketPolicyAuthBuffer,
     socketPolicyConnectOnSend,
     socketPolicyCloseOnTimeout,
     socketPolicyReopenActive,

package/dist/net/src/policy.js.map

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

package/{build → dist/net}/src/pool.d.ts

@@ -18,3 +18,4 @@ export declare class Pool {
     remove(url: string): void;
     clear(): void;
 }
+//# sourceMappingURL=pool.d.ts.map

package/dist/net/src/pool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../src/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAGlC,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,EAAE,6CAAgC,WAQvE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CACrC,CAAA;AAED,eAAO,IAAI,aAAa,EAAE,IAAI,CAAA;AAE9B,qBAAa,IAAI;IAYH,QAAQ,CAAC,OAAO,EAAE,WAAW;IAXzC,KAAK,sBAA4B;IACjC,KAAK,EAAE,gBAAgB,EAAE,CAAK;IAE9B,MAAM,CAAC,YAAY;gBAQE,OAAO,GAAE,WAAgB;IAE9C,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,UAAU,CAAC,GAAG,EAAE,MAAM;IAQtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAmBzB,SAAS,CAAC,EAAE,EAAE,gBAAgB;IAQ9B,MAAM,CAAC,GAAG,EAAE,MAAM;IAUlB,KAAK;CAKN"}

package/{build → dist/net}/src/pool.js

@@ -34,16 +34,16 @@ export class Pool {
     }
     get(_url) {
         const url = normalizeRelayUrl(_url);
-        const oldSocket = this._data.get(url);
-        if (oldSocket) {
-            return oldSocket;
+        const socket = this._data.get(url);
+        if (socket) {
+            return socket;
         }
-        const socket = this.makeSocket(url);
-        this._data.set(url, socket);
+        const newSocket = this.makeSocket(url);
+        this._data.set(url, newSocket);
         for (const cb of this._subs) {
-            cb(socket);
+            cb(newSocket);
         }
-        return socket;
+        return newSocket;
     }
     subscribe(cb) {
         this._subs.push(cb);

package/dist/net/src/pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAA;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAA;AAEjD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,QAAQ,GAAG,qBAAqB,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAA;IAE9B,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE,CAAC;QACnC,WAAW,CAAC,MAAM,CAAC,CAAA;IACrB,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAQD,MAAM,CAAC,IAAI,aAAmB,CAAA;AAE9B,MAAM,OAAO,IAAI;IAYM;IAXrB,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACjC,KAAK,GAAuB,EAAE,CAAA;IAE9B,MAAM,CAAC,YAAY;QACjB,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,IAAI,IAAI,EAAE,CAAA;QAC5B,CAAC;QAED,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,YAAqB,UAAuB,EAAE;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAElD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACrC,CAAC;QAED,OAAO,UAAU,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;IAED,GAAG,CAAC,IAAY;QACd,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAEtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAE9B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,CAAA;QACf,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,SAAS,CAAC,EAAoB;QAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEnB,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,OAAO,EAAE,CAAA;YAEhB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;CACF"}

package/{build → dist/net}/src/publish.d.ts

@@ -1,6 +1,6 @@
+import { EventEmitter } from "events";
 import { SignedEvent } from "@welshman/util";
 import { AbstractAdapter, AdapterContext } from "./adapter.js";
-import { TypedEmitter } from "./util.js";
 export declare enum PublishStatus {
     Pending = "publish:status:pending",
     Success = "publish:status:success",
@@ -15,21 +15,13 @@ export declare enum PublishEvent {
     Aborted = "publish:event:aborted",
     Complete = "publish:event:complete"
 }
-export type SinglePublishEvents = {
-    [PublishEvent.Success]: (id: string, detail: string) => void;
-    [PublishEvent.Failure]: (id: string, detail: string) => void;
-    [PublishEvent.Timeout]: () => void;
-    [PublishEvent.Aborted]: () => void;
-    [PublishEvent.Complete]: () => void;
-};
 export type SinglePublishOptions = {
     event: SignedEvent;
     relay: string;
     context?: AdapterContext;
     timeout?: number;
 };
-declare const SinglePublish_base: new () => TypedEmitter<SinglePublishEvents>;
-export declare class SinglePublish extends SinglePublish_base {
+export declare class SinglePublish extends EventEmitter {
     readonly options: SinglePublishOptions;
     status: PublishStatus;
     _unsubscriber: () => void;
@@ -38,23 +30,16 @@ export declare class SinglePublish extends SinglePublish_base {
     abort: () => void;
     cleanup: () => void;
 }
-export type MultiPublishEvents = {
-    [PublishEvent.Success]: (id: string, detail: string, url: string) => void;
-    [PublishEvent.Failure]: (id: string, detail: string, url: string) => void;
-    [PublishEvent.Timeout]: (url: string) => void;
-    [PublishEvent.Aborted]: (url: string) => void;
-    [PublishEvent.Complete]: () => void;
-};
 export type MultiPublishOptions = Omit<SinglePublishOptions, "relay"> & {
     relays: string[];
 };
-declare const MultiPublish_base: new () => TypedEmitter<MultiPublishEvents>;
-export declare class MultiPublish extends MultiPublish_base {
+export declare class MultiPublish extends EventEmitter {
     status: Record<string, PublishStatus>;
     _children: SinglePublish[];
     _completed: Set<string>;
-    constructor({ relays, ...options }: MultiPublishOptions);
+    constructor(options: MultiPublishOptions);
     abort(): void;
     cleanup(): void;
 }
-export {};
+export declare const publish: (options: MultiPublishOptions) => MultiPublish;
+//# sourceMappingURL=publish.d.ts.map

package/dist/net/src/publish.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../src/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAC,eAAe,EAAgB,cAAc,EAAa,MAAM,cAAc,CAAA;AAEtF,oBAAY,aAAa;IACvB,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;CACnC;AAED,oBAAY,YAAY;IACtB,OAAO,0BAA0B;IACjC,OAAO,0BAA0B;IACjC,OAAO,0BAA0B;IACjC,OAAO,0BAA0B;IACjC,QAAQ,2BAA2B;CACpC;AAID,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,aAAc,SAAQ,YAAY;IAMjC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IALlD,MAAM,gBAAwB;IAE9B,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,QAAQ,EAAE,eAAe,CAAA;gBAEJ,OAAO,EAAE,oBAAoB;IA6ClD,KAAK,aAMJ;IAED,OAAO,aAKN;CACF;AAID,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,EAAE,OAAO,CAAC,GAAG;IACtE,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA;AAED,qBAAa,YAAa,SAAQ,YAAY;IAC5C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAErC,SAAS,EAAE,aAAa,EAAE,CAAK;IAC/B,UAAU,cAAoB;gBAElB,OAAO,EAAE,mBAAmB;IAgDxC,KAAK;IAML,OAAO;CAGR;AAED,eAAO,MAAM,OAAO,GAAI,SAAS,mBAAmB,iBAA8B,CAAA"}

package/{build → dist/net}/src/publish.js

@@ -76,9 +76,13 @@ export class MultiPublish extends EventEmitter {
     status;
     _children = [];
     _completed = new Set();
-    constructor({ relays, ...options }) {
+    constructor(options) {
         super();
-        this.status = fromPairs(relays.map(relay => [relay, PublishStatus.Pending]));
+        const relays = new Set(options.relays);
+        if (relays.size !== options.relays.length) {
+            console.warn("Non-unique relays passed to MultiPublish");
+        }
+        this.status = fromPairs(Array.from(relays).map(relay => [relay, PublishStatus.Pending]));
         for (const relay of relays) {
             const unicast = new SinglePublish({ relay, ...options });
             unicast.on(PublishEvent.Success, (id, detail) => {
@@ -100,7 +104,7 @@ export class MultiPublish extends EventEmitter {
             unicast.on(PublishEvent.Complete, () => {
                 this._completed.add(relay);
                 this.status[relay] = unicast.status;
-                if (this._completed.size === relays.length) {
+                if (this._completed.size === relays.size) {
                     this.emit(PublishEvent.Complete);
                     this.cleanup();
                 }
@@ -117,4 +121,5 @@ export class MultiPublish extends EventEmitter {
         this.removeAllListeners();
     }
 }
+export const publish = (options) => new MultiPublish(options);
 //# sourceMappingURL=publish.js.map

package/dist/net/src/publish.js.map

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

package/{build → dist/net}/src/request.d.ts

@@ -1,6 +1,7 @@
+import { EventEmitter } from "events";
 import { Filter, TrustedEvent } from "@welshman/util";
 import { AdapterContext, AbstractAdapter } from "./adapter.js";
-import { TypedEmitter, Unsubscriber } from "./util.js";
+import { Unsubscriber } from "./util.js";
 import { Tracker } from "./tracker.js";
 export declare enum RequestEvent {
     Close = "request:event:close",
@@ -25,6 +26,7 @@ export type SingleRequestEvents = {
 export type SingleRequestOptions = {
     relay: string;
     filters: Filter[];
+    signal?: AbortSignal;
     context?: AdapterContext;
     timeout?: number;
     tracker?: Tracker;
@@ -32,10 +34,7 @@ export type SingleRequestOptions = {
     isEventValid?: (event: TrustedEvent, url: string) => boolean;
     isEventDeleted?: (event: TrustedEvent, url: string) => boolean;
 };
-export interface SingleRequest extends TypedEmitter<SingleRequestEvents> {
-}
-declare const SingleRequest_base: new () => TypedEmitter<SingleRequestEvents>;
-export declare class SingleRequest extends SingleRequest_base {
+export declare class SingleRequest extends EventEmitter {
     readonly options: SingleRequestOptions;
     _ids: Set<string>;
     _eose: Set<string>;
@@ -57,23 +56,34 @@ export type MultiRequestEvents = {
 };
 export type MultiRequestOptions = Omit<SingleRequestOptions, "relay"> & {
     relays: string[];
+    threshold?: number;
 };
-export interface MultiRequest extends TypedEmitter<MultiRequestEvents> {
-}
-declare const MultiRequest_base: new () => TypedEmitter<MultiRequestEvents>;
-export declare class MultiRequest extends MultiRequest_base {
+export declare class MultiRequest extends EventEmitter {
     _children: SingleRequest[];
     _closed: Set<string>;
-    constructor({ relays, ...options }: MultiRequestOptions);
+    constructor(options: MultiRequestOptions);
     close(): void;
 }
 export declare const request: (options: MultiRequestOptions) => MultiRequest;
+export type LoaderOptions = {
+    delay: number;
+    timeout?: number;
+    threshold?: number;
+    context?: AdapterContext;
+    isEventValid?: (event: TrustedEvent, url: string) => boolean;
+    isEventDeleted?: (event: TrustedEvent, url: string) => boolean;
+};
+export type LoadOptions = {
+    relays: string[];
+    filters: Filter[];
+};
 /**
- * A convenience function which returns a promise of events from a request.
+ * Creates a convenience function which returns a promise of events from a request.
  * It may return early if filter cardinality is known, and it delays requests by
  * 200 in order to implement batching
  * @param options - MultiRequestOptions
  * @returns - a promise containing an array of TrustedEvents
  */
-export declare const load: (request: MultiRequestOptions) => Promise<TrustedEvent[]>;
-export {};
+export declare const makeLoader: (options: LoaderOptions) => (request: LoadOptions) => Promise<TrustedEvent[]>;
+export declare const load: (request: LoadOptions) => Promise<TrustedEvent[]>;
+//# sourceMappingURL=request.d.ts.map

package/dist/net/src/request.d.ts.map

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

package/{build → dist/net}/src/request.js

@@ -79,9 +79,11 @@ export class SingleRequest extends EventEmitter {
             }));
         }
         // Timeout our subscription
-        if (this.options.timeout) {
-            setTimeout(() => this.close(), this.options.timeout);
+        if (this.options.timeout || this.options.autoClose) {
+            setTimeout(() => this.close(), this.options.timeout || 10000);
         }
+        // Handle abort signal
+        this.options.signal?.addEventListener("abort", () => this.close());
         // Start asynchronously so the caller can set up listeners
         yieldThread().then(() => {
             for (const filter of this.options.filters) {
@@ -97,19 +99,24 @@ export class SingleRequest extends EventEmitter {
         for (const id of this._ids) {
             this._adapter.send(["CLOSE", id]);
         }
+        this._closed = true;
         this.emit(RequestEvent.Close);
-        this.removeAllListeners();
-        this._unsubscribers.map(call);
         this._adapter.cleanup();
-        this._closed = true;
+        this._unsubscribers.map(call);
+        this.removeAllListeners();
     }
 }
 export class MultiRequest extends EventEmitter {
     _children = [];
     _closed = new Set();
-    constructor({ relays, ...options }) {
+    constructor(options) {
         super();
         const tracker = new Tracker();
+        const relays = new Set(options.relays);
+        const threshold = options.threshold || 1;
+        if (relays.size !== options.relays.length) {
+            console.warn("Non-unique relays passed to MultiRequest");
+        }
         for (const relay of relays) {
             const req = new SingleRequest({ relay, tracker, ...options });
             req.on(RequestEvent.Event, (event) => {
@@ -135,8 +142,9 @@ export class MultiRequest extends EventEmitter {
             });
             req.on(RequestEvent.Close, () => {
                 this._closed.add(relay);
-                if (this._closed.size === relays.length) {
+                if (this._closed.size >= relays.size * threshold) {
                     this.emit(RequestEvent.Close);
+                    this.close();
                 }
             });
             this._children.push(req);
@@ -150,13 +158,13 @@ export class MultiRequest extends EventEmitter {
 }
 export const request = (options) => new MultiRequest(options);
 /**
- * A convenience function which returns a promise of events from a request.
+ * Creates a convenience function which returns a promise of events from a request.
  * It may return early if filter cardinality is known, and it delays requests by
  * 200 in order to implement batching
  * @param options - MultiRequestOptions
  * @returns - a promise containing an array of TrustedEvents
  */
-export const load = batcher(200, async (requests) => {
+export const makeLoader = (options) => batcher(options.delay, async (requests) => {
     const filtersByRelay = new Map();
     for (const { filters, relays } of requests) {
         for (const relay of relays) {
@@ -174,8 +182,8 @@ export const load = batcher(200, async (requests) => {
             filters,
             tracker,
             relays: [relay],
-            timeout: 5000,
             autoClose: true,
+            ...options,
         });
         let count = 0;
         req.on(RequestEvent.Event, (event) => {
@@ -188,4 +196,5 @@ export const load = batcher(200, async (requests) => {
     })));
     return requests.map(r => events.filter(event => matchFilters(r.filters, event)));
 });
+export const load = makeLoader({ delay: 200, timeout: 3000, threshold: 0.5 });
 //# sourceMappingURL=request.js.map

package/dist/net/src/request.js.map

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

package/{build → dist/net}/src/socket.d.ts

@@ -1,32 +1,34 @@
 import WebSocket from "isomorphic-ws";
+import EventEmitter from "events";
 import { TaskQueue } from "@welshman/lib";
 import { RelayMessage, ClientMessage } from "./message.js";
-import { TypedEmitter } from "./util.js";
+import { AuthState } from "./auth.js";
 export declare enum SocketStatus {
     Open = "socket:status:open",
     Opening = "socket:status:opening",
     Closing = "socket:status:closing",
     Closed = "socket:status:closed",
-    Error = "socket:status:error",
-    Invalid = "socket:status:invalid"
+    Error = "socket:status:error"
 }
 export declare enum SocketEvent {
     Error = "socket:event:error",
     Status = "socket:event:status",
     Send = "socket:event:send",
-    Enqueue = "socket:event:enqueue",
-    Receive = "socket:event:receive"
+    Sending = "socket:event:sending",
+    Receive = "socket:event:receive",
+    Receiving = "socket:event:receiving"
 }
 export type SocketEvents = {
     [SocketEvent.Error]: (error: string, url: string) => void;
     [SocketEvent.Status]: (status: SocketStatus, url: string) => void;
     [SocketEvent.Send]: (message: ClientMessage, url: string) => void;
-    [SocketEvent.Enqueue]: (message: ClientMessage, url: string) => void;
+    [SocketEvent.Sending]: (message: ClientMessage, url: string) => void;
     [SocketEvent.Receive]: (message: RelayMessage, url: string) => void;
+    [SocketEvent.Receiving]: (message: RelayMessage, url: string) => void;
 };
-declare const Socket_base: new () => TypedEmitter<SocketEvents>;
-export declare class Socket extends Socket_base {
+export declare class Socket extends EventEmitter {
     readonly url: string;
+    auth: AuthState;
     status: SocketStatus;
     _ws?: WebSocket;
     _sendQueue: TaskQueue<ClientMessage>;
@@ -38,4 +40,4 @@ export declare class Socket extends Socket_base {
     cleanup: () => void;
     send: (message: ClientMessage) => void;
 }
-export {};
+//# sourceMappingURL=socket.d.ts.map

package/dist/net/src/socket.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../src/socket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,YAAY,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAA;AACvC,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,cAAc,CAAA;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAEnC,oBAAY,YAAY;IACtB,IAAI,uBAAuB;IAC3B,OAAO,0BAA0B;IACjC,OAAO,0BAA0B;IACjC,MAAM,yBAAyB;IAC/B,KAAK,wBAAwB;CAC9B;AAED,oBAAY,WAAW;IACrB,KAAK,uBAAuB;IAC5B,MAAM,wBAAwB;IAC9B,IAAI,sBAAsB;IAC1B,OAAO,yBAAyB;IAChC,OAAO,yBAAyB;IAChC,SAAS,2BAA2B;CACrC;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACzD,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACnE,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CACtE,CAAA;AAED,qBAAa,MAAO,SAAQ,YAAY;IAQ1B,QAAQ,CAAC,GAAG,EAAE,MAAM;IAPhC,IAAI,EAAE,SAAS,CAAA;IACf,MAAM,eAAsB;IAE5B,GAAG,CAAC,EAAE,SAAS,CAAA;IACf,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,CAAA;IACpC,UAAU,EAAE,SAAS,CAAC,YAAY,CAAC,CAAA;gBAEd,GAAG,EAAE,MAAM;IA4BhC,IAAI,aA6CH;IAED,aAAa,aAIZ;IAED,KAAK,aAGJ;IAED,OAAO,aAMN;IAED,IAAI,GAAI,SAAS,aAAa,UAG7B;CACF"}