@lightworkai.official/debug-capture 0.17.1 → 0.17.3

package/dist/ui/callFrame.d.ts

@@ -19,8 +19,15 @@ export interface FrameHandlers {
     /** It could not sign in or never came up — the frame is gone; the caller's own card carries the call. */
     failed(reason: string): void;
 }
-/** The support host's page for this call. Pure, for the tests. */
-export declare function frameUrl(supportHost: string, realmKey: string, token: string, id: string): string;
+/**
+ * The support host's page for this call. Pure, for the tests. Without a token (0.17.2): `hand=1` — the page asks for it
+ * by message, so it can load while the host is still fetching it.
+ */
+export declare function frameUrl(supportHost: string, realmKey: string, token: string | null, id: string): string;
+/** รับสาย pressed on our card: the frame answers the moment it is ready — now, if it is. */
+export declare function answerInFrame(id: string): void;
+/** ทดสอบไมค์และลำโพง pressed on our card: the frame's voice settings, the moment it is ready. */
+export declare function voiceInFrame(id: string): void;
 /** Within the window, by at least the margin — a corner dragged off screen comes back. Pure, for the tests. */
 export declare function clampTo(p: {
     x: number;
@@ -46,5 +53,6 @@ export declare function fromFrame(e: {
 }): FrameMessage | null;
 export declare function callFrameFor(): string | null;
 /** Open the call's frame — once per call; the same call again changes nothing. Shown when it says it is ready. */
-export declare function openCallFrame(src: string, id: string, h: FrameHandlers, readyWithinMs?: number): void;
+export declare function openCallFrame(src: string, id: string, h: FrameHandlers, readyWithinMs?: number, token?: Promise<string | null> | null): void;
 export declare function closeCallFrame(): void;
+export declare function nameTabAtRest(handle: string, readableBy: string): void;

package/dist/ui/ring.d.ts

@@ -4,14 +4,24 @@ export interface RingCall {
     ticketTitle: string;
 }
 export interface RingHandlers {
-    /** Runs INSIDE the press: a tab can be opened only there, before anything is awaited. */
+    /** The portal's way: runs INSIDE the press — a tab can be opened only there, before anything is awaited. */
     open: () => void;
     decline: () => void;
+    /** The call's frame is coming (0.17.2): รับสาย here — the frame answers the moment it is ready. */
+    answer?: () => void;
+    /** …and ทดสอบไมค์และลำโพง — the frame's voice settings, the moment it is ready. */
+    voice?: () => void;
 }
+/** `frame`: the call's own card while its frame comes; `portal`: answer in a new tab (no frame, or it failed). */
+export type RingMode = "frame" | "portal";
 /** "เรื่อง CALL-12 · title" — the line under the card's title. Pure, for the tests. */
 export declare function ringAbout(template: string, call: RingCall): string;
 /** Show the ring for this call — once; the same call again changes nothing. */
-export declare function showRing(call: RingCall, handlers: RingHandlers): void;
+export declare function showRing(call: RingCall, handlers: RingHandlers, mode?: RingMode): void;
+/** รับสาย pressed while the call's frame comes: said, and nothing more to press until it is there. */
+export declare function ringAnswering(id: string): void;
+/** The call's frame could not come up: the same card, now the portal's way — a new tab, which needs a fresh press. */
+export declare function ringFallback(call: RingCall, handlers: RingHandlers): void;
 /** Opened: the card says where to answer, and stops ringing. `blockedUrl` — the browser refused the tab: a link, which is a fresh press. */
 export declare function ringOpened(blockedUrl?: string): void;
 /**

package/dist/ui/strings.d.ts

@@ -113,5 +113,12 @@ export interface Strings {
     ringBlocked: string;
     ringClose: string;
     ringTab: string;
+    /** The call's own card, while its frame is coming (0.17.2): the same words as the support host's ring card. */
+    ringHint: string;
+    ringTest: string;
+    ringAnswer: string;
+    ringAnswering: string;
+    /** The frame could not come up: answer in a new tab instead. */
+    ringFallback: string;
 }
 export declare function strings(locale: "th" | "en" | undefined): Strings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightworkai.official/debug-capture",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "description": "Report-a-problem widget: rolling network/console/action capture, optional rrweb session replay, annotated screenshot, and submission to a Lightwork Support host",
   "type": "module",
   "module": "./dist/index.mjs",

package/src/live.ts

@@ -24,8 +24,10 @@
  */
 import { getConfig } from "./config";
 import { preparePortalUrl } from "./portal";
-import { hideRing, quietRing, ringOpened, ringShownFor, showRing } from "./ui/ring";
-import { callFrameFor, closeCallFrame, frameUrl, openCallFrame } from "./ui/callFrame";
+import { hideRing, quietRing, ringAnswering, ringFallback, ringOpened, ringShownFor, showRing, type RingHandlers } from "./ui/ring";
+import { answerInFrame, callFrameFor, closeCallFrame, frameUrl, nameTabAtRest, openCallFrame, voiceInFrame } from "./ui/callFrame";
+import { readInkOp } from "./ink";
+import { inkOnPage, removeInkLayer } from "./ui/inkOverlay";
 
 export interface RingingCall {
   id: string;
@@ -98,6 +100,12 @@ export function startLiveRing(): void {
   if (!config.identity || config.ring === false) return;
   started = true;
   stopped = false;
+  warmUp(config.host);
+  try {
+    nameTabAtRest(`lw-tab:${tabId()}`, new URL(config.host).origin);
+  } catch {
+    /* not a host we can name */
+  }
   void connect();
 }
 
@@ -165,6 +173,8 @@ async function connect(): Promise<void> {
   socket = ws;
   ws.onopen = () => {
     retry = 0;
+    // Which tab this is (§21): the call's marks for a screen shared from here reach it on this socket.
+    ws.send(JSON.stringify({ type: "tab", id: tabId() }));
     clearInterval(pinger);
     pinger = setInterval(() => {
       if (ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ type: "ping" }));
@@ -172,8 +182,16 @@ async function connect(): Promise<void> {
   };
   ws.onmessage = (e) => {
     try {
-      const frame = JSON.parse(String(e.data)) as { type?: string; call?: RingingCall };
-      if (frame.type === "call-state" && frame.call) hear(frame.call);
+      const frame = JSON.parse(String(e.data)) as { type?: string; call?: RingingCall | string; op?: unknown };
+      if (frame.type === "call-state" && frame.call && typeof frame.call === "object") hear(frame.call);
+      // The team's marks on this page, shared from the portal's call (§21) — read again, never drawn as received.
+      else if (frame.type === "call-ink" && typeof frame.call === "string") {
+        const op = readInkOp(frame.op);
+        if (op) {
+          inkCall = frame.call;
+          inkOnPage(op);
+        }
+      }
     } catch {
       /* not ours to read */
     }
@@ -203,36 +221,91 @@ function markFramed(id: string | null): void {
   }
 }
 
-let framing: string | null = null;
+/**
+ * The support host, met before the first ring (0.17.2): its name looked up and its connection made while the page is
+ * idle, so the call's frame does not start with them. A hint the browser may ignore; nothing is fetched.
+ */
+let warmed = false;
+function warmUp(supportHost: string): void {
+  if (warmed || typeof document === "undefined") return;
+  warmed = true;
+  try {
+    const href = new URL(supportHost).origin;
+    for (const rel of ["dns-prefetch", "preconnect"]) {
+      const link = document.createElement("link");
+      link.rel = rel;
+      link.href = href;
+      if (rel === "preconnect") link.crossOrigin = "anonymous";
+      link.dataset.debugReporter = "true";
+      document.head.append(link);
+    }
+  } catch {
+    /* not a host we can name */
+  }
+}
+
 /** The call in a frame here (0.16): the support host's own call UI, signed in with the host's token. */
-async function frameFor(call: RingingCall): Promise<void> {
+function frameFor(call: RingingCall): void {
   const config = getConfig();
-  if (config.callFrame === false || callFrameFor() === call.id || framing === call.id) return;
-  framing = call.id;
-  const token = await hostToken();
-  framing = null;
-  if (!token) return;
+  if (config.callFrame === false || callFrameFor() === call.id) return;
   markFramed(call.id);
-  openCallFrame(frameUrl(config.host, config.realmKey, token, call.id), call.id, {
-    ready: () => quietRing(call.id),
-    done: () => {
-      markFramed(null);
-      hideRing(call.id);
+  // At once (0.17.2): the frame loads while the host fetches its token — handed over when the frame says hello.
+  openCallFrame(
+    frameUrl(config.host, config.realmKey, null, call.id),
+    call.id,
+    {
+      ready: () => quietRing(call.id),
+      done: () => {
+        markFramed(null);
+        hideRing(call.id);
+      },
+      // The same card, now the portal's way: a new tab — a fresh press, since one cannot be opened after a wait.
+      failed: () => {
+        markFramed(null);
+        ringFallback(call, portalWay(call));
+      },
     },
-    // Our card carries the call again — still ringing, its button opens the portal to answer.
-    failed: () => {
-      markFramed(null);
-      quietRing(call.id, false);
-    },
-  });
+    15_000,
+    hostToken(),
+  );
 }
+const portalWay = (call: RingingCall): RingHandlers => ({ open: () => answer(call), decline: () => void decline(call) });
+
+/** This tab's own id (§21), kept across its reloads — what its name says, and what its socket says. */
+let ownTabId: string | null = null;
+function tabId(): string {
+  if (ownTabId) return ownTabId;
+  try {
+    ownTabId = sessionStorage.getItem(TAB_KEY);
+  } catch {
+    /* no storage: a new id each load */
+  }
+  if (!ownTabId || !/^[A-Za-z0-9_-]{8,40}$/.test(ownTabId)) {
+    const bytes = new Uint8Array(12);
+    crypto.getRandomValues(bytes);
+    ownTabId = Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
+    try {
+      sessionStorage.setItem(TAB_KEY, ownTabId);
+    } catch {
+      /* this load only */
+    }
+  }
+  return ownTabId;
+}
+const TAB_KEY = "lw-tab-id";
+/** The call whose marks are on this page (§21): they go with it. */
+let inkCall: string | null = null;
 
 /** The support host's word on a call: ringing here shows the card (and its frame); anything else takes the card away — the frame stays, it IS the call. */
 function hear(call: RingingCall): void {
+  if (!LIVE_STATES.has(call.status) && inkCall === call.id && callFrameFor() !== call.id) {
+    inkCall = null;
+    removeInkLayer();
+  }
   if (!ringsHere(call)) {
     hideRing(call.id);
     // Answered in this tab's frame, then the page reloaded: the frame comes back and takes the call back.
-    if (call.status === "active" && framedHere() === call.id && !callFrameFor()) void frameFor(call);
+    if (call.status === "active" && framedHere() === call.id && !callFrameFor()) frameFor(call);
     // Over: the frame says its last word and goes — and goes anyway if it cannot.
     if (!LIVE_STATES.has(call.status) && callFrameFor() === call.id) {
       setTimeout(() => {
@@ -244,8 +317,23 @@ function hear(call: RingingCall): void {
     }
     return;
   }
-  showRing(call, { open: () => answer(call), decline: () => void decline(call) });
-  void frameFor(call);
+  if (getConfig().callFrame === false) showRing(call, portalWay(call), "portal");
+  else {
+    // The call's own card from the first moment — รับสาย pressed before its frame is up is kept, and done when it is.
+    showRing(
+      call,
+      {
+        ...portalWay(call),
+        answer: () => {
+          ringAnswering(call.id);
+          answerInFrame(call.id);
+        },
+        voice: () => voiceInFrame(call.id),
+      },
+      "frame",
+    );
+    frameFor(call);
+  }
   // Never longer than it rings: a socket that dropped mid-ring must not leave a card up for good.
   clearTimeout(expiry);
   const left = new Date(call.ringUntil).getTime() - Date.now();

package/src/ui/callFrame.ts

@@ -12,6 +12,11 @@
  * Its own shadow root, like the ring card: it lands on pages we do not control. Marked as ours, so a report filed
  * during a call does not photograph it.
  *
+ * And at once (0.17.2, the support host's §20): the owner, "it shows [the widget's card] a few seconds then turns into
+ * [the call's card] — why". The frame used to wait for the host's token before it began to load. Now it opens the
+ * moment the call rings and says `hello`; the token follows by message when the host gives it (and is never in an
+ * address). A รับสาย pressed on our card meanwhile is kept and passed on the moment the frame is ready (`answer`).
+ *
  * And the team's marks (0.17, ชี้ · วาด · กรอบ): the frame hands each one up (`ink`) and ui/inkOverlay draws it over
  * the page. So the call can tell whether the tab being shared is this one — where the marks can be seen — this page
  * is named for the call while it lasts (Capture Handle, Chrome and Edge: `lw-call:<id>`, readable by the support host
@@ -39,6 +44,8 @@ export interface FrameMessage {
   reason?: string;
   op?: unknown;
 }
+/** What we tell the frame: where its corner is, the host's token, and a press it should act on. */
+type HostMessage = { type: "corner"; x: number; y: number; width: number } | { type: "token"; token: string } | { type: "answer" } | { type: "voice" };
 export interface FrameHandlers {
   /** The call is on screen in the frame. */
   ready(): void;
@@ -57,21 +64,47 @@ let layout: FrameLayout = "card";
 let size = { width: CARD_WIDTH, height: 0 };
 let readyTimer: ReturnType<typeof setTimeout> | undefined;
 let isReady = false;
+/** The host's token, on its way since the call rang — handed to the frame when it says hello (0.17.2). */
+let tokenOnItsWay: Promise<string | null> | null = null;
+/** Presses on our card while the frame was coming: passed on once it is ready. */
+let pending: { answer: boolean; voice: boolean } = { answer: false, voice: false };
 /** Where the corner was moved to (left, top), or null: bottom right. Kept for this tab. */
 let placed: { x: number; y: number } | null = null;
 /** A drag of the call's top line: where the press began (screen), where the frame was, and the last place it was moved to. */
 let drag: { sx: number; sy: number; x: number; y: number; lx: number; ly: number } | null = null;
 const PLACE_KEY = "lw-call-frame-place";
 
-/** The support host's page for this call. Pure, for the tests. */
-export function frameUrl(supportHost: string, realmKey: string, token: string, id: string): string {
+/**
+ * The support host's page for this call. Pure, for the tests. Without a token (0.17.2): `hand=1` — the page asks for it
+ * by message, so it can load while the host is still fetching it.
+ */
+export function frameUrl(supportHost: string, realmKey: string, token: string | null, id: string): string {
   const url = new URL("embed/call", supportHost.endsWith("/") ? supportHost : `${supportHost}/`);
   url.searchParams.set("realm", realmKey);
-  url.searchParams.set("token", token);
+  if (token) url.searchParams.set("token", token);
+  else url.searchParams.set("hand", "1");
   url.searchParams.set("call", id);
   return url.toString();
 }
 
+/** Tell the frame something — only the support host's origin may read it. */
+function tellFrame(m: HostMessage): void {
+  frame?.contentWindow?.postMessage({ source: "lw-call-host", ...m }, origin);
+}
+
+/** รับสาย pressed on our card: the frame answers the moment it is ready — now, if it is. */
+export function answerInFrame(id: string): void {
+  if (callId !== id) return;
+  pending.answer = true;
+  if (isReady) tellFrame({ type: "answer" });
+}
+/** ทดสอบไมค์และลำโพง pressed on our card: the frame's voice settings, the moment it is ready. */
+export function voiceInFrame(id: string): void {
+  if (callId !== id) return;
+  pending.voice = true;
+  if (isReady) tellFrame({ type: "voice" });
+}
+
 /** Within the window, by at least the margin — a corner dragged off screen comes back. Pure, for the tests. */
 export function clampTo(p: { x: number; y: number }, box: { w: number; h: number }, view: { w: number; h: number }): { x: number; y: number } {
   return {
@@ -92,13 +125,15 @@ export function callFrameFor(): string | null {
 }
 
 /** Open the call's frame — once per call; the same call again changes nothing. Shown when it says it is ready. */
-export function openCallFrame(src: string, id: string, h: FrameHandlers, readyWithinMs = 15_000): void {
+export function openCallFrame(src: string, id: string, h: FrameHandlers, readyWithinMs = 15_000, token: Promise<string | null> | null = null): void {
   if (typeof document === "undefined") return;
   if (callId === id && host?.isConnected) return;
   closeCallFrame();
   callId = id;
   handlers = h;
   isReady = false;
+  tokenOnItsWay = token;
+  pending = { answer: false, voice: false };
   layout = "card";
   size = { width: CARD_WIDTH, height: 0 };
   origin = new URL(src).origin;
@@ -134,7 +169,7 @@ iframe.on { visibility: visible; }`;
 }
 
 export function closeCallFrame(): void {
-  if (host) nameTab(null);
+  if (host) nameTab(resting?.handle ?? null, resting?.readableBy);
   removeInkLayer();
   clearTimeout(readyTimer);
   window.removeEventListener("message", onMessage);
@@ -146,6 +181,8 @@ export function closeCallFrame(): void {
   callId = null;
   handlers = null;
   drag = null;
+  tokenOnItsWay = null;
+  pending = { answer: false, voice: false };
 }
 
 function fail(reason: string): void {
@@ -159,11 +196,22 @@ function onMessage(e: MessageEvent): void {
   const m = fromFrame(e, { origin, window: frame.contentWindow });
   if (!m) return;
   switch (m.type) {
+    case "hello":
+      // The page is up and asks for the host's token (it was not in its address): given when the host has it.
+      void tokenOnItsWay?.then((token) => {
+        if (!frame || callId === null) return;
+        if (token) tellFrame({ type: "token", token });
+        else fail("no_token");
+      });
+      return;
     case "ready":
       isReady = true;
       clearTimeout(readyTimer);
       frame.classList.add("on");
       handlers?.ready();
+      // What was pressed on our card while it came: done now.
+      if (pending.answer) tellFrame({ type: "answer" });
+      if (pending.voice) tellFrame({ type: "voice" });
       return;
     case "size":
       if (typeof m.width === "number" && typeof m.height === "number") size = { width: m.width, height: m.height };
@@ -202,15 +250,26 @@ function onMessage(e: MessageEvent): void {
  * browser without Capture Handle simply has no name to give, and the call says it cannot tell.
  */
 type CaptureHandleConfig = { handle?: string; exposeOrigin?: boolean; permittedOrigins?: string[] };
-function nameTab(handle: string | null): void {
+function nameTab(handle: string | null, readableBy = origin): void {
   const md = (typeof navigator === "undefined" ? undefined : navigator.mediaDevices) as (MediaDevices & { setCaptureHandleConfig?: (c: CaptureHandleConfig) => void }) | undefined;
   try {
-    md?.setCaptureHandleConfig?.(handle ? { handle, exposeOrigin: false, permittedOrigins: [origin] } : {});
+    md?.setCaptureHandleConfig?.(handle && readableBy ? { handle, exposeOrigin: false, permittedOrigins: [readableBy] } : {});
   } catch {
     /* not a top-level page, or not this browser */
   }
 }
 
+/**
+ * The tab's name between calls (0.17.3, the support host's §21): `lw-tab:<id>` — so a call answered on the support
+ * host's portal, with THIS tab shared, can tell it is a tab of ours and have the team's marks drawn here (through the
+ * live socket). A call's frame names the tab for its call while it lasts, and gives this name back when it goes.
+ */
+let resting: { handle: string; readableBy: string } | null = null;
+export function nameTabAtRest(handle: string, readableBy: string): void {
+  resting = { handle, readableBy };
+  if (!host?.isConnected) nameTab(handle, readableBy);
+}
+
 /** The corner moved by its top line: from where the press began, by how far the pointer went on the screen. */
 function onDrag(m: FrameMessage): void {
   if (!frame || layout !== "card" || typeof m.x !== "number" || typeof m.y !== "number") return;
@@ -260,7 +319,7 @@ function followHere(on: boolean): void {
 function tellCorner(): void {
   if (!frame?.contentWindow) return;
   const r = frame.getBoundingClientRect();
-  frame.contentWindow.postMessage({ source: "lw-call-host", type: "corner", x: Math.round(r.left), y: Math.round(r.top), width: Math.round(r.width) }, origin);
+  tellFrame({ type: "corner", x: Math.round(r.left), y: Math.round(r.top), width: Math.round(r.width) });
 }
 
 function savePlace(): void {