@hydranium/client-theia 1.0.0-next.183 → 1.0.0-next.187

package/lib/node/session-bound-frontend-connection-service.d.ts

@@ -6,9 +6,14 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { AbstractChannel } from '@theia/core/lib/common/message-rpc/channel';
+import { type WriteBuffer } from '@theia/core/lib/common/message-rpc/message-buffer';
 import { WebsocketFrontendConnectionService } from '@theia/core/lib/node/messaging/websocket-frontend-connection-service';
 import { type interfaces } from '@theia/core/shared/inversify';
 import { type ConnectionResilienceOptions } from '../common/connection-resilience-options';
+import { FramedSocketWriteBuffer } from '../common/framed-socket-write-buffer';
+import { InboundMessageSequence } from '../common/inbound-message-sequence';
 /**
  * Socket Theia hands the disconnect handler, read off the base signature rather
  * than imported, which spares a direct `socket.io` dependency carried purely
@@ -26,6 +31,29 @@ export type FrontendSocket = Parameters<WebsocketFrontendConnectionService['hand
  * even be using.
  */
 export type FrontendChannel = Parameters<WebsocketFrontendConnectionService['handleSocketDisconnect']>[1];
+/**
+ * The server end of one frontend's session, carried across the sockets the
+ * frontend reconnects on.
+ *
+ * Theia's own channel sends straight into any socket that reports itself
+ * connected. A socket whose far end died unnoticed still does, so whatever is
+ * sent until the server notices is lost. This one numbers and keeps every
+ * message through {@link FramedSocketWriteBuffer}, resends what is still
+ * unacknowledged when the frontend reconnects, and drops what it has received
+ * twice. Otherwise it behaves as Theia's.
+ */
+export declare class AcknowledgedSocketChannel extends AbstractChannel {
+    protected readonly socketBuffer: FramedSocketWriteBuffer;
+    protected socket: FrontendSocket | undefined;
+    protected socketDisposables: DisposableCollection;
+    protected readonly inbound: InboundMessageSequence;
+    constructor(socketBuffer: FramedSocketWriteBuffer);
+    /** Flushes in the same step that attaches the listeners, so nothing new can overtake the resend. */
+    connect(socket: FrontendSocket): void;
+    disconnect(): void;
+    drainBuffer(): void;
+    getWriteBuffer(): WriteBuffer;
+}
 /**
  * Ignores a disconnect from a socket that no longer belongs to the frontend.
  *
@@ -54,6 +82,19 @@ export declare class SessionBoundFrontendConnectionService extends WebsocketFron
     /** When a frontend's live socket went away, so the reconnect gap can be reported. */
     protected readonly offlineSince: Map<string, number>;
     handleSocketDisconnect(socket: FrontendSocket, channel: FrontendChannel, frontEndId: string): void;
+    /**
+     * Theia's body, building an {@link AcknowledgedSocketChannel} in place of its own channel.
+     *
+     * Handed over through a cast, because Theia types the slot as its own channel class. The cast
+     * also hides from the compiler what Theia calls on the channel, so a release that calls a member
+     * this one lacks fails at runtime: re-diff with the disconnect handler.
+     */
+    protected createConnection(socket: FrontendSocket, frontEndId: string): FrontendChannel;
+    /**
+     * One buffer per session, from the container Theia resolves its own channel's buffer from.
+     * Reached through a structural view because Theia 1.70 does not declare `container`.
+     */
+    protected createWriteBuffer(): FramedSocketWriteBuffer;
     protected closeConnection(frontEndId: string, reason: string): void;
     /** Mirrors Theia's private `frontendConnectionTimeout`, including `Number('')` resolving to 0.
      *  Private there, so the copy is forced; re-diff it with the handler above. */

package/lib/node/session-bound-frontend-connection-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-bound-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../src/node/session-bound-frontend-connection-service.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,OAAO,EAAE,kCAAkC,EAAE,MAAM,sEAAsE,CAAC;AAC1H,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAQ3F;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,kCAAkC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzG;;;;;;;;;GASG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,kCAAkC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1G;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBACa,qCAAsC,SAAQ,kCAAkC;IAC1F,wFAAwF;IACxF,SAAS,CAAC,QAAQ,CAAC,QAAQ;kBAA+B,MAAM;iBAAW,MAAM;OAAM;IACvF,qFAAqF;IACrF,SAAS,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IAEnD,sBAAsB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAwC1G;IAED,UAAmB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAK3E;IAED;mFAC+E;IAC/E,SAAS,CAAC,iBAAiB,IAAI,MAAM,CAMpC;CACH;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACrC,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,EACzB,OAAO,GAAE,2BAAgC,GACzC,OAAO,CAST"}
+{"version":3,"file":"session-bound-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../src/node/session-bound-frontend-connection-service.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAc,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAIrF,OAAO,EAAE,kCAAkC,EAAE,MAAM,sEAAsE,CAAC;AAC1H,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAC3F,OAAO,EAGJ,uBAAuB,EAGzB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAyB,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEnG;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,kCAAkC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzG;;;;;;;;;GASG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,kCAAkC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1G;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,SAAQ,eAAe;IAK/C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,uBAAuB;IAJpE,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,CAAC;IAC7C,SAAS,CAAC,iBAAiB,uBAA8B;IACzD,SAAS,CAAC,QAAQ,CAAC,OAAO,yBAA8F;IAExH,YAA+B,YAAY,EAAE,uBAAuB,EAInE;IAED,oGAAoG;IACpG,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA+BpC;IAED,UAAU,IAAI,IAAI,CAGjB;IAED,WAAW,IAAI,IAAI,CAElB;IAED,cAAc,IAAI,WAAW,CAI5B;CACH;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBACa,qCAAsC,SAAQ,kCAAkC;IAC1F,wFAAwF;IACxF,SAAS,CAAC,QAAQ,CAAC,QAAQ;kBAA+B,MAAM;iBAAW,MAAM;OAAM;IACvF,qFAAqF;IACrF,SAAS,CAAC,QAAQ,CAAC,YAAY,sBAA6B;IAEnD,sBAAsB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAwC1G;IAED;;;;;;OAMG;IACH,UAAmB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAK/F;IAED;;;OAGG;IACH,SAAS,CAAC,iBAAiB,IAAI,uBAAuB,CAOrD;IAED,UAAmB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAK3E;IAED;mFAC+E;IAC/E,SAAS,CAAC,iBAAiB,IAAI,MAAM,CAMpC;CACH;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CACrC,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,EACzB,OAAO,GAAE,2BAAgC,GACzC,OAAO,CAST"}

package/lib/node/session-bound-frontend-connection-service.js

@@ -14,13 +14,84 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionBoundFrontendConnectionService = void 0;
+exports.SessionBoundFrontendConnectionService = exports.AcknowledgedSocketChannel = void 0;
 exports.bindConnectionResilience = bindConnectionResilience;
+const disposable_1 = require("@theia/core/lib/common/disposable");
+const channel_1 = require("@theia/core/lib/common/message-rpc/channel");
+const uint8_array_message_buffer_1 = require("@theia/core/lib/common/message-rpc/uint8-array-message-buffer");
 const backend_application_config_provider_1 = require("@theia/core/lib/node/backend-application-config-provider");
 const socket_write_buffer_1 = require("@theia/core/lib/common/messaging/socket-write-buffer");
 const websocket_frontend_connection_service_1 = require("@theia/core/lib/node/messaging/websocket-frontend-connection-service");
 const inversify_1 = require("@theia/core/shared/inversify");
 const framed_socket_write_buffer_1 = require("../common/framed-socket-write-buffer");
+const inbound_message_sequence_1 = require("../common/inbound-message-sequence");
+/**
+ * The server end of one frontend's session, carried across the sockets the
+ * frontend reconnects on.
+ *
+ * Theia's own channel sends straight into any socket that reports itself
+ * connected. A socket whose far end died unnoticed still does, so whatever is
+ * sent until the server notices is lost. This one numbers and keeps every
+ * message through {@link FramedSocketWriteBuffer}, resends what is still
+ * unacknowledged when the frontend reconnects, and drops what it has received
+ * twice. Otherwise it behaves as Theia's.
+ */
+class AcknowledgedSocketChannel extends channel_1.AbstractChannel {
+    socketBuffer;
+    socket;
+    socketDisposables = new disposable_1.DisposableCollection();
+    inbound = new inbound_message_sequence_1.InboundMessageSequence(sequence => this.socket?.emit(inbound_message_sequence_1.ACKNOWLEDGEMENT_EVENT, sequence));
+    constructor(socketBuffer) {
+        super();
+        this.socketBuffer = socketBuffer;
+        this.toDispose.push(this.inbound);
+        this.toDispose.push(disposable_1.Disposable.create(() => this.socketDisposables.dispose()));
+    }
+    /** Flushes in the same step that attaches the listeners, so nothing new can overtake the resend. */
+    connect(socket) {
+        this.socketDisposables.dispose();
+        this.socketDisposables = new disposable_1.DisposableCollection();
+        this.socket = socket;
+        const errorHandler = (error) => this.onErrorEmitter.fire(error);
+        const dataListener = (data, sequence) => {
+            if (typeof sequence === 'number') {
+                this.socketBuffer.markPeerDeduplicates();
+            }
+            if (!this.inbound.accept(sequence, data.byteLength)) {
+                return;
+            }
+            const buffer = data instanceof ArrayBuffer ? new Uint8Array(data) : data;
+            this.onMessageEmitter.fire(() => new uint8_array_message_buffer_1.Uint8ArrayReadBuffer(buffer));
+        };
+        const acknowledgementListener = (sequence) => {
+            if (typeof sequence === 'number') {
+                this.socketBuffer.acknowledge(sequence);
+            }
+        };
+        socket.on('error', errorHandler);
+        socket.on('message', dataListener);
+        socket.on(inbound_message_sequence_1.ACKNOWLEDGEMENT_EVENT, acknowledgementListener);
+        this.socketDisposables.push(disposable_1.Disposable.create(() => {
+            socket.off('error', errorHandler);
+            socket.off('message', dataListener);
+            socket.off(inbound_message_sequence_1.ACKNOWLEDGEMENT_EVENT, acknowledgementListener);
+        }));
+        this.socketBuffer.flush(socket);
+    }
+    disconnect() {
+        this.socketDisposables.dispose();
+        this.socket = undefined;
+    }
+    drainBuffer() {
+        this.socketBuffer.drain();
+    }
+    getWriteBuffer() {
+        const writeBuffer = new uint8_array_message_buffer_1.Uint8ArrayWriteBuffer();
+        writeBuffer.onCommit(data => this.socketBuffer.sendOrQueue(this.socket?.connected ? this.socket : undefined, data));
+        return writeBuffer;
+    }
+}
+exports.AcknowledgedSocketChannel = AcknowledgedSocketChannel;
 /**
  * Ignores a disconnect from a socket that no longer belongs to the frontend.
  *
@@ -81,6 +152,31 @@ let SessionBoundFrontendConnectionService = class SessionBoundFrontendConnection
             // timeout < 0: never close the back end.
         });
     }
+    /**
+     * Theia's body, building an {@link AcknowledgedSocketChannel} in place of its own channel.
+     *
+     * Handed over through a cast, because Theia types the slot as its own channel class. The cast
+     * also hides from the compiler what Theia calls on the channel, so a release that calls a member
+     * this one lacks fails at runtime: re-diff with the disconnect handler.
+     */
+    createConnection(socket, frontEndId) {
+        const channel = new AcknowledgedSocketChannel(this.createWriteBuffer());
+        channel.connect(socket);
+        this.connectionsByFrontend.set(frontEndId, channel);
+        return channel;
+    }
+    /**
+     * One buffer per session, from the container Theia resolves its own channel's buffer from.
+     * Reached through a structural view because Theia 1.70 does not declare `container`.
+     */
+    createWriteBuffer() {
+        const container = this.container;
+        const buffer = container.get(socket_write_buffer_1.SocketWriteBuffer);
+        if (!(buffer instanceof framed_socket_write_buffer_1.FramedSocketWriteBuffer)) {
+            throw new Error('SessionBoundFrontendConnectionService requires FramedSocketWriteBuffer to be bound');
+        }
+        return buffer;
+    }
     closeConnection(frontEndId, reason) {
         console.info(`${framed_socket_write_buffer_1.CONNECTION_LOG_PREFIX} closing frontend ${frontEndId}: ${reason}`);
         this.bindings.delete(frontEndId);
@@ -122,7 +218,7 @@ function bindConnectionResilience(bind, isBound, rebind, options = {}) {
     }
     bind(SessionBoundFrontendConnectionService).toSelf().inSingletonScope();
     rebind(websocket_frontend_connection_service_1.WebsocketFrontendConnectionService).toService(SessionBoundFrontendConnectionService);
-    rebind(socket_write_buffer_1.SocketWriteBuffer).toDynamicValue(() => (0, framed_socket_write_buffer_1.createFramedSocketWriteBuffer)(options.bufferBytes));
+    rebind(socket_write_buffer_1.SocketWriteBuffer).toDynamicValue(() => (0, framed_socket_write_buffer_1.createFramedSocketWriteBuffer)(options));
     return true;
 }
 //# sourceMappingURL=session-bound-frontend-connection-service.js.map

package/lib/node/session-bound-frontend-connection-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-bound-frontend-connection-service.js","sourceRoot":"","sources":["../../src/node/session-bound-frontend-connection-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-bound-frontend-connection-service.js","sourceRoot":"","sources":["../../src/node/session-bound-frontend-connection-service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/client-theia",
-  "version": "1.0.0-next.183",
+  "version": "1.0.0-next.187",
   "description": "Cross-head Theia client primitives shared by the hydranium protocol heads. Provides the socket-forwarding connection-handler base that the data-server and GLSP Theia integrations subclass, plus the preference-driven Output-channel logger; carries no head-specific dependency.",
   "keywords": [
     "hydranium",
@@ -81,7 +81,7 @@
     "watch": "tsc -b -w --preserveWatchOutput"
   },
   "devDependencies": {
-    "@hydranium/protocol": "1.0.0-next.183",
+    "@hydranium/protocol": "1.0.0-next.187",
     "@theia/core": "^1.70.0",
     "@theia/editor": "^1.70.0",
     "@theia/filesystem": "^1.70.0",
@@ -94,7 +94,7 @@
     "vscode-jsonrpc": "9.0.1"
   },
   "peerDependencies": {
-    "@hydranium/protocol": "1.0.0-next.183",
+    "@hydranium/protocol": "1.0.0-next.187",
     "@theia/core": "^1.70.0",
     "@theia/editor": "^1.70.0",
     "@theia/filesystem": "^1.70.0",

package/src/browser/session-aware-connection-source.ts

@@ -23,6 +23,7 @@ import {
    supportsConnectionResilience,
    warnConnectionResilienceUnavailable
 } from '../common/framed-socket-write-buffer';
+import { ACKNOWLEDGEMENT_EVENT, InboundMessageSequence } from '../common/inbound-message-sequence';
 
 /**
  * Sends a message only once the server has confirmed the session, and only
@@ -84,6 +85,11 @@ export class SessionAwareConnectionSource extends WebSocketConnectionSource {
       this.socket.on(ConnectionManagementMessages.RECONNECT, (hasConnection: boolean) => {
          this.sessionResumed = hasConnection;
       });
+      this.socket.on(ACKNOWLEDGEMENT_EVENT, (sequence: unknown) => {
+         if (typeof sequence === 'number') {
+            this.framedBuffer.acknowledge(sequence);
+         }
+      });
    }
 
    /** Whether a message may go out now, as opposed to waiting in the buffer. */
@@ -92,13 +98,24 @@ export class SessionAwareConnectionSource extends WebSocketConnectionSource {
    }
 
    /**
-    * Copied from Theia apart from the `onCommit` body, because the base builds that callback inline
-    * and exposes no narrower seam. Re-diff when the supported range moves.
+    * Copied from Theia apart from the duplicate check on receipt and the `onCommit` body, because
+    * the base builds both callbacks inline and exposes no narrower seam. Re-diff when the supported
+    * range moves.
+    *
+    * Called once per session, so the receive-side state starts afresh with the server's numbering.
     */
    protected override createChannel(): AbstractChannel {
       const toDispose = new DisposableCollection();
-      const messageHandler = (data: ArrayBuffer | Uint8Array): void => {
+      const inbound = new InboundMessageSequence(sequence => this.socket.emit(ACKNOWLEDGEMENT_EVENT, sequence));
+      toDispose.push(Disposable.create(() => inbound.dispose()));
+      const messageHandler = (data: ArrayBuffer | Uint8Array, sequence?: unknown): void => {
          this.onIncomingMessageActivityEmitter.fire();
+         if (typeof sequence === 'number') {
+            this.framedBuffer.markPeerDeduplicates();
+         }
+         if (!inbound.accept(sequence, data.byteLength)) {
+            return;
+         }
          if (this.currentChannel) {
             // socket.io hands binary over as ArrayBuffer in the browser.
             const buffer = data instanceof ArrayBuffer ? new Uint8Array(data) : data;
@@ -173,7 +190,7 @@ export function bindConnectionResilience(
       return false;
    }
    // Scopes are kept as Theia declares them: one buffer per connection source, one shared socket owner.
-   rebind(SocketWriteBuffer).toDynamicValue(() => createFramedSocketWriteBuffer(options.bufferBytes));
+   rebind(SocketWriteBuffer).toDynamicValue(() => createFramedSocketWriteBuffer(options));
    rebind(WebSocketConnectionSource).to(SessionAwareConnectionSource).inSingletonScope();
    return true;
 }

package/src/common/connection-resilience-options.ts

@@ -21,4 +21,10 @@ export interface ConnectionResilienceOptions {
     * trades memory for tolerance here.
     */
    readonly bufferBytes?: number;
+   /**
+    * How much each side keeps of what it sent and the peer has not acknowledged
+    * yet, in bytes. Past it the copies are discarded and a dropped connection
+    * loses them, so it bounds what a peer that never acknowledges can cost.
+    */
+   readonly unacknowledgedBytes?: number;
 }

package/src/common/framed-socket-write-buffer.ts

@@ -9,6 +9,7 @@
 
 import { Emitter, type Event } from '@theia/core/lib/common/event';
 import { SocketWriteBuffer } from '@theia/core/lib/common/messaging/socket-write-buffer';
+import { type ConnectionResilienceOptions } from './connection-resilience-options';
 
 /**
  * Prefix on every connection log line, deliberately shared by the browser and the
@@ -22,7 +23,8 @@ export const CONNECTION_LOG_PREFIX = '[connection]';
  * without a connection.
  */
 export interface MessageSink {
-   send(data: Uint8Array): void;
+   /** `sequence` travels as a second socket.io argument, which a reader that does not expect it ignores. */
+   send(data: Uint8Array, sequence: number): void;
 }
 
 /**
@@ -58,6 +60,11 @@ export interface ConnectionBufferOverflow {
  * dropping something silently. The limit is settable, since the right value
  * depends on how long an outage has to survive.
  *
+ * Added here: every message sent is numbered and kept until the peer
+ * acknowledges it, and {@link flush} resends what is still unacknowledged ahead
+ * of the backlog. A socket whose far end died unnoticed still accepts writes, so
+ * a message is not delivered just because it was sent.
+ *
  * Logging goes to `console` rather than through a `Logger`. On the browser side
  * Theia's preloader builds this before any Output channel exists, so there is
  * nothing else to write to; the {@link CONNECTION_LOG_PREFIX} keeps the lines
@@ -78,11 +85,33 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
     */
    maxBytes = FramedSocketWriteBuffer.DEFAULT_MAX_BYTES;
 
+   /** Kept copies past this are discarded, so a peer that never acknowledges cannot grow them without bound. */
+   static readonly DEFAULT_MAX_UNACKNOWLEDGED_BYTES = 1024 * 1024;
+
+   /**
+    * Separate from {@link maxBytes}, which counts only what is produced while
+    * the peer is away: copies kept on a healthy connection must not use up the
+    * room an outage needs.
+    */
+   maxUnacknowledgedBytes = FramedSocketWriteBuffer.DEFAULT_MAX_UNACKNOWLEDGED_BYTES;
+
    protected pending: Uint8Array[] = [];
    protected pendingBytes = 0;
    protected overflowReported = false;
    protected readonly onOverflowEmitter = new Emitter<ConnectionBufferOverflow>();
 
+   protected nextSequence = 1;
+   /** Oldest first: {@link acknowledge} stops at the first entry the peer has not accepted. */
+   protected unacknowledged: { readonly sequence: number; readonly data: Uint8Array }[] = [];
+   protected unacknowledgedBytes = 0;
+   protected unacknowledgedOverflowReported = false;
+   /**
+    * Whether the peer drops a message it already has. One without the hardening
+    * applies a resent message a second time, so nothing is resent until the
+    * peer has shown otherwise.
+    */
+   protected peerDeduplicates = false;
+
    /** Fires once per outage when the limit is reached. */
    get onOverflow(): Event<ConnectionBufferOverflow> {
       return this.onOverflowEmitter.event;
@@ -98,7 +127,7 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
     */
    sendOrQueue(socket: MessageSink | undefined, data: Uint8Array): void {
       if (socket && !this.hasBacklog) {
-         socket.send(data);
+         this.send(socket, data);
       } else {
          this.buffer(data);
       }
@@ -117,7 +146,80 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
       }
    }
 
+   /**
+    * Kept only once `send` returns: a message whose send threw stays in the
+    * backlog, and keeping it as well would send it again under a second number,
+    * which the receiver cannot recognise as a duplicate.
+    */
+   protected send(socket: MessageSink, data: Uint8Array): void {
+      const sequence = this.nextSequence++;
+      socket.send(data, sequence);
+      this.keep(sequence, data);
+   }
+
+   protected keep(sequence: number, data: Uint8Array): void {
+      if (this.unacknowledgedBytes + data.byteLength > this.maxUnacknowledgedBytes) {
+         // Said only to a peer known to acknowledge: one without the hardening never does, and
+         // nothing would be resent to it anyway.
+         if (this.peerDeduplicates && !this.unacknowledgedOverflowReported) {
+            this.unacknowledgedOverflowReported = true;
+            console.warn(
+               `${CONNECTION_LOG_PREFIX} the peer has not acknowledged ${this.unacknowledged.length} message(s), ` +
+                  `${this.unacknowledgedBytes} bytes; discarding their copies, so a connection dropped now loses them`
+            );
+         }
+         this.unacknowledged = [];
+         this.unacknowledgedBytes = 0;
+         return;
+      }
+      // Not copied: a committed write buffer hands over a fresh array and is disposed.
+      this.unacknowledged.push({ sequence, data });
+      this.unacknowledgedBytes += data.byteLength;
+   }
+
+   /**
+    * Records that the peer numbers its messages, which only a peer that also
+    * drops duplicates does, so resending to it is safe.
+    */
+   markPeerDeduplicates(): void {
+      this.peerDeduplicates = true;
+   }
+
+   /** Releases every kept message numbered up to `sequence`, which the peer has accepted. */
+   acknowledge(sequence: number): void {
+      this.peerDeduplicates = true;
+      let index = 0;
+      while (index < this.unacknowledged.length && this.unacknowledged[index].sequence <= sequence) {
+         this.unacknowledgedBytes -= this.unacknowledged[index].data.byteLength;
+         index++;
+      }
+      if (index > 0) {
+         this.unacknowledged = this.unacknowledged.slice(index);
+      }
+   }
+
+   /**
+    * Resends what the peer has not acknowledged, under the same numbers, then
+    * sends the backlog. Some of the resent messages may have arrived already;
+    * the receiver recognises them by number and drops them.
+    *
+    * Resends only to a peer known to drop duplicates, and otherwise discards the
+    * copies, leaving any message lost with the old socket lost.
+    */
    override flush(socket: MessageSink): void {
+      if (this.peerDeduplicates) {
+         for (const { sequence, data } of this.unacknowledged) {
+            socket.send(data, sequence);
+         }
+         if (this.unacknowledged.length > 0) {
+            console.info(
+               `${CONNECTION_LOG_PREFIX} resent ${this.unacknowledged.length} unacknowledged message(s), ${this.unacknowledgedBytes} bytes`
+            );
+         }
+      } else {
+         this.unacknowledged = [];
+         this.unacknowledgedBytes = 0;
+      }
       if (this.pending.length === 0) {
          return;
       }
@@ -131,7 +233,7 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
       try {
          while (index < this.pending.length) {
             const message = this.pending[index];
-            socket.send(message);
+            this.send(socket, message);
             index++;
             this.pendingBytes -= message.byteLength;
          }
@@ -153,8 +255,11 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
    }
 
    override drain(): void {
-      if (this.pending.length > 0) {
-         console.warn(`${CONNECTION_LOG_PREFIX} discarded ${this.pending.length} buffered message(s), ${this.pendingBytes} bytes`);
+      if (this.pending.length > 0 || this.unacknowledged.length > 0) {
+         console.warn(
+            `${CONNECTION_LOG_PREFIX} discarded ${this.pending.length} buffered message(s), ${this.pendingBytes} bytes, ` +
+               `and ${this.unacknowledged.length} sent but unacknowledged, ${this.unacknowledgedBytes} bytes`
+         );
       }
       this.reset();
    }
@@ -177,10 +282,16 @@ export class FramedSocketWriteBuffer extends SocketWriteBuffer {
       this.onOverflowEmitter.fire(overflow);
    }
 
+   /** Also discards the kept copies: a drain ends the session, and resending them would replay it into the next one. */
    protected reset(): void {
       this.pending = [];
       this.pendingBytes = 0;
       this.overflowReported = false;
+      this.nextSequence = 1;
+      this.unacknowledged = [];
+      this.unacknowledgedBytes = 0;
+      this.unacknowledgedOverflowReported = false;
+      this.peerDeduplicates = false;
    }
 }
 
@@ -217,11 +328,18 @@ export function warnConnectionResilienceUnavailable(tier: 'frontend' | 'backend'
    );
 }
 
-/** Builds a buffer with the given limit, or Theia's default when none is configured. */
-export function createFramedSocketWriteBuffer(maxBytes?: number): FramedSocketWriteBuffer {
+/** Builds a buffer with the configured limits, or the defaults for any not configured. */
+export function createFramedSocketWriteBuffer(options: ConnectionResilienceOptions = {}): FramedSocketWriteBuffer {
    const buffer = new FramedSocketWriteBuffer();
-   if (typeof maxBytes === 'number' && maxBytes > 0) {
-      buffer.maxBytes = maxBytes;
+   if (isPositive(options.bufferBytes)) {
+      buffer.maxBytes = options.bufferBytes;
+   }
+   if (isPositive(options.unacknowledgedBytes)) {
+      buffer.maxUnacknowledgedBytes = options.unacknowledgedBytes;
    }
    return buffer;
 }
+
+function isPositive(value: number | undefined): value is number {
+   return typeof value === 'number' && value > 0;
+}

package/src/common/inbound-message-sequence.ts

@@ -0,0 +1,102 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+
+import { CONNECTION_LOG_PREFIX } from './framed-socket-write-buffer';
+
+/** The socket.io event that carries the highest message number a side has accepted. */
+export const ACKNOWLEDGEMENT_EVENT = 'hydranium:ack';
+
+/**
+ * What one side has received on a session: drops a message it already accepted
+ * and acknowledges the rest.
+ *
+ * The peer resends everything unacknowledged when a session resumes, because it
+ * cannot tell which of its messages died with the old socket, so every resumed
+ * session can repeat messages already delivered. Delivering one twice corrupts
+ * anything applied by position, just as losing one does.
+ *
+ * Acknowledges once enough has arrived, and otherwise after a short delay. A
+ * timer alone is not enough: a background tab throttles timers, and the peer
+ * holds every unacknowledged message until the acknowledgement arrives. The
+ * first message of a session is acknowledged at once, because the peer resends
+ * nothing until an acknowledgement shows it may.
+ *
+ * Belongs to one session. A new session numbers from the start again, so it
+ * needs a new instance.
+ */
+export class InboundMessageSequence {
+   static readonly ACKNOWLEDGE_AFTER_MESSAGES = 64;
+   static readonly ACKNOWLEDGE_AFTER_BYTES = 32 * 1024;
+   static readonly ACKNOWLEDGE_DELAY_MS = 100;
+
+   protected lastAccepted = 0;
+   protected messagesSinceAcknowledgement = 0;
+   protected bytesSinceAcknowledgement = 0;
+   protected acknowledgementTimer: ReturnType<typeof setTimeout> | undefined;
+
+   constructor(protected readonly sendAcknowledgement: (sequence: number) => void) {}
+
+   /**
+    * Whether to deliver a message that arrived with `sequence`.
+    *
+    * A message without a number comes from a peer that does not number them,
+    * and is delivered as it is. A duplicate is still acknowledged: the peer
+    * resent it because an earlier acknowledgement was lost, and keeps it until
+    * one arrives.
+    *
+    * A skipped number is delivered past, with a warning: the skipped messages
+    * are lost, and this is the one place that can tell.
+    */
+   accept(sequence: unknown, bytes: number): boolean {
+      if (typeof sequence !== 'number') {
+         return true;
+      }
+      const isFirst = this.lastAccepted === 0;
+      const isNew = sequence > this.lastAccepted;
+      if (isNew) {
+         if (sequence > this.lastAccepted + 1) {
+            const missing = sequence - this.lastAccepted - 1;
+            console.warn(
+               `${CONNECTION_LOG_PREFIX} lost ${missing} message(s), numbered ${this.lastAccepted + 1} to ${sequence - 1}; ` +
+                  'they never arrived and nothing will resend them'
+            );
+         }
+         this.lastAccepted = sequence;
+      }
+      this.messagesSinceAcknowledgement++;
+      this.bytesSinceAcknowledgement += bytes;
+      if (
+         isFirst ||
+         this.messagesSinceAcknowledgement >= InboundMessageSequence.ACKNOWLEDGE_AFTER_MESSAGES ||
+         this.bytesSinceAcknowledgement >= InboundMessageSequence.ACKNOWLEDGE_AFTER_BYTES
+      ) {
+         this.acknowledge();
+      } else {
+         this.acknowledgementTimer ??= setTimeout(() => this.acknowledge(), InboundMessageSequence.ACKNOWLEDGE_DELAY_MS);
+      }
+      return isNew;
+   }
+
+   /** Sends the acknowledgement now rather than waiting for more traffic. */
+   acknowledge(): void {
+      this.cancelTimer();
+      this.messagesSinceAcknowledgement = 0;
+      this.bytesSinceAcknowledgement = 0;
+      this.sendAcknowledgement(this.lastAccepted);
+   }
+
+   dispose(): void {
+      this.cancelTimer();
+   }
+
+   protected cancelTimer(): void {
+      clearTimeout(this.acknowledgementTimer);
+      this.acknowledgementTimer = undefined;
+   }
+}

package/src/common/index.ts

@@ -11,5 +11,6 @@
 // bind for their own side, such as the buffer for each half of the socket.
 // Kept out of both tier barrels for that reason.
 export * from './framed-socket-write-buffer';
+export * from './inbound-message-sequence';
 export * from './connection-resilience-options';
 export * from './clock';