@q9labsai/chalk-react-native 4.1.5 → 4.1.8

package/src/space-client/create-native-space-client.ts

@@ -1,5 +1,6 @@
 import {
   AsyncStorageV1PendingTargetStore,
+  CloudflareRTKClient,
   CloudflareSFUClient,
   createChalkChatFileHttpTransport,
   createChalkWhiteboardV1Client,
@@ -20,8 +21,10 @@ import { RTCPeerConnection, mediaDevices } from "@cloudflare/react-native-webrtc
 import { AppState } from "react-native";
 
 import { authenticatedNativeCredential, bindNativeAuthenticatedTelemetry, createTelemetry, registerNativeJourneyContext, syncTransportCloseDiagnostic, type RtcPeerConnection, type TelemetryJourney } from "../telemetry";
+import { createNativeRealtimeKitClient } from "./cloudflare-rtk-native";
 
 type PlatformDependencies = NonNullable<SpaceClientPlatform["dependencies"]>;
+type NativeMediaClient = ReturnType<NonNullable<PlatformDependencies["createMediaClient"]>>;
 type MediaFactoryInput = Parameters<NonNullable<PlatformDependencies["createMediaClient"]>>[0];
 type SyncFactoryInput = Parameters<NonNullable<PlatformDependencies["createSyncClient"]>>[0];
 type ChatFileFactoryInput = Parameters<NonNullable<PlatformDependencies["createChatFileTransport"]>>[0];
@@ -129,9 +132,19 @@ function joinTracePhase(step: NonNullable<PlatformDiagnostic["step"]>): "authent
   }
 }
 
-function createMediaClient(apiBaseURL: string, input: MediaFactoryInput, fetch: typeof globalThis.fetch, observePeerConnection: ((peerConnection: RtcPeerConnection) => () => void) | undefined, journey: TelemetryJourney | undefined) {
+function createMediaClient(apiBaseURL: string, input: MediaFactoryInput, fetch: typeof globalThis.fetch, observePeerConnection: ((peerConnection: RtcPeerConnection) => () => void) | undefined, journey: TelemetryJourney | undefined): NativeMediaClient {
   const { subject } = input.access;
-  return new CloudflareSFUClient({
+  if (input.access.media.provider === "cloudflare_rtk") {
+    const client = new CloudflareRTKClient({
+      authToken: input.access.media.clientPayload.token,
+      participantId: subject.participantId,
+      clientFactory: createNativeRealtimeKitClient,
+      onError: input.onFailure,
+      onScreenEnded: input.onScreenEnded,
+    });
+    return createRTKConnectionMediaClient(client);
+  }
+  const client = new CloudflareSFUClient({
     bootstrap: input.access.media.clientPayload,
     participantId: subject.participantId,
     transport: createCloudflareSFUHTTPTransport({
@@ -151,6 +164,46 @@ function createMediaClient(apiBaseURL: string, input: MediaFactoryInput, fetch:
     onError: input.onFailure,
     onScreenEnded: input.onScreenEnded,
   });
+  return createSFUConnectionMediaClient(client);
+}
+
+function createRTKConnectionMediaClient(client: CloudflareRTKClient): NativeMediaClient {
+  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: (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);
+    },
+    prepareLocalTrack: client.prepareLocalTrack.bind(client),
+    clearPreparedLocalTrack: client.clearPreparedLocalTrack.bind(client),
+    getSnapshot: client.getSnapshot.bind(client),
+    subscribe: client.subscribe.bind(client),
+  };
+}
+
+function createSFUConnectionMediaClient(client: CloudflareSFUClient): NativeMediaClient {
+  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: (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);
+    },
+    prepareLocalTrack: client.prepareLocalTrack.bind(client),
+    clearPreparedLocalTrack: client.clearPreparedLocalTrack.bind(client),
+    getSnapshot: client.getSnapshot.bind(client),
+    subscribe: client.subscribe.bind(client),
+  };
 }
 
 function createSyncClient(syncURL: string, input: SyncFactoryInput, lifecycle: ReturnType<typeof createReactNativeSyncLifecycle>, webSocket: ReturnType<typeof createReactNativeWebSocketFactory>, storage: ReactNativeAsyncStorage | undefined) {

package/src/utils/build-chalk-invite-link.test.ts

@@ -2,11 +2,11 @@ import { describe, expect, it } from "vitest";
 import { buildChalkInviteLink } from "./build-chalk-invite-link";
 
 describe("buildChalkInviteLink", () => {
-  it("builds a Chalk invite link with the public host", () => {
-    expect(buildChalkInviteLink("join-token-123")).toBe("https://chalkmeet.com/j/join-token-123");
+  it("builds a canonical Space invite link with the public host", () => {
+    expect(buildChalkInviteLink("design-lab", "cspi1.key.payload.signature")).toBe("https://chalkmeet.com/space/design-lab#spaceInviteToken=cspi1.key.payload.signature");
   });
 
   it("normalizes trailing slashes on custom origins", () => {
-    expect(buildChalkInviteLink("join-token-123", "https://chalk.q9labs.ai/")).toBe("https://chalk.q9labs.ai/j/join-token-123");
+    expect(buildChalkInviteLink("design-lab", "cspi1.key.payload.signature", "https://chalk.q9labs.ai/")).toBe("https://chalk.q9labs.ai/space/design-lab#spaceInviteToken=cspi1.key.payload.signature");
   });
 });

package/src/utils/build-chalk-invite-link.ts

@@ -1,5 +1,7 @@
 const PUBLIC_INVITE_ORIGIN = "https://chalkmeet.com";
 
-export function buildChalkInviteLink(joinToken: string, origin = PUBLIC_INVITE_ORIGIN): string {
-  return `${origin.replace(/\/+$/, "")}/j/${joinToken}`;
+export function buildChalkInviteLink(spaceSlug: string, spaceInviteToken: string, origin = PUBLIC_INVITE_ORIGIN): string {
+  const link = new URL(`/space/${encodeURIComponent(spaceSlug)}`, origin.replace(/\/+$/u, ""));
+  link.hash = new URLSearchParams({ spaceInviteToken }).toString();
+  return link.toString();
 }