@solarisdk/core 0.4.5 → 0.4.6

package/dist/handle.js

@@ -687,11 +687,10 @@ export class SessionHandle {
         if (!this.hooks.revert) {
             return Promise.reject(new Error("revert requires a client-created handle"));
         }
+        const hadSocket = this.channel.hasSocket;
         return this.hooks.revert(this.id, snapshotId).then(async () => {
-            if (this.channel.connected) {
-                this.close({ quiet: true });
-                await this.channel.connect().catch(() => undefined);
-            }
+            if (hadSocket)
+                await this.channel.refresh();
         });
     }
     async pause() {

package/dist/transport.d.ts

@@ -81,6 +81,17 @@ export declare class ControlChannel {
      * `commands.start` / `pty.create` survive so callers can re-subscribe.
      */
     reconnect(): Promise<void>;
+    /**
+     * Swap the socket for a fresh, working one after the guest behind it was replaced in place (revert). The old socket
+     * is detached first, so its close, arriving whenever it likes (it may even have arrived already), cannot fail calls
+     * made on the new connection. Right after a restore the host can still be re-accepting the guest's control
+     * connection and closes a connection opened in that window within milliseconds (seen on staging as the first call
+     * failing with 1000/1005), so the new connection is proven with a cheap request and re-dialled a few times before
+     * this resolves. Never rejects: if no working connection can be had, calls retry lazily.
+     */
+    refresh(): Promise<void>;
+    /** True while the channel holds a socket, open or not. */
+    get hasSocket(): boolean;
     /** Register a "channel closed" callback for a stream id (cmdId/ptyId) so a
      * drop rejects its in-flight wait. Cleared on the stream's terminal frame.
      *

package/dist/transport.js

@@ -2,6 +2,9 @@ import { ActionError, ConnectionError, SolariError, TimeoutError, } from "./erro
 import { openWebSocket } from "./ws.js";
 const DEFAULT_CALL_TIMEOUT_MS = 300_000;
 const CONNECT_TIMEOUT_MS = 15_000;
+const REFRESH_MAX_ATTEMPTS = 4;
+const REFRESH_RETRY_BASE_MS = 300;
+const REFRESH_PROBE_TIMEOUT_MS = 5_000;
 const CONNECT_MAX_ATTEMPTS = 3;
 const CONNECT_RETRY_BASE_MS = 150;
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
@@ -41,6 +44,7 @@ export class ControlChannel {
             return Promise.resolve();
         if (this.connecting)
             return this.connecting;
+        this.#detachSocket();
         this.closed = false;
         this.connecting = this.#connectWithRetry();
         return this.connecting;
@@ -117,15 +121,39 @@ export class ControlChannel {
     async reconnect() {
         if (this.connected)
             return;
-        if (this.ws) {
-            const old = this.ws;
-            this.ws = null;
-            this.#failAll(new ConnectionError("Control channel replaced by a reconnect"));
-            old.close();
-        }
+        this.#detachSocket();
         this.connecting = null;
         await this.connect();
     }
+    async refresh() {
+        for (let attempt = 1; attempt <= REFRESH_MAX_ATTEMPTS; attempt++) {
+            if (this.closed)
+                return;
+            try {
+                this.#detachSocket();
+                this.connecting = null;
+                await this.connect();
+                await this.#send("fs.stat", { path: "/" }, { timeoutMs: REFRESH_PROBE_TIMEOUT_MS });
+                return;
+            }
+            catch (err) {
+                if (!(err instanceof ConnectionError))
+                    return;
+                await sleep(REFRESH_RETRY_BASE_MS * attempt);
+            }
+        }
+    }
+    get hasSocket() {
+        return this.ws !== null;
+    }
+    #detachSocket() {
+        if (!this.ws)
+            return;
+        const old = this.ws;
+        this.ws = null;
+        this.#failAll(new ConnectionError("Control channel replaced by a reconnect"));
+        old.close();
+    }
     onStreamClose(id, cb) {
         if (this.closed || !this.ws || !this.ws.isOpen) {
             cb(new ConnectionError("Control channel closed"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarisdk/core",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Shared runtime for the Solari SDK \u2014 transport, session handles, images, templates, and types used by @solarisdk/desktop and @solarisdk/sandbox.",
   "type": "module",
   "main": "./dist/index.js",