@ccmsg/cli 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccmsg/cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "The ccmsg daemon, CLI and agent plugins for one instance (= one config home)",
   "license": "MIT",
   "author": "kawaz",

package/src/auth/auth.ts

@@ -35,6 +35,7 @@ import {
   WebAuthnError,
 } from "./webauthn.ts";
 import { CborError } from "./cbor.ts";
+import { ENTRY_PATH } from "../transport/index.ts";
 
 /** How long an access token is accepted, and how long a refresh token is.
  *
@@ -963,15 +964,20 @@ export function hostOf(endpoint: Endpoint): string {
   return new URL(endpoint).hostname;
 }
 
-/** Where the page that runs the registration is served from: the endpoint's
- * origin over HTTP, which is where the web UI sits in the ordinary
- * configuration (§2.3). */
+/** Where the page that runs the registration is served from.
+ *
+ * The endpoint over HTTP, with the WebSocket's own path segment taken off: an
+ * endpoint is the address of a door (`wss://h/personal/ws`), and the web UI is
+ * what is served where that door is (`https://h/personal/`). Leaving the
+ * segment on would send the person to the WebSocket rather than to the page
+ * (DR-0001 §2.2). An endpoint that names no path is an instance whose UI is at
+ * the root. */
 export function webOrigin(endpoint: Endpoint): string {
   const url = new URL(endpoint);
   url.protocol = url.protocol === "wss:" ? "https:" : "http:";
-  const origin = url.origin;
   const path = url.pathname.replace(/\/$/, "");
-  return `${origin}${path}`;
+  const prefix = path.endsWith(ENTRY_PATH) ? path.slice(0, -ENTRY_PATH.length) : path;
+  return `${url.origin}${prefix}`;
 }
 
 /** Whether a relying party id is the host or a domain the host sits under.

package/src/transport/ws.ts

@@ -51,7 +51,7 @@ export interface WsOptions {
  * is either buffered whole by Bun or dropped whole — and the queue absorbs
  * that difference here (§3.1). */
 export function serveWs(options: WsOptions): Listener {
-  const path = options.path ?? "/ws";
+  const path = options.path ?? ENTRY_PATH;
   const entry = options.entry ?? OPEN;
   // The per-connection state is made in `open`, where the socket to write to
   // exists, so the upgrade carries nothing and the socket keeps no data of its
@@ -158,6 +158,12 @@ export function serveWs(options: WsOptions): Listener {
   };
 }
 
+/** Where a person's WebSocket is answered, on whatever prefix a proxy puts the
+ * instance under. Named here because it is one door, and more than one place
+ * has to know what it is called: the entry match below, and the registration
+ * URL, which is the same address without it (DR-0001 §2.2). */
+export const ENTRY_PATH = "/ws";
+
 /** Whether a request's path is this listener's entry.
  *
  * Matched at the end rather than whole, so a proxy that puts the instance under