@hydranium/data-client-theia 1.0.0-next.160 → 1.0.0-next.168

package/README.md

@@ -29,8 +29,10 @@ text edits.
   with a `servicePath`; it supplies the channel, the workspace gate, the
   reconnect signal and the `MessageService` error sink. Bind one per service path
   in singleton scope. Hand it to `DataConnectionWithEvents` (from
-  `@hydranium/protocol`) and the connection, its sessions and its event fan-out
-  are the host-neutral ones every other shell uses.
+  `@hydranium/protocol`) and each connection reports through the
+  `ConnectionReporter`, a data server not ready after 30 s included; the
+  connection, its sessions and its event fan-out are the host-neutral ones every
+  other shell uses.
 - **`EmitterDataClient`** (on `./common`, not `./browser`) — the default
   client-side implementation of the data protocol's inbound notifications,
   fanning each one out to a Theia `Event`: `onDidUpdateDocument`,
@@ -83,8 +85,10 @@ extension builds on. That extension's `package.json` declares the entries, and
 each entry names one frontend/backend module pair:
 
 - the **frontend** module binds your `ChannelDataPort` subclass and the
-  connection over it, both in singleton scope (and, for the diagnostics commands,
-  calls `bindHostDiagnostics`);
+  connection over it, both in singleton scope, and calls
+  `bindConnectionReporter` and `bindChannelLogger` from `@hydranium/client-theia`
+  (the port logs the connection failures it leaves to the reporter there), and,
+  for the diagnostics commands, `bindHostDiagnostics`;
 - the **backend** module is typically a one-liner:
   `export default createDataServerConnectionContainerModule(MyHandler)`, where
   `MyHandler` extends `DataServerConnectionHandler`.

package/lib/browser/channel-data-port.d.ts

@@ -6,7 +6,8 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type DataPort, type ResolvedMessage } from '@hydranium/protocol';
+import { ChannelLogger, ConnectionReporter, type ConnectionAttempt, type ConnectionTarget } from '@hydranium/client-theia/lib/browser';
+import { type DataPort, type ResolvedMessage, type RpcConnectionLifecycle } from '@hydranium/protocol';
 import { Emitter, MessageService, type Event } from '@theia/core';
 import { type ServiceConnectionProvider } from '@theia/core/lib/browser';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
@@ -28,6 +29,8 @@ export declare abstract class ChannelDataPort implements DataPort {
     protected readonly connectionProvider: ServiceConnectionProvider;
     protected readonly workspaceService: WorkspaceService;
     protected readonly messageService: MessageService;
+    protected readonly connectionReporter: ConnectionReporter;
+    protected readonly logger: ChannelLogger;
     /** Frontend service path the backend forwarder for this head is registered under. */
     protected abstract readonly servicePath: string;
     /**
@@ -40,6 +43,14 @@ export declare abstract class ChannelDataPort implements DataPort {
     protected readonly disposeEmitter: Emitter<void>;
     readonly onDispose: Event<void>;
     protected handle?: ChannelConnectionHandle;
+    /** How long a connection may take before it is reported as failed; it keeps trying after. */
+    protected readonly connectFailureNoticeMs: number;
+    protected attempt?: ConnectionAttempt;
+    protected attemptTimer?: ReturnType<typeof setTimeout>;
+    /** Set once {@link connectionLifecycle} reports, which then owns the connection failures. */
+    protected reportsConnections: boolean;
+    /** Reports each connection generation through the {@link ConnectionReporter}. */
+    readonly connectionLifecycle: RpcConnectionLifecycle;
     /**
      * Open the workspace-gated channel and hand back its listening connection.
      *
@@ -60,6 +71,13 @@ export declare abstract class ChannelDataPort implements DataPort {
      * inside another's and leave no translator in control of the whole.
      */
     reportError(_error: unknown, reported: ResolvedMessage): void;
+    /** End the current attempt through `settle`, or cancel it. */
+    protected settleAttempt(settle?: (attempt: ConnectionAttempt) => void): void;
+    protected get connectionTarget(): ConnectionTarget;
+    /** One object per port: the reporter keys what it has shown on it. */
+    protected cachedConnectionTarget?: ConnectionTarget;
+    protected unreachableMessage(): string;
+    protected connectTimeoutMessage(): string;
     dispose(): void;
 }
 //# sourceMappingURL=channel-data-port.d.ts.map

package/lib/browser/channel-data-port.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel-data-port.d.ts","sourceRoot":"","sources":["../../src/browser/channel-data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAA0B,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAClG,OAAO,EAAE,OAAO,EAAE,cAAc,EAAO,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,uBAAuB,EAAyB,MAAM,sBAAsB,CAAC;AAG3F;;;;;;;;;;;GAWG;AACH,8BACsB,eAAgB,YAAW,QAAQ;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAG,yBAAyB,CAAC;IAC1E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAG,gBAAgB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,cAAc,CAAC;IAE3E,qFAAqF;IACrF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEhD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAQ;IAE7D,SAAS,CAAC,QAAQ,CAAC,cAAc,gBAAuB;IACxD,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAA6B;IAE5D,SAAS,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;IAE3C;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAkBrC;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;IAI7D,OAAO,IAAI,IAAI;CAMjB"}
+{"version":3,"file":"channel-data-port.d.ts","sourceRoot":"","sources":["../../src/browser/channel-data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,KAAK,iBAAiB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvI,OAAO,EAIJ,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,cAAc,EAAO,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,uBAAuB,EAAyB,MAAM,sBAAsB,CAAC;AAG3F;;;;;;;;;;;GAWG;AACH,8BACsB,eAAgB,YAAW,QAAQ;IACpB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAG,yBAAyB,CAAC;IAC1E,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAG,gBAAgB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,cAAc,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAG,aAAa,CAAC;IAEjE,qFAAqF;IACrF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEhD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAQ;IAE7D,SAAS,CAAC,QAAQ,CAAC,cAAc,gBAAuB;IACxD,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAA6B;IAE5D,SAAS,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;IAE3C,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAU;IAC3D,SAAS,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACvD,6FAA6F;IAC7F,SAAS,CAAC,kBAAkB,UAAS;IAErC,iFAAiF;IACjF,QAAQ,CAAC,mBAAmB,EAAE,sBAAsB,CAclD;IAEF;;;;;;;OAOG;IACH,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAkBrC;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI;IAW7D,8DAA8D;IAC9D,SAAS,CAAC,aAAa,CAAC,MAAM,GAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAqC,GAAG,IAAI;IAS5G,SAAS,KAAK,gBAAgB,IAAI,gBAAgB,CAKjD;IACD,sEAAsE;IACtE,SAAS,CAAC,sBAAsB,CAAC,EAAE,gBAAgB,CAAC;IAEpD,SAAS,CAAC,kBAAkB,IAAI,MAAM;IAItC,SAAS,CAAC,qBAAqB,IAAI,MAAM;IAQzC,OAAO,IAAI,IAAI;CAOjB"}

package/lib/browser/channel-data-port.js

@@ -18,11 +18,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelDataPort = void 0;
+const browser_1 = require("@hydranium/client-theia/lib/browser");
 const protocol_1 = require("@hydranium/protocol");
 const core_1 = require("@theia/core");
 const service_connection_provider_1 = require("@theia/core/lib/browser/messaging/service-connection-provider");
 const inversify_1 = require("@theia/core/shared/inversify");
-const browser_1 = require("@theia/workspace/lib/browser");
+const browser_2 = require("@theia/workspace/lib/browser");
 const channel_connection_1 = require("./channel-connection");
 const workspace_gate_1 = require("./workspace-gate");
 /**
@@ -41,6 +42,8 @@ let ChannelDataPort = class ChannelDataPort {
     connectionProvider;
     workspaceService;
     messageService;
+    connectionReporter;
+    logger;
     /**
      * Re-open the channel when the current connection is lost. Default `true` —
      * re-opening is the only thing that recovers a restarted language server,
@@ -51,6 +54,28 @@ let ChannelDataPort = class ChannelDataPort {
     disposeEmitter = new core_1.Emitter();
     onDispose = this.disposeEmitter.event;
     handle;
+    /** How long a connection may take before it is reported as failed; it keeps trying after. */
+    connectFailureNoticeMs = 30_000;
+    attempt;
+    attemptTimer;
+    /** Set once {@link connectionLifecycle} reports, which then owns the connection failures. */
+    reportsConnections = false;
+    /** Reports each connection generation through the {@link ConnectionReporter}. */
+    connectionLifecycle = {
+        onConnecting: () => {
+            this.reportsConnections = true;
+            this.settleAttempt();
+            const attempt = this.connectionReporter.connecting(this.connectionTarget);
+            this.attempt = attempt;
+            this.attemptTimer = setTimeout(() => {
+                attempt.failed(this.connectTimeoutMessage());
+                // The generation keeps waiting; a follow-up attempt reports it connecting.
+                this.attempt = this.connectionReporter.connecting(this.connectionTarget);
+            }, this.connectFailureNoticeMs);
+        },
+        onReady: () => this.settleAttempt(attempt => attempt.connected()),
+        onFailed: () => this.settleAttempt(attempt => attempt.failed(this.unreachableMessage()))
+    };
     /**
      * Open the workspace-gated channel and hand back its listening connection.
      *
@@ -87,9 +112,40 @@ let ChannelDataPort = class ChannelDataPort {
      * inside another's and leave no translator in control of the whole.
      */
     reportError(_error, reported) {
-        this.messageService.error((0, protocol_1.renderFrameworkMessage)(reported, core_1.nls.localization?.translations));
+        const connectionFailure = reported.code === protocol_1.DATA_SERVER_CONNECT_FAILED.code || reported.code === protocol_1.DATA_SERVER_NOT_READY.code;
+        const message = (0, protocol_1.renderFrameworkMessage)(reported, core_1.nls.localization?.translations);
+        if (connectionFailure && this.reportsConnections) {
+            // The reporter shows the failure without its detail, so it is kept here.
+            this.logger.warn(message);
+            return;
+        }
+        this.messageService.error(message);
+    }
+    /** End the current attempt through `settle`, or cancel it. */
+    settleAttempt(settle = attempt => attempt.cancelled()) {
+        clearTimeout(this.attemptTimer);
+        const attempt = this.attempt;
+        this.attempt = undefined;
+        if (attempt) {
+            settle(attempt);
+        }
+    }
+    get connectionTarget() {
+        return (this.cachedConnectionTarget ??= {
+            connectingMessage: core_1.nls.localize('hydranium/data-client-theia/data-server-connecting', 'Connecting to the data server…'),
+            connectedMessage: core_1.nls.localize('hydranium/data-client-theia/data-server-connected', 'Connected to the data server.')
+        });
+    }
+    /** One object per port: the reporter keys what it has shown on it. */
+    cachedConnectionTarget;
+    unreachableMessage() {
+        return core_1.nls.localize('hydranium/data-client-theia/data-server-unreachable', 'Could not connect to the data server.');
+    }
+    connectTimeoutMessage() {
+        return core_1.nls.localize('hydranium/data-client-theia/data-server-timeout', 'The data server did not answer within {0} seconds.', String(Math.round(this.connectFailureNoticeMs / 1000)));
     }
     dispose() {
+        this.settleAttempt();
         this.handle?.dispose();
         this.handle = undefined;
         this.disposeEmitter.fire(undefined);
@@ -102,13 +158,21 @@ __decorate([
     __metadata("design:type", Function)
 ], ChannelDataPort.prototype, "connectionProvider", void 0);
 __decorate([
-    (0, inversify_1.inject)(browser_1.WorkspaceService),
-    __metadata("design:type", browser_1.WorkspaceService)
+    (0, inversify_1.inject)(browser_2.WorkspaceService),
+    __metadata("design:type", browser_2.WorkspaceService)
 ], ChannelDataPort.prototype, "workspaceService", void 0);
 __decorate([
     (0, inversify_1.inject)(core_1.MessageService),
     __metadata("design:type", core_1.MessageService)
 ], ChannelDataPort.prototype, "messageService", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.ConnectionReporter),
+    __metadata("design:type", Object)
+], ChannelDataPort.prototype, "connectionReporter", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.ChannelLogger),
+    __metadata("design:type", browser_1.ChannelLogger)
+], ChannelDataPort.prototype, "logger", void 0);
 exports.ChannelDataPort = ChannelDataPort = __decorate([
     (0, inversify_1.injectable)()
 ], ChannelDataPort);

package/lib/browser/channel-data-port.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel-data-port.js","sourceRoot":"","sources":["../../src/browser/channel-data-port.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,kDAAkG;AAClG,sCAAuE;AAEvE,+GAAyG;AACzG,4DAAkE;AAClE,0DAAgE;AAEhE,6DAA2F;AAC3F,qDAAqD;AAErD;;;;;;;;;;;GAWG;AAEI,IAAe,eAAe,GAA9B,MAAe,eAAe;IACmB,kBAAkB,CAA6B;IACvD,gBAAgB,CAAoB;IACtC,cAAc,CAAkB;IAK3E;;;;;OAKG;IACgB,yBAAyB,GAAY,IAAI,CAAC;IAE1C,cAAc,GAAG,IAAI,cAAO,EAAQ,CAAC;IAC/C,SAAS,GAAgB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;IAElD,MAAM,CAA2B;IAE3C;;;;;;;OAOG;IACH,OAAO;QACJ,sEAAsE;QACtE,sEAAsE;QACtE,iEAAiE;QACjE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,IAAA,0CAAqB,EAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,EAAE;gBAC5E,SAAS,EAAE,IAAA,kCAAiB,EAAC,IAAI,CAAC,gBAAgB,CAAC;gBACnD,SAAS,EAAE,IAAI,CAAC,yBAAyB;aAC3C,CAAC,CAAC;YACH,qEAAqE;YACrE,iEAAiE;YACjE,oEAAoE;YACpE,sCAAsC;YACtC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAe,EAAE,QAAyB;QACnD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAA,iCAAsB,EAAC,QAAQ,EAAE,UAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,OAAO;QACJ,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACH,CAAA;AAnEqB,0CAAe;AACmB;IAApD,IAAA,kBAAM,EAAC,sDAAwB,CAAC;;2DAAmE;AACvD;IAA5C,IAAA,kBAAM,EAAC,0BAAgB,CAAC;8BAAuC,0BAAgB;yDAAC;AACtC;IAA1C,IAAA,kBAAM,EAAC,qBAAc,CAAC;8BAAqC,qBAAc;uDAAC;0BAHxD,eAAe;IADpC,IAAA,sBAAU,GAAE;GACS,eAAe,CAmEpC"}
+{"version":3,"file":"channel-data-port.js","sourceRoot":"","sources":["../../src/browser/channel-data-port.ts"],"names":[],"mappings":"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"}

package/lib/node/data-server-connection-handler.d.ts

@@ -24,15 +24,7 @@ export interface DataServerConnectionHandlerOptions {
      *  Defaults to the framework `DATA_SERVER_PORT_COMMAND`; override to match
      *  an adopter's established id. */
     readonly portCommand?: string;
-    /**
-     * Product name for the connect-failure dialog this handler raises.
-     *
-     * It reaches the adopter's UI verbatim, so the framework default leaks a
-     * framework noun into a product that is not ours. Not a translation concern —
-     * routing it through a catalogue would ask an adopter to "translate" English
-     * into their own product name, and would make their branding
-     * locale-dependent.
-     */
+    /** Name of the server in this handler's log lines. */
     readonly serverName?: string;
     readonly findPortTimeout?: number;
     readonly findPortAttempts?: number;
@@ -57,5 +49,8 @@ export interface DataServerConnectionHandlerOptions {
  */
 export declare class DataServerConnectionHandler extends AbstractSocketForwardingConnectionHandler {
     constructor(options?: DataServerConnectionHandlerOptions);
+    /** Logged only: the frontend port reports the connection, and a second
+     *  notification would duplicate it. */
+    protected reportConnectFailure(): void;
 }
 //# sourceMappingURL=data-server-connection-handler.d.ts.map

package/lib/node/data-server-connection-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-server-connection-handler.d.ts","sourceRoot":"","sources":["../../src/node/data-server-connection-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,yCAAyC,EAAE,MAAM,kCAAkC,CAAC;AAG7F,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC;;;;kBAIkB;AAClB,MAAM,WAAW,kCAAkC;IAChD;;;;yDAIqD;IACrD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;uCAEmC;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;OAQG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC1D;AAED;;;;;;;;GAQG;AACH,qBACa,2BAA4B,SAAQ,yCAAyC;gBAC9D,OAAO,GAAE,kCAAuC;CAY3E"}
+{"version":3,"file":"data-server-connection-handler.d.ts","sourceRoot":"","sources":["../../src/node/data-server-connection-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,yCAAyC,EAAE,MAAM,kCAAkC,CAAC;AAG7F,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC;;;;kBAIkB;AAClB,MAAM,WAAW,kCAAkC;IAChD;;;;yDAIqD;IACrD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;uCAEmC;IACnC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,sDAAsD;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC1D;AAED;;;;;;;;GAQG;AACH,qBACa,2BAA4B,SAAQ,yCAAyC;gBAC9D,OAAO,GAAE,kCAAuC;IAazE;2CACuC;cACpB,oBAAoB,IAAI,IAAI;CACjD"}

package/lib/node/data-server-connection-handler.js

@@ -39,13 +39,16 @@ let DataServerConnectionHandler = class DataServerConnectionHandler extends node
             path: options.servicePath ?? protocol_1.DATA_SERVER_PATH,
             portCommand: options.portCommand ?? protocol_1.DATA_SERVER_PORT_COMMAND,
             logComponent: 'DataServer',
-            serverName: options.serverName ?? 'Model Server',
+            serverName: options.serverName ?? 'Data Server',
             findPortTimeout: options.findPortTimeout,
             findPortAttempts: options.findPortAttempts,
             connectTimeoutMs: options.connectTimeoutMs,
             onSocketCreated: options.onSocketCreated
         });
     }
+    /** Logged only: the frontend port reports the connection, and a second
+     *  notification would duplicate it. */
+    reportConnectFailure() { }
 };
 exports.DataServerConnectionHandler = DataServerConnectionHandler;
 exports.DataServerConnectionHandler = DataServerConnectionHandler = __decorate([

package/lib/node/data-server-connection-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-server-connection-handler.js","sourceRoot":"","sources":["../../src/node/data-server-connection-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAElF,2DAA6F;AAC7F,kDAAiF;AACjF,4DAAqE;AA0CrE;;;;;;;;GAQG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,gDAAyC;IACvF,YAAyB,UAA8C,EAAE;QACtE,KAAK,CAAC;YACH,IAAI,EAAE,OAAO,CAAC,WAAW,IAAI,2BAAgB;YAC7C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,mCAAwB;YAC5D,YAAY,EAAE,YAAY;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,cAAc;YAChD,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;SAC1C,CAAC,CAAC;IACN,CAAC;CACH,CAAA;AAbY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAEG,WAAA,IAAA,qBAAS,GAAE,CAAA;;GADd,2BAA2B,CAavC"}
+{"version":3,"file":"data-server-connection-handler.js","sourceRoot":"","sources":["../../src/node/data-server-connection-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAElF,2DAA6F;AAC7F,kDAAiF;AACjF,4DAAqE;AAkCrE;;;;;;;;GAQG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,gDAAyC;IACvF,YAAyB,UAA8C,EAAE;QACtE,KAAK,CAAC;YACH,IAAI,EAAE,OAAO,CAAC,WAAW,IAAI,2BAAgB;YAC7C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,mCAAwB;YAC5D,YAAY,EAAE,YAAY;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,aAAa;YAC/C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;SAC1C,CAAC,CAAC;IACN,CAAC;IAED;2CACuC;IACpB,oBAAoB,KAAU,CAAC;CACpD,CAAA;AAjBY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAEG,WAAA,IAAA,qBAAS,GAAE,CAAA;;GADd,2BAA2B,CAiBvC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/data-client-theia",
-  "version": "1.0.0-next.160",
+  "version": "1.0.0-next.168",
   "description": "Theia-coupled client primitives for the hydranium data-server protocol head; companion of @hydranium/data-server. Bridges framework typed errors (e.g. ConflictError) across Theia's RPC boundary so their code + data survive the wire.",
   "keywords": [
     "hydranium",
@@ -70,9 +70,9 @@
     "watch": "tsc -b -w --preserveWatchOutput"
   },
   "devDependencies": {
-    "@hydranium/client-theia": "1.0.0-next.160",
-    "@hydranium/core": "1.0.0-next.160",
-    "@hydranium/protocol": "1.0.0-next.160",
+    "@hydranium/client-theia": "1.0.0-next.168",
+    "@hydranium/core": "1.0.0-next.168",
+    "@hydranium/protocol": "1.0.0-next.168",
     "@theia/core": "^1.70.0",
     "@theia/workspace": "^1.70.0",
     "@types/node": "^22.0.0",
@@ -83,9 +83,9 @@
     "vscode-jsonrpc": "9.0.1"
   },
   "peerDependencies": {
-    "@hydranium/client-theia": "1.0.0-next.160",
-    "@hydranium/core": "1.0.0-next.160",
-    "@hydranium/protocol": "1.0.0-next.160",
+    "@hydranium/client-theia": "1.0.0-next.168",
+    "@hydranium/core": "1.0.0-next.168",
+    "@hydranium/protocol": "1.0.0-next.168",
     "@theia/core": "^1.70.0",
     "@theia/workspace": "^1.70.0",
     "inversify": "^6.0.0",

package/src/browser/channel-data-port.ts

@@ -7,7 +7,15 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { renderFrameworkMessage, type DataPort, type ResolvedMessage } from '@hydranium/protocol';
+import { ChannelLogger, ConnectionReporter, type ConnectionAttempt, type ConnectionTarget } from '@hydranium/client-theia/lib/browser';
+import {
+   DATA_SERVER_CONNECT_FAILED,
+   DATA_SERVER_NOT_READY,
+   renderFrameworkMessage,
+   type DataPort,
+   type ResolvedMessage,
+   type RpcConnectionLifecycle
+} from '@hydranium/protocol';
 import { Emitter, MessageService, nls, type Event } from '@theia/core';
 import { type ServiceConnectionProvider } from '@theia/core/lib/browser';
 import { RemoteConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
@@ -34,6 +42,8 @@ export abstract class ChannelDataPort implements DataPort {
    @inject(RemoteConnectionProvider) protected readonly connectionProvider!: ServiceConnectionProvider;
    @inject(WorkspaceService) protected readonly workspaceService!: WorkspaceService;
    @inject(MessageService) protected readonly messageService!: MessageService;
+   @inject(ConnectionReporter) protected readonly connectionReporter!: ConnectionReporter;
+   @inject(ChannelLogger) protected readonly logger!: ChannelLogger;
 
    /** Frontend service path the backend forwarder for this head is registered under. */
    protected abstract readonly servicePath: string;
@@ -51,6 +61,30 @@ export abstract class ChannelDataPort implements DataPort {
 
    protected handle?: ChannelConnectionHandle;
 
+   /** How long a connection may take before it is reported as failed; it keeps trying after. */
+   protected readonly connectFailureNoticeMs: number = 30_000;
+   protected attempt?: ConnectionAttempt;
+   protected attemptTimer?: ReturnType<typeof setTimeout>;
+   /** Set once {@link connectionLifecycle} reports, which then owns the connection failures. */
+   protected reportsConnections = false;
+
+   /** Reports each connection generation through the {@link ConnectionReporter}. */
+   readonly connectionLifecycle: RpcConnectionLifecycle = {
+      onConnecting: () => {
+         this.reportsConnections = true;
+         this.settleAttempt();
+         const attempt = this.connectionReporter.connecting(this.connectionTarget);
+         this.attempt = attempt;
+         this.attemptTimer = setTimeout(() => {
+            attempt.failed(this.connectTimeoutMessage());
+            // The generation keeps waiting; a follow-up attempt reports it connecting.
+            this.attempt = this.connectionReporter.connecting(this.connectionTarget);
+         }, this.connectFailureNoticeMs);
+      },
+      onReady: () => this.settleAttempt(attempt => attempt.connected()),
+      onFailed: () => this.settleAttempt(attempt => attempt.failed(this.unreachableMessage()))
+   };
+
    /**
     * Open the workspace-gated channel and hand back its listening connection.
     *
@@ -88,10 +122,49 @@ export abstract class ChannelDataPort implements DataPort {
     * inside another's and leave no translator in control of the whole.
     */
    reportError(_error: unknown, reported: ResolvedMessage): void {
-      this.messageService.error(renderFrameworkMessage(reported, nls.localization?.translations));
+      const connectionFailure = reported.code === DATA_SERVER_CONNECT_FAILED.code || reported.code === DATA_SERVER_NOT_READY.code;
+      const message = renderFrameworkMessage(reported, nls.localization?.translations);
+      if (connectionFailure && this.reportsConnections) {
+         // The reporter shows the failure without its detail, so it is kept here.
+         this.logger.warn(message);
+         return;
+      }
+      this.messageService.error(message);
+   }
+
+   /** End the current attempt through `settle`, or cancel it. */
+   protected settleAttempt(settle: (attempt: ConnectionAttempt) => void = attempt => attempt.cancelled()): void {
+      clearTimeout(this.attemptTimer);
+      const attempt = this.attempt;
+      this.attempt = undefined;
+      if (attempt) {
+         settle(attempt);
+      }
+   }
+
+   protected get connectionTarget(): ConnectionTarget {
+      return (this.cachedConnectionTarget ??= {
+         connectingMessage: nls.localize('hydranium/data-client-theia/data-server-connecting', 'Connecting to the data server…'),
+         connectedMessage: nls.localize('hydranium/data-client-theia/data-server-connected', 'Connected to the data server.')
+      });
+   }
+   /** One object per port: the reporter keys what it has shown on it. */
+   protected cachedConnectionTarget?: ConnectionTarget;
+
+   protected unreachableMessage(): string {
+      return nls.localize('hydranium/data-client-theia/data-server-unreachable', 'Could not connect to the data server.');
+   }
+
+   protected connectTimeoutMessage(): string {
+      return nls.localize(
+         'hydranium/data-client-theia/data-server-timeout',
+         'The data server did not answer within {0} seconds.',
+         String(Math.round(this.connectFailureNoticeMs / 1000))
+      );
    }
 
    dispose(): void {
+      this.settleAttempt();
       this.handle?.dispose();
       this.handle = undefined;
       this.disposeEmitter.fire(undefined);

package/src/node/data-server-connection-handler.ts

@@ -28,15 +28,7 @@ export interface DataServerConnectionHandlerOptions {
     *  Defaults to the framework `DATA_SERVER_PORT_COMMAND`; override to match
     *  an adopter's established id. */
    readonly portCommand?: string;
-   /**
-    * Product name for the connect-failure dialog this handler raises.
-    *
-    * It reaches the adopter's UI verbatim, so the framework default leaks a
-    * framework noun into a product that is not ours. Not a translation concern —
-    * routing it through a catalogue would ask an adopter to "translate" English
-    * into their own product name, and would make their branding
-    * locale-dependent.
-    */
+   /** Name of the server in this handler's log lines. */
    readonly serverName?: string;
    readonly findPortTimeout?: number;
    readonly findPortAttempts?: number;
@@ -67,11 +59,15 @@ export class DataServerConnectionHandler extends AbstractSocketForwardingConnect
          path: options.servicePath ?? DATA_SERVER_PATH,
          portCommand: options.portCommand ?? DATA_SERVER_PORT_COMMAND,
          logComponent: 'DataServer',
-         serverName: options.serverName ?? 'Model Server',
+         serverName: options.serverName ?? 'Data Server',
          findPortTimeout: options.findPortTimeout,
          findPortAttempts: options.findPortAttempts,
          connectTimeoutMs: options.connectTimeoutMs,
          onSocketCreated: options.onSocketCreated
       });
    }
+
+   /** Logged only: the frontend port reports the connection, and a second
+    *  notification would duplicate it. */
+   protected override reportConnectFailure(): void {}
 }