@hydranium/glsp-client-theia 1.0.0-next.160 → 1.0.0-next.169

package/README.md

@@ -21,7 +21,9 @@ if you are mounting a hydranium GLSP diagram in a Theia application.
 - **`createGlspClientTheiaModule(context, options)`** — the standard per-diagram
   bindings, all unconditional: the cross-head `ChannelLogger`,
   `HydraniumGlspActionDispatcher`, `HydraniumDiagramLoader`,
-  `HydraniumHiddenBoundsUpdater`, and `HydraniumGlspMessageService`. Each
+  `HydraniumHiddenBoundsUpdater`, `HydraniumGlspMessageService`, and
+  `HydraniumStatusOverlay`, which keeps GLSP's status overlay on the page after
+  sprotty's first render replaces the diagram's base div. Each
   replaces a GLSP default with a strict superset of its behaviour, so a head that
   wants the original rebinds that one token back.
 - **Loading feedback that cannot silently vanish.** `HydraniumDiagramLoader`
@@ -47,10 +49,20 @@ if you are mounting a hydranium GLSP diagram in a Theia application.
   `NoOpExternalMarkerManager` instead: markers still decorate the diagram, but
   Theia's Problems view stops double-listing them.
   **`AbstractHydraniumGlspDiagramManager`** derives the language-correlated
-  getters from one descriptor plus a label.
-- **`HydraniumGlspClientContribution`** — for a server that starts late: it tails
-  the Output channel for a server-printed ready marker and defers `start` until a
-  workspace is open.
+  getters from one descriptor plus a label, and `reopen` replaces a diagram
+  with a fresh widget in the same tab position, as the Retry of a failed load
+  does. It reopens every diagram when their client is lost, and a failed one
+  when a client starts.
+- **`HydraniumGlspClientContribution`** — for a server that starts late: it
+  defers `start` until a workspace is open, fails a start that takes longer than
+  `startupTimeoutMs` (30 s by default), and starts a fresh client after a failed
+  start or a lost connection, after a delay that grows while clients keep
+  failing, reporting each attempt through `client-theia`'s
+  `ConnectionReporter`. `onDidStartClient` and `onDidLoseClient` announce each
+  client, and each start and loss is logged to the application-scope
+  `ChannelLogger` an adopter binds with `bindChannelLogger`. Its client is
+  `HydraniumGlspClient`, which ends a session without the server once the
+  connection is gone.
 - **`HydraniumGlspSaveable`** — the diagram widget's saveable. Each save is a
   `RequestSaveModelAction` the server answers: the save resolves on its own
   response, and rejects on its own rejection or after 10 s rather than GLSP's
@@ -85,7 +97,6 @@ hydranium GLSP server. The declared peer dependencies are:
 | `@hydranium/client-theia`         | `^1.0.0-next` |
 | `@hydranium/protocol`             | `^1.0.0-next` |
 | `@theia/core`                     | `^1.70.0`     |
-| `@theia/output`                   | `^1.70.0`     |
 | `@theia/process`                  | `^1.70.0`     |
 | `@theia/workspace`                | `^1.70.0`     |
 | `inversify`                       | `^6.0.0`      |

package/lib/browser/client-contribution.d.ts

@@ -6,48 +6,105 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type GLSPClient } from '@eclipse-glsp/client';
+import { type GLSPClient, type InitializeResult } from '@eclipse-glsp/client';
 import { BaseGLSPClientContribution } from '@eclipse-glsp/theia-integration';
-import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
+import { ChannelLogger, ConnectionReporter, type ConnectionTarget } from '@hydranium/client-theia/lib/browser';
+import { type Channel, Emitter, Event } from '@theia/core';
+import { Deferred } from '@theia/core/lib/common/promise-util';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
-/** Options for `HydraniumGlspClientContribution`. The channel name is the
- *  Theia Output channel both the LSP and GLSP sides write to (so log lines
- *  interleave); the ready marker is a server-printed substring that signals
- *  "the GLSP server is accepting client connections". */
+export declare const DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS = 30000;
+/** Options for `HydraniumGlspClientContribution`. */
 export interface ClientContributionOptions {
     readonly languageContributionId: string;
-    readonly channelName: string;
-    readonly readyMarker: string;
+    /** How long a start may take, from the workspace opening to the server
+     *  answering `initializeServer`, before it fails; `0` or less waits for good. */
+    readonly startupTimeoutMs?: number;
 }
 /**
  * Theia GLSP client contribution for adopters whose GLSP server runs in a
  * sideloaded VS Code extension process (or any other deferred-start setup).
- * The behaviours adopters reliably need are lifted:
  *
- *   1. `waitForBackendConnected`: tail the OutputChannel for a server-printed
- *      ready marker. While a socket connection might open earlier, the GLSP
- *      server typically does internal initialisation before it can accept
- *      client connections — we wait for it to say so.
- *   2. `start`: defer until a workspace is opened. If Theia starts without a
- *      workspace, this prevents the frontend-backend connection (and its
- *      "connecting" progress spinner) from firing prematurely.
+ * The client starts once a workspace is open and sends its first request at
+ * once; the backend handler holds it until its socket to the server is up. A
+ * start that fails, and a connection lost after one succeeded, start a fresh
+ * client after a backoff, for as long as the contribution lives. Each start is
+ * reported through the {@link ConnectionReporter}, and announced through
+ * {@link onDidStartClient} and {@link onDidLoseClient}.
  *
  * A `GLSPClient` override filtering inbound messages by clientId is
  * deliberately NOT provided: upstream's `BaseJsonrpcGLSPClient.onActionMessage`
- * already filters by clientId, so the `TheiaJsonrpcGLSPClient` returned by
- * `BaseGLSPClientContribution.createGLSPClient` is correct as-is.
+ * already filters by clientId.
  */
 export declare class HydraniumGlspClientContribution extends BaseGLSPClientContribution {
-    protected outputChannelManager: OutputChannelManager;
     protected readonly workspaceService: WorkspaceService;
+    protected readonly connectionReporter: ConnectionReporter;
+    protected readonly logger: ChannelLogger;
     readonly id: string;
-    protected readonly channelName: string;
-    protected readonly readyMarker: string;
+    /** Delay before the restart following each consecutive failed start or lost
+     *  client; the last repeats. */
+    protected readonly restartDelaysMs: readonly number[];
+    /** How long a client must stay up before the restart delays start over, so
+     *  a server that fails right after starting is not restarted at once. */
+    protected readonly restartEscalationResetMs: number;
+    protected consecutiveFailures: number;
+    protected restartTimer?: ReturnType<typeof setTimeout>;
+    /** When the current client started; `0` once a restart has taken it into account. */
+    protected startedAt: number;
+    /** Clients started so far, which numbers them in the log: they share {@link id}. */
+    protected startedClients: number;
+    /** The attempt waiting for a channel, if any. */
+    protected channelRequest?: Deferred<Channel>;
+    protected disposed: boolean;
+    protected readonly clientStartedEmitter: Emitter<GLSPClient>;
+    protected readonly clientLostEmitter: Emitter<void>;
+    /** Fires with each client once it has started and its server has answered. */
+    readonly onDidStartClient: Event<GLSPClient>;
+    /** Fires when the started client stops; {@link glspClient} already waits
+     *  for its replacement then. */
+    readonly onDidLoseClient: Event<void>;
     constructor(options: ClientContributionOptions);
-    /** Wait for the server to print its ready marker into the OutputChannel.
-     *  Resolves immediately if the marker is already present (server started
-     *  before the client contribution mounted). */
-    protected waitForBackendConnected(): Promise<void>;
+    /** The client every diagram load awaits; after a failed start, a fresh one. */
+    get glspClient(): Promise<GLSPClient>;
+    /** Start a fresh client over a fresh channel at once, if the last start failed. */
+    restart(): Promise<GLSPClient>;
+    /** Point {@link glspClient} at a fresh client still to start, and tear down
+     *  the old one's channel. */
+    protected replaceClient(): void;
+    /** Settles the promise current when it began, so a start a restart overtook
+     *  cannot settle its successor. */
+    protected activateClient(): Promise<void>;
+    /** Run `restart` after the delay for the failures so far, and return that delay. */
+    protected scheduleRestart(restart: () => void): number;
+    /** Once `client` stops, replace it and start its replacement after the
+     *  restart delay, unless a dispose stopped it. */
+    protected restartOnLoss(client: GLSPClient): void;
+    /** Start the client and initialize its server, rejecting on failure; the
+     *  caller settles {@link glspClient}. */
     protected start(glspClient: GLSPClient): Promise<void>;
+    /** Without upstream's own error notification, which would duplicate the reporter's. */
+    protected initialize(glspClient: GLSPClient): Promise<InitializeResult>;
+    /** Upstream's base client, without the notifications of its Theia subclass,
+     *  which would duplicate the reporter's. */
+    protected createGLSPClient(connectionProvider: Parameters<BaseGLSPClientContribution['createGLSPClient']>[0]): Promise<GLSPClient>;
+    /**
+     * Whichever channel arrives goes to the attempt waiting now, and one that
+     * arrives with none waiting is closed. Theia holds each open until its
+     * websocket is back, and after an outage every held open past the first
+     * throws "already open" without reaching its handler, so the first to arrive
+     * has to serve the latest attempt. Without Theia's replay, which would be a
+     * second opener of the same path.
+     */
+    protected createChannelConnection(): ReturnType<BaseGLSPClientContribution['createChannelConnection']>;
+    /** Also closes the channel: upstream leaves a Theia channel open, and the
+     *  next one on the same path then cannot open. */
+    protected disposeChannel(connection: Parameters<BaseGLSPClientContribution['disposeChannel']>[0], channel: Channel): Promise<void>;
+    /** Also fails a start in flight, so nothing reports it after this. */
+    dispose(): void;
+    protected workspaceOpened(): Promise<void>;
+    protected get connectionTarget(): ConnectionTarget;
+    /** One object per contribution: the reporter keys what it has shown on it. */
+    protected cachedConnectionTarget?: ConnectionTarget;
+    protected unreachableMessage(): string;
+    protected startupTimeoutMessage(): string;
 }
 //# sourceMappingURL=client-contribution.d.ts.map

package/lib/browser/client-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAG7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;yDAGyD;AACzD,MAAM,WAAW,yBAAyB;IACvC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,qBACa,+BAAgC,SAAQ,0BAA0B;IAC9C,SAAS,CAAC,oBAAoB,EAAG,oBAAoB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAG,gBAAgB,CAAC;IAEjF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;gBAEd,OAAO,EAAE,yBAAyB;IAO3D;;mDAE+C;cAC/B,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;cAkB/B,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkBvE"}
+{"version":3,"file":"client-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/client-contribution.js

@@ -20,89 +20,254 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HydraniumGlspClientContribution = void 0;
+exports.HydraniumGlspClientContribution = exports.DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS = void 0;
+const client_1 = require("@eclipse-glsp/client");
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
+const common_1 = require("@eclipse-glsp/theia-integration/lib/common");
+const browser_1 = require("@hydranium/client-theia/lib/browser");
+const core_1 = require("@theia/core");
 const promise_util_1 = require("@theia/core/lib/common/promise-util");
 const inversify_1 = require("@theia/core/shared/inversify");
-const output_channel_1 = require("@theia/output/lib/browser/output-channel");
-const browser_1 = require("@theia/workspace/lib/browser");
+const browser_2 = require("@theia/workspace/lib/browser");
+const glsp_client_1 = require("./glsp-client");
+exports.DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS = 30_000;
 /**
  * Theia GLSP client contribution for adopters whose GLSP server runs in a
  * sideloaded VS Code extension process (or any other deferred-start setup).
- * The behaviours adopters reliably need are lifted:
  *
- *   1. `waitForBackendConnected`: tail the OutputChannel for a server-printed
- *      ready marker. While a socket connection might open earlier, the GLSP
- *      server typically does internal initialisation before it can accept
- *      client connections — we wait for it to say so.
- *   2. `start`: defer until a workspace is opened. If Theia starts without a
- *      workspace, this prevents the frontend-backend connection (and its
- *      "connecting" progress spinner) from firing prematurely.
+ * The client starts once a workspace is open and sends its first request at
+ * once; the backend handler holds it until its socket to the server is up. A
+ * start that fails, and a connection lost after one succeeded, start a fresh
+ * client after a backoff, for as long as the contribution lives. Each start is
+ * reported through the {@link ConnectionReporter}, and announced through
+ * {@link onDidStartClient} and {@link onDidLoseClient}.
  *
  * A `GLSPClient` override filtering inbound messages by clientId is
  * deliberately NOT provided: upstream's `BaseJsonrpcGLSPClient.onActionMessage`
- * already filters by clientId, so the `TheiaJsonrpcGLSPClient` returned by
- * `BaseGLSPClientContribution.createGLSPClient` is correct as-is.
+ * already filters by clientId.
  */
 let HydraniumGlspClientContribution = class HydraniumGlspClientContribution extends theia_integration_1.BaseGLSPClientContribution {
-    outputChannelManager;
     workspaceService;
+    connectionReporter;
+    logger;
     id;
-    channelName;
-    readyMarker;
+    /** Delay before the restart following each consecutive failed start or lost
+     *  client; the last repeats. */
+    restartDelaysMs = [1_000, 2_000, 4_000, 8_000];
+    /** How long a client must stay up before the restart delays start over, so
+     *  a server that fails right after starting is not restarted at once. */
+    restartEscalationResetMs = 30_000;
+    consecutiveFailures = 0;
+    restartTimer;
+    /** When the current client started; `0` once a restart has taken it into account. */
+    startedAt = 0;
+    /** Clients started so far, which numbers them in the log: they share {@link id}. */
+    startedClients = 0;
+    /** The attempt waiting for a channel, if any. */
+    channelRequest;
+    disposed = false;
+    clientStartedEmitter = new core_1.Emitter();
+    clientLostEmitter = new core_1.Emitter();
+    /** Fires with each client once it has started and its server has answered. */
+    onDidStartClient = this.clientStartedEmitter.event;
+    /** Fires when the started client stops; {@link glspClient} already waits
+     *  for its replacement then. */
+    onDidLoseClient = this.clientLostEmitter.event;
     constructor(options) {
         super();
         this.id = options.languageContributionId;
-        this.channelName = options.channelName;
-        this.readyMarker = options.readyMarker;
-    }
-    /** Wait for the server to print its ready marker into the OutputChannel.
-     *  Resolves immediately if the marker is already present (server started
-     *  before the client contribution mounted). */
-    async waitForBackendConnected() {
-        const channel = this.outputChannelManager.getChannel(this.channelName);
-        const channelText = channel.resource?.textModel?.getValue() ?? '';
-        if (channelText.includes(this.readyMarker)) {
+        this.glspClientStartupTimeout = options.startupTimeoutMs ?? exports.DEFAULT_GLSP_CLIENT_STARTUP_TIMEOUT_MS;
+    }
+    /** The client every diagram load awaits; after a failed start, a fresh one. */
+    get glspClient() {
+        return this.glspClientDeferred.state === 'rejected' ? this.restart() : this.glspClientDeferred.promise;
+    }
+    /** Start a fresh client over a fresh channel at once, if the last start failed. */
+    restart() {
+        if (!this.disposed && this.glspClientDeferred.state === 'rejected') {
+            this.replaceClient();
+            void this.activateClient();
+        }
+        return this.glspClientDeferred.promise;
+    }
+    /** Point {@link glspClient} at a fresh client still to start, and tear down
+     *  the old one's channel. */
+    replaceClient() {
+        clearTimeout(this.restartTimer);
+        // Replaced before the old channel goes, so the old client stopping is
+        // not taken for a loss of the new one.
+        this.glspClientDeferred = new promise_util_1.Deferred();
+        this.toDispose.dispose();
+        // Upstream refuses to open a channel while the collection is disposed.
+        this.toDispose.push(core_1.Disposable.NULL);
+    }
+    /** Settles the promise current when it began, so a start a restart overtook
+     *  cannot settle its successor. */
+    async activateClient() {
+        const pending = this.glspClientDeferred;
+        await this.workspaceOpened();
+        if (this.disposed) {
             return;
         }
-        const deferred = new promise_util_1.Deferred();
-        const channelListener = channel.onContentChange(() => {
-            const text = channel.resource?.textModel?.getValue() ?? '';
-            if (text.includes(this.readyMarker)) {
-                channelListener.dispose();
-                deferred.resolve();
+        const attempt = this.connectionReporter.connecting(this.connectionTarget);
+        const timeout = this.glspClientStartupTimeout > 0
+            ? setTimeout(() => pending.reject(new Error(this.startupTimeoutMessage())), this.glspClientStartupTimeout)
+            : undefined;
+        pending.promise.then(client => {
+            clearTimeout(timeout);
+            attempt.connected();
+            this.startedAt = Date.now();
+            this.logger.info(`[${this.id}] Diagram client ${++this.startedClients} started.`);
+            this.clientStartedEmitter.fire(client);
+            this.restartOnLoss(client);
+        }, (error) => {
+            clearTimeout(timeout);
+            if (this.disposed) {
+                attempt.cancelled();
+                return;
             }
+            attempt.failed(error instanceof Error ? error.message : String(error), () => void this.restart());
+            this.scheduleRestart(() => {
+                if (this.glspClientDeferred === pending) {
+                    void this.restart();
+                }
+            });
         });
-        return deferred.promise;
+        try {
+            const connection = await this.createConnection();
+            // Ahead of the client's own listener, whose teardown rejects with a
+            // transport message instead.
+            connection.onClose(() => pending.reject(new Error(this.unreachableMessage())));
+            const client = await this.createGLSPClient(connection);
+            connection.onDispose(() => client.stop());
+            await this.start(client);
+            pending.resolve(client);
+        }
+        catch (error) {
+            pending.reject(error);
+        }
     }
+    /** Run `restart` after the delay for the failures so far, and return that delay. */
+    scheduleRestart(restart) {
+        if (this.startedAt > 0 && Date.now() - this.startedAt >= this.restartEscalationResetMs) {
+            this.consecutiveFailures = 0;
+        }
+        this.startedAt = 0;
+        const delay = this.restartDelaysMs[Math.min(this.consecutiveFailures, this.restartDelaysMs.length - 1)];
+        this.consecutiveFailures++;
+        clearTimeout(this.restartTimer);
+        this.restartTimer = setTimeout(restart, delay);
+        return delay;
+    }
+    /** Once `client` stops, replace it and start its replacement after the
+     *  restart delay, unless a dispose stopped it. */
+    restartOnLoss(client) {
+        const listener = client.onCurrentStateChanged(state => {
+            if (state !== client_1.ClientState.ServerError && state !== client_1.ClientState.Stopped) {
+                return;
+            }
+            listener.dispose();
+            if (!this.disposed) {
+                this.replaceClient();
+                this.clientLostEmitter.fire();
+                const delay = this.scheduleRestart(() => void this.activateClient());
+                // Upstream's client has just logged that it will not be restarted, which holds for it alone.
+                this.logger.info(`[${this.id}] Diagram client ${this.startedClients} lost; starting a fresh one in ${delay} ms.`);
+            }
+        });
+    }
+    /** Start the client and initialize its server, rejecting on failure; the
+     *  caller settles {@link glspClient}. */
     async start(glspClient) {
-        // Defer starting the GLSP client until a workspace is opened. If Theia
-        // starts without a workspace, this prevents creating the frontend-
-        // backend connection (and showing the "connecting" progress) prematurely.
+        await glspClient.start();
+        await this.initialize(glspClient);
+    }
+    /** Without upstream's own error notification, which would duplicate the reporter's. */
+    async initialize(glspClient) {
+        return glspClient.initializeServer(await this.createInitializeParameters());
+    }
+    /** Upstream's base client, without the notifications of its Theia subclass,
+     *  which would duplicate the reporter's. */
+    async createGLSPClient(connectionProvider) {
+        return new glsp_client_1.HydraniumGlspClient({ id: this.id, connectionProvider });
+    }
+    /**
+     * Whichever channel arrives goes to the attempt waiting now, and one that
+     * arrives with none waiting is closed. Theia holds each open until its
+     * websocket is back, and after an outage every held open past the first
+     * throws "already open" without reaching its handler, so the first to arrive
+     * has to serve the latest attempt. Without Theia's replay, which would be a
+     * second opener of the same path.
+     */
+    async createChannelConnection() {
+        this.channelRequest?.reject(new Error('A newer start took over the channel request.'));
+        const request = new promise_util_1.Deferred();
+        this.channelRequest = request;
+        this.connectionProvider.listen(common_1.GLSPContribution.getPath(this), (_path, channel) => {
+            const waiting = this.channelRequest;
+            this.channelRequest = undefined;
+            if (waiting && !this.disposed) {
+                waiting.resolve(channel);
+            }
+            else {
+                channel.close();
+            }
+        }, false);
+        const channel = await request.promise;
+        const connection = (0, common_1.createChannelConnection)(channel);
+        this.toDispose.push(core_1.Disposable.create(() => this.disposeChannel(connection, channel)));
+        return connection;
+    }
+    /** Also closes the channel: upstream leaves a Theia channel open, and the
+     *  next one on the same path then cannot open. */
+    async disposeChannel(connection, channel) {
+        await super.disposeChannel(connection, channel);
+        channel.close();
+    }
+    /** Also fails a start in flight, so nothing reports it after this. */
+    dispose() {
+        this.disposed = true;
+        clearTimeout(this.restartTimer);
+        this.glspClientDeferred.promise.catch(() => undefined);
+        this.glspClientDeferred.reject(new Error('The diagram client was disposed.'));
+        this.clientStartedEmitter.dispose();
+        this.clientLostEmitter.dispose();
+        super.dispose();
+    }
+    async workspaceOpened() {
         const roots = this.workspaceService.tryGetRoots();
-        if (!roots || roots.length === 0) {
-            await new Promise(resolve => {
-                const disposable = this.workspaceService.onWorkspaceChanged(changedRoots => {
-                    if (changedRoots && changedRoots.length > 0) {
-                        disposable.dispose();
-                        resolve();
-                    }
-                });
-            });
+        if (roots.length === 0) {
+            await core_1.Event.toPromise(core_1.Event.filter(this.workspaceService.onWorkspaceChanged, changedRoots => changedRoots.length > 0));
         }
-        await this.waitForBackendConnected();
-        return super.start(glspClient);
+    }
+    get connectionTarget() {
+        return (this.cachedConnectionTarget ??= {
+            connectingMessage: core_1.nls.localize('hydranium/glsp-client-theia/diagram-server-connecting', 'Connecting to the diagram server…'),
+            connectedMessage: core_1.nls.localize('hydranium/glsp-client-theia/diagram-server-connected', 'Connected to the diagram server.')
+        });
+    }
+    /** One object per contribution: the reporter keys what it has shown on it. */
+    cachedConnectionTarget;
+    unreachableMessage() {
+        return core_1.nls.localize('hydranium/glsp-client-theia/diagram-server-unreachable', 'Could not connect to the diagram server.');
+    }
+    startupTimeoutMessage() {
+        return core_1.nls.localize('hydranium/glsp-client-theia/diagram-server-timeout', 'The diagram server did not answer within {0} seconds.', String(Math.round(this.glspClientStartupTimeout / 1000)));
     }
 };
 exports.HydraniumGlspClientContribution = HydraniumGlspClientContribution;
 __decorate([
-    (0, inversify_1.inject)(output_channel_1.OutputChannelManager),
-    __metadata("design:type", output_channel_1.OutputChannelManager)
-], HydraniumGlspClientContribution.prototype, "outputChannelManager", 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)
 ], HydraniumGlspClientContribution.prototype, "workspaceService", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.ConnectionReporter),
+    __metadata("design:type", Object)
+], HydraniumGlspClientContribution.prototype, "connectionReporter", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.ChannelLogger),
+    __metadata("design:type", browser_1.ChannelLogger)
+], HydraniumGlspClientContribution.prototype, "logger", void 0);
 exports.HydraniumGlspClientContribution = HydraniumGlspClientContribution = __decorate([
     (0, inversify_1.injectable)(),
     __param(0, (0, inversify_1.unmanaged)()),

package/lib/browser/client-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-contribution.js","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAGlF,uEAA6E;AAC7E,sEAA+D;AAC/D,4DAA6E;AAC7E,6EAAgF;AAChF,0DAAgE;AAYhE;;;;;;;;;;;;;;;;;GAiBG;AAEI,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,8CAA0B;IACpC,oBAAoB,CAAwB;IACvC,gBAAgB,CAAoB;IAExE,EAAE,CAAS;IACD,WAAW,CAAS;IACpB,WAAW,CAAS;IAEvC,YAAyB,OAAkC;QACxD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAC1C,CAAC;IAED;;mDAE+C;IACrC,KAAK,CAAC,uBAAuB;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,WAAW,GACb,OAA4E,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACvH,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1C,OAAO;QACV,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,uBAAQ,EAAQ,CAAC;QACtC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE;YAClD,MAAM,IAAI,GAAI,OAA4E,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACjI,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnC,eAAe,CAAC,OAAO,EAAE,CAAC;gBAC1B,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC3B,CAAC;IAEkB,KAAK,CAAC,KAAK,CAAC,UAAsB;QAClD,uEAAuE;QACvE,mEAAmE;QACnE,0EAA0E;QAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAClD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE;oBACxE,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC3C,UAAU,CAAC,OAAO,EAAE,CAAC;wBACrB,OAAO,EAAE,CAAC;oBACb,CAAC;gBACJ,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,CAAC;QACN,CAAC;QACD,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;CACH,CAAA;AAtDY,0EAA+B;AACD;IAAvC,IAAA,kBAAM,EAAC,qCAAoB,CAAC;8BAAkC,qCAAoB;6EAAC;AACvC;IAA5C,IAAA,kBAAM,EAAC,0BAAgB,CAAC;8BAAuC,0BAAgB;yEAAC;0CAFvE,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;IASG,WAAA,IAAA,qBAAS,GAAE,CAAA;;GARd,+BAA+B,CAsD3C"}
+{"version":3,"file":"client-contribution.js","sourceRoot":"","sources":["../../src/browser/client-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/diagram-loader.d.ts

@@ -26,8 +26,7 @@ export interface DiagramLoadFailure {
     readonly error: unknown;
     /**
      * Whether the `severity: 'ERROR'` {@link StatusAction} reached the action
-     * dispatcher — i.e. whether GLSP's `StatusOverlay` is now displaying this
-     * failure.
+     * dispatcher. It says nothing about whether a status overlay shows it.
      *
      * `false` means the report itself failed, which happens when the action
      * dispatcher is the thing that could not initialize. A consumer that covers
@@ -111,9 +110,7 @@ export declare class HydraniumDiagramLoader extends DiagramLoader {
     /**
      * The sentence a failed load is reported with, on every surface that reports
      * it. Public because the canvas overlay is one of those surfaces and lives in
-     * another class: it renders this failure exactly when the `StatusAction` did
-     * not land, so a second copy of the sentence there could only ever drift
-     * unseen.
+     * another class, where a second copy of the sentence would drift.
      *
      * **The seam and the catalogue key answer different questions, so it carries
      * both.** Overriding this method changes the WORDING for every user of one

package/lib/browser/diagram-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,aAAa,EAAE,KAAK,qBAAqB,EAAgB,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,sBAAuB,SAAQ,aAAa;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,aAAa,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,OAAO,+BAAsC;IAChE,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAEhD;IAED;uEACmE;IACnE,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAI/B,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnE;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAQnD;;;;;;;;;;;OAWG;cACa,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjE;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAItC;qFACiF;IACjF,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;CAG7C"}
+{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,aAAa,EAAE,KAAK,qBAAqB,EAAgB,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,sBAAuB,SAAQ,aAAa;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,aAAa,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,OAAO,+BAAsC;IAChE,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAEhD;IAED;uEACmE;IACnE,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAI/B,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAQnD;;;;;;;;;;;OAWG;cACa,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjE;;;;;;;;;;;;;;;;OAgBG;IACH,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAItC;qFACiF;IACjF,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;CAG7C"}

package/lib/browser/diagram-loader.js

@@ -76,10 +76,7 @@ let HydraniumDiagramLoader = class HydraniumDiagramLoader extends client_1.Diagr
             this.settle({ status: 'loaded' });
         }
         catch (err) {
-            // Report first, settle second, and carry whether the report landed: a
-            // consumer that uncovers the canvas on settle then finds the error
-            // already on the status overlay — or learns that it has to render the
-            // failure itself because nothing else can.
+            // Report first, settle second, and carry whether the report landed.
             const surfaced = await this.reportLoadFailure(err);
             this.settle({ status: 'failed', error: err, surfaced });
         }
@@ -130,9 +127,7 @@ let HydraniumDiagramLoader = class HydraniumDiagramLoader extends client_1.Diagr
     /**
      * The sentence a failed load is reported with, on every surface that reports
      * it. Public because the canvas overlay is one of those surfaces and lives in
-     * another class: it renders this failure exactly when the `StatusAction` did
-     * not land, so a second copy of the sentence there could only ever drift
-     * unseen.
+     * another class, where a second copy of the sentence would drift.
      *
      * **The seam and the catalogue key answer different questions, so it carries
      * both.** Overriding this method changes the WORDING for every user of one

package/lib/browser/diagram-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA+F;AAC/F,iEAAoE;AACpE,kDAA+C;AAC/C,sCAAkC;AAClC,4DAAkE;AAkClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAa;IACZ,OAAO,CAAiB;IAE/C,OAAO,GAAG,IAAI,mBAAQ,EAAsB,CAAC;IACtD,OAAO,CAAsB;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;IAED;uEACmE;IACnE,eAAe;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAA+B;QAChD,IAAI,CAAC;YACF,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACZ,sEAAsE;YACtE,mEAAmE;YACnE,sEAAsE;YACtE,2CAA2C;YAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACO,MAAM,CAAC,OAA2B;QACzC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;OAWG;IACO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,IAAI,CAAC;QACf,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kEAAkE,EAAE,SAAS,CAAC,CAAC;YAClG,OAAO,KAAK,CAAC;QAChB,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBAAgB,CAAC,GAAY;QAC1B,OAAO,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChI,CAAC;IAED;qFACiF;IACvE,WAAW,CAAC,GAAY;QAC/B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;CACH,CAAA;AA1GY,wDAAsB;AACU;IAAzC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BAA8B,uBAAa;uDAAC;iCADxD,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA0GlC"}
+{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA+F;AAC/F,iEAAoE;AACpE,kDAA+C;AAC/C,sCAAkC;AAClC,4DAAkE;AAiClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAa;IACZ,OAAO,CAAiB;IAE/C,OAAO,GAAG,IAAI,mBAAQ,EAAsB,CAAC;IACtD,OAAO,CAAsB;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;IAED;uEACmE;IACnE,eAAe;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAA+B;QAChD,IAAI,CAAC;YACF,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACZ,oEAAoE;YACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACO,MAAM,CAAC,OAA2B;QACzC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;OAWG;IACO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,IAAI,CAAC;QACf,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kEAAkE,EAAE,SAAS,CAAC,CAAC;YAClG,OAAO,KAAK,CAAC;QAChB,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,gBAAgB,CAAC,GAAY;QAC1B,OAAO,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChI,CAAC;IAED;qFACiF;IACvE,WAAW,CAAC,GAAY;QAC/B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;CACH,CAAA;AArGY,wDAAsB;AACU;IAAzC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BAA8B,uBAAa;uDAAC;iCADxD,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAqGlC"}