@cabane/companion 0.6.32 → 0.6.34

package/dist/pairing-config.js

@@ -160,10 +160,11 @@ var companionConfigSchema = z2.object({
   // device with no device-level entry behaves exactly as it did before. A hook
   // that fails still fails the dispatch loudly, as now.
   prepareHook: prepareHookSchema.optional(),
-  // Dashboard settings (all optional). dashboardPort: preferred bind port (next
-  // free one if taken); autoOpen: whether `start` opens the browser (the
-  // `--no-open` flag / `COMPANION_NO_OPEN=1` override per-run); logLevel: pino
-  // level, live-editable from the dashboard settings panel.
+  // CT1085 §9: `dashboardPort` and `autoOpen` are READ AND IGNORED by the CLI —
+  // it binds no port and opens no browser. They stay in the schema (rather than
+  // becoming a strict-mode parse error on an existing config file) and still mean
+  // what they say to the Electron shell, the one front-end that renders a
+  // dashboard. `logLevel` is unaffected: pino level, live-editable.
   dashboardPort: z2.number().int().min(1).max(65535).optional(),
   autoOpen: z2.boolean().optional(),
   logLevel: z2.enum(["warn", "info", "debug"]).optional(),
@@ -326,6 +327,18 @@ function saveConfig(cfg) {
 }
 
 // src/enrollment.ts
+var EnrollmentExpiredError = class extends CompanionError {
+  constructor() {
+    super("this pairing code expired before it was confirmed.");
+    this.name = "EnrollmentExpiredError";
+  }
+};
+var EnrollmentCancelledError = class extends CompanionError {
+  constructor() {
+    super("pairing was cancelled.");
+    this.name = "EnrollmentCancelledError";
+  }
+};
 function trimBase(baseUrl) {
   return baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
 }
@@ -362,18 +375,20 @@ async function postJson(baseUrl, path, body) {
   }
   return parsed;
 }
-function requestEnrollmentCode(baseUrl) {
-  return postJson(baseUrl, "/api/device-enrollment/code", {});
+function requestEnrollmentCode(baseUrl, opts = {}) {
+  return postJson(baseUrl, "/api/device-enrollment/code", {
+    ...opts.label ? { label: opts.label } : {}
+  });
 }
 function pollOnce(baseUrl, deviceCode) {
   return postJson(baseUrl, "/api/device-enrollment/poll", { deviceCode });
 }
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function runDeviceFlow(baseUrl, print, opts = {}) {
-  const now = opts.now ?? (() => Date.now());
-  const wait = opts.sleepMs ?? sleep;
-  if (opts.signal?.aborted) throw new CompanionError("pairing was cancelled.");
-  const code = await requestEnrollmentCode(baseUrl);
+  if (opts.signal?.aborted) throw new EnrollmentCancelledError();
+  const code = await requestEnrollmentCode(baseUrl, {
+    ...opts.label ? { label: opts.label } : {}
+  });
   if (opts.onCode) await opts.onCode(code);
   print("");
   print(`  Enter this code at ${code.verificationUri}`);
@@ -382,12 +397,17 @@ async function runDeviceFlow(baseUrl, print, opts = {}) {
   print("");
   print(`  or open: ${code.verificationUriComplete}`);
   print("");
-  print("Waiting for you to confirm it in cabane\u2026");
+  print("Waiting for you to confirm it in Cabane\u2026");
+  return awaitEnrollment(baseUrl, code, opts);
+}
+async function awaitEnrollment(baseUrl, code, opts = {}) {
+  const now = opts.now ?? (() => Date.now());
+  const wait = opts.sleepMs ?? sleep;
   const deadline = now() + code.expiresIn * 1e3;
   let intervalMs = Math.max(1, code.interval) * 1e3;
   while (now() < deadline) {
     await wait(intervalMs);
-    if (opts.signal?.aborted) throw new CompanionError("pairing was cancelled.");
+    if (opts.signal?.aborted) throw new EnrollmentCancelledError();
     const res = await pollOnce(baseUrl, code.deviceCode);
     if (res.status === "complete") {
       if (!res.deviceToken || !res.baseUrl) {
@@ -397,19 +417,14 @@ async function runDeviceFlow(baseUrl, print, opts = {}) {
         baseUrl: res.baseUrl,
         deviceToken: res.deviceToken,
         ...res.deviceId ? { deviceId: res.deviceId } : {},
-        ...res.deviceLabel ? { deviceLabel: res.deviceLabel } : {}
+        ...res.deviceLabel ? { deviceLabel: res.deviceLabel } : {},
+        ...res.ownerName ? { ownerName: res.ownerName } : {}
       };
     }
-    if (res.status === "expired") {
-      throw new CompanionError(
-        "this pairing code expired before it was confirmed. Run `cabane-companion pair` again for a fresh one."
-      );
-    }
+    if (res.status === "expired") throw new EnrollmentExpiredError();
     if (res.status === "slow_down") intervalMs += 1e3;
   }
-  throw new CompanionError(
-    "this pairing code expired before it was confirmed. Run `cabane-companion pair` again for a fresh one."
-  );
+  throw new EnrollmentExpiredError();
 }
 
 // src/pairing-config.ts