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

package/dist/vim-web.js

@@ -49947,7 +49947,7 @@ async function loadFromVim(bfast2, settings2, onProgress) {
   }
   return vim;
 }
-let DeferredPromise$2 = class DeferredPromise extends Promise {
+let DeferredPromise$1 = class DeferredPromise extends Promise {
   constructor(executor = () => {
   }) {
     var _a2;
@@ -50010,8 +50010,8 @@ class VimRequest {
     __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();
@@ -50025,7 +50025,7 @@ class VimRequest {
       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) {
@@ -59719,7 +59719,6 @@ class SocketClient {
     __publicField(this, "_rpcCallId", 0);
     __publicField(this, "_reconnectTimeout");
     __publicField(this, "_connectionTimeout");
-    __publicField(this, "_retries", -1);
     __publicField(this, "_validateConnection");
     /**
      * Callback function to handle incoming video frames.
@@ -59730,7 +59729,7 @@ class SocketClient {
     __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);
@@ -59763,7 +59762,8 @@ class SocketClient {
    * @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.
@@ -59773,7 +59773,9 @@ class SocketClient {
   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)) {
@@ -59785,16 +59787,18 @@ class SocketClient {
         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);
       };
@@ -59817,15 +59821,15 @@ class SocketClient {
    * 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();
@@ -59906,29 +59910,30 @@ class SocketClient {
     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.
@@ -60301,31 +60306,6 @@ class Decoder {
     this._pendingFrame = frame;
   }
 }
-let DeferredPromise$1 = class DeferredPromise2 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);
@@ -60348,8 +60328,8 @@ class LoadError {
 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() {
@@ -60362,18 +60342,18 @@ let LoadRequest$1 = class LoadRequest {
       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);
@@ -61754,7 +61734,7 @@ class Viewer2 {
    * @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.
@@ -74997,7 +74977,7 @@ const bimInfoData = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
   __proto__: null,
   useBimInfo
 }, Symbol.toStringTag, { value: "Module" }));
-class DeferredPromise3 extends Promise {
+class DeferredPromise2 extends Promise {
   constructor(executor = () => {
   }) {
     var _a2;
@@ -75028,9 +75008,9 @@ class LoadRequest2 {
     __publicField(this, "_callbacks");
     __publicField(this, "_request");
     __publicField(this, "_progress", { loaded: 0, total: 0, all: /* @__PURE__ */ new Map() });
-    __publicField(this, "_progressPromise", new DeferredPromise3());
+    __publicField(this, "_progressPromise", new DeferredPromise2());
     __publicField(this, "_isDone", false);
-    __publicField(this, "_completionPromise", new DeferredPromise3());
+    __publicField(this, "_completionPromise", new DeferredPromise2());
     this.source = source;
     this._callbacks = callbacks;
     this.startRequest(source, settings2);
@@ -75051,7 +75031,7 @@ class LoadRequest2 {
     this._callbacks.onProgress(progress);
     this._progress = progress;
     this._progressPromise.resolve();
-    this._progressPromise = new DeferredPromise3();
+    this._progressPromise = new DeferredPromise2();
   }
   onSuccess() {
     this._callbacks.onDone();
@@ -75411,7 +75391,7 @@ function setComponentBehind(value) {
   }
 }
 function createWebglComponent(container, componentSettings = {}, viewerSettings = {}) {
-  const promise2 = new DeferredPromise3();
+  const promise2 = new DeferredPromise2();
   const cmpContainer = container instanceof HTMLElement ? createContainer(container) : container ?? createContainer();
   const viewer = new Viewer$1(viewerSettings);
   viewer.viewport.reparent(cmpContainer.gfx);
@@ -75874,7 +75854,7 @@ function getRequestErrorMessage(source, error) {
   }
 }
 function createUltraComponent(container) {
-  const promise2 = new DeferredPromise3();
+  const promise2 = new DeferredPromise2();
   const cmpContainer = container instanceof HTMLElement ? createContainer(container) : container ?? createContainer();
   const viewer = Viewer2.createWithCanvas(cmpContainer.gfx);
   const reactRoot = clientExports.createRoot(cmpContainer.ui);