@crowdedkingdoms/construct 0.3.9-dev.1 → 0.3.10-test.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdedkingdoms/construct",
-  "version": "0.3.9-dev.1",
+  "version": "0.3.10-test.1",
   "description": "The Construct framework: the Crowded Kingdoms game platform layer (hosted sign-in, World Stores, voice/webcam/chat, Crowdy Studio dock, app and grid mods, grid programs) and engine loop, shared by the-construct starter and the games built on it. Ships TypeScript source for Vite.",
   "license": "MIT",
   "type": "module",

package/src/platform/studio/clientModHost.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 
 const {
   DEFAULT_VOXEL_STATE,
@@ -7,6 +7,7 @@ const {
   bytesToBase64,
   parseVoxelSetArgs,
   routeClientHostCall,
+  routeWithFallback,
   voxelStateToWire,
   voxelsFromBase64,
   voxelsListRows,
@@ -144,6 +145,23 @@ describe('routeClientHostCall', () => {
     }
   });
 
+  it("hands an SDK call to the host's server calls while no session is bound", async () => {
+    const { bindModSession } = await import('./modChunkRuntime');
+    bindModSession(null);
+    const r = reads();
+    for (const fn of ['emit_channel', 'channel_join', 'sessions_list']) {
+      const call = { fn, args: { channelId: '5' } } as never;
+      await expect(routeClientHostCall(call, r.reads, grid)).rejects.toBeInstanceOf(
+        HostCallRefusedError,
+      );
+      const serverCalls = vi.fn(async () => ({ answered: fn }));
+      await expect(
+        routeWithFallback(call, () => routeClientHostCall(call, r.reads, grid), serverCalls),
+      ).resolves.toEqual({ answered: fn });
+      expect(serverCalls).toHaveBeenCalledWith(call);
+    }
+  });
+
   it('drains pointer_clicks when the game supplies an input sink', async () => {
     const r = reads();
     await expect(

package/src/platform/studio/clientModHost.ts

@@ -13,7 +13,7 @@
  * the same route Paint uses. Never hand a mod the raw client.
  */
 import type { PlayerCodeGridBounds, PlayerCodeHostCall } from '@crowdedkingdoms/crowdyjs';
-import { routeModGameplay } from './modChunkRuntime';
+import { NO_SESSION, routeModGameplay } from './modChunkRuntime';
 import type { ModSceneStore } from './modScene';
 
 export interface ClientVoxelState {
@@ -188,13 +188,14 @@ export async function routeClientHostCall(
       return scene.store.setInstances(scene.source, args);
     default: {
       const answered = await routeModGameplay(call);
-      if (
-        answered &&
-        typeof answered === 'object' &&
-        'error' in answered &&
-        String((answered as { error: unknown }).error).startsWith('unrouted')
-      ) {
-        throw new HostCallRefusedError(fn);
+      if (answered && typeof answered === 'object' && 'error' in answered) {
+        // A call the mod runtime does not route, or an SDK call in a game that never binds a
+        // session (one without StudioService), is the host's to answer: `routeWithFallback`
+        // hands a refusal to its server calls.
+        const error = String((answered as { error: unknown }).error);
+        if (error.startsWith('unrouted') || error === NO_SESSION) {
+          throw new HostCallRefusedError(fn);
+        }
       }
       return answered;
     }

package/src/platform/studio/modChunkRuntime.ts

@@ -429,6 +429,9 @@ async function restoreAvatar(): Promise<void> {
     .catch(() => undefined);
 }
 
+/** The answer to an SDK call while no session is bound; the host's router hands such a call on. */
+export const NO_SESSION = 'no session';
+
 const PASS_SDK = new Set([
   'actors_create',
   'actors_update',
@@ -494,7 +497,7 @@ const PASS_SDK = new Set([
 
 async function passSdk(fn: string, args: Record<string, unknown>): Promise<unknown> {
   if (!PASS_SDK.has(fn)) return { ok: false, error: `unrouted host call ${fn}` };
-  if (!port) return { ok: false, error: 'no session' };
+  if (!port) return { ok: false, error: NO_SESSION };
   const client = port.client;
   switch (fn) {
     case 'actors_create':