@ddtcorex/dsh-maestro-config 0.4.0 → 0.5.0

package/cordis.patch.yml

@@ -3,4 +3,8 @@
 - insert:
     - id: maestro-config
       name: '@ddtcorex/dsh-maestro-config'
+      # rpc.handle registers a webServer route inside an effect fiber which
+      # carries only the row's inject (not the module's); without webServer
+      # the row fails on harnesses that provide webServer after rows apply (DSH 0.1.5-rc.1+).
+      inject: ['connection', 'webServer']
       config: {}

package/lib/client.js

@@ -2156,6 +2156,22 @@ function gitlabWebhookUrl(hostname) {
   return `https://${authority}/hooks/gitlab-mr`;
 }
 
+// src/client/pin-ttl.ts
+var PIN_TTL_PRESETS = [
+  { hours: 0, label: "Session only" },
+  { hours: 1, label: "1 hour" },
+  { hours: 8, label: "8 hours" },
+  { hours: 24, label: "1 day (default)" },
+  { hours: 168, label: "7 days" },
+  { hours: 720, label: "30 days" }
+];
+var DEFAULT_PIN_TTL_HOURS = 24;
+var MAX_PIN_TTL_HOURS = 8760;
+function presetForTtlHours(hours) {
+  const value = hours === void 0 || !Number.isFinite(hours) ? DEFAULT_PIN_TTL_HOURS : hours;
+  return PIN_TTL_PRESETS.some((preset) => preset.hours === value) ? value : null;
+}
+
 // src/client/MaestroSettings.tsx
 var t = {
   bgLayer1: "var(--dsw-alias-bg-layer-1)",
@@ -3003,6 +3019,14 @@ function LanAccess({ proxyStatus, lanPin }) {
   if (!proxyStatus?.running) {
     return (0, import_react.createElement)("p", { style: { color: t.stateError, fontSize: 12, margin: "8px 0 0" } }, proxyStatus?.errorMessage ?? "Proxy not running");
   }
+  if (urls.length === 0) {
+    return (0, import_react.createElement)(
+      "div",
+      null,
+      (0, import_react.createElement)("p", { style: captionStyle }, "No LAN listener is configured \u2014 set a LAN port under Tunnel to expose one."),
+      lanPin !== null ? (0, import_react.createElement)(LanPinRow, { lanPin }) : null
+    );
+  }
   return (0, import_react.createElement)(
     "div",
     null,
@@ -3043,7 +3067,56 @@ function LanPinRow({ lanPin }) {
     ) : null
   );
 }
-function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePin }) {
+function PinSessionTtl({ hours, onSave }) {
+  const selected = presetForTtlHours(hours);
+  const [custom, setCustom] = (0, import_react.useState)(false);
+  const [draft, setDraft] = (0, import_react.useState)("");
+  const customActive = custom || selected === null;
+  const commit = () => {
+    const parsed = Number(draft);
+    if (!Number.isInteger(parsed) || parsed < 0 || parsed > MAX_PIN_TTL_HOURS) return;
+    onSave(parsed);
+  };
+  return (0, import_react.createElement)(
+    "div",
+    { "data-maestro-pin-ttl": "", style: { display: "flex", flexDirection: "column", gap: 6, alignItems: "flex-end" } },
+    (0, import_react.createElement)(
+      "select",
+      {
+        "data-maestro-pin-ttl-select": "",
+        value: customActive ? "custom" : String(selected),
+        onChange: (e) => {
+          const next = e.target.value;
+          if (next === "custom") {
+            setCustom(true);
+            setDraft(String(hours ?? 24));
+            return;
+          }
+          setCustom(false);
+          onSave(Number(next));
+        },
+        style: { height: 36, padding: "0 12px", border: `1px solid ${t.borderL2}`, borderRadius: 18, background: "var(--dsw-alias-bg-module-platform, #F5F6F7)", color: t.labelPrimary, font: "inherit", fontSize: 13 }
+      },
+      ...PIN_TTL_PRESETS.map((preset) => (0, import_react.createElement)("option", { key: preset.hours, value: String(preset.hours) }, preset.label)),
+      (0, import_react.createElement)("option", { key: "custom", value: "custom" }, "Custom\u2026")
+    ),
+    customActive ? (0, import_react.createElement)(FieldInput, {
+      "data-maestro-pin-ttl-custom": "",
+      inputMode: "numeric",
+      placeholder: "hours",
+      value: draft,
+      min: 1,
+      max: MAX_PIN_TTL_HOURS,
+      onChange: (e) => setDraft(e.target.value),
+      onBlur: commit,
+      onKeyDown: (e) => {
+        if (e.key === "Enter") commit();
+      },
+      style: { width: 120 }
+    }) : null
+  );
+}
+function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePin, pinTtlHours, onSavePinTtl }) {
   return (0, import_react.createElement)(
     "div",
     null,
@@ -3065,7 +3138,15 @@ function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePi
       showPin ? (0, import_react.createElement)(Button, { variant: "outline", size: "sm", onClick: onHidePin }, "Hide") : (0, import_react.createElement)(Button, { variant: "outline", size: "sm", onClick: onRevealPin }, "Show"),
       (0, import_react.createElement)(Button, { variant: "outline", size: "sm", onClick: onRotatePin }, "Rotate")
     ),
-    (0, import_react.createElement)("p", { style: captionStyle }, "Stays the same across tunnel and DSH restarts; use Rotate when you need a new PIN.")
+    (0, import_react.createElement)("p", { style: captionStyle }, "Stays the same across tunnel and DSH restarts; use Rotate when you need a new PIN."),
+    (0, import_react.createElement)(SettingRow, {
+      title: "PIN session duration",
+      // The caption lives in the description column on purpose: a long caption
+      // inside the control column claims its intrinsic width (min-width: auto)
+      // and squeezes the title/description to a few characters per line.
+      description: "How long a browser stays signed in after entering the PIN. Applies to the next login; covers the public tunnel and LAN access.",
+      control: (0, import_react.createElement)(PinSessionTtl, { hours: pinTtlHours, onSave: onSavePinTtl })
+    })
   );
 }
 function NamedTunnelSetupNote() {
@@ -3542,8 +3623,8 @@ function MaestroSettingsTab({ rpcCall, configRpcCall }) {
         (0, import_react.createElement)(SettingRow, { title: "Hostname", description: "Public hostname for the tunnel.", control: (0, import_react.createElement)(FieldInput, { placeholder: "dsh.example.com", value: config.tunnelHostname ?? "", onChange: (e) => saveField("tunnelHostname", e.target.value), style: { width: 260 } }) })
       ) : null,
       (0, import_react.createElement)("div", { style: { display: "flex", gap: 8, flexWrap: "wrap", padding: "12px 0", borderBottom: `1px solid ${t.borderL2}` } }, status?.running ? (0, import_react.createElement)(Button, { variant: "outline", size: "md", disabled: busy, onClick: stopTunnel }, "Stop tunnel") : (0, import_react.createElement)(Button, { variant: "primary", size: "md", disabled: busy, onClick: startTunnel }, "Start tunnel")),
-      (0, import_react.createElement)("div", { style: { ...cardInsetStyle, marginTop: "12px" } }, (0, import_react.createElement)("div", { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary } }, "Remote access \u2014 LAN"), (0, import_react.createElement)(LanAccess, { proxyStatus, lanPin: lanPinEnabled === null ? null : { enabled: lanPinEnabled, pin: lanPin, show: showLanPin, onShow: revealLanPin, onHide: () => setShowLanPin(false), onRotate: rotateLanPin, onToggle: toggleLanPin } })),
-      (0, import_react.createElement)("div", { style: { ...cardInsetStyle, marginTop: "12px" } }, (0, import_react.createElement)("div", { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary } }, "Public access"), (0, import_react.createElement)(PublicAccess, { status, pin, showPin, onRevealPin: revealPin, onHidePin: () => setShowPin(false), onRotatePin: rotatePin }))
+      (0, import_react.createElement)("div", { style: { ...cardInsetStyle, marginTop: "12px" } }, (0, import_react.createElement)("div", { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary } }, "Public access"), (0, import_react.createElement)(PublicAccess, { status, pin, showPin, onRevealPin: revealPin, onHidePin: () => setShowPin(false), onRotatePin: rotatePin, pinTtlHours: config.pinSessionTtlHours, onSavePinTtl: (value) => saveField("pinSessionTtlHours", value) })),
+      (0, import_react.createElement)("div", { style: { ...cardInsetStyle, marginTop: "12px" } }, (0, import_react.createElement)("div", { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary } }, "Remote access \u2014 LAN"), (0, import_react.createElement)(LanAccess, { proxyStatus, lanPin: lanPinEnabled === null ? null : { enabled: lanPinEnabled, pin: lanPin, show: showLanPin, onShow: revealLanPin, onHide: () => setShowLanPin(false), onRotate: rotateLanPin, onToggle: toggleLanPin } }))
     ),
     gitlab: (0, import_react.createElement)(
       "div",

package/lib/types/client/MaestroSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MaestroSettings.d.ts","sourceRoot":"","sources":["../../../src/client/MaestroSettings.tsx"],"names":[],"mappings":"AACA;;;;;;;;GAQG;AAgwCH,wBAAgB,kBAAkB,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,GAAG,CAAA;CAAE;;;;;;;;;mBA4ZmE,GAAG;;gBAoBzK"}
+{"version":3,"file":"MaestroSettings.d.ts","sourceRoot":"","sources":["../../../src/client/MaestroSettings.tsx"],"names":[],"mappings":"AACA;;;;;;;;GAQG;AAw0CH,wBAAgB,kBAAkB,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,aAAa,CAAC,EAAE,GAAG,CAAA;CAAE;;;;;;;;;mBA4ZmE,GAAG;;gBAoBzK"}

package/lib/types/client/pin-ttl.d.ts

@@ -0,0 +1,23 @@
+/**
+ * PIN login-cookie lifetimes offered by the Settings card.
+ * `0` = session cookie (expires when the browser closes); an absent setting
+ * means the dsh-maestro-remote default of 24 hours.
+ */
+export declare const PIN_TTL_PRESETS: ReadonlyArray<{
+    hours: number;
+    label: string;
+}>;
+/** Mirrors DEFAULT_PIN_SESSION_TTL_HOURS in dsh-maestro-remote. */
+export declare const DEFAULT_PIN_TTL_HOURS = 24;
+/**
+ * Mirrors MAX_PIN_SESSION_TTL_HOURS in dsh-maestro-remote. This bound only
+ * hints the custom input — the host resolver and the settings RPC enforce it.
+ */
+export declare const MAX_PIN_TTL_HOURS = 8760;
+/**
+ * The preset hours to show as selected, or `null` when the stored value is not
+ * a preset (the caller then shows the "Custom…" option). An unset or unusable
+ * value falls back to the product default.
+ */
+export declare function presetForTtlHours(hours: number | undefined): number | null;
+//# sourceMappingURL=pin-ttl.d.ts.map

package/lib/types/client/pin-ttl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pin-ttl.d.ts","sourceRoot":"","sources":["../../../src/client/pin-ttl.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAO3E,CAAA;AAED,mEAAmE;AACnE,eAAO,MAAM,qBAAqB,KAAK,CAAA;AACvC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,OAAO,CAAA;AAErC;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAG1E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddtcorex/dsh-maestro-config",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": false,
   "description": "Maestro Config — shared settings service for the dsh-maestro-* suite over the single namespaced store (~/.dsh/maestro/settings.json)",
   "type": "module",

package/src/client/MaestroSettings.tsx

@@ -13,6 +13,7 @@ import { createElement as h, useEffect, useRef, useState } from 'react'
 import QRCode from 'qrcode'
 import { MAESTRO_ENDPOINTS } from './api.js'
 import { generateWebhookSecret, gitlabWebhookUrl } from './webhook-secret.js'
+import { PIN_TTL_PRESETS, MAX_PIN_TTL_HOURS, presetForTtlHours } from './pin-ttl.js'
 
 // ---------------------------------------------------------------------------
 // DSH tokens — single source, no custom hex (except QR quiet zone #fff)
@@ -1055,6 +1056,17 @@ function LanAccess({ proxyStatus, lanPin }: { proxyStatus: any; lanPin: any }) {
   if (!proxyStatus?.running) {
     return h('p', { style: { color: t.stateError as string, fontSize: 12, margin: '8px 0 0' } }, proxyStatus?.errorMessage ?? 'Proxy not running')
   }
+  if (urls.length === 0) {
+    // Without a LAN listener there is no LAN entry to advertise. Saying "no PIN
+    // needed" next to the reader's own reachable-but-public URL would promise
+    // access this card cannot deliver, so point at the setting instead.
+    return h(
+      'div',
+      null,
+      h('p', { style: captionStyle }, 'No LAN listener is configured — set a LAN port under Tunnel to expose one.'),
+      lanPin !== null ? h(LanPinRow as any, { lanPin }) : null,
+    )
+  }
   return h(
     'div',
     null,
@@ -1103,7 +1115,59 @@ function LanPinRow({ lanPin }: { lanPin: any }) {
   )
 }
 
-function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePin }: { status: any; pin: string | null; showPin: boolean; onRevealPin: () => void; onHidePin: () => void; onRotatePin: () => void }) {
+/**
+ * Login-cookie lifetime. Presets cover the common choices; "Custom…" reveals a
+ * free hours input saved on blur/Enter — never per keystroke, so a half-typed
+ * number is not persisted. The host resolver and the settings RPC own the
+ * authoritative bounds; the input's min/max are an affordance only.
+ */
+function PinSessionTtl({ hours, onSave }: { hours: number | undefined; onSave: (hours: number) => void }) {
+  const selected = presetForTtlHours(hours)
+  const [custom, setCustom] = useState(false)
+  const [draft, setDraft] = useState('')
+  const customActive = custom || selected === null
+  const commit = () => {
+    const parsed = Number(draft)
+    if (!Number.isInteger(parsed) || parsed < 0 || parsed > MAX_PIN_TTL_HOURS) return
+    onSave(parsed)
+  }
+  return h(
+    'div',
+    { 'data-maestro-pin-ttl': '', style: { display: 'flex', flexDirection: 'column' as const, gap: 6, alignItems: 'flex-end' } },
+    h(
+      'select',
+      {
+        'data-maestro-pin-ttl-select': '',
+        value: customActive ? 'custom' : String(selected),
+        onChange: (e: any) => {
+          const next = e.target.value
+          if (next === 'custom') { setCustom(true); setDraft(String(hours ?? 24)); return }
+          setCustom(false)
+          onSave(Number(next))
+        },
+        style: { height: 36, padding: '0 12px', border: `1px solid ${t.borderL2}`, borderRadius: 18, background: 'var(--dsw-alias-bg-module-platform, #F5F6F7)' as string, color: t.labelPrimary as string, font: 'inherit', fontSize: 13 },
+      },
+      ...PIN_TTL_PRESETS.map((preset) => h('option', { key: preset.hours, value: String(preset.hours) }, preset.label)),
+      h('option', { key: 'custom', value: 'custom' }, 'Custom…'),
+    ),
+    customActive
+      ? h(FieldInput as any, {
+          'data-maestro-pin-ttl-custom': '',
+          inputMode: 'numeric',
+          placeholder: 'hours',
+          value: draft,
+          min: 1,
+          max: MAX_PIN_TTL_HOURS,
+          onChange: (e: any) => setDraft(e.target.value),
+          onBlur: commit,
+          onKeyDown: (e: any) => { if (e.key === 'Enter') commit() },
+          style: { width: 120 } as any,
+        })
+      : null,
+  )
+}
+
+function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePin, pinTtlHours, onSavePinTtl }: { status: any; pin: string | null; showPin: boolean; onRevealPin: () => void; onHidePin: () => void; onRotatePin: () => void; pinTtlHours: number | undefined; onSavePinTtl: (hours: number) => void }) {
   return h(
     'div',
     null,
@@ -1128,6 +1192,14 @@ function PublicAccess({ status, pin, showPin, onRevealPin, onHidePin, onRotatePi
       h(Button as any, { variant: 'outline', size: 'sm', onClick: onRotatePin }, 'Rotate'),
     ),
     h('p', { style: captionStyle }, 'Stays the same across tunnel and DSH restarts; use Rotate when you need a new PIN.'),
+    h(SettingRow as any, {
+      title: 'PIN session duration',
+      // The caption lives in the description column on purpose: a long caption
+      // inside the control column claims its intrinsic width (min-width: auto)
+      // and squeezes the title/description to a few characters per line.
+      description: 'How long a browser stays signed in after entering the PIN. Applies to the next login; covers the public tunnel and LAN access.',
+      control: h(PinSessionTtl as any, { hours: pinTtlHours, onSave: onSavePinTtl }),
+    }),
   )
 }
 
@@ -1627,8 +1699,8 @@ export function MaestroSettingsTab({ rpcCall, configRpcCall }: { rpcCall: any; c
             )
           : null,
         h('div', { style: { display: 'flex', gap: 8, flexWrap: 'wrap' as const, padding: '12px 0', borderBottom: `1px solid ${t.borderL2}` } }, status?.running ? h(Button as any, { variant: 'outline', size: 'md', disabled: busy, onClick: stopTunnel }, 'Stop tunnel') : h(Button as any, { variant: 'primary', size: 'md', disabled: busy, onClick: startTunnel }, 'Start tunnel')),
+        h('div', { style: { ...cardInsetStyle, marginTop: '12px' } }, h('div', { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary as string } }, 'Public access'), h(PublicAccess as any, { status, pin, showPin, onRevealPin: revealPin, onHidePin: () => setShowPin(false), onRotatePin: rotatePin, pinTtlHours: config.pinSessionTtlHours, onSavePinTtl: (value: number) => saveField('pinSessionTtlHours', value) })),
         h('div', { style: { ...cardInsetStyle, marginTop: '12px' } }, h('div', { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary as string } }, 'Remote access — LAN'), h(LanAccess as any, { proxyStatus, lanPin: lanPinEnabled === null ? null : { enabled: lanPinEnabled, pin: lanPin, show: showLanPin, onShow: revealLanPin, onHide: () => setShowLanPin(false), onRotate: rotateLanPin, onToggle: toggleLanPin } })),
-        h('div', { style: { ...cardInsetStyle, marginTop: '12px' } }, h('div', { style: { fontSize: 13, fontWeight: 600, color: t.labelPrimary as string } }, 'Public access'), h(PublicAccess as any, { status, pin, showPin, onRevealPin: revealPin, onHidePin: () => setShowPin(false), onRotatePin: rotatePin })),
       ),
     gitlab: h(
         'div',

package/src/client/pin-ttl.ts

@@ -0,0 +1,31 @@
+/**
+ * PIN login-cookie lifetimes offered by the Settings card.
+ * `0` = session cookie (expires when the browser closes); an absent setting
+ * means the dsh-maestro-remote default of 24 hours.
+ */
+export const PIN_TTL_PRESETS: ReadonlyArray<{ hours: number; label: string }> = [
+  { hours: 0, label: 'Session only' },
+  { hours: 1, label: '1 hour' },
+  { hours: 8, label: '8 hours' },
+  { hours: 24, label: '1 day (default)' },
+  { hours: 168, label: '7 days' },
+  { hours: 720, label: '30 days' },
+]
+
+/** Mirrors DEFAULT_PIN_SESSION_TTL_HOURS in dsh-maestro-remote. */
+export const DEFAULT_PIN_TTL_HOURS = 24
+/**
+ * Mirrors MAX_PIN_SESSION_TTL_HOURS in dsh-maestro-remote. This bound only
+ * hints the custom input — the host resolver and the settings RPC enforce it.
+ */
+export const MAX_PIN_TTL_HOURS = 8760
+
+/**
+ * The preset hours to show as selected, or `null` when the stored value is not
+ * a preset (the caller then shows the "Custom…" option). An unset or unusable
+ * value falls back to the product default.
+ */
+export function presetForTtlHours(hours: number | undefined): number | null {
+  const value = hours === undefined || !Number.isFinite(hours) ? DEFAULT_PIN_TTL_HOURS : hours
+  return PIN_TTL_PRESETS.some((preset) => preset.hours === value) ? value : null
+}

package/lib/types/client/Settings.d.ts

@@ -1,11 +0,0 @@
-type RpcCall = (endpoint: string, payload?: unknown, signal?: AbortSignal) => Promise<unknown>;
-export declare function Settings({ configRpcCall }: {
-    configRpcCall: RpcCall;
-}): import("react").DetailedReactHTMLElement<{
-    'data-maestro-guard-settings': string;
-    style: {
-        maxWidth: number;
-    };
-}, HTMLElement>;
-export default Settings;
-//# sourceMappingURL=Settings.d.ts.map

package/lib/types/client/Settings.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../../src/client/Settings.tsx"],"names":[],"mappings":"AAIA,KAAK,OAAO,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAiF9F,wBAAgB,QAAQ,CAAC,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,OAAO,CAAA;CAAE;;;;;gBAiRrE;AAGD,eAAe,QAAQ,CAAA"}