@welshman/net 0.1.1 → 0.2.0

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

@@ -1,16 +1,13 @@
+import { StampedEvent, SignedEvent } from "@welshman/util";
 import { Socket } from "./socket.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 declare const socketPolicyDeferOnAuth: (socket: Socket) => () => void;
-/**
- * Re-enqueues event/req messages once if rejected due to auth-required
- * @param socket - a Socket object
- * @return a cleanup function
- */
-export declare const socketPolicyRetryAuthRequired: (socket: Socket) => () => void;
+export declare const socketPolicyAuthBuffer: (socket: Socket) => () => void;
 /**
  * Auto-connects a closed socket when a message is sent unless there was a recent error
  * @param socket - a Socket object
@@ -29,4 +26,15 @@ export declare const socketPolicyCloseOnTimeout: (socket: Socket) => () => void;
  * @return a cleanup function
  */
 export declare const socketPolicyReopenActive: (socket: Socket) => () => void;
+export type SocketPolicyAuthOptions = {
+    sign: (event: StampedEvent) => Promise<SignedEvent>;
+    shouldAuth?: (socket: Socket) => boolean;
+};
+/**
+ * Factory function for a policy which may authenticate the socket
+ * @param options - SocketPolicyAuthOptions object
+ * @return a socket policy
+ */
+export declare const makeSocketPolicyAuth: (options: SocketPolicyAuthOptions) => (socket: Socket) => () => void;
 export declare const defaultSocketPolicies: ((socket: Socket) => () => void)[];
+//# sourceMappingURL=policy.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../../src/policy.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,YAAY,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAanE,OAAO,EAAC,MAAM,EAA4B,MAAM,aAAa,CAAA;AAG7D;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,eAuDpD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,eAmBvD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,GAAI,QAAQ,MAAM,eAsBxD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,QAAQ,MAAM,eA0CtD,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;IACnD,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;CACzC,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,uBAAuB,MAAM,QAAQ,MAAM,eAcxF,CAAA;AAED,eAAO,MAAM,qBAAqB,YA3La,MAAM,kBAgMpD,CAAA"}

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

@@ -1,99 +1,63 @@
-import { on, call, sleep, spec, ago, now } from "@welshman/lib";
+import { on, nthNe, 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(nthNe(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.doAuth(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

@@ -9,7 +9,7 @@ export declare class Pool {
     readonly options: PoolOptions;
     _data: Map<string, Socket>;
     _subs: PoolSubscription[];
-    static getSingleton(): Pool;
+    static get(): Pool;
     constructor(options?: PoolOptions);
     has(url: string): boolean;
     makeSocket(url: string): Socket;
@@ -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,GAAG;gBAQW,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

@@ -14,7 +14,7 @@ export class Pool {
     options;
     _data = new Map();
     _subs = [];
-    static getSingleton() {
+    static get() {
         if (!poolSingleton) {
             poolSingleton = new Pool();
         }
@@ -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,GAAG;QACR,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/dist/net/src/publish.d.ts

@@ -0,0 +1,44 @@
+import { SignedEvent } from "@welshman/util";
+import { AdapterContext } from "./adapter.js";
+export declare enum PublishStatus {
+    Sending = "publish:status:sending",
+    Pending = "publish:status:pending",
+    Success = "publish:status:success",
+    Failure = "publish:status:failure",
+    Timeout = "publish:status:timeout",
+    Aborted = "publish:status:aborted"
+}
+export type PublishResult = {
+    status: PublishStatus;
+    detail: string;
+};
+export type PublishOneOptions = {
+    event: SignedEvent;
+    relay: string;
+    signal?: AbortSignal;
+    timeout?: number;
+    context?: AdapterContext;
+    onSuccess?: (detail: string) => void;
+    onFailure?: (detail: string) => void;
+    onPending?: () => void;
+    onTimeout?: () => void;
+    onAborted?: () => void;
+    onComplete?: () => void;
+};
+export declare const publishOne: (options: PublishOneOptions) => Promise<unknown>;
+export type PublishStatusByRelay = Record<string, PublishStatus>;
+export type PublishOptions = {
+    event: SignedEvent;
+    relays: string[];
+    signal?: AbortSignal;
+    timeout?: number;
+    context?: AdapterContext;
+    onSuccess?: (detail: string, relay: string) => void;
+    onFailure?: (detail: string, relay: string) => void;
+    onPending?: (relay: string) => void;
+    onTimeout?: (relay: string) => void;
+    onAborted?: (relay: string) => void;
+    onComplete?: () => void;
+};
+export declare const publish: (options: PublishOptions) => Promise<PublishStatusByRelay>;
+//# 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,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAe,cAAc,EAAa,MAAM,cAAc,CAAA;AAErE,oBAAY,aAAa;IACvB,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;IAClC,OAAO,2BAA2B;CACnC;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,qBAmDjD,CAAA;AAEJ,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAEhE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnD,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnD,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,kCAkDpD,CAAA"}

package/dist/net/src/publish.js

@@ -0,0 +1,96 @@
+import { ClientMessageType, isRelayOk } from "./message.js";
+import { AdapterEvent, getAdapter } from "./adapter.js";
+export var PublishStatus;
+(function (PublishStatus) {
+    PublishStatus["Sending"] = "publish:status:sending";
+    PublishStatus["Pending"] = "publish:status:pending";
+    PublishStatus["Success"] = "publish:status:success";
+    PublishStatus["Failure"] = "publish:status:failure";
+    PublishStatus["Timeout"] = "publish:status:timeout";
+    PublishStatus["Aborted"] = "publish:status:aborted";
+})(PublishStatus || (PublishStatus = {}));
+export const publishOne = (options) => new Promise(resolve => {
+    const adapter = getAdapter(options.relay, options.context);
+    let status = PublishStatus.Pending;
+    options.onPending?.();
+    const cleanup = () => {
+        options.onComplete?.();
+        adapter.cleanup();
+        resolve(status);
+    };
+    adapter.on(AdapterEvent.Receive, (message, url) => {
+        if (isRelayOk(message)) {
+            const [_, id, ok, detail] = message;
+            if (id !== options.event.id)
+                return;
+            if (ok) {
+                status = PublishStatus.Success;
+                options.onSuccess?.(detail);
+            }
+            else {
+                status = PublishStatus.Failure;
+                options.onFailure?.(detail);
+            }
+            cleanup();
+        }
+    });
+    options.signal?.addEventListener("abort", () => {
+        if (status === PublishStatus.Pending) {
+            status = PublishStatus.Aborted;
+            options.onAborted?.();
+        }
+        cleanup();
+    });
+    setTimeout(() => {
+        if (status === PublishStatus.Pending) {
+            status = PublishStatus.Timeout;
+            options.onTimeout?.();
+        }
+        cleanup();
+    }, options.timeout || 10_000);
+    adapter.send([ClientMessageType.Event, options.event]);
+});
+export const publish = async (options) => {
+    const { event, timeout, signal, context } = options;
+    const status = {};
+    const completed = new Set();
+    const relays = new Set(options.relays);
+    if (relays.size !== options.relays.length) {
+        console.warn("Non-unique relays passed to publish");
+    }
+    await Promise.all(options.relays.map(relay => publishOne({
+        event,
+        relay,
+        signal,
+        timeout,
+        context,
+        onSuccess: (detail) => {
+            status[relay] = PublishStatus.Success;
+            options.onSuccess?.(detail, relay);
+        },
+        onFailure: (detail) => {
+            status[relay] = PublishStatus.Failure;
+            options.onFailure?.(detail, relay);
+        },
+        onPending: () => {
+            status[relay] = PublishStatus.Pending;
+            options.onPending?.(relay);
+        },
+        onTimeout: () => {
+            status[relay] = PublishStatus.Timeout;
+            options.onTimeout?.(relay);
+        },
+        onAborted: () => {
+            status[relay] = PublishStatus.Aborted;
+            options.onAborted?.(relay);
+        },
+        onComplete: () => {
+            completed.add(relay);
+            if (completed.size === relays.size) {
+                options.onComplete?.();
+            }
+        },
+    })));
+    return status;
+};
+//# 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":"AACA,OAAO,EAAe,iBAAiB,EAAE,SAAS,EAAC,MAAM,cAAc,CAAA;AACvE,OAAO,EAAC,YAAY,EAAkB,UAAU,EAAC,MAAM,cAAc,CAAA;AAErE,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,mDAAkC,CAAA;IAClC,mDAAkC,CAAA;IAClC,mDAAkC,CAAA;IAClC,mDAAkC,CAAA;IAClC,mDAAkC,CAAA;IAClC,mDAAkC,CAAA;AACpC,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAqBD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAA0B,EAAE,EAAE,CACvD,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;IACpB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAE1D,IAAI,MAAM,GAAG,aAAa,CAAC,OAAO,CAAA;IAElC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;IAErB,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAA;QACtB,OAAO,CAAC,OAAO,EAAE,CAAA;QACjB,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC,CAAA;IAED,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,OAAqB,EAAE,GAAW,EAAE,EAAE;QACtE,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAA;YAEnC,IAAI,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,EAAE;gBAAE,OAAM;YAEnC,IAAI,EAAE,EAAE,CAAC;gBACP,MAAM,GAAG,aAAa,CAAC,OAAO,CAAA;gBAC9B,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,aAAa,CAAC,OAAO,CAAA;gBAC9B,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAA;YAC7B,CAAC;YAED,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QAC7C,IAAI,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,GAAG,aAAa,CAAC,OAAO,CAAA;YAC9B,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;QACvB,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC,CAAC,CAAA;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,GAAG,aAAa,CAAC,OAAO,CAAA;YAC9B,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;QACvB,CAAC;QAED,OAAO,EAAE,CAAA;IACX,CAAC,EAAE,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,CAAA;IAE7B,OAAO,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;AACxD,CAAC,CAAC,CAAA;AAkBJ,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,OAAuB,EAAE,EAAE;IACvD,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAC,GAAG,OAAO,CAAA;IACjD,MAAM,MAAM,GAAyB,EAAE,CAAA;IACvC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAA;IACnC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAEtC,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IACrD,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACzB,UAAU,CAAC;QACT,KAAK;QACL,KAAK;QACL,MAAM;QACN,OAAO;QACP,OAAO;QACP,SAAS,EAAE,CAAC,MAAc,EAAE,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACpC,CAAC;QACD,SAAS,EAAE,CAAC,MAAc,EAAE,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACpC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,OAAO,CAAA;YACrC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC;QACD,UAAU,EAAE,GAAG,EAAE;YACf,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAEpB,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;gBACnC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAA;YACxB,CAAC;QACH,CAAC;KACF,CAAC,CACH,CACF,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}

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

@@ -0,0 +1,55 @@
+import { Deferred } from "@welshman/lib";
+import { Filter, TrustedEvent } from "@welshman/util";
+import { AdapterContext } from "./adapter.js";
+import { Tracker } from "./tracker.js";
+export type RequestOneOptions = {
+    relay: string;
+    filters: Filter[];
+    signal?: AbortSignal;
+    tracker?: Tracker;
+    context?: AdapterContext;
+    autoClose?: boolean;
+    isEventValid?: (event: TrustedEvent, url: string) => boolean;
+    isEventDeleted?: (event: TrustedEvent, url: string) => boolean;
+    onEvent?: (event: TrustedEvent, url: string) => void;
+    onDeleted?: (event: unknown, url: string) => void;
+    onInvalid?: (event: unknown, url: string) => void;
+    onFiltered?: (event: TrustedEvent, url: string) => void;
+    onDuplicate?: (event: TrustedEvent, url: string) => void;
+    onDisconnect?: (url: string) => void;
+    onEose?: (url: string) => void;
+    onClose?: () => void;
+};
+export declare const requestOne: (options: RequestOneOptions) => Deferred<TrustedEvent[], TrustedEvent[]>;
+export type RequestOptions = Omit<RequestOneOptions, "relay"> & {
+    relays: string[];
+    threshold?: number;
+};
+export declare const request: (options: RequestOptions) => Promise<TrustedEvent[]>;
+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[];
+    signal?: AbortSignal;
+    onEvent?: (event: TrustedEvent, url: string) => void;
+    onDisconnect?: (url: string) => void;
+    onEose?: (url: string) => void;
+    onClose?: () => void;
+};
+/**
+ * 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 in order
+ * to implement batching
+ * @param options - LoaderOptions
+ * @returns - a load function
+ */
+export declare const makeLoader: (options: LoaderOptions) => (request: LoadOptions) => Promise<Deferred<TrustedEvent[]>>;
+export declare const load: (request: LoadOptions) => Promise<Deferred<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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"}