@ganglion/xacpx-relay 0.1.0 → 0.2.0

package/dist/cli.d.ts

@@ -12,7 +12,8 @@ export declare function resolveBundledWebRoot(): string | undefined;
 export interface StartOptions {
     dbPath: string;
     httpPort: number;
-    wsPort: number;
+    /** Dedicated gateway port; undefined (default) merges the gateway onto the HTTP port. */
+    wsPort: number | undefined;
     host: string | undefined;
     webRoot: string | undefined;
     historyRetentionDays: number | undefined;

package/dist/cli.js

@@ -979,26 +979,37 @@ async function startRelayServer(options) {
       reject(err);
     }
   });
-  const wss = new WebSocketServer({ port: options.wsPort, host });
-  await new Promise((resolve) => wss.on("listening", () => resolve()));
-  wss.on("connection", (socket) => runtime.gateway.handleConnection(socket));
+  const dedicated = options.wsPort !== undefined;
+  let wss;
+  let gatewayWss;
+  if (dedicated) {
+    wss = new WebSocketServer({ port: options.wsPort, host });
+    await new Promise((resolve) => wss.on("listening", () => resolve()));
+    wss.on("connection", (socket) => runtime.gateway.handleConnection(socket));
+  } else {
+    gatewayWss = new WebSocketServer({ noServer: true });
+  }
   const webWss = new WebSocketServer({ noServer: true });
   httpServer.on("upgrade", (req, socket, head) => {
-    const path = (req.url ?? "").split("?")[0];
-    if (path !== "/ws") {
-      socket.destroy();
+    const path = (req.url ?? "").split("?")[0] ?? "";
+    if (path === "/ws") {
+      const token = parseCookie(req.headers.cookie ?? "")["xrelay_session"];
+      const account = token ? runtime.accounts.getSessionAccount(token) : null;
+      if (!account) {
+        socket.destroy();
+        return;
+      }
+      webWss.handleUpgrade(req, socket, head, (ws) => runtime.webGateway.register(account.id, ws));
       return;
     }
-    const token = parseCookie(req.headers.cookie ?? "")["xrelay_session"];
-    const account = token ? runtime.accounts.getSessionAccount(token) : null;
-    if (!account) {
-      socket.destroy();
+    if (gatewayWss && (path === "/" || path === "/gateway" || path.startsWith("/gateway/"))) {
+      gatewayWss.handleUpgrade(req, socket, head, (ws) => runtime.gateway.handleConnection(ws));
       return;
     }
-    webWss.handleUpgrade(req, socket, head, (ws) => runtime.webGateway.register(account.id, ws));
+    socket.destroy();
   });
   const httpPort = httpServer.address().port;
-  const wsPort = wss.address().port;
+  const wsPort = wss ? wss.address().port : null;
   return {
     runtime,
     httpPort,
@@ -1006,7 +1017,10 @@ async function startRelayServer(options) {
     close: async () => {
       stopMaintenance();
       await new Promise((resolve) => webWss.close(() => resolve()));
-      await new Promise((resolve) => wss.close(() => resolve()));
+      if (gatewayWss)
+        await new Promise((resolve) => gatewayWss.close(() => resolve()));
+      if (wss)
+        await new Promise((resolve) => wss.close(() => resolve()));
       await new Promise((resolve) => httpServer.close(() => resolve()));
       runtime.close();
     }
@@ -1044,7 +1058,8 @@ function resolveBundledWebRoot() {
 }
 var USAGE = [
   "Usage: xacpx-relay <command>",
-  "  start      [--db <path>] [--web-root <dir>] [--host 0.0.0.0] [--http-port 8787] [--ws-port 8788] [--history-retention-days 30] [--request-timeout-ms 120000] [--trust-proxy]",
+  "  start      [--db <path>] [--web-root <dir>] [--host 0.0.0.0] [--http-port 8787] [--ws-port <n>] [--history-retention-days 30] [--request-timeout-ms 120000] [--trust-proxy]",
+  "             (--ws-port omitted = gateway merged onto the HTTP port; pass it only for a dedicated gateway port)",
   "  add token  [--label <note>] [--db <path>]",
   "  ls         [--db <path>]",
   "  rm token <value-or-id> [--db <path>]",
@@ -1069,7 +1084,7 @@ function parseStartOptions(args) {
   return {
     dbPath,
     httpPort: Number(flag(args, "--http-port") ?? "8787"),
-    wsPort: Number(flag(args, "--ws-port") ?? "8788"),
+    wsPort: flag(args, "--ws-port") !== undefined ? Number(flag(args, "--ws-port")) : undefined,
     host: flag(args, "--host"),
     webRoot: flag(args, "--web-root"),
     historyRetentionDays: retentionDays !== undefined && !Number.isNaN(retentionDays) ? retentionDays : undefined,
@@ -1085,7 +1100,8 @@ async function runRelayCli(args, io) {
       startOpts.webRoot = resolveBundledWebRoot();
     }
     const running = await startRelayServer(startOpts);
-    io.print(`xacpx-relay listening: http :${running.httpPort}, instance ws :${running.wsPort}, db ${startOpts.dbPath}, dashboard: ${startOpts.webRoot ?? "(none)"}`);
+    const gatewayDesc = running.wsPort !== null ? `instance ws :${running.wsPort}` : `instance gateway: merged on http :${running.httpPort} (path / or /gateway)`;
+    io.print(`xacpx-relay listening: http :${running.httpPort}, ${gatewayDesc}, db ${startOpts.dbPath}, dashboard: ${startOpts.webRoot ?? "(none)"}`);
     return await new Promise((resolve2) => {
       const shutdown = () => {
         running.close().then(() => resolve2(0));
@@ -1103,7 +1119,7 @@ async function runRelayCli(args, io) {
       const { token } = runtime.accounts.createLoginToken(acc.id, label);
       io.print(`access token: ${token}`);
       io.print("(store it now — not shown again)");
-      io.print(`hint: use this token for web login AND: xacpx channel add relay --url ws://<host>:<ws-port> --token ${token}`);
+      io.print(`hint: use this token for web login AND: xacpx channel add relay --url <host> --token ${token}`);
       return 0;
     } finally {
       runtime.close();

package/dist/server.d.ts

@@ -26,7 +26,12 @@ export declare function createRelayRuntime(dbPath: string, options?: CreateRunti
 export interface StartRelayOptions {
     dbPath: string;
     httpPort: number;
-    wsPort: number;
+    /**
+     * Dedicated instance-gateway port (legacy two-port layout). Omit (default) to
+     * merge the gateway onto the HTTP port: connectors then reach it via a WS
+     * upgrade at `/` or `/gateway`, so a single port + domain serves everything.
+     */
+    wsPort?: number;
     host?: string;
     webRoot?: string;
     historyRetentionDays?: number;
@@ -36,7 +41,8 @@ export interface StartRelayOptions {
 export interface RunningRelay {
     runtime: RelayRuntime;
     httpPort: number;
-    wsPort: number;
+    /** The dedicated gateway port, or `null` when the gateway is merged onto the HTTP port. */
+    wsPort: number | null;
     close(): Promise<void>;
 }
 export declare function startRelayServer(options: StartRelayOptions): Promise<RunningRelay>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx-relay",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Self-hosted relay hub for xacpx: instance gateway, accounts, and web API.",
   "license": "MIT",
   "keywords": ["xacpx", "relay", "hub"],