@welshman/net 0.0.32 → 0.0.33

package/build/src/Connection.cjs

@@ -1,101 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
+exports.Connection = exports.ConnectionStatus = void 0;
 const lib_1 = require("@welshman/lib");
-const util_1 = require("@welshman/util");
-const ConnectionMeta_1 = require("./ConnectionMeta.cjs");
-const ConnectionAuth_1 = require("./ConnectionAuth.cjs");
 const Socket_1 = require("./Socket.cjs");
+const ConnectionState_1 = require("./ConnectionState.cjs");
+const ConnectionStats_1 = require("./ConnectionStats.cjs");
+const ConnectionAuth_1 = require("./ConnectionAuth.cjs");
+const ConnectionSender_1 = require("./ConnectionSender.cjs");
+var ConnectionStatus;
+(function (ConnectionStatus) {
+    ConnectionStatus["Ready"] = "ready";
+    ConnectionStatus["Closed"] = "Closed";
+    ConnectionStatus["Closing"] = "Closing";
+})(ConnectionStatus || (exports.ConnectionStatus = ConnectionStatus = {}));
+const { Ready, Closed, Closing } = ConnectionStatus;
 class Connection extends lib_1.Emitter {
     constructor(url) {
         super();
-        this.createSender = () => {
-            const worker = new lib_1.Worker({
-                shouldDefer: (message) => {
-                    if (!this.socket.isOpen()) {
-                        return true;
-                    }
-                    const [verb, ...extra] = (0, Socket_1.asMessage)(message);
-                    if (verb === 'AUTH') {
-                        return false;
-                    }
-                    // Only close reqs that have been sent
-                    if (verb === 'CLOSE') {
-                        return !this.meta.pendingRequests.has(extra[0]);
-                    }
-                    // Allow relay requests through
-                    if (verb === 'EVENT' && extra[0].kind === util_1.AUTH_JOIN) {
-                        return false;
-                    }
-                    // Only defer for auth if we're not multiplexing
-                    if ((0, Socket_1.isMessage)(message) && ![ConnectionAuth_1.AuthStatus.None, ConnectionAuth_1.AuthStatus.Ok].includes(this.auth.status)) {
-                        return true;
-                    }
-                    if (verb === 'REQ') {
-                        return this.meta.pendingRequests.size >= 8;
-                    }
-                    return false;
-                }
-            });
-            worker.addGlobalHandler((message) => {
-                // If we ended up handling a CLOSE before we handled the REQ, don't send the REQ
-                if (message[0] === 'CLOSE') {
-                    worker.buffer = worker.buffer.filter(m => !(m[0] === 'REQ' && m[1] === message[1]));
-                }
-                this.onSend(message);
-            });
-            return worker;
-        };
-        this.createReceiver = () => {
-            const worker = new lib_1.Worker();
-            worker.addGlobalHandler(this.onReceive);
-            return worker;
-        };
-        this.send = (m) => this.sender.push(m);
-        this.onOpen = () => this.emit('open', this);
-        this.onClose = () => this.emit('close', this);
-        this.onFault = () => this.emit('fault', this);
-        this.onMessage = (m) => this.receiver.push(m);
-        this.onSend = (message) => {
-            this.emit('send', this, message);
-            this.socket.send(message);
-        };
-        this.onReceive = (message) => {
-            this.emit('receive', this, message);
-        };
-        this.ensureConnected = async ({ shouldReconnect = true } = {}) => {
-            const isUnhealthy = this.socket.isClosing() || this.socket.isClosed();
-            const noRecentFault = this.meta.lastFault < Date.now() - 60000;
-            if (shouldReconnect && isUnhealthy && noRecentFault) {
-                await this.disconnect();
-            }
-            if (this.socket.isNew()) {
-                await this.socket.connect();
-            }
-            while (this.socket.isConnecting()) {
-                await (0, lib_1.sleep)(100);
+        this.status = Ready;
+        this.emit = (type, ...args) => super.emit(type, this, ...args);
+        this.send = async (message) => {
+            await this.socket.open();
+            if (this.status === Ready) {
+                this.sender.push(message);
             }
         };
+        this.close = async () => {
+            this.status = Closing;
+            await this.sender.close();
+            await this.socket.close();
+            this.status = Closed;
+            this.removeAllListeners();
+        };
         this.url = url;
-        this.socket = new Socket_1.Socket(url, this);
-        this.sender = this.createSender();
-        this.receiver = this.createReceiver();
-        this.meta = new ConnectionMeta_1.ConnectionMeta(this);
+        this.socket = new Socket_1.Socket(this);
+        this.sender = new ConnectionSender_1.ConnectionSender(this);
+        this.state = new ConnectionState_1.ConnectionState(this);
+        this.stats = new ConnectionStats_1.ConnectionStats(this);
         this.auth = new ConnectionAuth_1.ConnectionAuth(this);
         this.setMaxListeners(100);
     }
-    async disconnect() {
-        await this.socket.disconnect();
-        this.sender.clear();
-        this.receiver.clear();
-        this.meta.clearPending();
-    }
-    async destroy() {
-        await this.disconnect();
-        this.removeAllListeners();
-        this.sender.stop();
-        this.receiver.stop();
-    }
 }
 exports.Connection = Connection;
 //# sourceMappingURL=Connection.cjs.map

package/build/src/Connection.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Connection.cjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,yCAA+B;AAG/B,2DAAiD;AACjD,2DAAiD;AACjD,yDAA+C;AAC/C,6DAAmD;AAEnD,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,mCAAe,CAAA;IACf,qCAAiB,CAAA;IACjB,uCAAmB,CAAA;AACrB,CAAC,EAJW,gBAAgB,gCAAhB,gBAAgB,QAI3B;AAED,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,GAAG,gBAAgB,CAAA;AAEjD,MAAa,UAAW,SAAQ,aAAO;IASrC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAA;QAHT,WAAM,GAAG,KAAK,CAAA;QAcd,SAAI,GAAG,CAAC,IAAqB,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;QAEjF,SAAI,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;YAChC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aAC1B;QACH,CAAC,CAAA;QAED,UAAK,GAAG,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;YAErB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACzB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YAEzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YACpB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC3B,CAAC,CAAA;QA3BC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;CAqBF;AAxCD,gCAwCC"}

package/build/src/Connection.d.ts

@@ -1,28 +1,26 @@
-import { Emitter, Worker } from '@welshman/lib';
-import { ConnectionMeta } from './ConnectionMeta';
-import { ConnectionAuth } from './ConnectionAuth';
+import { Emitter } from '@welshman/lib';
 import { Socket } from './Socket';
-import type { SocketMessage } 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';
+export declare enum ConnectionStatus {
+    Ready = "ready",
+    Closed = "Closed",
+    Closing = "Closing"
+}
 export declare class Connection extends Emitter {
     url: string;
     socket: Socket;
-    sender: Worker<SocketMessage>;
-    receiver: Worker<SocketMessage>;
-    meta: ConnectionMeta;
+    sender: ConnectionSender;
+    state: ConnectionState;
+    stats: ConnectionStats;
     auth: ConnectionAuth;
+    status: ConnectionStatus;
     constructor(url: string);
-    createSender: () => Worker<SocketMessage>;
-    createReceiver: () => Worker<SocketMessage>;
-    send: (m: SocketMessage) => void;
-    onOpen: () => boolean;
-    onClose: () => boolean;
-    onFault: () => boolean;
-    onMessage: (m: SocketMessage) => void;
-    onSend: (message: SocketMessage) => void;
-    onReceive: (message: SocketMessage) => void;
-    ensureConnected: ({ shouldReconnect }?: {
-        shouldReconnect?: boolean | undefined;
-    }) => Promise<void>;
-    disconnect(): Promise<void>;
-    destroy(): Promise<void>;
+    emit: (type: ConnectionEvent, ...args: any[]) => boolean;
+    send: (message: Message) => Promise<void>;
+    close: () => Promise<void>;
 }

package/build/src/Connection.mjs

@@ -1,97 +1,41 @@
-import { Emitter, Worker, sleep } from '@welshman/lib';
-import { AUTH_JOIN } from '@welshman/util';
-import { ConnectionMeta } from "./ConnectionMeta.mjs";
-import { ConnectionAuth, AuthStatus } from "./ConnectionAuth.mjs";
-import { Socket, isMessage, asMessage } from "./Socket.mjs";
+import { Emitter } from '@welshman/lib';
+import { Socket } from "./Socket.mjs";
+import { ConnectionState } from "./ConnectionState.mjs";
+import { ConnectionStats } from "./ConnectionStats.mjs";
+import { ConnectionAuth } from "./ConnectionAuth.mjs";
+import { ConnectionSender } from "./ConnectionSender.mjs";
+export var ConnectionStatus;
+(function (ConnectionStatus) {
+    ConnectionStatus["Ready"] = "ready";
+    ConnectionStatus["Closed"] = "Closed";
+    ConnectionStatus["Closing"] = "Closing";
+})(ConnectionStatus || (ConnectionStatus = {}));
+const { Ready, Closed, Closing } = ConnectionStatus;
 export class Connection extends Emitter {
     constructor(url) {
         super();
-        this.createSender = () => {
-            const worker = new Worker({
-                shouldDefer: (message) => {
-                    if (!this.socket.isOpen()) {
-                        return true;
-                    }
-                    const [verb, ...extra] = asMessage(message);
-                    if (verb === 'AUTH') {
-                        return false;
-                    }
-                    // Only close reqs that have been sent
-                    if (verb === 'CLOSE') {
-                        return !this.meta.pendingRequests.has(extra[0]);
-                    }
-                    // Allow relay requests through
-                    if (verb === 'EVENT' && extra[0].kind === AUTH_JOIN) {
-                        return false;
-                    }
-                    // Only defer for auth if we're not multiplexing
-                    if (isMessage(message) && ![AuthStatus.None, AuthStatus.Ok].includes(this.auth.status)) {
-                        return true;
-                    }
-                    if (verb === 'REQ') {
-                        return this.meta.pendingRequests.size >= 8;
-                    }
-                    return false;
-                }
-            });
-            worker.addGlobalHandler((message) => {
-                // If we ended up handling a CLOSE before we handled the REQ, don't send the REQ
-                if (message[0] === 'CLOSE') {
-                    worker.buffer = worker.buffer.filter(m => !(m[0] === 'REQ' && m[1] === message[1]));
-                }
-                this.onSend(message);
-            });
-            return worker;
-        };
-        this.createReceiver = () => {
-            const worker = new Worker();
-            worker.addGlobalHandler(this.onReceive);
-            return worker;
-        };
-        this.send = (m) => this.sender.push(m);
-        this.onOpen = () => this.emit('open', this);
-        this.onClose = () => this.emit('close', this);
-        this.onFault = () => this.emit('fault', this);
-        this.onMessage = (m) => this.receiver.push(m);
-        this.onSend = (message) => {
-            this.emit('send', this, message);
-            this.socket.send(message);
-        };
-        this.onReceive = (message) => {
-            this.emit('receive', this, message);
-        };
-        this.ensureConnected = async ({ shouldReconnect = true } = {}) => {
-            const isUnhealthy = this.socket.isClosing() || this.socket.isClosed();
-            const noRecentFault = this.meta.lastFault < Date.now() - 60000;
-            if (shouldReconnect && isUnhealthy && noRecentFault) {
-                await this.disconnect();
-            }
-            if (this.socket.isNew()) {
-                await this.socket.connect();
-            }
-            while (this.socket.isConnecting()) {
-                await sleep(100);
+        this.status = Ready;
+        this.emit = (type, ...args) => super.emit(type, this, ...args);
+        this.send = async (message) => {
+            await this.socket.open();
+            if (this.status === Ready) {
+                this.sender.push(message);
             }
         };
+        this.close = async () => {
+            this.status = Closing;
+            await this.sender.close();
+            await this.socket.close();
+            this.status = Closed;
+            this.removeAllListeners();
+        };
         this.url = url;
-        this.socket = new Socket(url, this);
-        this.sender = this.createSender();
-        this.receiver = this.createReceiver();
-        this.meta = new ConnectionMeta(this);
+        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);
     }
-    async disconnect() {
-        await this.socket.disconnect();
-        this.sender.clear();
-        this.receiver.clear();
-        this.meta.clearPending();
-    }
-    async destroy() {
-        await this.disconnect();
-        this.removeAllListeners();
-        this.sender.stop();
-        this.receiver.stop();
-    }
 }
 //# sourceMappingURL=Connection.mjs.map

package/build/src/Connection.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Connection.mjs","sourceRoot":"","sources":["../../src/Connection.ts"],"names":[],"mappings":"OAAO,EAAC,OAAO,EAAC,MAAM,eAAe;OAC9B,EAAC,MAAM,EAAC;OAGR,EAAC,eAAe,EAAC;OACjB,EAAC,eAAe,EAAC;OACjB,EAAC,cAAc,EAAC;OAChB,EAAC,gBAAgB,EAAC;AAEzB,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,mCAAe,CAAA;IACf,qCAAiB,CAAA;IACjB,uCAAmB,CAAA;AACrB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B;AAED,MAAM,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,GAAG,gBAAgB,CAAA;AAEjD,MAAM,OAAO,UAAW,SAAQ,OAAO;IASrC,YAAY,GAAW;QACrB,KAAK,EAAE,CAAA;QAHT,WAAM,GAAG,KAAK,CAAA;QAcd,SAAI,GAAG,CAAC,IAAqB,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,CAAA;QAEjF,SAAI,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;YAChC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YAExB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aAC1B;QACH,CAAC,CAAA;QAED,UAAK,GAAG,KAAK,IAAI,EAAE;YACjB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;YAErB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACzB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YAEzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YACpB,IAAI,CAAC,kBAAkB,EAAE,CAAA;QAC3B,CAAC,CAAA;QA3BC,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;CAqBF"}

package/build/src/ConnectionAuth.cjs

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionAuth = exports.AuthStatus = exports.AuthMode = void 0;
 const lib_1 = require("@welshman/lib");
 const util_1 = require("@welshman/util");
-const Socket_1 = require("./Socket.cjs");
+const ConnectionEvent_1 = require("./ConnectionEvent.cjs");
 var AuthMode;
 (function (AuthMode) {
     AuthMode["Implicit"] = "implicit";
@@ -27,11 +27,10 @@ var AuthStatus;
 })(AuthStatus || (exports.AuthStatus = AuthStatus = {}));
 const { None, Requested, PendingSignature, DeniedSignature, PendingResponse, Forbidden, Ok, } = AuthStatus;
 class ConnectionAuth {
-    constructor(connection) {
-        this.connection = connection;
+    constructor(cxn) {
+        this.cxn = cxn;
         this.status = None;
-        _ConnectionAuth_onReceive.set(this, (connection, message) => {
-            const [verb, ...extra] = (0, Socket_1.asMessage)(message);
+        _ConnectionAuth_onReceive.set(this, (cxn, [verb, ...extra]) => {
             if (verb === 'OK') {
                 const [id, ok, message] = extra;
                 if (id === this.request) {
@@ -45,17 +44,28 @@ class ConnectionAuth {
                 this.message = undefined;
                 this.status = Requested;
                 if (lib_1.ctx.net.authMode === AuthMode.Implicit) {
-                    this.attempt();
+                    this.respond();
                 }
             }
         });
-        _ConnectionAuth_onClose.set(this, (connection) => {
+        _ConnectionAuth_onClose.set(this, (cxn) => {
             this.challenge = undefined;
             this.request = undefined;
             this.message = undefined;
             this.status = None;
         });
-        this.attempt = async () => {
+        this.waitFor = async (condition, timeout = 300) => {
+            const start = Date.now();
+            while (Date.now() - timeout <= start) {
+                await (0, lib_1.sleep)(100);
+                if (condition()) {
+                    break;
+                }
+            }
+        };
+        this.waitForChallenge = async (timeout = 300) => this.waitFor(() => Boolean(this.challenge), timeout);
+        this.waitForResolution = async (timeout = 300) => this.waitFor(() => [None, DeniedSignature, Forbidden, Ok].includes(this.status), timeout);
+        this.respond = async () => {
             if (!this.challenge) {
                 throw new Error("Attempted to authenticate with no challenge");
             }
@@ -65,53 +75,33 @@ class ConnectionAuth {
             this.status = PendingSignature;
             const template = (0, util_1.createEvent)(util_1.CLIENT_AUTH, {
                 tags: [
-                    ["relay", this.connection.url],
+                    ["relay", this.cxn.url],
                     ["challenge", this.challenge],
                 ],
             });
             const [event] = await Promise.all([
                 lib_1.ctx.net.signEvent(template),
-                this.connection.ensureConnected(),
+                this.cxn.socket.open(),
             ]);
             if (event) {
                 this.request = event.id;
-                this.connection.send(['AUTH', event]);
+                this.cxn.send(['AUTH', event]);
                 this.status = PendingResponse;
             }
             else {
                 this.status = DeniedSignature;
             }
         };
-        this.attemptIfRequested = async () => {
+        this.attempt = async (timeout = 300) => {
+            await this.cxn.socket.open();
+            await this.waitForChallenge(timeout);
             if (this.status === Requested) {
-                await this.attempt();
+                await this.respond();
             }
+            await this.waitForResolution(timeout);
         };
-        this.wait = async ({ timeout = 3000 } = {}) => {
-            const deadline = Date.now() + timeout;
-            while (Date.now() < deadline) {
-                await (0, lib_1.sleep)(100);
-                // State got reset while we were waiting
-                if ([None, Requested].includes(this.status)) {
-                    break;
-                }
-                // We've completed the auth flow
-                if ([DeniedSignature, Forbidden, Ok].includes(this.status)) {
-                    break;
-                }
-            }
-        };
-        this.waitIfPending = async ({ timeout = 3000 } = {}) => {
-            while ([PendingSignature, PendingResponse].includes(this.status)) {
-                await this.wait({ timeout });
-            }
-        };
-        this.destroy = () => {
-            this.connection.off('receive', __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
-            this.connection.off('close', __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
-        };
-        this.connection.on('receive', __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
-        this.connection.on('close', __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
+        this.cxn.on(ConnectionEvent_1.ConnectionEvent.Close, __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
+        this.cxn.on(ConnectionEvent_1.ConnectionEvent.Receive, __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
     }
 }
 exports.ConnectionAuth = ConnectionAuth;

package/build/src/ConnectionAuth.cjs.map

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

package/build/src/ConnectionAuth.d.ts

@@ -14,19 +14,15 @@ export declare enum AuthStatus {
 }
 export declare class ConnectionAuth {
     #private;
-    readonly connection: Connection;
+    readonly cxn: Connection;
     challenge: string | undefined;
     request: string | undefined;
     message: string | undefined;
     status: AuthStatus;
-    constructor(connection: Connection);
-    attempt: () => Promise<void>;
-    attemptIfRequested: () => Promise<void>;
-    wait: ({ timeout }?: {
-        timeout?: number | undefined;
-    }) => Promise<void>;
-    waitIfPending: ({ timeout }?: {
-        timeout?: number | undefined;
-    }) => Promise<void>;
-    destroy: () => void;
+    constructor(cxn: Connection);
+    waitFor: (condition: () => boolean, timeout?: number) => Promise<void>;
+    waitForChallenge: (timeout?: number) => Promise<void>;
+    waitForResolution: (timeout?: number) => Promise<void>;
+    respond: () => Promise<void>;
+    attempt: (timeout?: number) => Promise<void>;
 }

package/build/src/ConnectionAuth.mjs

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _ConnectionAuth_onReceive, _ConnectionAuth_onClose;
 import { ctx, sleep } from '@welshman/lib';
 import { CLIENT_AUTH, createEvent } from '@welshman/util';
-import { asMessage } from "./Socket.mjs";
+import { ConnectionEvent } from "./ConnectionEvent.mjs";
 export var AuthMode;
 (function (AuthMode) {
     AuthMode["Implicit"] = "implicit";
@@ -24,11 +24,10 @@ export var AuthStatus;
 })(AuthStatus || (AuthStatus = {}));
 const { None, Requested, PendingSignature, DeniedSignature, PendingResponse, Forbidden, Ok, } = AuthStatus;
 export class ConnectionAuth {
-    constructor(connection) {
-        this.connection = connection;
+    constructor(cxn) {
+        this.cxn = cxn;
         this.status = None;
-        _ConnectionAuth_onReceive.set(this, (connection, message) => {
-            const [verb, ...extra] = asMessage(message);
+        _ConnectionAuth_onReceive.set(this, (cxn, [verb, ...extra]) => {
             if (verb === 'OK') {
                 const [id, ok, message] = extra;
                 if (id === this.request) {
@@ -42,17 +41,28 @@ export class ConnectionAuth {
                 this.message = undefined;
                 this.status = Requested;
                 if (ctx.net.authMode === AuthMode.Implicit) {
-                    this.attempt();
+                    this.respond();
                 }
             }
         });
-        _ConnectionAuth_onClose.set(this, (connection) => {
+        _ConnectionAuth_onClose.set(this, (cxn) => {
             this.challenge = undefined;
             this.request = undefined;
             this.message = undefined;
             this.status = None;
         });
-        this.attempt = async () => {
+        this.waitFor = async (condition, timeout = 300) => {
+            const start = Date.now();
+            while (Date.now() - timeout <= start) {
+                await sleep(100);
+                if (condition()) {
+                    break;
+                }
+            }
+        };
+        this.waitForChallenge = async (timeout = 300) => this.waitFor(() => Boolean(this.challenge), timeout);
+        this.waitForResolution = async (timeout = 300) => this.waitFor(() => [None, DeniedSignature, Forbidden, Ok].includes(this.status), timeout);
+        this.respond = async () => {
             if (!this.challenge) {
                 throw new Error("Attempted to authenticate with no challenge");
             }
@@ -62,53 +72,33 @@ export class ConnectionAuth {
             this.status = PendingSignature;
             const template = createEvent(CLIENT_AUTH, {
                 tags: [
-                    ["relay", this.connection.url],
+                    ["relay", this.cxn.url],
                     ["challenge", this.challenge],
                 ],
             });
             const [event] = await Promise.all([
                 ctx.net.signEvent(template),
-                this.connection.ensureConnected(),
+                this.cxn.socket.open(),
             ]);
             if (event) {
                 this.request = event.id;
-                this.connection.send(['AUTH', event]);
+                this.cxn.send(['AUTH', event]);
                 this.status = PendingResponse;
             }
             else {
                 this.status = DeniedSignature;
             }
         };
-        this.attemptIfRequested = async () => {
+        this.attempt = async (timeout = 300) => {
+            await this.cxn.socket.open();
+            await this.waitForChallenge(timeout);
             if (this.status === Requested) {
-                await this.attempt();
+                await this.respond();
             }
+            await this.waitForResolution(timeout);
         };
-        this.wait = async ({ timeout = 3000 } = {}) => {
-            const deadline = Date.now() + timeout;
-            while (Date.now() < deadline) {
-                await sleep(100);
-                // State got reset while we were waiting
-                if ([None, Requested].includes(this.status)) {
-                    break;
-                }
-                // We've completed the auth flow
-                if ([DeniedSignature, Forbidden, Ok].includes(this.status)) {
-                    break;
-                }
-            }
-        };
-        this.waitIfPending = async ({ timeout = 3000 } = {}) => {
-            while ([PendingSignature, PendingResponse].includes(this.status)) {
-                await this.wait({ timeout });
-            }
-        };
-        this.destroy = () => {
-            this.connection.off('receive', __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
-            this.connection.off('close', __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
-        };
-        this.connection.on('receive', __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
-        this.connection.on('close', __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
+        this.cxn.on(ConnectionEvent.Close, __classPrivateFieldGet(this, _ConnectionAuth_onClose, "f"));
+        this.cxn.on(ConnectionEvent.Receive, __classPrivateFieldGet(this, _ConnectionAuth_onReceive, "f"));
     }
 }
 _ConnectionAuth_onReceive = new WeakMap(), _ConnectionAuth_onClose = new WeakMap();