vim-web 0.3.42-dev.3 → 0.3.42-dev.5

package/dist/types/core-viewers/ultra/viewer/socketClient.d.ts

@@ -5,6 +5,8 @@ export declare const DEFAULT_LOCAL_ULTRA_SERVER_URL = "ws://localhost:8123";
 export type ConnectionSettings = {
     url?: string;
     retries?: number;
+    timeout?: number;
+    retryDelay?: number;
 };
 export type ClientState = ClientStateConnecting | ClientStateConnected | ClientStateDisconnected | ClientStateValidating | ClientError;
 export type ClientError = ClientStateCompatibilityError | ClientStateConnectionError | ClientStreamError;
@@ -58,7 +60,6 @@ export declare class SocketClient {
     private _rpcCallId;
     private _reconnectTimeout;
     private _connectionTimeout;
-    private _retries;
     private _validateConnection;
     /**
      * Callback function to handle incoming video frames.
@@ -67,6 +68,8 @@ export declare class SocketClient {
     onVideoFrame: (msg: Protocol.VideoFrameMessage) => void;
     private _state;
     private _onStatusUpdate;
+    private _connectPromise;
+    private _connectionSettings;
     /**
      * Event that is triggered when the connection status updates.
      * @returns An event dispatcher for connection status updates.
@@ -82,8 +85,6 @@ export declare class SocketClient {
      * @param state - The new connection state.
      */
     private updateState;
-    private _connectPromise;
-    private _connectingUrl;
     /**
      * Gets the URL to which the messenger is currently connecting or connected.
      * @returns The WebSocket URL as a string, or undefined if not set.
@@ -100,7 +101,7 @@ export declare class SocketClient {
      * @param url - The WebSocket URL to connect to.
      * @returns A promise that resolves when the connection is established.
      */
-    connect(settings: ConnectionSettings): Promise<void>;
+    connect(settings: ConnectionSettings): Promise<boolean>;
     /**
      * Disconnects from the current WebSocket server.
      */

package/dist/types/core-viewers/ultra/viewer/viewer.d.ts

@@ -96,7 +96,7 @@ export declare class Viewer {
      * @param url - The server URL to connect to. Defaults to 'ws://localhost:8123'.
      * @returns A promise that resolves when the connection is established.
      */
-    connect(settings?: ConnectionSettings): Promise<void>;
+    connect(settings?: ConnectionSettings): Promise<boolean>;
     /**
      * Disconnects from the current VIM Ultra server.
      */

package/dist/vim-web.iife.js

@@ -49963,7 +49963,7 @@ void main() {
     }
     return vim;
   }
-  let DeferredPromise$2 = class DeferredPromise extends Promise {
+  let DeferredPromise$1 = class DeferredPromise extends Promise {
     constructor(executor = () => {
     }) {
       var _a2;
@@ -50026,8 +50026,8 @@ void main() {
       __publicField(this, "_error");
       // Promises to await progress updates and completion
       __publicField(this, "_progress", { loaded: 0, total: 0, all: /* @__PURE__ */ new Map() });
-      __publicField(this, "_progressPromise", new DeferredPromise$2());
-      __publicField(this, "_completionPromise", new DeferredPromise$2());
+      __publicField(this, "_progressPromise", new DeferredPromise$1());
+      __publicField(this, "_completionPromise", new DeferredPromise$1());
       this._source = source;
       this._settings = settings2;
       this.startRequest();
@@ -50041,7 +50041,7 @@ void main() {
         const vim = await open(this._bfast, this._settings, (progress) => {
           this._progress = progress;
           this._progressPromise.resolve(progress);
-          this._progressPromise = new DeferredPromise$2();
+          this._progressPromise = new DeferredPromise$1();
         });
         this._vimResult = vim;
       } catch (err) {
@@ -59735,7 +59735,6 @@ Averrage Date/Second ${avgDataRatePS} kb
       __publicField(this, "_rpcCallId", 0);
       __publicField(this, "_reconnectTimeout");
       __publicField(this, "_connectionTimeout");
-      __publicField(this, "_retries", -1);
       __publicField(this, "_validateConnection");
       /**
        * Callback function to handle incoming video frames.
@@ -59746,7 +59745,7 @@ Averrage Date/Second ${avgDataRatePS} kb
       __publicField(this, "_state", { status: "disconnected" });
       __publicField(this, "_onStatusUpdate", new distExports.SimpleEventDispatcher());
       __publicField(this, "_connectPromise", new ResolvedPromise(void 0));
-      __publicField(this, "_connectingUrl");
+      __publicField(this, "_connectionSettings");
       this._logger = logger;
       this._rpcCallId = 0;
       this._streamLogger = new StreamLogger(logger);
@@ -59779,7 +59778,8 @@ Averrage Date/Second ${avgDataRatePS} kb
      * @returns The WebSocket URL as a string, or undefined if not set.
      */
     get url() {
-      return this._connectingUrl;
+      var _a2;
+      return (_a2 = this._connectionSettings) == null ? void 0 : _a2.url;
     }
     /**
      * Connects to a WebSocket server at the specified URL.
@@ -59789,7 +59789,9 @@ Averrage Date/Second ${avgDataRatePS} kb
     connect(settings2) {
       settings2 = {
         url: (settings2 == null ? void 0 : settings2.url) ?? DEFAULT_LOCAL_ULTRA_SERVER_URL,
-        retries: (settings2 == null ? void 0 : settings2.retries) ?? 0
+        retries: (settings2 == null ? void 0 : settings2.retries) ?? -1,
+        timeout: (settings2 == null ? void 0 : settings2.timeout) ?? 5e3,
+        retryDelay: (settings2 == null ? void 0 : settings2.retryDelay) ?? 5e3
       };
       const url = settings2.url;
       if (!isWebSocketUrl(url)) {
@@ -59801,16 +59803,18 @@ Averrage Date/Second ${avgDataRatePS} kb
           return this._connectPromise.promise;
         } else {
           this._clearSocket();
+          this._connectionSettings = void 0;
           this._connectPromise.reject("Connection to a different server");
         }
       }
-      this._connectPromise = new ControllablePromise();
-      this._connectingUrl = settings2.url;
-      this._retries = settings2.retries;
+      if (this.url !== url) {
+        this._connectPromise = new ControllablePromise();
+        this._connectionSettings = settings2;
+      }
       this.updateState({ status: "connecting" });
       try {
         this._socket = new WebSocket(url);
-        this._connectionTimeout = setTimeout(() => this._onClose(), 5e3);
+        this._connectionTimeout = setTimeout(() => this._onClose(), settings2.timeout);
         this._socket.onopen = (e) => {
           this._onOpen(e);
         };
@@ -59833,15 +59837,15 @@ Averrage Date/Second ${avgDataRatePS} kb
      * Disconnects from the current WebSocket server.
      */
     disconnect(error) {
-      this._logger.log("Disconnecting from: ", this._connectingUrl);
-      this._connectingUrl = void 0;
+      this._logger.log("Disconnecting from: ", this.url);
+      this._connectionSettings = void 0;
       this._disconnect(error);
     }
     /**
      * Handles the disconnection logic, stopping logging and clearing the socket.
      */
     _disconnect(error) {
-      console.log("disconnect", error);
+      this._logger.log("disconnect", error);
       clearTimeout(this._reconnectTimeout);
       clearTimeout(this._connectionTimeout);
       this._streamLogger.stopLogging();
@@ -59922,29 +59926,30 @@ Averrage Date/Second ${avgDataRatePS} kb
       this._logger.log("Connected to: ", (_a2 = this._socket) == null ? void 0 : _a2.url);
       this.updateState({ status: "connected" });
       this._streamLogger.startLoggging();
-      this._connectPromise.resolve();
+      this._connectPromise.resolve(true);
     }
     /**
      * Handler for WebSocket 'close' event.
      * @param _event - The event object.
      */
     _onClose(_event) {
+      const connecting = this.state.status === "connecting" || this.state.status === "validating";
       this._logger.log("WebSocket closed.");
       clearTimeout(this._connectionTimeout);
-      this._disconnect({ status: "error", error: "connection", serverUrl: this._connectingUrl });
-      if (this._retries === 0) {
+      this._disconnect({ status: "error", error: "connection", serverUrl: this.url });
+      if (connecting && this._connectionSettings.retries === 0) {
         this._logger.log("No more retries left");
-        this._connectPromise.resolve();
+        this._connectPromise.resolve(false);
         return;
       }
       this._logger.log("Attempting to reconnect in 5 seconds");
       this._reconnectTimeout = setTimeout(() => {
         this.updateState({ status: "connecting" });
-        this.connect({
-          url: this._connectingUrl,
-          retries: this._retries - 1
-        });
-      }, 5e3);
+        if (connecting) {
+          this._connectionSettings.retries--;
+        }
+        this.connect(this._connectionSettings);
+      }, this._connectionSettings.retryDelay);
     }
     /**
      * Sends binary data over the WebSocket connection.
@@ -60317,31 +60322,6 @@ Averrage Date/Second ${avgDataRatePS} kb
       this._pendingFrame = frame;
     }
   }
-  let DeferredPromise$1 = class DeferredPromise extends Promise {
-    constructor(executor = () => {
-    }) {
-      var _a2;
-      let resolver;
-      let rejector;
-      super((resolve, reject) => {
-        resolver = resolve;
-        rejector = reject;
-        return executor(resolve, reject);
-      });
-      __publicField(this, "resolve");
-      __publicField(this, "reject");
-      __publicField(this, "initialCallStack");
-      this.resolve = resolver;
-      this.reject = rejector;
-      this.initialCallStack = (_a2 = Error().stack) == null ? void 0 : _a2.split("\n").slice(2).join("\n");
-    }
-    /** @throws error with amended call stack */
-    rejectWithError(error) {
-      var _a2;
-      error.stack = [(_a2 = error.stack) == null ? void 0 : _a2.split("\n")[0], this.initialCallStack].join("\n");
-      this.reject(error);
-    }
-  };
   class LoadSuccess {
     constructor(vim) {
       __publicField(this, "isError", false);
@@ -60364,8 +60344,8 @@ Averrage Date/Second ${avgDataRatePS} kb
   let LoadRequest$1 = class LoadRequest {
     constructor() {
       __publicField(this, "_progress", 0);
-      __publicField(this, "_progressPromise", new DeferredPromise$1());
-      __publicField(this, "_completionPromise", new DeferredPromise$1());
+      __publicField(this, "_progressPromise", new ControllablePromise());
+      __publicField(this, "_completionPromise", new ControllablePromise());
       __publicField(this, "_result");
     }
     get isCompleted() {
@@ -60378,18 +60358,18 @@ Averrage Date/Second ${avgDataRatePS} kb
         return;
       }
       while (this._result === void 0) {
-        await this._progressPromise;
+        await this._progressPromise.promise;
         yield this._progress;
       }
     }
     async getResult() {
-      await this._completionPromise;
+      await this._completionPromise.promise;
       return this._result;
     }
     onProgress(progress) {
       this._progress = progress;
       this._progressPromise.resolve();
-      this._progressPromise = new DeferredPromise$1();
+      this._progressPromise = new ControllablePromise();
     }
     success(vim) {
       this._result = new LoadSuccess(vim);
@@ -61770,7 +61750,7 @@ Averrage Date/Second ${avgDataRatePS} kb
      * @returns A promise that resolves when the connection is established.
      */
     async connect(settings2) {
-      await this._socketClient.connect(settings2);
+      return this._socketClient.connect(settings2);
     }
     /**
      * Disconnects from the current VIM Ultra server.