@sogni-ai/sogni-client 4.0.0-alpha.3 → 4.0.0-alpha.30

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

@@ -0,0 +1,332 @@
+"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"));
+const PRIMARY_HEARTBEAT_INTERVAL = 2000;
+const PRIMARY_TIMEOUT = 4000;
+const ACK_TIMEOUT = 5000;
+var MessageType;
+(function (MessageType) {
+    MessageType["ELECTION"] = "election";
+    MessageType["ELECTION_RESPONSE"] = "election_response";
+    MessageType["PRIMARY_ANNOUNCE"] = "primary_announce";
+    MessageType["PRIMARY_HEARTBEAT"] = "primary_heartbeat";
+    MessageType["BROADCAST"] = "broadcast";
+    MessageType["REQUEST"] = "request";
+    MessageType["REQUEST_ACK"] = "request_ack";
+})(MessageType || (MessageType = {}));
+const CHANNEL_NAME = 'sogni-websocket-channel';
+let isActiveTab = false;
+if (typeof window !== 'undefined' && window.location.protocol === 'https:') {
+    isActiveTab = window.document.visibilityState === 'visible';
+    window.addEventListener('visibilitychange', () => (isActiveTab = window.document.visibilityState === 'visible'));
+}
+/**
+ * A class responsible for coordinating communication across browser tabs or windows via BroadcastChannel API.
+ * It handles the role election of the primary (leader) tab, message broadcasting, heartbeats for primary tab monitoring,
+ * and message acknowledgment for reliable communication.
+ *
+ * The `ChannelCoordinator` ensures that one tab per session is assigned as the primary, while allowing others to act as secondaries,
+ * utilizing various message types for communication and coordination.
+ *
+ * Message is sent by secondary tabs to the primary tab via the `sendMessage` method. By sending message
+ * tab can tell primary to connect, disconnect, send message to socket etc.
+ *
+ * Notification is type of message broadcasted by primary to secondary tabs. This is mostly used to
+ * broadcast socket events from primary to secondary tabs.
+ *
+ * @template M - The type of messages being broadcast to other tabs/windows.
+ * @template N - The type of notifications being handled within the coordinator.
+ */
+class ChannelCoordinator {
+    constructor({ callbacks, logger }) {
+        this.id = (0, getUUID_1.default)();
+        this.priority = Date.now();
+        this.channel = new BroadcastChannel(CHANNEL_NAME);
+        this._isPrimary = false;
+        this.ackCallbacks = {};
+        // User to handle election of primary tab
+        this.electionInProgress = false;
+        this.electionResponses = new Map();
+        // Heartbeat to detect primary tab death
+        this.lastPrimaryHeartbeat = Date.now();
+        this.heartbeatTimer = null;
+        this.primaryCheckTimer = null;
+        this.readyCallback = () => { };
+        this.readyPromise = new Promise((resolve) => {
+            let called = false;
+            this.readyCallback = () => {
+                if (!called) {
+                    called = true;
+                    resolve();
+                }
+            };
+        });
+        this.callbacks = callbacks;
+        this.logger = logger;
+        this.channel.addEventListener('message', (event) => this.handleMessage(event.data));
+        this.startElections();
+        this.startPrimaryMonitor();
+        // Listen for tab closing to gracefully release primary role
+        if (typeof window !== 'undefined') {
+            window.addEventListener('beforeunload', () => {
+                this.priority = 0;
+                this.startElections();
+            });
+        }
+    }
+    get isPrimary() {
+        return this._isPrimary;
+    }
+    get currentPriority() {
+        return isActiveTab ? this.priority * 10 : this.priority;
+    }
+    isReady() {
+        return this.readyPromise;
+    }
+    startElections() {
+        this.logger.debug(`Start primary elections, my priority is ${this.currentPriority}, tab visibility is ${isActiveTab}`);
+        this.electionInProgress = true;
+        this.electionResponses.clear();
+        this.electionResponses.set(this.id, this.currentPriority);
+        this.broadcast({
+            type: MessageType.ELECTION,
+            payload: { priority: this.currentPriority }
+        });
+        setTimeout(() => {
+            this.finishElections();
+        }, 500);
+    }
+    finishElections() {
+        if (!this.electionInProgress) {
+            return;
+        }
+        // Find highest priority
+        let highestPriority = -Infinity;
+        let winnerId = null;
+        for (const [id, priority] of this.electionResponses) {
+            if (priority > highestPriority || (priority === highestPriority && id > (winnerId || ''))) {
+                highestPriority = priority;
+                winnerId = id;
+            }
+        }
+        if (winnerId === this.id) {
+            this.becomePrimary();
+            this.logger.debug(`Won elections! ${winnerId}`);
+        }
+        else {
+            this.logger.debug(`Lost elections! Winner is ${winnerId}`);
+        }
+        this.electionInProgress = false;
+        this.electionResponses.clear();
+    }
+    becomePrimary() {
+        this._isPrimary = true;
+        this.lastPrimaryHeartbeat = Date.now();
+        this.broadcast({
+            type: MessageType.PRIMARY_ANNOUNCE,
+            payload: { id: this.id, priority: this.currentPriority }
+        });
+        this.startHeartbeat();
+        this.callbacks.onRoleChange(true);
+        this.readyCallback();
+    }
+    startHeartbeat() {
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+        }
+        this.heartbeatTimer = setInterval(() => {
+            if (this._isPrimary) {
+                this.broadcast({
+                    type: MessageType.PRIMARY_HEARTBEAT,
+                    payload: { id: this.id, priority: this.currentPriority }
+                });
+            }
+            else {
+                this.stopHeartbeat();
+            }
+        }, PRIMARY_HEARTBEAT_INTERVAL);
+    }
+    stopHeartbeat() {
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = null;
+        }
+    }
+    startPrimaryMonitor() {
+        if (this.primaryCheckTimer) {
+            clearInterval(this.primaryCheckTimer);
+        }
+        this.primaryCheckTimer = setInterval(() => {
+            if (!this._isPrimary) {
+                const timeSinceLastHeartbeat = Date.now() - this.lastPrimaryHeartbeat;
+                if (timeSinceLastHeartbeat > PRIMARY_TIMEOUT) {
+                    this.startElections();
+                }
+            }
+            else {
+                this.lastPrimaryHeartbeat = Date.now();
+            }
+        }, PRIMARY_HEARTBEAT_INTERVAL);
+    }
+    handleMessage(envelope) {
+        const { senderId, recipientId, message } = envelope;
+        const isForOtherClient = recipientId && recipientId !== this.id;
+        if (senderId === this.id || isForOtherClient) {
+            return;
+        }
+        switch (message.type) {
+            case MessageType.ELECTION:
+                return this.handleElection(message);
+            case MessageType.ELECTION_RESPONSE:
+                return this.handleElectionResponse(message);
+            case MessageType.PRIMARY_ANNOUNCE:
+                return this.handlePrimaryAnnounce(message);
+            case MessageType.PRIMARY_HEARTBEAT:
+                return this.handlePrimaryHeartbeat();
+            case MessageType.BROADCAST:
+                return this.handleBroadcast(message);
+            case MessageType.REQUEST:
+                return this.handleRequest(message, envelope);
+            case MessageType.REQUEST_ACK:
+                return this.handleRequestAck(message);
+        }
+    }
+    handleElection(message) {
+        this.broadcast({
+            type: MessageType.ELECTION_RESPONSE,
+            payload: { id: this.id, priority: this.currentPriority }
+        });
+        if (this.currentPriority > message.payload.priority && !this.electionInProgress) {
+            this.startElections();
+        }
+    }
+    handleElectionResponse(message) {
+        if (this.electionInProgress) {
+            this.electionResponses.set(message.payload.id, message.payload.priority);
+        }
+    }
+    handlePrimaryAnnounce(message) {
+        this.logger.debug(`Primary announced: ${message.payload.id}`);
+        const wasPrimary = this._isPrimary;
+        this._isPrimary = false;
+        this.lastPrimaryHeartbeat = Date.now();
+        this.electionInProgress = false;
+        this.electionResponses.clear();
+        if (this.heartbeatTimer) {
+            clearInterval(this.heartbeatTimer);
+            this.heartbeatTimer = null;
+        }
+        if (wasPrimary) {
+            this.callbacks.onRoleChange(false);
+        }
+        this.readyCallback();
+    }
+    handlePrimaryHeartbeat() {
+        this.lastPrimaryHeartbeat = Date.now();
+    }
+    handleBroadcast(message) {
+        this.logger.debug(`Received broadcast from primary`, message.payload);
+        this.callbacks.onNotification(message.payload);
+    }
+    handleRequest(message, envelope) {
+        if (!this.isPrimary) {
+            return;
+        }
+        this.logger.debug(`Received request from secondary`, message.payload);
+        this.callbacks
+            .onMessage(message.payload)
+            .then(() => {
+            this.send({
+                type: MessageType.REQUEST_ACK,
+                payload: { id: envelope.id }
+            }, envelope.senderId);
+        })
+            .catch((error) => {
+            this.send({
+                type: MessageType.REQUEST_ACK,
+                payload: { id: envelope.id, error }
+            }, envelope.senderId);
+        });
+    }
+    handleRequestAck(message) {
+        const ackCallback = this.ackCallbacks[message.payload.id];
+        if (ackCallback) {
+            ackCallback(message.payload.error);
+            delete this.ackCallbacks[message.payload.id];
+        }
+    }
+    send(message, recipientId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const envelope = {
+                id: (0, getUUID_1.default)(),
+                senderId: this.id,
+                recipientId,
+                timestamp: Date.now(),
+                message: message
+            };
+            if (message.type !== MessageType.REQUEST) {
+                this.channel.postMessage(envelope);
+                return;
+            }
+            return new Promise((resolve, reject) => {
+                const ackTimeout = setTimeout(() => {
+                    if (this.ackCallbacks[envelope.id]) {
+                        this.ackCallbacks[envelope.id](new Error('Message delivery timeout'));
+                        delete this.ackCallbacks[envelope.id];
+                    }
+                }, ACK_TIMEOUT);
+                this.ackCallbacks[envelope.id] = (error) => {
+                    clearTimeout(ackTimeout);
+                    delete this.ackCallbacks[envelope.id];
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        resolve();
+                    }
+                };
+                this.channel.postMessage(envelope);
+            });
+        });
+    }
+    broadcast(message) {
+        const envelope = {
+            id: (0, getUUID_1.default)(),
+            senderId: this.id,
+            timestamp: Date.now(),
+            message: message
+        };
+        this.channel.postMessage(envelope);
+        return envelope.id;
+    }
+    sendMessage(message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.debug(`Sending message to primary`, message);
+            return this.send({
+                type: MessageType.REQUEST,
+                payload: message
+            });
+        });
+    }
+    notify(message) {
+        this.logger.debug(`Sending notification to secondary tabs`, message);
+        this.broadcast({
+            type: MessageType.BROADCAST,
+            payload: message
+        });
+    }
+}
+exports.default = ChannelCoordinator;
+//# sourceMappingURL=ChannelCoordinator.js.map

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

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

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

@@ -0,0 +1,28 @@
+import { IWebSocketClient, SupernetType } from '../types';
+import { AuthManager } from '../../../lib/AuthManager';
+import { Logger } from '../../../lib/DefaultLogger';
+import RestClient from '../../../lib/RestClient';
+import { SocketEventMap } from '../events';
+import { MessageType, SocketMessageMap } from '../messages';
+declare class BrowserWebSocketClient extends RestClient<SocketEventMap> implements IWebSocketClient {
+    appId: string;
+    baseUrl: string;
+    private socketClient;
+    private coordinator;
+    private _isConnected;
+    private _supernetType;
+    constructor(baseUrl: string, auth: AuthManager, appId: string, supernetType: SupernetType, logger: Logger);
+    get isConnected(): boolean;
+    get supernetType(): SupernetType;
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    switchNetwork(supernetType: SupernetType): Promise<SupernetType>;
+    send<T extends MessageType>(messageType: T, data: SocketMessageMap[T]): Promise<void>;
+    private handleMessage;
+    private handleNotification;
+    private handleAuthChanged;
+    private handleSocketEvent;
+    private handleAuthUpdated;
+    private handleRoleChange;
+}
+export default BrowserWebSocketClient;

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

@@ -0,0 +1,203 @@
+"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 AuthManager_1 = require("../../../lib/AuthManager");
+const index_1 = __importDefault(require("../index"));
+const RestClient_1 = __importDefault(require("../../../lib/RestClient"));
+const ChannelCoordinator_1 = __importDefault(require("./ChannelCoordinator"));
+class WrappedClient extends index_1.default {
+    constructor() {
+        super(...arguments);
+        this.interceptor = undefined;
+    }
+    intercept(interceptor) {
+        this.interceptor = interceptor;
+    }
+    emit(event, data) {
+        super.emit(event, data);
+        if (this.interceptor) {
+            this.interceptor(event, data);
+        }
+    }
+}
+class BrowserWebSocketClient extends RestClient_1.default {
+    constructor(baseUrl, auth, appId, supernetType, logger) {
+        const socketClient = new WrappedClient(baseUrl, auth, appId, supernetType, logger);
+        super(socketClient.baseUrl, auth, logger);
+        this._isConnected = false;
+        this.socketClient = socketClient;
+        this.appId = appId;
+        this.baseUrl = socketClient.baseUrl;
+        this._supernetType = supernetType;
+        this.coordinator = new ChannelCoordinator_1.default({
+            callbacks: {
+                onRoleChange: this.handleRoleChange.bind(this),
+                onMessage: this.handleMessage.bind(this),
+                onNotification: this.handleNotification.bind(this)
+            },
+            logger
+        });
+        this.auth.on('updated', this.handleAuthUpdated.bind(this));
+        this.socketClient.intercept(this.handleSocketEvent.bind(this));
+    }
+    get isConnected() {
+        return this.coordinator.isPrimary ? this.socketClient.isConnected : this._isConnected;
+    }
+    get supernetType() {
+        return this.coordinator.isPrimary ? this.socketClient.supernetType : this._supernetType;
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.coordinator.isReady();
+            if (this.coordinator.isPrimary) {
+                yield this.socketClient.connect();
+            }
+            else {
+                return this.coordinator.sendMessage({
+                    type: 'connect'
+                });
+            }
+        });
+    }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.coordinator.isReady();
+            if (this.coordinator.isPrimary) {
+                this.socketClient.disconnect();
+            }
+            else {
+                this.coordinator.sendMessage({
+                    type: 'disconnect'
+                });
+            }
+        });
+    }
+    switchNetwork(supernetType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.coordinator.isReady();
+            if (this.coordinator.isPrimary) {
+                return this.socketClient.switchNetwork(supernetType);
+            }
+            yield this.coordinator.sendMessage({
+                type: 'switchNetwork',
+                payload: supernetType
+            });
+            this._supernetType = supernetType;
+            return supernetType;
+        });
+    }
+    send(messageType, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.coordinator.isReady();
+            if (this.coordinator.isPrimary) {
+                if (!this.socketClient.isConnected) {
+                    yield this.socketClient.connect();
+                }
+                return this.socketClient.send(messageType, data);
+            }
+            return this.coordinator.sendMessage({
+                type: 'socket-send',
+                payload: { type: messageType, data }
+            });
+        });
+    }
+    handleMessage(message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._logger.debug('Received control message', message);
+            switch (message.type) {
+                case 'socket-send': {
+                    if (!this.socketClient.isConnected) {
+                        yield this.socketClient.connect();
+                    }
+                    return this.socketClient.send(message.payload.type, message.payload.data);
+                }
+                case 'connect': {
+                    if (!this.socketClient.isConnected) {
+                        yield this.socketClient.connect();
+                    }
+                    return;
+                }
+                case 'disconnect': {
+                    if (this.socketClient.isConnected) {
+                        this.socketClient.disconnect();
+                    }
+                    return;
+                }
+                case 'switchNetwork': {
+                    yield this.switchNetwork(message.payload);
+                    return;
+                }
+                default: {
+                    this._logger.error('Received unknown message type:', message);
+                }
+            }
+        });
+    }
+    handleNotification(notification) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._logger.debug('Received notification', notification.type, notification.payload);
+            switch (notification.type) {
+                case 'socket-event': {
+                    this.emit(notification.payload.type, notification.payload.data);
+                    return;
+                }
+                case 'auth-state-changed': {
+                    this.handleAuthChanged(notification.payload);
+                    return;
+                }
+                default: {
+                    this._logger.error('Received unknown notification type:', notification);
+                }
+            }
+        });
+    }
+    handleAuthChanged(isAuthenticated) {
+        if (this.auth instanceof AuthManager_1.TokenAuthManager) {
+            throw new Error('TokenAuthManager is not supported in multi client mode');
+        }
+        if (this.auth.isAuthenticated !== isAuthenticated) {
+            if (isAuthenticated) {
+                this.auth.authenticate();
+            }
+            else {
+                this.auth.clear();
+            }
+        }
+    }
+    handleSocketEvent(eventType, payload) {
+        if (this.coordinator.isPrimary) {
+            this.coordinator.notify({
+                type: 'socket-event',
+                payload: { type: eventType, data: payload }
+            });
+            this.emit(eventType, payload);
+        }
+    }
+    handleAuthUpdated(isAuthenticated) {
+        this.coordinator.notify({
+            type: 'auth-state-changed',
+            payload: isAuthenticated
+        });
+    }
+    handleRoleChange(isPrimary) {
+        if (isPrimary && !this.socketClient.isConnected && this.isConnected) {
+            this.socketClient.connect();
+        }
+        else if (!isPrimary && this.socketClient.isConnected) {
+            this.socketClient.disconnect();
+        }
+    }
+}
+exports.default = BrowserWebSocketClient;
+//# sourceMappingURL=index.js.map

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

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

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

@@ -44,6 +44,11 @@ export type JobProgressData = {
     step: number;
     stepCount: number;
 };
+export type JobETAData = {
+    jobID: string;
+    imgID?: string;
+    etaSeconds: number;
+};
 export type JobResultData = {
     jobID: string;
     imgID: string;
@@ -109,6 +114,11 @@ export type SocketEventMap = {
      * @event WebSocketClient#jobProgress - Job progress update
      */
     jobProgress: JobProgressData;
+    /**
+     * @event WebSocketClient#jobETA - Job ETA update (sent every second during inference by ComfyUI workers)
+     * Note: Only available for ComfyUI-based workers during video generation
+     */
+    jobETA: JobETAData;
     /**
      * @event WebSocketClient#jobResult - Job result received
      */
@@ -135,3 +145,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/index.js

@@ -80,7 +80,7 @@ class WebSocketClient extends RestClient_1.default {
         socket.onmessage = null;
         socket.onopen = null;
         this.stopPing();
-        socket.close();
+        socket.close(1000, 'Client disconnected');
     }
     startPing(socket) {
         if (!isNodejs_1.default) {
@@ -139,9 +139,16 @@ class WebSocketClient extends RestClient_1.default {
         this.emit('connected', { network: this._supernetType });
     }
     handleClose(e) {
-        if (e.target === this.socket) {
+        const socket = e.target;
+        socket.onerror = null;
+        socket.onmessage = null;
+        socket.onopen = null;
+        if (socket === this.socket || !this.socket) {
             this._logger.info('WebSocket disconnected, cleanup', e);
-            this.disconnect();
+            if (socket === this.socket) {
+                this.stopPing();
+                this.socket = null;
+            }
             this.emit('disconnected', {
                 code: e.code,
                 reason: e.reason
@@ -183,6 +190,9 @@ class WebSocketClient extends RestClient_1.default {
     }
     send(messageType, data) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isConnected) {
+                yield this.connect();
+            }
             yield this.waitForConnection();
             this._logger.debug('WebSocket send:', messageType, data);
             this.socket.send(JSON.stringify({ type: messageType, data: (0, base64_1.base64Encode)(JSON.stringify(data)) }));