@anvil-works/anvil-cli 0.4.1 → 0.4.2

package/dist/cli.js

@@ -47506,9 +47506,15 @@ var __webpack_exports__ = {};
         username;
         reconnectAttempts = 0;
         reconnectTimer = null;
+        heartbeatTimer = null;
+        pongTimeoutTimer = null;
+        reconnectDelayMs;
+        isClosing = false;
         sessionId;
-        MAX_RECONNECT_ATTEMPTS = 5;
-        RECONNECT_DELAY = 5000;
+        RECONNECT_DELAY_BASE_MS = 5000;
+        RECONNECT_DELAY_MAX_MS = 60000;
+        HEARTBEAT_INTERVAL_MS = 30000;
+        HEARTBEAT_TIMEOUT_MS = 10000;
         constructor(options){
             super();
             this.appId = options.appId;
@@ -47518,12 +47524,14 @@ var __webpack_exports__ = {};
             this.editSession = options.editSession;
             this.username = options.username;
             this.sessionId = Math.random().toString(36).substring(2, 10);
+            this.reconnectDelayMs = this.RECONNECT_DELAY_BASE_MS;
         }
         async connect() {
+            this.isClosing = false;
             if (this.ws?.readyState === ws_wrapper.OPEN) return void logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket already open, skipping connection");
             if (this.ws) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing existing WebSocket before reconnecting");
-                this.close();
+                this.teardownSocket();
             }
             this.authToken = await auth_getValidAuthToken(this.anvilUrl, this.username);
             const wsUrl = getWebSocketUrl(this.appId, this.authToken, this.anvilUrl);
@@ -47533,6 +47541,8 @@ var __webpack_exports__ = {};
                 logger_logger.verbose(chalk_source.green("🔌 Connected to Anvil WebSocket"));
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket opened");
                 this.reconnectAttempts = 0;
+                this.reconnectDelayMs = this.RECONNECT_DELAY_BASE_MS;
+                this.startHeartbeat();
                 const subscribeMsg = {
                     cmd: "WATCH_APP",
                     app: this.appId,
@@ -47543,6 +47553,7 @@ var __webpack_exports__ = {};
                 this.emit("connected", void 0);
             });
             this.ws.on("message", (data)=>{
+                this.markSocketResponsive();
                 try {
                     const msg = JSON.parse(data.toString());
                     logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Message: ${JSON.stringify(msg)}`);
@@ -47551,8 +47562,12 @@ var __webpack_exports__ = {};
                     logger_logger.error(chalk_source.red(`Failed to parse WebSocket message: ${error.message}`));
                 }
             });
+            this.ws.on("pong", ()=>{
+                this.markSocketResponsive();
+            });
             this.ws.on("close", (code, reason)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Closed: code=${code}, reason=${reason.toString()}`);
+                this.stopHeartbeat();
                 this.ws = null;
                 if (1008 === code || reason.toString().includes("unauthenticated")) {
                     logger_logger.warn(chalk_source.yellow(" WebSocket authentication failed - changes from the Anvil Editor won't be detected"));
@@ -47560,21 +47575,12 @@ var __webpack_exports__ = {};
                     this.emit("auth-failed", void 0);
                     return;
                 }
+                if (this.isClosing) return;
                 this.emit("disconnected", {
                     code,
                     reason: reason.toString()
                 });
-                if (this.reconnectAttempts < this.MAX_RECONNECT_ATTEMPTS) {
-                    this.reconnectAttempts++;
-                    logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${this.RECONNECT_DELAY / 1000}s (attempt ${this.reconnectAttempts}/${this.MAX_RECONNECT_ATTEMPTS})...`));
-                    this.reconnectTimer = setTimeout(()=>{
-                        this.connect().catch((error)=>{
-                            this.emit("error", {
-                                error: error instanceof Error ? error : new Error(String(error))
-                            });
-                        });
-                    }, this.RECONNECT_DELAY);
-                } else logger_logger.warn(chalk_source.yellow(` WebSocket reconnection failed after ${this.MAX_RECONNECT_ATTEMPTS} attempts - changes from the Anvil Editor won't be detected`));
+                this.scheduleReconnect();
             });
             this.ws.on("error", (error)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Error: ${error.message}`);
@@ -47619,24 +47625,74 @@ var __webpack_exports__ = {};
             return this.editSession;
         }
         close() {
+            this.isClosing = true;
             if (this.reconnectTimer) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Clearing reconnect timer");
                 clearTimeout(this.reconnectTimer);
                 this.reconnectTimer = null;
             }
-            if (this.ws) {
+            this.teardownSocket();
+        }
+        isConnected() {
+            return this.ws?.readyState === ws_wrapper.OPEN;
+        }
+        scheduleReconnect() {
+            if (this.reconnectTimer || this.isClosing) return;
+            this.reconnectAttempts++;
+            const delayMs = this.reconnectDelayMs;
+            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${Math.round(delayMs / 1000)}s (attempt ${this.reconnectAttempts})...`));
+            this.reconnectTimer = setTimeout(()=>{
+                this.reconnectTimer = null;
+                this.connect().catch((error)=>{
+                    this.emit("error", {
+                        error: error instanceof Error ? error : new Error(String(error))
+                    });
+                });
+            }, delayMs);
+            this.reconnectDelayMs = Math.min(Math.round(1.5 * this.reconnectDelayMs), this.RECONNECT_DELAY_MAX_MS);
+        }
+        startHeartbeat() {
+            this.stopHeartbeat();
+            this.heartbeatTimer = setInterval(()=>{
+                const ws = this.ws;
+                if (!ws || ws.readyState !== ws_wrapper.OPEN) return;
                 try {
-                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing WebSocket");
-                    this.ws.removeAllListeners();
-                    if (this.ws.readyState === ws_wrapper.OPEN) this.ws.close();
-                } catch (e) {
-                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Error closing WebSocket (ignoring):", e);
+                    ws.ping();
+                } catch (error) {
+                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Failed to send ping: ${error.message}`);
+                    ws.terminate();
+                    return;
                 }
-                this.ws = null;
+                this.pongTimeoutTimer = setTimeout(()=>{
+                    logger_logger.warn(chalk_source.yellow(" WebSocket heartbeat timed out - reconnecting"));
+                    ws.terminate();
+                }, this.HEARTBEAT_TIMEOUT_MS);
+            }, this.HEARTBEAT_INTERVAL_MS);
+        }
+        markSocketResponsive() {
+            if (this.pongTimeoutTimer) {
+                clearTimeout(this.pongTimeoutTimer);
+                this.pongTimeoutTimer = null;
             }
         }
-        isConnected() {
-            return this.ws?.readyState === ws_wrapper.OPEN;
+        stopHeartbeat() {
+            if (this.heartbeatTimer) {
+                clearInterval(this.heartbeatTimer);
+                this.heartbeatTimer = null;
+            }
+            this.markSocketResponsive();
+        }
+        teardownSocket() {
+            this.stopHeartbeat();
+            if (!this.ws) return;
+            try {
+                logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing WebSocket");
+                this.ws.removeAllListeners();
+                if (this.ws.readyState === ws_wrapper.OPEN || this.ws.readyState === ws_wrapper.CONNECTING) this.ws.terminate();
+            } catch (e) {
+                logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Error closing WebSocket (ignoring):", e);
+            }
+            this.ws = null;
         }
     }
     async function detectRemoteChanges(gitService, oldCommitId, newCommitId) {
@@ -49364,7 +49420,11 @@ var __webpack_exports__ = {};
         wsClient = null;
         saveProcessor = null;
         syncManager = null;
+        localChangePollTimer = null;
+        isPollingLocalChanges = false;
+        lastLocalStatusFingerprint = null;
         BRANCH_CHANGE_SETTLE_MS = 2000;
+        LOCAL_CHANGE_POLL_MS = 2000;
         stagedOnly;
         constructor(repoPath, appId, options){
             super();
@@ -49502,6 +49562,10 @@ var __webpack_exports__ = {};
                 this.fileWatcher.cleanup();
                 this.fileWatcher = null;
             }
+            if (this.localChangePollTimer) {
+                clearInterval(this.localChangePollTimer);
+                this.localChangePollTimer = null;
+            }
             logger_logger.debug(`[Session ${this.sessionId}]`, "Cleanup complete");
         }
         async startWatching() {
@@ -49535,8 +49599,70 @@ var __webpack_exports__ = {};
                 }
             });
             await this.fileWatcher.start(this.currentBranch);
+            await this.initializeLocalChangeFingerprint();
+            this.startLocalChangeFallbackPolling();
             await new Promise(()=>{});
         }
+        async initializeLocalChangeFingerprint() {
+            if (this.stagedOnly) return;
+            try {
+                const status = await this.gitService.getStatus();
+                this.lastLocalStatusFingerprint = this.getLocalStatusFingerprint(status);
+            } catch (error) {
+                logger_logger.debug(`[Session ${this.sessionId}]`, `Failed to initialize local change fingerprint: ${error.message}`);
+            }
+        }
+        startLocalChangeFallbackPolling() {
+            if (this.stagedOnly || this.localChangePollTimer) return;
+            this.localChangePollTimer = setInterval(()=>{
+                this.pollForMissedLocalChanges();
+            }, this.LOCAL_CHANGE_POLL_MS);
+        }
+        async pollForMissedLocalChanges() {
+            if (this.isCleanedUp || this.isPausedForUserInput || this.isPollingLocalChanges) return;
+            this.isPollingLocalChanges = true;
+            try {
+                const status = await this.gitService.getStatus();
+                const fingerprint = this.getLocalStatusFingerprint(status);
+                if (null === this.lastLocalStatusFingerprint) {
+                    this.lastLocalStatusFingerprint = fingerprint;
+                    return;
+                }
+                if (fingerprint !== this.lastLocalStatusFingerprint) {
+                    this.lastLocalStatusFingerprint = fingerprint;
+                    if (fingerprint) {
+                        logger_logger.debug(`[Session ${this.sessionId}]`, "Detected local change via fallback status poll");
+                        this.saveProcessor?.queueSave();
+                    }
+                }
+            } catch (error) {
+                logger_logger.debug(`[Session ${this.sessionId}]`, `Fallback status poll failed: ${error.message}`);
+            } finally{
+                this.isPollingLocalChanges = false;
+            }
+        }
+        getLocalStatusFingerprint(status) {
+            const renamed = status.renamed.map((r)=>`${r.from}->${r.to}`).sort();
+            const modified = [
+                ...status.modified
+            ].sort();
+            const notAdded = [
+                ...status.notAdded
+            ].sort();
+            const created = [
+                ...status.created
+            ].sort();
+            const deleted = [
+                ...status.deleted
+            ].sort();
+            return [
+                ...renamed.map((r)=>`R:${r}`),
+                ...modified.map((m)=>`M:${m}`),
+                ...notAdded.map((n)=>`N:${n}`),
+                ...created.map((c)=>`C:${c}`),
+                ...deleted.map((d)=>`D:${d}`)
+            ].join("|");
+        }
         async handleFileChange(event, filePath, relativePath) {
             if (this.isCleanedUp || this.isPausedForUserInput) return;
             logger_logger.verbose(chalk_source.blue("File changed: ") + chalk_source.bold(relativePath));

package/dist/index.js

@@ -22643,9 +22643,15 @@ var __webpack_exports__ = {};
         username;
         reconnectAttempts = 0;
         reconnectTimer = null;
+        heartbeatTimer = null;
+        pongTimeoutTimer = null;
+        reconnectDelayMs;
+        isClosing = false;
         sessionId;
-        MAX_RECONNECT_ATTEMPTS = 5;
-        RECONNECT_DELAY = 5000;
+        RECONNECT_DELAY_BASE_MS = 5000;
+        RECONNECT_DELAY_MAX_MS = 60000;
+        HEARTBEAT_INTERVAL_MS = 30000;
+        HEARTBEAT_TIMEOUT_MS = 10000;
         constructor(options){
             super();
             this.appId = options.appId;
@@ -22655,12 +22661,14 @@ var __webpack_exports__ = {};
             this.editSession = options.editSession;
             this.username = options.username;
             this.sessionId = Math.random().toString(36).substring(2, 10);
+            this.reconnectDelayMs = this.RECONNECT_DELAY_BASE_MS;
         }
         async connect() {
+            this.isClosing = false;
             if (this.ws?.readyState === ws_wrapper.OPEN) return void logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket already open, skipping connection");
             if (this.ws) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing existing WebSocket before reconnecting");
-                this.close();
+                this.teardownSocket();
             }
             this.authToken = await auth_getValidAuthToken(this.anvilUrl, this.username);
             const wsUrl = getWebSocketUrl(this.appId, this.authToken, this.anvilUrl);
@@ -22670,6 +22678,8 @@ var __webpack_exports__ = {};
                 logger_logger.verbose(chalk_source.green("🔌 Connected to Anvil WebSocket"));
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "WebSocket opened");
                 this.reconnectAttempts = 0;
+                this.reconnectDelayMs = this.RECONNECT_DELAY_BASE_MS;
+                this.startHeartbeat();
                 const subscribeMsg = {
                     cmd: "WATCH_APP",
                     app: this.appId,
@@ -22680,6 +22690,7 @@ var __webpack_exports__ = {};
                 this.emit("connected", void 0);
             });
             this.ws.on("message", (data)=>{
+                this.markSocketResponsive();
                 try {
                     const msg = JSON.parse(data.toString());
                     logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Message: ${JSON.stringify(msg)}`);
@@ -22688,8 +22699,12 @@ var __webpack_exports__ = {};
                     logger_logger.error(chalk_source.red(`Failed to parse WebSocket message: ${error.message}`));
                 }
             });
+            this.ws.on("pong", ()=>{
+                this.markSocketResponsive();
+            });
             this.ws.on("close", (code, reason)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Closed: code=${code}, reason=${reason.toString()}`);
+                this.stopHeartbeat();
                 this.ws = null;
                 if (1008 === code || reason.toString().includes("unauthenticated")) {
                     logger_logger.warn(chalk_source.yellow(" WebSocket authentication failed - changes from the Anvil Editor won't be detected"));
@@ -22697,21 +22712,12 @@ var __webpack_exports__ = {};
                     this.emit("auth-failed", void 0);
                     return;
                 }
+                if (this.isClosing) return;
                 this.emit("disconnected", {
                     code,
                     reason: reason.toString()
                 });
-                if (this.reconnectAttempts < this.MAX_RECONNECT_ATTEMPTS) {
-                    this.reconnectAttempts++;
-                    logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${this.RECONNECT_DELAY / 1000}s (attempt ${this.reconnectAttempts}/${this.MAX_RECONNECT_ATTEMPTS})...`));
-                    this.reconnectTimer = setTimeout(()=>{
-                        this.connect().catch((error)=>{
-                            this.emit("error", {
-                                error: error instanceof Error ? error : new Error(String(error))
-                            });
-                        });
-                    }, this.RECONNECT_DELAY);
-                } else logger_logger.warn(chalk_source.yellow(` WebSocket reconnection failed after ${this.MAX_RECONNECT_ATTEMPTS} attempts - changes from the Anvil Editor won't be detected`));
+                this.scheduleReconnect();
             });
             this.ws.on("error", (error)=>{
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Error: ${error.message}`);
@@ -22756,24 +22762,74 @@ var __webpack_exports__ = {};
             return this.editSession;
         }
         close() {
+            this.isClosing = true;
             if (this.reconnectTimer) {
                 logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Clearing reconnect timer");
                 clearTimeout(this.reconnectTimer);
                 this.reconnectTimer = null;
             }
-            if (this.ws) {
+            this.teardownSocket();
+        }
+        isConnected() {
+            return this.ws?.readyState === ws_wrapper.OPEN;
+        }
+        scheduleReconnect() {
+            if (this.reconnectTimer || this.isClosing) return;
+            this.reconnectAttempts++;
+            const delayMs = this.reconnectDelayMs;
+            logger_logger.verbose(chalk_source.gray(`WebSocket disconnected, reconnecting in ${Math.round(delayMs / 1000)}s (attempt ${this.reconnectAttempts})...`));
+            this.reconnectTimer = setTimeout(()=>{
+                this.reconnectTimer = null;
+                this.connect().catch((error)=>{
+                    this.emit("error", {
+                        error: error instanceof Error ? error : new Error(String(error))
+                    });
+                });
+            }, delayMs);
+            this.reconnectDelayMs = Math.min(Math.round(1.5 * this.reconnectDelayMs), this.RECONNECT_DELAY_MAX_MS);
+        }
+        startHeartbeat() {
+            this.stopHeartbeat();
+            this.heartbeatTimer = setInterval(()=>{
+                const ws = this.ws;
+                if (!ws || ws.readyState !== ws_wrapper.OPEN) return;
                 try {
-                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing WebSocket");
-                    this.ws.removeAllListeners();
-                    if (this.ws.readyState === ws_wrapper.OPEN) this.ws.close();
-                } catch (e) {
-                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Error closing WebSocket (ignoring):", e);
+                    ws.ping();
+                } catch (error) {
+                    logger_logger.debug(`[WebSocket ${this.sessionId}]`, `Failed to send ping: ${error.message}`);
+                    ws.terminate();
+                    return;
                 }
-                this.ws = null;
+                this.pongTimeoutTimer = setTimeout(()=>{
+                    logger_logger.warn(chalk_source.yellow(" WebSocket heartbeat timed out - reconnecting"));
+                    ws.terminate();
+                }, this.HEARTBEAT_TIMEOUT_MS);
+            }, this.HEARTBEAT_INTERVAL_MS);
+        }
+        markSocketResponsive() {
+            if (this.pongTimeoutTimer) {
+                clearTimeout(this.pongTimeoutTimer);
+                this.pongTimeoutTimer = null;
             }
         }
-        isConnected() {
-            return this.ws?.readyState === ws_wrapper.OPEN;
+        stopHeartbeat() {
+            if (this.heartbeatTimer) {
+                clearInterval(this.heartbeatTimer);
+                this.heartbeatTimer = null;
+            }
+            this.markSocketResponsive();
+        }
+        teardownSocket() {
+            this.stopHeartbeat();
+            if (!this.ws) return;
+            try {
+                logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Closing WebSocket");
+                this.ws.removeAllListeners();
+                if (this.ws.readyState === ws_wrapper.OPEN || this.ws.readyState === ws_wrapper.CONNECTING) this.ws.terminate();
+            } catch (e) {
+                logger_logger.debug(`[WebSocket ${this.sessionId}]`, "Error closing WebSocket (ignoring):", e);
+            }
+            this.ws = null;
         }
     }
     async function detectRemoteChanges(gitService, oldCommitId, newCommitId) {
@@ -25000,7 +25056,11 @@ var __webpack_exports__ = {};
         wsClient = null;
         saveProcessor = null;
         syncManager = null;
+        localChangePollTimer = null;
+        isPollingLocalChanges = false;
+        lastLocalStatusFingerprint = null;
         BRANCH_CHANGE_SETTLE_MS = 2000;
+        LOCAL_CHANGE_POLL_MS = 2000;
         stagedOnly;
         constructor(repoPath, appId, options){
             super();
@@ -25138,6 +25198,10 @@ var __webpack_exports__ = {};
                 this.fileWatcher.cleanup();
                 this.fileWatcher = null;
             }
+            if (this.localChangePollTimer) {
+                clearInterval(this.localChangePollTimer);
+                this.localChangePollTimer = null;
+            }
             logger_logger.debug(`[Session ${this.sessionId}]`, "Cleanup complete");
         }
         async startWatching() {
@@ -25171,8 +25235,70 @@ var __webpack_exports__ = {};
                 }
             });
             await this.fileWatcher.start(this.currentBranch);
+            await this.initializeLocalChangeFingerprint();
+            this.startLocalChangeFallbackPolling();
             await new Promise(()=>{});
         }
+        async initializeLocalChangeFingerprint() {
+            if (this.stagedOnly) return;
+            try {
+                const status = await this.gitService.getStatus();
+                this.lastLocalStatusFingerprint = this.getLocalStatusFingerprint(status);
+            } catch (error) {
+                logger_logger.debug(`[Session ${this.sessionId}]`, `Failed to initialize local change fingerprint: ${error.message}`);
+            }
+        }
+        startLocalChangeFallbackPolling() {
+            if (this.stagedOnly || this.localChangePollTimer) return;
+            this.localChangePollTimer = setInterval(()=>{
+                this.pollForMissedLocalChanges();
+            }, this.LOCAL_CHANGE_POLL_MS);
+        }
+        async pollForMissedLocalChanges() {
+            if (this.isCleanedUp || this.isPausedForUserInput || this.isPollingLocalChanges) return;
+            this.isPollingLocalChanges = true;
+            try {
+                const status = await this.gitService.getStatus();
+                const fingerprint = this.getLocalStatusFingerprint(status);
+                if (null === this.lastLocalStatusFingerprint) {
+                    this.lastLocalStatusFingerprint = fingerprint;
+                    return;
+                }
+                if (fingerprint !== this.lastLocalStatusFingerprint) {
+                    this.lastLocalStatusFingerprint = fingerprint;
+                    if (fingerprint) {
+                        logger_logger.debug(`[Session ${this.sessionId}]`, "Detected local change via fallback status poll");
+                        this.saveProcessor?.queueSave();
+                    }
+                }
+            } catch (error) {
+                logger_logger.debug(`[Session ${this.sessionId}]`, `Fallback status poll failed: ${error.message}`);
+            } finally{
+                this.isPollingLocalChanges = false;
+            }
+        }
+        getLocalStatusFingerprint(status) {
+            const renamed = status.renamed.map((r)=>`${r.from}->${r.to}`).sort();
+            const modified = [
+                ...status.modified
+            ].sort();
+            const notAdded = [
+                ...status.notAdded
+            ].sort();
+            const created = [
+                ...status.created
+            ].sort();
+            const deleted = [
+                ...status.deleted
+            ].sort();
+            return [
+                ...renamed.map((r)=>`R:${r}`),
+                ...modified.map((m)=>`M:${m}`),
+                ...notAdded.map((n)=>`N:${n}`),
+                ...created.map((c)=>`C:${c}`),
+                ...deleted.map((d)=>`D:${d}`)
+            ].join("|");
+        }
         async handleFileChange(event, filePath, relativePath) {
             if (this.isCleanedUp || this.isPausedForUserInput) return;
             logger_logger.verbose(chalk_source.blue("File changed: ") + chalk_source.bold(relativePath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",