@hydranium/glsp-server 1.0.0-next.309 → 1.0.0-next.313

package/README.md

@@ -44,7 +44,9 @@ decorators need it.
    your diagram modules in `serverModule`,
    `new HydraniumGlspAppModule({ shared })` in `appModules`, and a
    `GlspClientLogger` from `createLogger`. Pass `lspConnection` and
-   `portCommand` to tell the client its port.
+   `portCommand` to tell the client its port. Without an LSP head, pass the
+   workspace root as `workspace`: the head brings the workspace up before it
+   listens.
 3. In a browser, start it with `startGlspServerInWorker` from `./browser`
    instead, on a transferred `MessagePort`.
 

package/lib/node/start-glsp-server.d.ts

@@ -10,7 +10,7 @@ import { type Logger as GlspLogger, type ServerModule, SocketServerLauncher } fr
 import { ContainerModule } from 'inversify';
 import { type Logger } from '@hydranium/protocol';
 import type * as net from 'node:net';
-import type { IntegratedServer } from '@hydranium/core';
+import { type IntegratedServer, type WorkspaceFolderInput } from '@hydranium/core';
 import type { LspConnectionLike } from '@hydranium/core/node';
 /**
  * The default socket launcher of {@link startGlspServer}: GLSP's own,
@@ -80,6 +80,13 @@ export interface GlspServerOptions {
      * symbol) here, and replace the launcher with `rebind`.
      */
     readonly appModules?: ReadonlyArray<ContainerModule>;
+    /**
+     * Workspace root(s) to initialize — a filesystem path or a `URI`. Required
+     * when no LSP head is composed, refused beside one: see
+     * `initializeWorkspaceWithoutLsp`. The shared services are the ones
+     * `HydraniumGlspAppModule` binds in {@link appModules}.
+     */
+    readonly workspace?: WorkspaceFolderInput | ReadonlyArray<WorkspaceFolderInput>;
     /**
      * Optional LSP connection used to register a port-discovery request
      * handler. When both `lspConnection` and `portCommand` are set, the
@@ -113,12 +120,14 @@ export interface GlspServerOptions {
 /**
  * Live GLSP server handle returned by {@link startGlspServer}.
  *
- * - {@link IntegratedServer.started} resolves once the GLSP socket is
- *   listening AND (if configured) the port-discovery handler has been
- *   registered on the LSP connection.
- * - {@link IntegratedServer.stopped} resolves once GLSP's
- *   `SocketServerLauncher.start` promise settles (i.e. the underlying
- *   `net.Server` has closed).
+ * - {@link IntegratedServer.started} resolves once the workspace is up,
+ *   where the launcher brings it up, AND the GLSP socket is listening AND
+ *   (if configured) the port-discovery handler has been registered on the
+ *   LSP connection. It rejects, and nothing listens, when the bring-up fails.
+ * - {@link IntegratedServer.stopped} settles as GLSP's
+ *   `SocketServerLauncher.start` promise does (i.e. once the underlying
+ *   `net.Server` has closed), or resolves once a failed bring-up has
+ *   rejected `started`.
  * - {@link port} is `undefined` until `started` resolves.
  */
 export interface StartedGlspServer extends IntegratedServer {
@@ -139,6 +148,10 @@ export interface StartedGlspServer extends IntegratedServer {
  * (data-server's pattern), not GLSP's Inversify-driven per-connection
  * server-instance model. Bridging the two would lose GLSP's action-handler
  * registry plumbing.
+ *
+ * **Without an LSP head the launcher brings the workspace up, then
+ * listens**, as `startSocketServer` does: a diagram loaded before the
+ * bring-up starts keeps its cross-file edges missing for good.
  */
 export declare function startGlspServer(options: GlspServerOptions): StartedGlspServer;
 //# sourceMappingURL=start-glsp-server.d.ts.map

package/lib/node/start-glsp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-glsp-server.d.ts","sourceRoot":"","sources":["../../src/node/start-glsp-server.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,IAAI,UAAU,EACzB,KAAK,YAAY,EAEjB,oBAAoB,EAGtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAa,eAAe,EAAc,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsD,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACtG,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAKxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;;;;GAKG;AACH,qBACa,iCAAkC,SAAQ,oBAAoB;IACxE,UAAmB,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,UAAU,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAW5G;CACH;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,IAAI,eAAe,CAIhE;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC;IACvD;;;OAGG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC;;;;;;;;OAQG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACrD;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAC3C;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACxD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,CAmF7E"}
+{"version":3,"file":"start-glsp-server.d.ts","sourceRoot":"","sources":["../../src/node/start-glsp-server.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,IAAI,UAAU,EACzB,KAAK,YAAY,EAEjB,oBAAoB,EAGtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAa,eAAe,EAAc,MAAM,WAAW,CAAC;AACnE,OAAO,EAAqE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACrH,OAAO,KAAK,KAAK,GAAG,MAAM,UAAU,CAAC;AAErC,OAAO,EAEJ,KAAK,gBAAgB,EAErB,KAAK,oBAAoB,EAC3B,MAAM,iBAAiB,CAAC;AAMzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;;;;GAKG;AACH,qBACa,iCAAkC,SAAQ,oBAAoB;IACxE,UAAmB,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,UAAU,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAW5G;CACH;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,IAAI,eAAe,CAIhE;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC;IACvD;;;OAGG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC;;;;;;;;OAQG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACrD;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAChF;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAC3C;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC7D;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACxD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,iBAAiB,CA+G7E"}

package/lib/node/start-glsp-server.js

@@ -14,12 +14,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { SocketServerLauncher, createAppModule, defaultSocketLaunchOptions } from '@eclipse-glsp/server/node.js';
 import { Container, ContainerModule, injectable } from 'inversify';
-import { Deferred, describeErrorWithStack, sendByMethodName } from '@hydranium/protocol';
+import { Deferred, describeError, describeErrorWithStack, sendByMethodName } from '@hydranium/protocol';
 import { createMessageConnection, SocketMessageReader, SocketMessageWriter } from 'vscode-jsonrpc/node';
+import { initializeWorkspaceWithoutLsp } from '@hydranium/core';
 import { dropNotificationsToGoneClient } from '../launcher/drop-notifications-to-gone-client.js';
 import { createGlspConnectionLogger } from '../launcher/glsp-connection-logger.js';
 import { createGlspFrameworkOverrides } from '../launcher/glsp-framework-overrides.js';
 import { createGlspServerOverrides } from '../launcher/glsp-server-overrides.js';
+import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
 /**
  * The default socket launcher of {@link startGlspServer}: GLSP's own,
  * with each connection built from this package's copy of `vscode-jsonrpc`, so a
@@ -65,6 +67,10 @@ export function createGlspSocketLauncherModule() {
  * (data-server's pattern), not GLSP's Inversify-driven per-connection
  * server-instance model. Bridging the two would lose GLSP's action-handler
  * registry plumbing.
+ *
+ * **Without an LSP head the launcher brings the workspace up, then
+ * listens**, as `startSocketServer` does: a diagram loaded before the
+ * bring-up starts keeps its cross-file edges missing for good.
  */
 export function startGlspServer(options) {
     const launchOptions = {
@@ -89,9 +95,12 @@ export function startGlspServer(options) {
     // the tier where each connection gets a server of its own.
     launcher.configure(options.serverModule, createGlspServerOverrides());
     const started = new Deferred();
+    const stopped = new Deferred();
     const portHandle = { port: undefined };
-    try {
-        const stoppedPromise = Promise.resolve(launcher.start(launchOptions));
+    const listen = () => {
+        // `start` creates the `net.Server` and listens, so the listeners below
+        // attach to it synchronously after the call, before any event fires.
+        Promise.resolve(launcher.start(launchOptions)).then(() => stopped.resolve(), (error) => stopped.reject(error));
         // GLSP's `SocketServerLauncher.netServer` field is `protected`; we
         // access it via property indexing. The alternative is to fork the
         // launcher or add a 'listening' callback to GLSP upstream.
@@ -120,23 +129,42 @@ export function startGlspServer(options) {
         if (options.onClientConnection) {
             netServer.on('connection', options.onClientConnection);
         }
-        return {
-            get port() {
-                return portHandle.port;
-            },
-            started: started.promise,
-            stopped: stoppedPromise
-        };
-    }
-    catch (error) {
-        lifecycle?.error('Error in GLSP server launcher:', error);
-        return {
-            get port() {
-                return portHandle.port;
-            },
-            started: Promise.reject(error),
-            stopped: Promise.resolve()
-        };
-    }
+    };
+    // The workspace manager logs a failed initialization itself; a refused
+    // `workspace` throws before `initializing` is set.
+    let initializing = false;
+    const begin = async () => {
+        const shared = appContainer.isBound(HydraniumTypes.SharedCoreServices)
+            ? appContainer.get(HydraniumTypes.SharedCoreServices)
+            : undefined;
+        if (shared === undefined) {
+            throw new Error('[hydranium] startGlspServer found no shared services in its app container. Add `new HydraniumGlspAppModule({ shared })` to `appModules`.');
+        }
+        const initialization = initializeWorkspaceWithoutLsp(shared, options.workspace);
+        initializing = true;
+        await initialization;
+        initializing = false;
+        listen();
+    };
+    begin().catch((error) => {
+        if (initializing) {
+            lifecycle?.debug(`[GlspServer] Startup failed: the workspace did not initialize. ${describeError(error)}`);
+        }
+        else {
+            lifecycle?.error(`[GlspServer] Startup failed: ${describeErrorWithStack(error)}`);
+        }
+        started.reject(error);
+        stopped.resolve();
+    });
+    // `started` is always observed internally, as `startStdioServer`'s is, so a
+    // caller that closes early and ignores it cannot crash the process.
+    void started.promise.catch(() => undefined);
+    return {
+        get port() {
+            return portHandle.port;
+        },
+        started: started.promise,
+        stopped: stopped.promise
+    };
 }
 //# sourceMappingURL=start-glsp-server.js.map

package/lib/node/start-glsp-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"start-glsp-server.js","sourceRoot":"","sources":["../../src/node/start-glsp-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"start-glsp-server.js","sourceRoot":"","sources":["../../src/node/start-glsp-server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-server",
-  "version": "1.0.0-next.309",
+  "version": "1.0.0-next.313",
   "description": "GLSP protocol head for the hydranium framework. Peer of @hydranium/core/lsp and @hydranium/data-server; built on @hydranium/core.",
   "keywords": [
     "diagram",
@@ -70,9 +70,9 @@
   },
   "devDependencies": {
     "@eclipse-glsp/server": "2.7.0",
-    "@hydranium/core": "1.0.0-next.309",
-    "@hydranium/langium": "1.0.0-next.309",
-    "@hydranium/protocol": "1.0.0-next.309",
+    "@hydranium/core": "1.0.0-next.313",
+    "@hydranium/langium": "1.0.0-next.313",
+    "@hydranium/protocol": "1.0.0-next.313",
     "inversify": "6.2.2",
     "reflect-metadata": "0.2.2",
     "rimraf": "^5.0.0",
@@ -82,9 +82,9 @@
   },
   "peerDependencies": {
     "@eclipse-glsp/server": "^2.6.0",
-    "@hydranium/core": "1.0.0-next.309",
-    "@hydranium/langium": "1.0.0-next.309",
-    "@hydranium/protocol": "1.0.0-next.309",
+    "@hydranium/core": "1.0.0-next.313",
+    "@hydranium/langium": "1.0.0-next.313",
+    "@hydranium/protocol": "1.0.0-next.313",
     "inversify": "^6.0.0",
     "reflect-metadata": "^0.2.2",
     "vscode-jsonrpc": "^9.0.0",

package/src/node/start-glsp-server.ts

@@ -16,14 +16,20 @@ import {
    defaultSocketLaunchOptions
 } from '@eclipse-glsp/server/node.js';
 import { Container, ContainerModule, injectable } from 'inversify';
-import { Deferred, describeErrorWithStack, sendByMethodName, type Logger } from '@hydranium/protocol';
+import { Deferred, describeError, describeErrorWithStack, sendByMethodName, type Logger } from '@hydranium/protocol';
 import type * as net from 'node:net';
 import { createMessageConnection, SocketMessageReader, SocketMessageWriter } from 'vscode-jsonrpc/node';
-import type { IntegratedServer } from '@hydranium/core';
+import {
+   initializeWorkspaceWithoutLsp,
+   type IntegratedServer,
+   type ServerSharedServicesMinimal,
+   type WorkspaceFolderInput
+} from '@hydranium/core';
 import { dropNotificationsToGoneClient } from '../launcher/drop-notifications-to-gone-client.js';
 import { createGlspConnectionLogger } from '../launcher/glsp-connection-logger.js';
 import { createGlspFrameworkOverrides } from '../launcher/glsp-framework-overrides.js';
 import { createGlspServerOverrides } from '../launcher/glsp-server-overrides.js';
+import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
 import type { LspConnectionLike } from '@hydranium/core/node';
 
 /**
@@ -112,6 +118,13 @@ export interface GlspServerOptions {
     * symbol) here, and replace the launcher with `rebind`.
     */
    readonly appModules?: ReadonlyArray<ContainerModule>;
+   /**
+    * Workspace root(s) to initialize — a filesystem path or a `URI`. Required
+    * when no LSP head is composed, refused beside one: see
+    * `initializeWorkspaceWithoutLsp`. The shared services are the ones
+    * `HydraniumGlspAppModule` binds in {@link appModules}.
+    */
+   readonly workspace?: WorkspaceFolderInput | ReadonlyArray<WorkspaceFolderInput>;
    /**
     * Optional LSP connection used to register a port-discovery request
     * handler. When both `lspConnection` and `portCommand` are set, the
@@ -146,12 +159,14 @@ export interface GlspServerOptions {
 /**
  * Live GLSP server handle returned by {@link startGlspServer}.
  *
- * - {@link IntegratedServer.started} resolves once the GLSP socket is
- *   listening AND (if configured) the port-discovery handler has been
- *   registered on the LSP connection.
- * - {@link IntegratedServer.stopped} resolves once GLSP's
- *   `SocketServerLauncher.start` promise settles (i.e. the underlying
- *   `net.Server` has closed).
+ * - {@link IntegratedServer.started} resolves once the workspace is up,
+ *   where the launcher brings it up, AND the GLSP socket is listening AND
+ *   (if configured) the port-discovery handler has been registered on the
+ *   LSP connection. It rejects, and nothing listens, when the bring-up fails.
+ * - {@link IntegratedServer.stopped} settles as GLSP's
+ *   `SocketServerLauncher.start` promise does (i.e. once the underlying
+ *   `net.Server` has closed), or resolves once a failed bring-up has
+ *   rejected `started`.
  * - {@link port} is `undefined` until `started` resolves.
  */
 export interface StartedGlspServer extends IntegratedServer {
@@ -173,6 +188,10 @@ export interface StartedGlspServer extends IntegratedServer {
  * (data-server's pattern), not GLSP's Inversify-driven per-connection
  * server-instance model. Bridging the two would lose GLSP's action-handler
  * registry plumbing.
+ *
+ * **Without an LSP head the launcher brings the workspace up, then
+ * listens**, as `startSocketServer` does: a diagram loaded before the
+ * bring-up starts keeps its cross-file edges missing for good.
  */
 export function startGlspServer(options: GlspServerOptions): StartedGlspServer {
    const launchOptions: SocketLaunchOptions = {
@@ -206,10 +225,16 @@ export function startGlspServer(options: GlspServerOptions): StartedGlspServer {
    launcher.configure(options.serverModule, createGlspServerOverrides());
 
    const started = new Deferred<void>();
+   const stopped = new Deferred<void>();
    const portHandle: { port: number | undefined } = { port: undefined };
 
-   try {
-      const stoppedPromise = Promise.resolve(launcher.start(launchOptions));
+   const listen = (): void => {
+      // `start` creates the `net.Server` and listens, so the listeners below
+      // attach to it synchronously after the call, before any event fires.
+      Promise.resolve(launcher.start(launchOptions)).then(
+         () => stopped.resolve(),
+         (error: unknown) => stopped.reject(error)
+      );
 
       // GLSP's `SocketServerLauncher.netServer` field is `protected`; we
       // access it via property indexing. The alternative is to fork the
@@ -239,22 +264,44 @@ export function startGlspServer(options: GlspServerOptions): StartedGlspServer {
       if (options.onClientConnection) {
          netServer.on('connection', options.onClientConnection);
       }
+   };
 
-      return {
-         get port() {
-            return portHandle.port;
-         },
-         started: started.promise,
-         stopped: stoppedPromise
-      };
-   } catch (error) {
-      lifecycle?.error('Error in GLSP server launcher:', error);
-      return {
-         get port() {
-            return portHandle.port;
-         },
-         started: Promise.reject(error),
-         stopped: Promise.resolve()
-      };
-   }
+   // The workspace manager logs a failed initialization itself; a refused
+   // `workspace` throws before `initializing` is set.
+   let initializing = false;
+   const begin = async (): Promise<void> => {
+      const shared = appContainer.isBound(HydraniumTypes.SharedCoreServices)
+         ? appContainer.get<ServerSharedServicesMinimal>(HydraniumTypes.SharedCoreServices)
+         : undefined;
+      if (shared === undefined) {
+         throw new Error(
+            '[hydranium] startGlspServer found no shared services in its app container. Add `new HydraniumGlspAppModule({ shared })` to `appModules`.'
+         );
+      }
+      const initialization = initializeWorkspaceWithoutLsp(shared, options.workspace);
+      initializing = true;
+      await initialization;
+      initializing = false;
+      listen();
+   };
+   begin().catch((error: unknown) => {
+      if (initializing) {
+         lifecycle?.debug(`[GlspServer] Startup failed: the workspace did not initialize. ${describeError(error)}`);
+      } else {
+         lifecycle?.error(`[GlspServer] Startup failed: ${describeErrorWithStack(error)}`);
+      }
+      started.reject(error);
+      stopped.resolve();
+   });
+   // `started` is always observed internally, as `startStdioServer`'s is, so a
+   // caller that closes early and ignores it cannot crash the process.
+   void started.promise.catch(() => undefined);
+
+   return {
+      get port() {
+         return portHandle.port;
+      },
+      started: started.promise,
+      stopped: stopped.promise
+   };
 }