agent-yes 1.290.7 → 1.291.0

package/ts/webrtcLink.ts

@@ -13,30 +13,74 @@ export interface WebrtcLink {
   host: string;
 }
 
+/** room + RAW token (marker and all), before parseSecret strips the `e1.`. */
+interface RawLink {
+  room: string;
+  token: string;
+  host: string;
+}
+
+// The fragment of a /room/ link is a key=value set, parsed with URLSearchParams:
+//
+//   https://agent-yes.com/room/#room=<id>&s=e1.<64hex>[&sig=<host>]
+//
+// Positional (#<room>:<token>[@<sighost>]) is the older /w/ console form, kept
+// working forever for saved links and PWA caches. New links use key=value
+// because the fragment namespace is shared with #k=, #ch= and #launch=, and the
+// positional grammar can only be told apart from those by a blocklist that has
+// to be updated for every new key (see parseRoomHash in lab/ui/rtc.js). A leading
+// "?" is tolerated (#?room=…) since that spelling is also in the wild.
+//
+// NOTE: URLSearchParams percent-decodes and reads "+" as a space. The secret is
+// `e1.` + hex so it survives untouched, but any future value must be written
+// with encodeURIComponent.
+function parseFragment(frag: string): RawLink | null {
+  if (/^\??[A-Za-z_]+=/.test(frag)) {
+    const q = new URLSearchParams(frag.replace(/^\?/, ""));
+    const room = q.get("room");
+    const token = q.get("s");
+    if (!room || !token) return null;
+    return { room, token, host: q.get("sig") || DEFAULT_SIGHOST };
+  }
+  const at = frag.split("@");
+  const seg = at[0]!;
+  const i = seg.indexOf(":");
+  if (i < 0) return null;
+  return { room: seg.slice(0, i), token: seg.slice(i + 1), host: at[1] || DEFAULT_SIGHOST };
+}
+
+/** Parse a share link WITHOUT validating/stripping the secret's version marker. */
+function parseRaw(link: string): RawLink | null {
+  const wr = /^webrtc:\/\/([^:]+):([^@]+)@(.+)$/.exec(link);
+  if (wr) return { room: wr[1]!, token: wr[2]!, host: wr[3]! };
+  if (/^https?:\/\//.test(link) && link.includes("#"))
+    return parseFragment(link.split("#")[1] ?? "");
+  return null;
+}
+
 /**
  * Parse a share link into { room, secret, signaling-host }. Accepts:
- *   webrtc://<room>:<token>@<host>
- *   https://<anyhost>/w/#<room>:<token>            (signaling host defaults to s.agent-yes.com)
- *   https://<anyhost>/w/#<room>:<token>@<sighost>  (explicit signaling host)
+ *   webrtc://<room>:<token>@<host>                    (internal / legacy form)
+ *   https://<anyhost>/room/#room=<id>&s=<token>[&sig=<host>]
+ *   https://<anyhost>/w/#<room>:<token>[@<sighost>]   (older positional form)
  * Returns null if the string isn't a recognizable share link.
  */
 export function parseWebrtcLink(link: string): WebrtcLink | null {
-  const wr = /^webrtc:\/\/([^:]+):([^@]+)@(.+)$/.exec(link);
-  if (wr) {
-    const { s } = parseSecret(wr[2]!);
-    return { room: wr[1]!, s, host: wr[3]! };
-  }
-  if (/^https?:\/\//.test(link) && link.includes("#")) {
-    const frag = link.split("#")[1] ?? "";
-    const at = frag.split("@");
-    const host = at[1] || DEFAULT_SIGHOST;
-    const seg = at[0]!;
-    const i = seg.indexOf(":");
-    if (i < 0) return null;
-    const { s } = parseSecret(seg.slice(i + 1));
-    return { room: seg.slice(0, i), s, host };
-  }
-  return null;
+  const raw = parseRaw(link);
+  if (!raw) return null;
+  const { s } = parseSecret(raw.token);
+  return { room: raw.room, s, host: raw.host };
+}
+
+/**
+ * Normalize any accepted share-link spelling to the internal
+ * `webrtc://<room>:<token>@<host>` form that startShare/parseShareUrl consume.
+ * Returns the RAW token, so a legacy markerless room round-trips unchanged
+ * instead of being handed a marker it never had.
+ */
+export function toWebrtcUrl(link: string): string | null {
+  const raw = parseRaw(link);
+  return raw ? `webrtc://${raw.room}:${raw.token}@${raw.host}` : null;
 }
 
 /** True if `spec` looks like a WebRTC share link (vs. an http remote or alias). */

package/dist/SUPPORTED_CLIS-CuvT3tKq.js

@@ -1,12 +0,0 @@
-import "./logger-CDIsZ-Pp.js";
-import "./versionChecker-CMjS88mL.js";
-import "./ts-oyuaLWWx.js";
-import "./todoAutomation-CbVVS4re.js";
-import "./JsonlStore-BqF7AQ6E.js";
-import "./globalPidIndex-DoaKEUkO.js";
-import "./pidStore-B73xnAeT.js";
-import "./messageLog-CVRSTLza.js";
-import "./todoStore-DF6vxHgV.js";
-import { t as SUPPORTED_CLIS } from "./SUPPORTED_CLIS-hTRegnm5.js";
-
-export { SUPPORTED_CLIS };

package/dist/globalPidIndex-yvWZXeWT.js

@@ -1,4 +0,0 @@
-import "./logger-CDIsZ-Pp.js";
-import { a as updateGlobalPidStatus, i as readGlobalPids, n as maybeCompactGlobalPids, r as pruneOldLogs, t as appendGlobalPid } from "./globalPidIndex-DoaKEUkO.js";
-
-export { readGlobalPids };

package/dist/pidStore-V51mbgZY.js

@@ -1,6 +0,0 @@
-import "./logger-CDIsZ-Pp.js";
-import "./JsonlStore-BqF7AQ6E.js";
-import "./globalPidIndex-DoaKEUkO.js";
-import { t as PidStore } from "./pidStore-B73xnAeT.js";
-
-export { PidStore };

package/dist/share-BvU4I8BI.js

@@ -1,4 +0,0 @@
-import "./e2e-z1xpwSAg.js";
-import { a as startShare, i as shareLinkFromRoomUrl, n as importRTC, r as loadOrCreateShareRoom, t as getIceServers } from "./share-DTlaFn6s.js";
-
-export { getIceServers, importRTC, loadOrCreateShareRoom, shareLinkFromRoomUrl, startShare };

package/dist/spawnGate-C8MSRt7X.js

@@ -1,5 +0,0 @@
-import "./logger-CDIsZ-Pp.js";
-import "./globalPidIndex-DoaKEUkO.js";
-import { i as waitForSpawnCapacity, n as spawnGateEnabled, r as spawnRejectionReason, t as memAvailableMb } from "./spawnGate-B26UnzqP.js";
-
-export { waitForSpawnCapacity };

package/dist/trayApp-Br2T2Yrb.js

@@ -1,5 +0,0 @@
-import "./versionChecker-CMjS88mL.js";
-import "./rustBinary-jO6EN8LR.js";
-import { a as trayHiddenMarker, i as launchTray, n as hasDesktop, r as isTrayHidden, t as cmdTray } from "./trayApp-BdNlQCFx.js";
-
-export { cmdTray };

package/dist/webrtcLink-DLaJfTcB.js

@@ -1,45 +0,0 @@
-import { u as parseSecret } from "./e2e-z1xpwSAg.js";
-
-//#region ts/webrtcLink.ts
-const SIGNAL_SUBPROTOCOL = "ay-signal-1";
-const DEFAULT_SIGHOST = "s.agent-yes.com";
-/**
-* Parse a share link into { room, secret, signaling-host }. Accepts:
-*   webrtc://<room>:<token>@<host>
-*   https://<anyhost>/w/#<room>:<token>            (signaling host defaults to s.agent-yes.com)
-*   https://<anyhost>/w/#<room>:<token>@<sighost>  (explicit signaling host)
-* Returns null if the string isn't a recognizable share link.
-*/
-function parseWebrtcLink(link) {
-	const wr = /^webrtc:\/\/([^:]+):([^@]+)@(.+)$/.exec(link);
-	if (wr) {
-		const { s } = parseSecret(wr[2]);
-		return {
-			room: wr[1],
-			s,
-			host: wr[3]
-		};
-	}
-	if (/^https?:\/\//.test(link) && link.includes("#")) {
-		const at = (link.split("#")[1] ?? "").split("@");
-		const host = at[1] || DEFAULT_SIGHOST;
-		const seg = at[0];
-		const i = seg.indexOf(":");
-		if (i < 0) return null;
-		const { s } = parseSecret(seg.slice(i + 1));
-		return {
-			room: seg.slice(0, i),
-			s,
-			host
-		};
-	}
-	return null;
-}
-/** True if `spec` looks like a WebRTC share link (vs. an http remote or alias). */
-function isWebrtcSpec(spec) {
-	return spec.startsWith("webrtc://") || /^https?:\/\//.test(spec) && spec.includes("#");
-}
-
-//#endregion
-export { isWebrtcSpec as n, parseWebrtcLink as r, SIGNAL_SUBPROTOCOL as t };
-//# sourceMappingURL=webrtcLink-DLaJfTcB.js.map