@q9labsai/chalk-client 4.1.5 → 4.1.8

package/dist/{chunk-DI7C5UEM.js → chunk-V6P6EHYO.js}

@@ -1,7 +1,13 @@
 import {
+  CloudflareRTKClient,
   CloudflareSFUClient,
   createCloudflareSFUHTTPTransport
-} from "./chunk-PBCGWE2V.js";
+} from "./chunk-C4BIONCP.js";
+import {
+  AccessGrantError,
+  requireParsedAccessGrant,
+  validEpisodeDiagnosticCredential
+} from "./chunk-JPNE4K2L.js";
 import {
   createBrowserSyncLifecycle,
   createBrowserWebSocketFactory,
@@ -81,7 +87,15 @@ function validateRefresh(previous, next, replaceMediaConnection) {
   if (left.tenantId !== right.tenantId || left.spaceId !== right.spaceId || left.episodeId !== right.episodeId || left.participantId !== right.participantId || left.participantGeneration !== right.participantGeneration) {
     throw new TypeError("Access grant refresh changed its subject");
   }
-  if (!replaceMediaConnection && previous.media.clientPayload.connectionId !== next.media.clientPayload.connectionId) throw new TypeError("Access grant refresh unexpectedly replaced its media connection");
+  if (!replaceMediaConnection && (previous.media.provider !== next.media.provider || mediaBinding(previous) !== mediaBinding(next))) throw new TypeError("Access grant refresh unexpectedly replaced its media connection");
+}
+function mediaBinding(access) {
+  switch (access.media.provider) {
+    case "cloudflare_sfu":
+      return access.media.clientPayload.connectionId;
+    case "cloudflare_rtk":
+      return access.media.clientPayload.providerSubject;
+  }
 }
 function expiresAt(value) {
   const timestamp = Date.parse(value);
@@ -873,6 +887,7 @@ var ChalkWhiteboardV1Client = class {
   #listeners = /* @__PURE__ */ new Set();
   #operations = /* @__PURE__ */ new Map();
   #reservedOperationIds = /* @__PURE__ */ new Set();
+  #pendingStoreWrites = /* @__PURE__ */ new Set();
   #operationRetryTimers = /* @__PURE__ */ new Map();
   #snapshots = /* @__PURE__ */ new Map();
   #updateAssembler = new WhiteboardV1UpdateAssembler();
@@ -894,6 +909,7 @@ var ChalkWhiteboardV1Client = class {
   #latestSnapshot = null;
   #initialSnapshot = null;
   #startPromise = null;
+  #stopPromise = null;
   #reconnectTimer;
   #heartbeatTimer;
   #missedHeartbeats = 0;
@@ -912,6 +928,7 @@ var ChalkWhiteboardV1Client = class {
     this.#revision = options.cursor?.revision ?? null;
   }
   startSceneSubscription() {
+    if (this.#stopPromise) return this.#stopPromise.then(() => this.startSceneSubscription());
     if (this.#started && this.#startPromise) return this.#startPromise;
     this.#started = true;
     this.#useLegacyHello = false;
@@ -925,6 +942,18 @@ var ChalkWhiteboardV1Client = class {
     return this.#startPromise;
   }
   stopSceneSubscription() {
+    if (this.#stopPromise) return this.#stopPromise;
+    if (this.#phase === "stopped" && !this.#started) return Promise.resolve();
+    this.#stopPromise = Promise.resolve().then(async () => {
+      while (this.#pendingStoreWrites.size > 0) {
+        await Promise.allSettled([...this.#pendingStoreWrites]);
+      }
+      this.#stopNow();
+      this.#stopPromise = null;
+    });
+    return this.#stopPromise;
+  }
+  #stopNow() {
     this.#started = false;
     this.#startupGeneration += 1;
     this.#unsubscribeLifecycle?.();
@@ -1270,11 +1299,19 @@ var ChalkWhiteboardV1Client = class {
       throw error(failure("submit_update", "unavailable", true, "Whiteboard operation byte capacity is full."));
     }
     this.#reservedOperationIds.add(frame.operation_id);
+    let storeWrite;
+    try {
+      storeWrite = this.#store.put(pending);
+    } catch (cause) {
+      throw error(failure(operationName(frame), "unavailable", true, "Unable to persist the whiteboard operation."), cause);
+    }
+    this.#pendingStoreWrites.add(storeWrite);
     try {
-      await this.#store.put(pending);
+      await storeWrite;
     } catch (cause) {
       throw error(failure(operationName(frame), "unavailable", true, "Unable to persist the whiteboard operation."), cause);
     } finally {
+      this.#pendingStoreWrites.delete(storeWrite);
       this.#reservedOperationIds.delete(frame.operation_id);
     }
     let deferred;
@@ -1669,8 +1706,18 @@ function createChatFileTransport(apiBaseURL, input) {
   });
 }
 function createMediaClient(apiBaseURL, input) {
+  if (input.access.media.provider === "cloudflare_rtk") {
+    return createRTKConnectionMediaClient(
+      new CloudflareRTKClient({
+        authToken: input.access.media.clientPayload.token,
+        participantId: input.access.subject.participantId,
+        onError: input.onFailure,
+        onScreenEnded: input.onScreenEnded
+      })
+    );
+  }
   const { subject } = input.access;
-  return new CloudflareSFUClient({
+  const client = new CloudflareSFUClient({
     bootstrap: input.access.media.clientPayload,
     participantId: subject.participantId,
     transport: createCloudflareSFUHTTPTransport({
@@ -1684,6 +1731,36 @@ function createMediaClient(apiBaseURL, input) {
     onError: input.onFailure,
     onScreenEnded: input.onScreenEnded
   });
+  return createSFUConnectionMediaClient(client);
+}
+function createRTKConnectionMediaClient(client) {
+  return bindConnectionMediaClient(client, (input) => {
+    if (!("provider" in input) || input.provider !== "cloudflare_rtk") throw new TypeError("The RealtimeKit adapter requires a Cloudflare RealtimeKit access grant");
+    return client.restart(input);
+  });
+}
+function createSFUConnectionMediaClient(client) {
+  return bindConnectionMediaClient(client, (input) => {
+    if ("provider" in input) {
+      if (input.provider !== "cloudflare_sfu") throw new TypeError("The Cloudflare SFU adapter requires a Cloudflare SFU access grant");
+      return client.restart(input.clientPayload);
+    }
+    return client.restart(input);
+  });
+}
+function bindConnectionMediaClient(client, restart) {
+  return {
+    setLocalPublicationTarget: client.setLocalPublicationTarget.bind(client),
+    observeLocalPublications: client.observeLocalPublications.bind(client),
+    observeRemotePublications: client.observeRemotePublications.bind(client),
+    start: client.start.bind(client),
+    stop: client.stop.bind(client),
+    restart,
+    prepareLocalTrack: client.prepareLocalTrack.bind(client),
+    clearPreparedLocalTrack: client.clearPreparedLocalTrack.bind(client),
+    getSnapshot: client.getSnapshot.bind(client),
+    subscribe: client.subscribe.bind(client)
+  };
 }
 function createSyncClient(syncURL, input) {
   return createV1SyncClient({
@@ -1725,172 +1802,6 @@ function whiteboardURL(syncURL) {
 // src/connection/lifecycle.ts
 import { Clock as Clock2, Context as Context3, Data as Data2, Deferred, Duration, Effect as Effect2, Exit, Fiber, Layer as Layer3, Queue, Scope, SubscriptionRef } from "effect";
 
-// src/access/base64-url.ts
-function decodeBase64Url(value) {
-  const base64 = value.replaceAll("-", "+").replaceAll("_", "/").padEnd(Math.ceil(value.length / 4) * 4, "=");
-  const bytes = Uint8Array.from(globalThis.atob(base64), (character) => character.charCodeAt(0));
-  return new TextDecoder().decode(bytes);
-}
-
-// src/access/episode-diagnostic-credential.ts
-var INTAKE_PATH = "/_internal/episode-diagnostic-events";
-var RFC3339_ZONED = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?(Z|[+-]\d{2}:\d{2})$/;
-function parseEpisodeDiagnosticCredential(value) {
-  if (!isRecord3(value)) return null;
-  const token = value.token;
-  const expiresAt2 = value.expires_at;
-  const generation = value.generation;
-  const intakePath = value.intake_path;
-  if (typeof token !== "string" || !validDiagnosticCredential(token)) return null;
-  if (!isRFC3339Zoned(expiresAt2)) return null;
-  if (!Number.isSafeInteger(generation) || generation < 1) return null;
-  if (intakePath !== INTAKE_PATH) return null;
-  return Object.freeze({ token, expiresAt: expiresAt2, generation, intakePath });
-}
-function validEpisodeDiagnosticCredential(credential, now) {
-  return credential.intakePath === INTAKE_PATH && Number.isSafeInteger(credential.generation) && credential.generation > 0 && isRFC3339Zoned(credential.expiresAt) && Date.parse(credential.expiresAt) > now && validDiagnosticCredential(credential.token);
-}
-function validDiagnosticCredential(token) {
-  const segments = token.split(".");
-  if (segments.length !== 3) return false;
-  try {
-    const payload = JSON.parse(decodeBase64Url(segments[1] ?? ""));
-    return isRecord3(payload) && payload.aud === "chalk-diagnostics";
-  } catch {
-    return false;
-  }
-}
-function isRFC3339Zoned(value) {
-  if (typeof value !== "string") return false;
-  const match = RFC3339_ZONED.exec(value);
-  if (!match) return false;
-  return validTimestampFields(match) && Number.isFinite(Date.parse(value));
-}
-function validTimestampFields(match) {
-  const year = Number(match[1]);
-  const month = Number(match[2]);
-  const day = Number(match[3]);
-  const hour = Number(match[4]);
-  const minute = Number(match[5]);
-  const second = Number(match[6]);
-  const zone = match[7] ?? "";
-  return validCalendarDate(year, month, day) && validClockTime(hour, minute, second) && validZoneOffset(zone);
-}
-function inRange(value, min, max) {
-  return value >= min && value <= max;
-}
-function validCalendarDate(year, month, day) {
-  return inRange(month, 1, 12) && inRange(day, 1, daysInMonth(year, month));
-}
-function validClockTime(hour, minute, second) {
-  return inRange(hour, 0, 23) && inRange(minute, 0, 59) && inRange(second, 0, 59);
-}
-function validZoneOffset(zone) {
-  if (zone === "Z") return true;
-  return inRange(Number(zone.slice(1, 3)), 0, 23) && inRange(Number(zone.slice(4, 6)), 0, 59);
-}
-function daysInMonth(year, month) {
-  if (month === 2) return isLeapYear(year) ? 29 : 28;
-  return [4, 6, 9, 11].includes(month) ? 30 : 31;
-}
-function isLeapYear(year) {
-  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
-}
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-// src/access/grant.ts
-var AccessGrantError = class extends TypeError {
-  code = "access.invalid";
-  constructor(message = "Access grant is invalid") {
-    super(message);
-    this.name = "AccessGrantError";
-  }
-};
-function parseParsedAccessGrant(value) {
-  if (!isRecord4(value)) throw new AccessGrantError();
-  const subject = parseSubject(value.subject);
-  const diagnostics = parseEpisodeDiagnosticCredential(value.diagnostics);
-  return {
-    subject,
-    sync: parseSyncAccess(value.sync),
-    media: parseMediaAccess(value.media),
-    diagnostics: diagnostics?.generation === subject.participantGeneration ? diagnostics : null
-  };
-}
-async function requireParsedAccessGrant(value) {
-  if (typeof Response !== "undefined" && value instanceof Response) {
-    if (!value.ok) throw new AccessGrantError(`Access grant request failed with HTTP ${value.status}`);
-    try {
-      return parseParsedAccessGrant(await value.json());
-    } catch (error2) {
-      if (error2 instanceof AccessGrantError) throw error2;
-      throw new AccessGrantError();
-    }
-  }
-  return parseParsedAccessGrant(value);
-}
-function parseSubject(value) {
-  if (!isRecord4(value)) throw new AccessGrantError();
-  return {
-    tenantId: requireNonEmptyString(value.tenant_id),
-    spaceId: requireNonEmptyString(value.space_id),
-    episodeId: requireNonEmptyString(value.episode_id),
-    participantId: requireNonEmptyString(value.participant_id),
-    participantGeneration: requirePositiveInteger(value.participant_generation)
-  };
-}
-function requirePositiveInteger(value) {
-  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 1) throw new AccessGrantError();
-  return value;
-}
-function parseSyncAccess(value) {
-  if (!isRecord4(value)) throw new AccessGrantError();
-  return {
-    token: requireCredential(value.token, "chalk-sync"),
-    expiresAt: requireDateTime(value.expires_at ?? value.expiresAt)
-  };
-}
-function parseMediaAccess(value) {
-  if (!isRecord4(value) || value.provider !== "cloudflare_sfu" || !isRecord4(value.client_payload ?? value.clientPayload)) throw new AccessGrantError();
-  const payload = value.client_payload ?? value.clientPayload;
-  return {
-    token: requireCredential(value.token, "chalk-media"),
-    expiresAt: requireDateTime(value.expires_at ?? value.expiresAt),
-    provider: value.provider,
-    clientPayload: {
-      connectionId: requireNonEmptyString(payload.connectionId),
-      stunServer: requireNonEmptyString(payload.stunServer)
-    }
-  };
-}
-function requireCredential(value, audience) {
-  const token = requireNonEmptyString(value);
-  const segments = token.split(".");
-  if (segments.length !== 3) throw new AccessGrantError();
-  let payload;
-  try {
-    payload = JSON.parse(decodeBase64Url(segments[1] ?? ""));
-  } catch {
-    throw new AccessGrantError();
-  }
-  if (!isRecord4(payload) || payload.aud !== audience) throw new AccessGrantError();
-  return token;
-}
-function requireDateTime(value) {
-  const dateTime = requireNonEmptyString(value);
-  if (!Number.isFinite(Date.parse(dateTime))) throw new AccessGrantError();
-  return dateTime;
-}
-function requireNonEmptyString(value) {
-  if (typeof value !== "string" || value.trim().length === 0) throw new AccessGrantError();
-  return value;
-}
-function isRecord4(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 // src/connection/diagnostics.ts
 var ConnectionDiagnostics = class {
   #limit;
@@ -2346,7 +2257,8 @@ var makeConnectionLifecycleLayerFromServices = (options) => Layer3.effect(
       const sync = model.sync;
       if (!media || !sync) return yield* Effect2.fail(lifecycleFailure("invalid_state", false, "Media recovery requires active ports"));
       const grant = yield* access.refresh("media_recovery", true).pipe(Effect2.mapError(accessFailure));
-      yield* foreign6(() => media.restart(grant.media.clientPayload));
+      const restartInput = grant.media.provider === "cloudflare_sfu" ? grant.media.clientPayload : grant.media;
+      yield* foreign6(() => media.restart(restartInput));
       model.mediaSnapshot = media.getSnapshot();
       yield* waitForSyncLive(sync, boundedInteger(options.recovery?.budgetMs, RECOVERY_BUDGET_MS, 1, 6e4));
     });
@@ -4757,7 +4669,7 @@ function stripTrailingUrlSlash(value) {
   return value.endsWith("/") ? value.slice(0, -1) : value;
 }
 function intakeResponse(value) {
-  if (!isRecord5(value) || typeof value.diagnosticReference !== "string" || !Number.isSafeInteger(value.committedCursor)) return null;
+  if (!isRecord3(value) || typeof value.diagnosticReference !== "string" || !Number.isSafeInteger(value.committedCursor)) return null;
   if (!Array.isArray(value.accepted) || !Array.isArray(value.duplicates) || !Array.isArray(value.conflicts)) return null;
   return { accepted: value.accepted, duplicates: value.duplicates, conflicts: value.conflicts };
 }
@@ -4768,14 +4680,14 @@ function completeDelivery(delivery, expected) {
 function intakeIds(items, expected, cursorRequired) {
   const ids = [];
   for (const item of items) {
-    if (!isRecord5(item) || typeof item.eventId !== "string" || !expected.has(item.eventId)) return null;
+    if (!isRecord3(item) || typeof item.eventId !== "string" || !expected.has(item.eventId)) return null;
     if (cursorRequired && !Number.isSafeInteger(item.cursor)) return null;
     if (!cursorRequired && item.code !== "fingerprint_mismatch") return null;
     ids.push(item.eventId);
   }
   return ids;
 }
-function isRecord5(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -4863,7 +4775,7 @@ var makeSpaceClientCoreLayer = (options, platform = {}) => {
     now: baseDependencies.clock.now,
     setTimeout: baseDependencies.clock.setTimeout,
     clearTimeout: baseDependencies.clock.clearTimeout,
-    release: { id: "chalk-client@4.1.5" }
+    release: { id: "chalk-client@4.1.8" }
   });
   const diagnosticSyncClients = /* @__PURE__ */ new Set();
   const dependencies = {