@hydranium/data-client-theia 1.0.0-next.216 → 1.0.0-next.217

package/README.md

@@ -45,9 +45,10 @@ text edits.
   would hang in port discovery; pass this as `whenReady`.
 - **`DataSessionStopContribution`** — ends a frontend's data sessions with its
   page, so the server ends them as closed rather than waiting for the connection
-  to go, and holds the page while one of them is saving. Bind it as a
-  `FrontendApplicationContribution` and call its `track(connection)` once, where
-  the connection is bound.
+  to go, and holds the page while one of them is saving.
+  `bindDataConnection(bind, isBound, ConnectionClass)` binds a connection with
+  its sessions tracked, and binds this contribution and the
+  `ConnectionReporter` the connection's port injects unless they are bound.
 - **Backend (`./node`)** — `DataServerConnectionHandler` (the socket bridge,
   over `@hydranium/client-theia`'s `SocketChannelForwarder`),
   `createDataServerConnectionContainerModule(...handlers)` for the
@@ -80,11 +81,15 @@ This package declares no `theiaExtensions` — it is a library your own Theia
 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 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 **frontend** module:
+  - binds your `ChannelDataPort` subclass in singleton scope;
+  - calls `bindDataConnection(bind, isBound, MyConnection)` for the connection
+    over it;
+  - calls `bindChannelLogger` from `@hydranium/client-theia`, where the port
+    logs the connection failures it leaves to the reporter;
+  - calls `bindEditorDiskSync` from `@hydranium/client-theia`, since a data
+    server save writes a file an editor can have open;
+  - calls `bindHostDiagnostics` for the diagnostics commands;
 - the **backend** module is typically a one-liner:
   `export default createDataServerConnectionContainerModule(MyHandler)`, where
   `MyHandler` extends `DataServerConnectionHandler`.
@@ -107,7 +112,7 @@ its loading state indefinitely with nothing in the server log to say why.
 | ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- |
 | `.`         | Nothing — the surface is split by environment, so the root barrel stays empty.                                                                                                                        | browser-neutral (gated)          |
 | `./common`  | `EmitterDataClient` — a module lands here only when values, types and relative imports are all neutral or Theia COMMON tier. No error-reconstruction bridge, and that is a property of the transport: the direct `vscode-jsonrpc` connection carries a typed error across the relay natively. | browser-neutral (gated)          |
-| `./browser` | `openChannelConnection`, `createChannelConnection`, the three `Abstract*DataServiceFrontend` bases, `bindHostDiagnostics`, `whenWorkspaceOpen`, `DataSessionStopContribution` | browser / Theia frontend (gated) |
+| `./browser` | `openChannelConnection`, `createChannelConnection`, the three `Abstract*DataServiceFrontend` bases, `bindHostDiagnostics`, `whenWorkspaceOpen`, `DataSessionStopContribution`, `bindDataConnection` | browser / Theia frontend (gated) |
 | `./node`    | `DataServerConnectionHandler`, `createDataServerConnectionContainerModule`, `HostDiagnosticsServer`, `createHostDiagnosticsBackendModule`                                    | Node / Theia backend             |
 
 Resolve the subpaths with [a resolver that reads

package/lib/browser/data-session-stop-contribution.d.ts

@@ -7,12 +7,12 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import type { DataConnection, DataServerProtocol, DataSession, DiagnosticOf, TransferElement } from '@hydranium/protocol';
-import type { FrontendApplicationContribution, OnWillStopAction } from '@theia/core/lib/browser';
+import { FrontendApplicationContribution, type OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
+import { type interfaces } from '@theia/core/shared/inversify';
 /**
  * Ends a Theia frontend's data sessions with its page, and holds the page
- * while one of them is still saving. Bind it as a
- * `FrontendApplicationContribution` in singleton scope and {@link track} each
- * data connection the frontend binds, once.
+ * while one of them is still saving. {@link bindDataConnection} binds it and
+ * has it {@link track} each data connection bound through it.
  *
  * **Stop.** {@link onStop} disposes every tracked session, which sends its
  * `closeSession`, so the server ends it as closed: each document it was the
@@ -61,4 +61,16 @@ export declare class DataSessionStopContribution implements FrontendApplicationC
     protected savingSessions(): DataSession<TransferElement>[];
     onStop(): void;
 }
+/**
+ * Bind `connectionClass` in singleton scope, its sessions tracked by the
+ * {@link DataSessionStopContribution}, and bind that contribution and the
+ * `ConnectionReporter` the connection's port injects unless they are bound
+ * already. The binding's `onActivation` is taken; a frontend's own hook on the
+ * connection goes on the container's `onActivation`, which runs after it. A
+ * subclass of the contribution is rebound after this call: one bound before it
+ * is never registered as a frontend contribution, so its stop never runs.
+ * Call it once per connection class: a second call makes the class's lookup
+ * ambiguous.
+ */
+export declare function bindDataConnection<TTransfer extends TransferElement, TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>>, TClient extends object>(bind: interfaces.Bind, isBound: interfaces.IsBound, connectionClass: interfaces.Newable<DataConnection<TTransfer, TServer, TClient>>): void;
 //# sourceMappingURL=data-session-stop-contribution.d.ts.map

package/lib/browser/data-session-stop-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-session-stop-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/data-session-stop-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG1H,OAAO,KAAK,EAAE,+BAA+B,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGjG;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBACa,2BAA4B,YAAW,+BAA+B;IAChF,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,kKAA2C;IACtE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAK;IAE/C;;;;OAIG;IACH,KAAK,CAAC,SAAS,SAAS,eAAe,EAAE,OAAO,SAAS,kBAAkB,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,SAAS,MAAM,EAClI,UAAU,EAAE,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,GACvD,IAAI,CAGN;IAED;;;;OAIG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,IAAI,CAYlE;IAED,UAAU,IAAI,gBAAgB,GAAG,SAAS,CAoBzC;IAED,kDAAkD;IAClD,SAAS,CAAC,cAAc,IAAI,WAAW,CAAC,eAAe,CAAC,EAAE,CAEzD;IAED,MAAM,IAAI,IAAI,CAIb;CACH"}
+{"version":3,"file":"data-session-stop-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/data-session-stop-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG1H,OAAO,EAAE,+BAA+B,EAAE,KAAK,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AACnI,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE3E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,qBACa,2BAA4B,YAAW,+BAA+B;IAChF,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,kKAA2C;IACtE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAK;IAE/C;;;;OAIG;IACH,KAAK,CAAC,SAAS,SAAS,eAAe,EAAE,OAAO,SAAS,kBAAkB,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,SAAS,MAAM,EAClI,UAAU,EAAE,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,GACvD,IAAI,CAGN;IAED;;;;OAIG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,eAAe,CAAC,GAAG,IAAI,CAYlE;IAED,UAAU,IAAI,gBAAgB,GAAG,SAAS,CAoBzC;IAED,kDAAkD;IAClD,SAAS,CAAC,cAAc,IAAI,WAAW,CAAC,eAAe,CAAC,EAAE,CAEzD;IAED,MAAM,IAAI,IAAI,CAIb;CACH;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAC/B,SAAS,SAAS,eAAe,EACjC,OAAO,SAAS,kBAAkB,CAAC,SAAS,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EACpE,OAAO,SAAS,MAAM,EAEtB,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,GAChF,IAAI,CAaN"}

package/lib/browser/data-session-stop-contribution.js

@@ -15,12 +15,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSessionStopContribution = void 0;
+exports.bindDataConnection = bindDataConnection;
+const browser_1 = require("@hydranium/client-theia/browser");
+// Not the `@theia/core/lib/browser` barrel: it touches DOM globals at module
+// load, which the node-environment unit tests cannot provide.
+const frontend_application_contribution_1 = require("@theia/core/lib/browser/frontend-application-contribution");
 const inversify_1 = require("@theia/core/shared/inversify");
 /**
  * Ends a Theia frontend's data sessions with its page, and holds the page
- * while one of them is still saving. Bind it as a
- * `FrontendApplicationContribution` in singleton scope and {@link track} each
- * data connection the frontend binds, once.
+ * while one of them is still saving. {@link bindDataConnection} binds it and
+ * has it {@link track} each data connection bound through it.
  *
  * **Stop.** {@link onStop} disposes every tracked session, which sends its
  * `closeSession`, so the server ends it as closed: each document it was the
@@ -114,4 +118,29 @@ exports.DataSessionStopContribution = DataSessionStopContribution;
 exports.DataSessionStopContribution = DataSessionStopContribution = __decorate([
     (0, inversify_1.injectable)()
 ], DataSessionStopContribution);
+/**
+ * Bind `connectionClass` in singleton scope, its sessions tracked by the
+ * {@link DataSessionStopContribution}, and bind that contribution and the
+ * `ConnectionReporter` the connection's port injects unless they are bound
+ * already. The binding's `onActivation` is taken; a frontend's own hook on the
+ * connection goes on the container's `onActivation`, which runs after it. A
+ * subclass of the contribution is rebound after this call: one bound before it
+ * is never registered as a frontend contribution, so its stop never runs.
+ * Call it once per connection class: a second call makes the class's lookup
+ * ambiguous.
+ */
+function bindDataConnection(bind, isBound, connectionClass) {
+    bind(connectionClass)
+        .toSelf()
+        .inSingletonScope()
+        .onActivation((context, connection) => {
+        context.container.get(DataSessionStopContribution).track(connection);
+        return connection;
+    });
+    if (!isBound(DataSessionStopContribution)) {
+        bind(DataSessionStopContribution).toSelf().inSingletonScope();
+        bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(DataSessionStopContribution);
+    }
+    (0, browser_1.bindConnectionReporter)(bind, isBound);
+}
 //# sourceMappingURL=data-session-stop-contribution.js.map

package/lib/browser/data-session-stop-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-session-stop-contribution.js","sourceRoot":"","sources":["../../src/browser/data-session-stop-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAMlF,4DAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IACrC,wEAAwE;IACrD,QAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;IACtE;;;;OAIG;IACgB,eAAe,GAAW,CAAC,CAAC;IAE/C;;;;OAIG;IACH,KAAK,CACF,UAAuD;QAEvD,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;IAED;;;;OAIG;IACO,YAAY,CAAC,OAAqC;QACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,uEAAuE;QACvE,qBAAqB;QACrB,MAAM,OAAO,GAAG,GAAS,EAAE,CACxB,KAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtH,0EAA0E;QAC1E,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACb,CAAC;aAAM,CAAC;YACL,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACJ,CAAC;IAED,UAAU;QACP,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACpB,CAAC;QACD,OAAO;YACJ,uEAAuE;YACvE,MAAM,EAAE,0BAA0B;YAClC,MAAM,EAAE,KAAK,IAAI,EAAE;gBAChB,+DAA+D;gBAC/D,qEAAqE;gBACrE,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC;oBACtD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;oBACrC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACvB,MAAM;oBACT,CAAC;oBACD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;gBACxE,CAAC;gBACD,OAAO,IAAI,CAAC;YACf,CAAC;SACH,CAAC;IACL,CAAC;IAED,kDAAkD;IACxC,cAAc;QACrB,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzE,CAAC;IAED,MAAM;QACH,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC;IACJ,CAAC;CACH,CAAA;;sCAzEY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAyEvC"}
+{"version":3,"file":"data-session-stop-contribution.js","sourceRoot":"","sources":["../../src/browser/data-session-stop-contribution.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/data-client-theia",
-  "version": "1.0.0-next.216",
+  "version": "1.0.0-next.217",
   "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",
@@ -61,8 +61,8 @@
     "watch": "tsc -b -w --preserveWatchOutput"
   },
   "devDependencies": {
-    "@hydranium/client-theia": "1.0.0-next.216",
-    "@hydranium/protocol": "1.0.0-next.216",
+    "@hydranium/client-theia": "1.0.0-next.217",
+    "@hydranium/protocol": "1.0.0-next.217",
     "@theia/core": "^1.70.0",
     "@theia/workspace": "^1.70.0",
     "@types/node": "^22.0.0",
@@ -73,8 +73,8 @@
     "vscode-jsonrpc": "9.0.0"
   },
   "peerDependencies": {
-    "@hydranium/client-theia": "1.0.0-next.216",
-    "@hydranium/protocol": "1.0.0-next.216",
+    "@hydranium/client-theia": "1.0.0-next.217",
+    "@hydranium/protocol": "1.0.0-next.217",
     "@theia/core": "^1.70.0",
     "@theia/workspace": "^1.70.0",
     "inversify": "^6.0.0",

package/src/browser/data-session-stop-contribution.ts

@@ -7,17 +7,17 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
+import { bindConnectionReporter } from '@hydranium/client-theia/browser';
 import type { DataConnection, DataServerProtocol, DataSession, DiagnosticOf, TransferElement } from '@hydranium/protocol';
-// Type-only: the `@theia/core/lib/browser` barrel touches DOM globals at module
+// Not the `@theia/core/lib/browser` barrel: it touches DOM globals at module
 // load, which the node-environment unit tests cannot provide.
-import type { FrontendApplicationContribution, OnWillStopAction } from '@theia/core/lib/browser';
-import { injectable } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution, type OnWillStopAction } from '@theia/core/lib/browser/frontend-application-contribution';
+import { injectable, type interfaces } from '@theia/core/shared/inversify';
 
 /**
  * Ends a Theia frontend's data sessions with its page, and holds the page
- * while one of them is still saving. Bind it as a
- * `FrontendApplicationContribution` in singleton scope and {@link track} each
- * data connection the frontend binds, once.
+ * while one of them is still saving. {@link bindDataConnection} binds it and
+ * has it {@link track} each data connection bound through it.
  *
  * **Stop.** {@link onStop} disposes every tracked session, which sends its
  * `closeSession`, so the server ends it as closed: each document it was the
@@ -115,3 +115,37 @@ export class DataSessionStopContribution implements FrontendApplicationContribut
       }
    }
 }
+
+/**
+ * Bind `connectionClass` in singleton scope, its sessions tracked by the
+ * {@link DataSessionStopContribution}, and bind that contribution and the
+ * `ConnectionReporter` the connection's port injects unless they are bound
+ * already. The binding's `onActivation` is taken; a frontend's own hook on the
+ * connection goes on the container's `onActivation`, which runs after it. A
+ * subclass of the contribution is rebound after this call: one bound before it
+ * is never registered as a frontend contribution, so its stop never runs.
+ * Call it once per connection class: a second call makes the class's lookup
+ * ambiguous.
+ */
+export function bindDataConnection<
+   TTransfer extends TransferElement,
+   TServer extends DataServerProtocol<TTransfer, DiagnosticOf<TServer>>,
+   TClient extends object
+>(
+   bind: interfaces.Bind,
+   isBound: interfaces.IsBound,
+   connectionClass: interfaces.Newable<DataConnection<TTransfer, TServer, TClient>>
+): void {
+   bind(connectionClass)
+      .toSelf()
+      .inSingletonScope()
+      .onActivation((context, connection) => {
+         context.container.get(DataSessionStopContribution).track(connection);
+         return connection;
+      });
+   if (!isBound(DataSessionStopContribution)) {
+      bind(DataSessionStopContribution).toSelf().inSingletonScope();
+      bind(FrontendApplicationContribution).toService(DataSessionStopContribution);
+   }
+   bindConnectionReporter(bind, isBound);
+}