neoctl 0.2.62 → 0.2.63

package/dist/web/index.js

@@ -855,7 +855,7 @@ export class WebRepl {
         });
         if (clientInfo)
             this.send(subscriber, "client.version", clientInfo);
-        this.send(subscriber, "sync", this.snapshot(true));
+        this.sendSubscriberSnapshot(subscriber, this.snapshot(true));
         this.publishRuntimeContext([subscriber]);
         reqKeepAlive(res);
         res.on("close", () => this.subscribers.delete(subscriber));
@@ -2707,7 +2707,7 @@ export class WebRepl {
             }
             if (subscriber.needsSync) {
                 subscriber.needsSync = false;
-                this.send(subscriber, "sync", this.snapshot(false));
+                this.sendSubscriberSnapshot(subscriber, this.snapshot(false));
             }
             if (subscriber.pendingFastModeFallback) {
                 const payload = subscriber.pendingFastModeFallback;
@@ -2773,7 +2773,8 @@ export class WebRepl {
         this.pendingDeltaTimer = undefined;
         if (this.pendingDeltaOperations.length === 0 && !this.pendingDeltaStatus)
             return;
-        const operations = compactLineOperations(this.pendingDeltaOperations);
+        const pending = this.pendingDeltaOperations;
+        const operations = compactLineOperations(pending);
         this.pendingDeltaOperations = [];
         this.pendingDeltaStatus = false;
         const payload = {
@@ -2782,8 +2783,12 @@ export class WebRepl {
             operations,
             status: this.timedStatus(),
         };
-        for (const subscriber of this.subscribers)
-            this.send(subscriber, "delta", payload);
+        for (const subscriber of this.subscribers) {
+            const offset = subscriber.snapshotDeltaOffset ?? 0;
+            subscriber.snapshotDeltaOffset = undefined;
+            // Text appends are not idempotent: skip operations its own snapshot already contains.
+            this.send(subscriber, "delta", offset > 0 ? { ...payload, operations: compactLineOperations(pending.slice(offset)) } : payload);
+        }
     }
     discardPendingDeltaOperations() {
         if (this.pendingDeltaTimer)
@@ -2791,6 +2796,13 @@ export class WebRepl {
         this.pendingDeltaTimer = undefined;
         this.pendingDeltaOperations = [];
         this.pendingDeltaStatus = false;
+        for (const subscriber of this.subscribers)
+            subscriber.snapshotDeltaOffset = undefined;
+    }
+    /** Snapshot for one subscriber; it already includes every currently queued delta operation. */
+    sendSubscriberSnapshot(subscriber, snapshot) {
+        subscriber.snapshotDeltaOffset = this.pendingDeltaOperations.length;
+        this.send(subscriber, "sync", snapshot);
     }
     dropInactiveTerminalOutput() {
         for (const sessionId of this.pendingTerminalOutput.keys()) {