@sogni-ai/sogni-client 4.0.0-alpha.11 → 4.0.0-alpha.13

package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/WSCoordinator.js

@@ -0,0 +1,359 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getUUID_1 = __importDefault(require("../../../lib/getUUID"));
+class WSCoordinator {
+    constructor(callbacks, logger) {
+        this._isConnected = false;
+        this.lastPrimaryHeartbeat = 0;
+        this.heartbeatInterval = null;
+        this.primaryCheckInterval = null;
+        this.startingEvents = {};
+        this.ackCallbacks = {};
+        /**
+         * Handle tab closing event
+         */
+        this.handleBeforeUnload = () => {
+            if (this._isPrimary) {
+                this.logger.info(`Client ${this.id} closing, releasing primary role`);
+                this.releasePrimary();
+            }
+        };
+        this.id = (0, getUUID_1.default)();
+        this.logger = logger;
+        this.callbacks = callbacks;
+        this.channel = new BroadcastChannel(WSCoordinator.CHANNEL_NAME);
+        this.channel.onmessage = this.handleMessage.bind(this);
+        this._isPrimary = false;
+        // Listen for tab closing to gracefully release primary role
+        if (typeof window !== 'undefined') {
+            window.addEventListener('beforeunload', this.handleBeforeUnload.bind(this));
+        }
+    }
+    /**
+     * Initialize tab coordination and determine role
+     */
+    initialize() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.info(`WSCoordinator ${this.id} initializing...`);
+            // Announce our presence
+            this.broadcast({
+                type: 'announce'
+            });
+            // Wait to see if there's an existing primary
+            yield this.waitForPrimaryResponse();
+            if (!this._isPrimary) {
+                this.logger.info(`Client ${this.id} is secondary, primary exists`);
+                this.startPrimaryCheck();
+            }
+            else {
+                this.logger.info(`Client ${this.id} becoming primary`);
+                this.becomePrimary();
+            }
+            return this._isPrimary;
+        });
+    }
+    connect() {
+        if (this._isPrimary) {
+            throw new Error('Primary should connect the socket directly.');
+        }
+        this.broadcast({
+            type: 'connection-toggle',
+            payload: { connected: true }
+        });
+    }
+    disconnect() {
+        if (this._isPrimary) {
+            throw new Error('Primary should disconnect socket directly.');
+        }
+        this.broadcast({
+            type: 'connection-toggle',
+            payload: { connected: false }
+        });
+    }
+    changeAuthState(isAuthenticated) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.broadcast({
+                type: 'authentication',
+                payload: { authenticated: isAuthenticated }
+            });
+        });
+    }
+    /**
+     * Wait briefly to see if a primary tab responds
+     */
+    waitForPrimaryResponse() {
+        return new Promise((resolve) => {
+            const timeout = setTimeout(() => {
+                // No primary responded, we become primary
+                this._isPrimary = true;
+                resolve();
+            }, 500);
+            const messageHandler = (e) => {
+                const envelope = e.data;
+                const message = envelope.payload;
+                if (message.type === 'primary-present' || message.type === 'primary-claim') {
+                    // Primary exists
+                    this._isPrimary = false;
+                    this.lastPrimaryHeartbeat = envelope.timestamp;
+                    clearTimeout(timeout);
+                    this.channel.removeEventListener('message', messageHandler);
+                    resolve();
+                }
+            };
+            this.channel.addEventListener('message', messageHandler);
+        });
+    }
+    /**
+     * Become the primary tab
+     */
+    becomePrimary() {
+        this._isPrimary = true;
+        this.callbacks.onRoleChange(true);
+        // Broadcast that we're claiming primary role
+        this.broadcast({
+            type: 'primary-claim'
+        });
+        // Start sending heartbeats
+        this.startHeartbeat();
+    }
+    /**
+     * Release primary role (when closing)
+     */
+    releasePrimary() {
+        if (this._isPrimary) {
+            this.broadcast({
+                type: 'primary-release'
+            });
+            this.stopHeartbeat();
+        }
+    }
+    /**
+     * Start sending heartbeat messages as primary
+     */
+    startHeartbeat() {
+        if (this.heartbeatInterval)
+            throw new Error('Heartbeat interval already started. This should never happen.');
+        this.heartbeatInterval = setInterval(() => {
+            this.broadcast({
+                type: 'primary-present',
+                payload: { connected: this._isConnected }
+            });
+        }, WSCoordinator.HEARTBEAT_INTERVAL);
+    }
+    /**
+     * Stop sending heartbeat messages
+     */
+    stopHeartbeat() {
+        if (this.heartbeatInterval) {
+            clearInterval(this.heartbeatInterval);
+            this.heartbeatInterval = null;
+        }
+    }
+    /**
+     * Start checking for primary heartbeat (as secondary)
+     */
+    startPrimaryCheck() {
+        this.primaryCheckInterval = setInterval(() => {
+            const timeSinceLastHeartbeat = Date.now() - this.lastPrimaryHeartbeat;
+            if (timeSinceLastHeartbeat > WSCoordinator.PRIMARY_TIMEOUT) {
+                this.logger.warn(`Primary tab timeout, becoming primary`);
+                this.stopPrimaryCheck();
+                this.becomePrimary();
+            }
+        }, 1000);
+    }
+    /**
+     * Stop checking for primary heartbeat
+     */
+    stopPrimaryCheck() {
+        if (this.primaryCheckInterval) {
+            clearInterval(this.primaryCheckInterval);
+            this.primaryCheckInterval = null;
+        }
+    }
+    handleMessage(e) {
+        const envelope = e.data;
+        const message = envelope.payload;
+        // If a message sent to specific recipient and not to us, ignore it
+        if (!!envelope.recipientId && envelope.recipientId !== this.id) {
+            return;
+        }
+        switch (message.type) {
+            case 'announce':
+                if (this._isPrimary) {
+                    this.broadcast({
+                        type: 'primary-present',
+                        payload: { connected: this._isConnected }
+                    });
+                    // Re-broadcast starting events for the new tab
+                    Object.entries(this.startingEvents).forEach(([eventType, payload]) => {
+                        this.broadcast({
+                            type: 'socket-event',
+                            payload: { eventType: eventType, payload }
+                        }, envelope.senderId);
+                    });
+                }
+                return;
+            case 'primary-claim':
+            case 'primary-present':
+                this.lastPrimaryHeartbeat = envelope.timestamp;
+                if (this._isPrimary) {
+                    this.logger.info(`Stepping down from primary, ${envelope.senderId} claimed it`);
+                    this.stopHeartbeat();
+                    this._isPrimary = false;
+                    this.callbacks.onRoleChange(false);
+                    this.startPrimaryCheck();
+                }
+                return;
+            case 'primary-release':
+                if (!this._isPrimary) {
+                    // Wait random time (0 - 300ms) before claiming "primary" role, so not all tabs try to claim at the same time
+                    setTimeout(() => {
+                        const timeSinceRelease = Date.now() - envelope.timestamp;
+                        const timeSinceLastHeartbeat = Date.now() - this.lastPrimaryHeartbeat;
+                        if (timeSinceLastHeartbeat > timeSinceRelease) {
+                            this.logger.info(`Primary released, becoming primary`);
+                            this.stopPrimaryCheck();
+                            this.becomePrimary();
+                        }
+                        else {
+                            this.logger.info(`Another primary exists, do nothing`);
+                        }
+                    }, Math.round(Math.random() * 300));
+                }
+                return;
+            case 'authentication':
+                this.callbacks.onAuthChanged(message.payload.authenticated);
+                return;
+            case 'connection-toggle':
+                if (this._isPrimary) {
+                    this.logger.info(`Should ${message.payload.connected ? 'connect' : 'disconnect'} socket.`);
+                    this.callbacks.onConnectionToggle(message.payload.connected);
+                }
+                return;
+            case 'socket-event': {
+                if (!this._isPrimary) {
+                    this.callbacks.onMessageFromPrimary(message);
+                }
+                return;
+            }
+            case 'socket-send': {
+                if (this._isPrimary) {
+                    this.callbacks.onSendRequest(message).then(() => {
+                        //Acknowledge the request
+                        this.broadcast({
+                            type: 'socket-ack',
+                            payload: {
+                                envelopeId: envelope.id
+                            }
+                        });
+                    });
+                }
+                return;
+            }
+            case 'socket-ack': {
+                if (!this._isPrimary) {
+                    if (this.ackCallbacks[message.payload.envelopeId]) {
+                        this.ackCallbacks[message.payload.envelopeId]();
+                    }
+                }
+            }
+        }
+    }
+    broadcast(message, recipientId) {
+        const envelope = {
+            id: (0, getUUID_1.default)(),
+            senderId: this.id,
+            timestamp: Date.now(),
+            payload: message
+        };
+        if (recipientId) {
+            envelope.recipientId = recipientId;
+        }
+        this.channel.postMessage(envelope);
+        return envelope.id;
+    }
+    /**
+     * Send a message to be transmitted over the socket (from secondary to primary)
+     */
+    sendToSocket(messageType, data) {
+        if (this._isPrimary) {
+            throw new Error('Primary tab should send directly');
+        }
+        this.logger.debug(`Sending socket message ${messageType}`, data);
+        const messageId = this.broadcast({
+            type: 'socket-send',
+            payload: { messageType, data }
+        });
+        return new Promise((resolve, reject) => {
+            const ackTimeout = setTimeout(() => {
+                //If callback is not called within 5 seconds, call it with an error
+                if (this.ackCallbacks[messageId]) {
+                    this.ackCallbacks[messageId](new Error('Message delivery timeout'));
+                }
+            }, WSCoordinator.ACK_TIMEOUT);
+            this.ackCallbacks[messageId] = (error) => {
+                delete this.ackCallbacks[messageId];
+                clearTimeout(ackTimeout);
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    resolve();
+                }
+            };
+        });
+    }
+    /**
+     * Broadcast a socket event from primary to all secondaries
+     */
+    broadcastSocketEvent(eventType, payload) {
+        if (!this._isPrimary) {
+            throw new Error('Only primary tab can broadcast socket events');
+        }
+        if (eventType === 'connected') {
+            this._isConnected = true;
+        }
+        else if (eventType === 'disconnected') {
+            this._isConnected = false;
+        }
+        this.updateStartingState(eventType, payload);
+        this.logger.debug(`Broadcasting socket event ${eventType}`, payload);
+        this.broadcast({
+            type: 'socket-event',
+            payload: { eventType, payload }
+        });
+    }
+    updateStartingState(eventType, payload) {
+        if (eventType === 'authenticated') {
+            this.startingEvents.authenticated = payload;
+        }
+        else if (eventType === 'balanceUpdate') {
+            this.startingEvents.balanceUpdate = payload;
+        }
+        else if (eventType === 'swarmModels') {
+            this.startingEvents.swarmModels = payload;
+        }
+    }
+    isPrimary() {
+        return this._isPrimary;
+    }
+}
+WSCoordinator.HEARTBEAT_INTERVAL = 2000;
+WSCoordinator.PRIMARY_TIMEOUT = 3000;
+WSCoordinator.CHANNEL_NAME = 'sogni-websocket-clients';
+WSCoordinator.ACK_TIMEOUT = 5000;
+exports.default = WSCoordinator;
+//# sourceMappingURL=WSCoordinator.js.map

package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/WSCoordinator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WSCoordinator.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/WSCoordinator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,mEAA2C;AA8C3C,MAAM,aAAa;IAkBjB,YAAY,SAAiC,EAAE,MAAc;QARrD,iBAAY,GAAG,KAAK,CAAC;QACrB,yBAAoB,GAAW,CAAC,CAAC;QAEjC,sBAAiB,GAA0B,IAAI,CAAC;QAChD,yBAAoB,GAA0B,IAAI,CAAC;QACnD,mBAAc,GAAmB,EAAE,CAAC;QACpC,iBAAY,GAA0C,EAAE,CAAC;QA8VjE;;WAEG;QACK,uBAAkB,GAAG,GAAG,EAAE;YAChC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,kCAAkC,CAAC,CAAC;gBACtE,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,CAAC;QACH,CAAC,CAAC;QAnWA,IAAI,CAAC,EAAE,GAAG,IAAA,iBAAO,GAAE,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAExB,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;YAClC,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED;;OAEG;IACG,UAAU;;YACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,EAAE,kBAAkB,CAAC,CAAC;YAE7D,wBAAwB;YACxB,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;YAEH,6CAA6C;YAC7C,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,+BAA+B,CAAC,CAAC;gBACnE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,mBAAmB,CAAC,CAAC;gBACvD,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,CAAC;YAED,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;KAAA;IAED,OAAO;QACL,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;SAC9B,CAAC,CAAC;IACL,CAAC;IAEK,eAAe,CAAC,eAAwB;;YAC5C,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,gBAAgB;gBACtB,OAAO,EAAE,EAAE,aAAa,EAAE,eAAe,EAAE;aAC5C,CAAC,CAAC;QACL,CAAC;KAAA;IAED;;OAEG;IACK,sBAAsB;QAC5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,0CAA0C;gBAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,OAAO,EAAE,CAAC;YACZ,CAAC,EAAE,GAAG,CAAC,CAAC;YAER,MAAM,cAAc,GAAG,CAAC,CAAgC,EAAE,EAAE;gBAC1D,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC;gBACxB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACjC,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBAC3E,iBAAiB;oBACjB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;oBACxB,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,SAAS,CAAC;oBAC/C,YAAY,CAAC,OAAO,CAAC,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;oBAC5D,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,aAAa;QACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAElC,6CAA6C;QAC7C,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,eAAe;SACtB,CAAC,CAAC;QAEH,2BAA2B;QAC3B,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,iBAAiB;aACxB,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,IAAI,IAAI,CAAC,iBAAiB;YACxB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;aAC1C,CAAC,CAAC;QACL,CAAC,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IACK,aAAa;QACnB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3C,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;YACtE,IAAI,sBAAsB,GAAG,aAAa,CAAC,eAAe,EAAE,CAAC;gBAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;gBAC1D,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACzC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,CAAgC;QACpD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC;QACxB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,mEAAmE;QACnE,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,UAAU;gBACb,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,SAAS,CAAC;wBACb,IAAI,EAAE,iBAAiB;wBACvB,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;qBAC1C,CAAC,CAAC;oBACH,+CAA+C;oBAC/C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE;wBACnE,IAAI,CAAC,SAAS,CACZ;4BACE,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,EAAE,SAAS,EAAE,SAA4B,EAAE,OAAO,EAAE;yBAC9D,EACD,QAAQ,CAAC,QAAQ,CAClB,CAAC;oBACJ,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;YACT,KAAK,eAAe,CAAC;YACrB,KAAK,iBAAiB;gBACpB,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,SAAS,CAAC;gBAC/C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,QAAQ,aAAa,CAAC,CAAC;oBAChF,IAAI,CAAC,aAAa,EAAE,CAAC;oBACrB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;oBACxB,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBACnC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC3B,CAAC;gBACD,OAAO;YACT,KAAK,iBAAiB;gBACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBACrB,6GAA6G;oBAC7G,UAAU,CACR,GAAG,EAAE;wBACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC;wBACzD,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;wBACtE,IAAI,sBAAsB,GAAG,gBAAgB,EAAE,CAAC;4BAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;4BACvD,IAAI,CAAC,gBAAgB,EAAE,CAAC;4BACxB,IAAI,CAAC,aAAa,EAAE,CAAC;wBACvB,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;wBACzD,CAAC;oBACH,CAAC,EACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAChC,CAAC;gBACJ,CAAC;gBACD,OAAO;YACT,KAAK,gBAAgB;gBACnB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC5D,OAAO;YACT,KAAK,mBAAmB;gBACtB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,UAAU,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,UAAU,CACzE,CAAC;oBACF,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC/D,CAAC;gBACD,OAAO;YACT,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBAC/C,CAAC;gBACD,OAAO;YACT,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;wBAC9C,yBAAyB;wBACzB,IAAI,CAAC,SAAS,CAAC;4BACb,IAAI,EAAE,YAAY;4BAClB,OAAO,EAAE;gCACP,UAAU,EAAE,QAAQ,CAAC,EAAE;6BACxB;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;YACT,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBACrB,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;wBAClD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClD,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,OAAuB,EAAE,WAAoB;QAC7D,MAAM,QAAQ,GAAoB;YAChC,EAAE,EAAE,IAAA,iBAAO,GAAE;YACb,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IAED;;OAEG;IACH,YAAY,CAAsC,WAAc,EAAE,IAAyB;QACzF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAC/B,CAAC,CAAC;QACH,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;gBACjC,mEAAmE;gBACnE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;oBACjC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,KAAW,EAAE,EAAE;gBAC7C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACpC,YAAY,CAAC,UAAU,CAAC,CAAC;gBACzB,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,oBAAoB,CAClB,SAAY,EACZ,OAA0B;QAE1B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;aAAM,IAAI,SAAS,KAAK,cAAc,EAAE,CAAC;YACxC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,SAAS,EAAE,EAAE,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE;SAChC,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAA4B,SAAY,EAAE,OAA0B;QAC7F,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,CAAC,aAAa,GAAG,OAA4B,CAAC;QACnE,CAAC;aAAM,IAAI,SAAS,KAAK,eAAe,EAAE,CAAC;YACzC,IAAI,CAAC,cAAc,CAAC,aAAa,GAAG,OAAmB,CAAC;QAC1D,CAAC;aAAM,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,OAAiC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;;AA3WuB,gCAAkB,GAAG,IAAI,AAAP,CAAQ;AAC1B,6BAAe,GAAG,IAAI,AAAP,CAAQ;AACvB,0BAAY,GAAG,yBAAyB,AAA5B,CAA6B;AACzC,yBAAW,GAAG,IAAI,AAAP,CAAQ;AAqX7C,kBAAe,aAAa,CAAC"}

package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/types.d.ts

@@ -0,0 +1,101 @@
+import { SocketEventMap, SocketEventName } from '../events';
+import { MessageType, SocketMessageMap } from '../messages';
+/**
+ * Primary tab to broadcast socket events to secondary tabs.
+ * @param eventType - The event type.
+ * @param payload - The event payload. See {@link SocketEventMap} for the list of available events.
+ */
+export interface SocketEventReceived<T extends SocketEventName = SocketEventName> {
+    type: 'socket-event';
+    payload: {
+        eventType: T;
+        payload: SocketEventMap[T];
+    };
+}
+/**
+ * Sent by secondary tabs to the primary tab to send a message to WebSocket.
+ * @param messageType - The message type.
+ * @param data - The message payload. See {@link SocketMessageMap} for the list of available messages.
+ */
+export interface SendSocketMessage<T extends MessageType = MessageType> {
+    type: 'socket-send';
+    payload: {
+        messageType: T;
+        data: SocketMessageMap[T];
+    };
+}
+/**
+ * Sent by the primary tab to acknowledge that a message was sent to WebSocket.
+ */
+export interface SocketMessageAck {
+    type: 'socket-ack';
+    payload: {
+        envelopeId: string;
+    };
+}
+/**
+ * Sent by the primary tab to notify the secondary tabs that the primary tab is still alive.
+ * @param connected - true if the primary tab is connected to the server, false otherwise.
+ */
+export interface Heartbeat {
+    type: 'primary-present';
+    payload: {
+        connected: boolean;
+    };
+}
+/**
+ * Used to tell the primary tab to connect/disconnect socket.
+ * @param connected - true to connect, false to disconnect.
+ */
+export interface ConnectionToggle {
+    type: 'connection-toggle';
+    payload: {
+        connected: boolean;
+    };
+}
+/**
+ * Sent by tab when it is opened to notify other tabs. If another tab is present,
+ * it will respond with {@link Heartbeat}.
+ */
+export interface ClientAnnounce {
+    type: 'announce';
+}
+/**
+ * Sent by the client to let other know that it is claiming the primary role.
+ */
+export interface PrimaryClaim {
+    type: 'primary-claim';
+}
+/**
+ * Sent by the client to let other know that it is releasing the primary role.
+ * This usually happens when the tab is closed.
+ */
+export interface PrimaryRelease {
+    type: 'primary-release';
+}
+/**
+ * Sent by the tab where user has auth state changed.
+ * @param authenticated - true if the user is authenticated, false otherwise.
+ */
+export interface AuthenticationChange {
+    type: 'authentication';
+    payload: {
+        authenticated: boolean;
+    };
+}
+export type ChannelMessage = AuthenticationChange | SocketEventReceived | SendSocketMessage | SocketMessageAck | ConnectionToggle | Heartbeat | ClientAnnounce | PrimaryClaim | PrimaryRelease;
+/**
+ * Envelope for messages sent between tabs.
+ * @param id - Unique message ID.
+ * @param senderId - ID of the tab that sent the message.
+ * @param recipientId - ID of the tab that should receive the message. If not specified, the message will be broadcasted to all tabs.
+ * @param timestamp - Timestamp of the message.
+ * @param payload - Message payload.
+ */
+export interface MessageEnvelope {
+    id: string;
+    senderId: string;
+    recipientId?: string;
+    timestamp: number;
+    payload: ChannelMessage;
+}

package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/ApiClient/WebSocketClient/BrowserWebSocketClient/types.ts"],"names":[],"mappings":""}

package/dist/ApiClient/WebSocketClient/events.d.ts

@@ -135,3 +135,4 @@ export type SocketEventMap = {
     toastMessage: ToastMessage;
     artistCancelConfirmation: ArtistCancelConfirmation;
 };
+export type SocketEventName = keyof SocketEventMap;

package/dist/ApiClient/WebSocketClient/index.d.ts

@@ -1,10 +1,10 @@
 import { MessageType, SocketMessageMap } from './messages';
 import { SocketEventMap } from './events';
 import RestClient from '../../lib/RestClient';
-import { SupernetType } from './types';
+import { IWebSocketClient, SupernetType } from './types';
 import { Logger } from '../../lib/DefaultLogger';
 import { AuthManager } from '../../lib/AuthManager';
-declare class WebSocketClient extends RestClient<SocketEventMap> {
+declare class WebSocketClient extends RestClient<SocketEventMap> implements IWebSocketClient {
     appId: string;
     baseUrl: string;
     private socket;

package/dist/ApiClient/WebSocketClient/types.d.ts

@@ -1 +1,14 @@
+import { MessageType, SocketMessageMap } from './messages';
+import RestClient from '../../lib/RestClient';
+import { SocketEventMap } from './events';
 export type SupernetType = 'relaxed' | 'fast';
+export interface IWebSocketClient extends RestClient<SocketEventMap> {
+    appId: string;
+    baseUrl: string;
+    isConnected: boolean;
+    supernetType: SupernetType;
+    connect(): Promise<void>;
+    disconnect(): void;
+    send<T extends MessageType>(messageType: T, data: SocketMessageMap[T]): Promise<void>;
+    switchNetwork(supernetType: SupernetType): Promise<SupernetType>;
+}

package/dist/ApiClient/index.d.ts

@@ -1,10 +1,9 @@
 import RestClient from '../lib/RestClient';
-import WebSocketClient from './WebSocketClient';
 import TypedEventEmitter from '../lib/TypedEventEmitter';
 import { ApiClientEvents } from './events';
 import { ServerConnectData, ServerDisconnectData } from './WebSocketClient/events';
 import { JSONValue } from '../types/json';
-import { SupernetType } from './WebSocketClient/types';
+import { IWebSocketClient, SupernetType } from './WebSocketClient/types';
 import { Logger } from '../lib/DefaultLogger';
 import { AuthManager } from '../lib/AuthManager';
 export interface ApiResponse<D = JSONValue> {
@@ -42,7 +41,7 @@ declare class ApiClient extends TypedEventEmitter<ApiClientEvents> {
     constructor({ baseUrl, socketUrl, appId, networkType, authType, logger, disableSocket }: ApiClientOptions);
     get isAuthenticated(): boolean;
     get auth(): AuthManager;
-    get socket(): WebSocketClient;
+    get socket(): IWebSocketClient;
     get rest(): RestClient;
     get socketEnabled(): boolean;
     handleSocketConnect({ network }: ServerConnectData): void;

package/dist/ApiClient/index.js

@@ -10,6 +10,8 @@ const TypedEventEmitter_1 = __importDefault(require("../lib/TypedEventEmitter"))
 const ErrorCode_1 = require("./WebSocketClient/ErrorCode");
 const CookieAuthManager_1 = __importDefault(require("../lib/AuthManager/CookieAuthManager"));
 const AuthManager_1 = require("../lib/AuthManager");
+const isNodejs_1 = __importDefault(require("../lib/isNodejs"));
+const BrowserWebSocketClient_1 = __importDefault(require("./WebSocketClient/BrowserWebSocketClient/BrowserWebSocketClient"));
 const WS_RECONNECT_ATTEMPTS = 5;
 class ApiError extends Error {
     constructor(status, payload) {
@@ -29,7 +31,13 @@ class ApiClient extends TypedEventEmitter_1.default {
         this._auth =
             authType === 'token' ? new AuthManager_1.TokenAuthManager(baseUrl, logger) : new CookieAuthManager_1.default(logger);
         this._rest = new RestClient_1.default(baseUrl, this._auth, logger);
-        this._socket = new WebSocketClient_1.default(socketUrl, this._auth, appId, networkType, logger);
+        // Use coordinated WebSocket client in browser, regular in Node.js
+        if (this._auth instanceof AuthManager_1.TokenAuthManager || isNodejs_1.default) {
+            this._socket = new WebSocketClient_1.default(socketUrl, this._auth, appId, networkType, logger);
+        }
+        else {
+            this._socket = new BrowserWebSocketClient_1.default(socketUrl, this._auth, appId, networkType, logger);
+        }
         this._disableSocket = disableSocket;
         this._auth.on('updated', this.handleAuthUpdated.bind(this));
         this._socket.on('connected', this.handleSocketConnect.bind(this));
@@ -55,14 +63,24 @@ class ApiClient extends TypedEventEmitter_1.default {
         this.emit('connected', { network });
     }
     handleSocketDisconnect(data) {
+        // If user is not authenticated, we don't need to reconnect
+        if (!this.auth.isAuthenticated) {
+            this.emit('disconnected', data);
+            return;
+        }
         if (!data.code || (0, ErrorCode_1.isNotRecoverable)(data.code)) {
+            // If this is browser, another tab is probably claiming the connection, so we don't need to reconnect
+            if (this._socket instanceof BrowserWebSocketClient_1.default &&
+                data.code === ErrorCode_1.ErrorCode.SWITCH_CONNECTION) {
+                this.logger.debug('Switching network connection, not reconnecting');
+                return;
+            }
             this.auth.clear();
             this.emit('disconnected', data);
             this.logger.error('Not recoverable socket error', data);
             return;
         }
         if (this._reconnectAttempts <= 0) {
-            this.auth.clear();
             this.emit('disconnected', data);
             this._reconnectAttempts = WS_RECONNECT_ATTEMPTS;
             return;

package/dist/ApiClient/index.js.map

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

package/dist/Projects/Job.d.ts

@@ -122,7 +122,7 @@ declare class Job extends DataEntity<JobData, JobEventMap> {
     _syncWithRestData(data: RawJob): Promise<void>;
     private handleUpdated;
     private handleEnhancementUpdate;
-    getResultData(): Promise<import("buffer").Blob>;
+    getResultData(): Promise<Blob>;
     /**
      * Enhance the image using the Flux model. This method will create a new project with the
      * enhancement parameters and use the result image of the current job as the starting image.

package/dist/Projects/index.d.ts

@@ -1,5 +1,5 @@
 import ApiGroup, { ApiConfig } from '../ApiGroup';
-import { AvailableModel, EnhancementStrength, EstimateRequest, ImageUrlParams, ProjectParams, SizePreset, SupportedModel } from './types';
+import { AvailableModel, EnhancementStrength, EstimateRequest, ImageUrlParams, CostEstimation, ProjectParams, SizePreset, SupportedModel } from './types';
 import Project from './Project';
 import { ProjectApiEvents } from './types/events';
 import { RawProject } from './types/RawProject';
@@ -52,14 +52,8 @@ declare class ProjectsApi extends ApiGroup<ProjectApiEvents> {
     /**
      * Estimate project cost
      */
-    estimateCost({ network, tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages }: EstimateRequest): Promise<{
-        token: string;
-        usd: string;
-    }>;
-    estimateEnhancementCost(strength: EnhancementStrength, tokenType?: TokenType): Promise<{
-        token: string;
-        usd: string;
-    }>;
+    estimateCost({ network, tokenType, model, imageCount, stepCount, previewCount, cnEnabled, startingImageStrength, width, height, sizePreset, guidance, sampler, contextImages }: EstimateRequest): Promise<CostEstimation>;
+    estimateEnhancementCost(strength: EnhancementStrength, tokenType?: TokenType): Promise<CostEstimation>;
     /**
      * Get upload URL for image
      * @internal

package/dist/Projects/index.js

@@ -528,7 +528,9 @@ class ProjectsApi extends ApiGroup_1.default {
             const r = yield this.client.socket.get(`/api/v${apiVersion}/job/estimate/${pathParams.join('/')}`);
             return {
                 token: r.quote.project.costInToken,
-                usd: r.quote.project.costInUSD
+                usd: r.quote.project.costInUSD,
+                spark: r.quote.project.costInSpark,
+                sogni: r.quote.project.costInSogni
             };
         });
     }