@volter/world-core 3.0.161 → 3.0.163

package/src/sockets.ts

@@ -1,3 +1,4 @@
+import { runWithStorageTenant, storageTenant } from './request-scope.ts';
 // A vendor's persistent wire (architecture, "Other wires: sockets"): a WebSocket its clients hold open, on which the
 // vendor sends what happens as it happens (Discord's Gateway: a bot identifies, is told the guilds it is in, and is sent
 // each message, member and interaction as it lands). The manifest declares the socket (`sockets`); the pack's engine
@@ -49,7 +50,7 @@ export type SocketEngine<C> = {
   close?(session: SocketSession, ctx: C): void | Promise<void>;
 };
 
-type Open = { session: SocketSession; engine: SocketEngine<unknown>; context: () => Promise<unknown>; queue: Promise<void>; pending: Map<string, { resolve: (v: unknown) => void; reject: (e: Error) => void; timer: ReturnType<typeof setTimeout>; due: number }> };
+type Open = { tenant?: string; run: <T>(fn: () => T) => T; session: SocketSession; engine: SocketEngine<unknown>; context: () => Promise<unknown>; queue: Promise<void>; pending: Map<string, { resolve: (v: unknown) => void; reject: (e: Error) => void; timer: ReturnType<typeof setTimeout>; due: number }> };
 const sessions = new Map<string, Set<Open>>();
 /** A World's next session number, per World (its service and root): a session's id is the World's, never the
  *  process's, so a life replayed on a fresh World numbers its sessions as it did the first time. */
@@ -58,7 +59,7 @@ const keyOf = (service: string, root: string | undefined): string => `${service}
 
 /** The open sessions of one socket of the vendor in a World (a handler reaches them as `ctx.sockets(id)`). */
 export function openSessions(service: string, root: string | undefined, socket: string): SocketSession[] {
-  return [...(sessions.get(keyOf(service, root)) ?? [])].filter((o) => o.session.socket === socket).map((o) => o.session);
+  return [...(sessions.get(keyOf(service, root)) ?? [])].filter((o) => o.session.socket === socket && o.tenant === storageTenant(service)).map((o) => o.session);
 }
 
 /** What a session awaits that the World's clock has run out (a life's `wait` past a relay's timeout), rejected as the
@@ -77,8 +78,9 @@ export function socketWrite(service: string, root: string | undefined, write: Ev
   if (!open?.size) return;
   for (const o of open) {
     const { engine } = o;
+    if (o.tenant !== storageTenant(service)) continue;
     if (!engine.write) continue;
-    o.queue = o.queue.then(async () => engine.write!(o.session, write, await o.context())).catch((error) => o.session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
+    o.queue = o.queue.then(() => o.run(async () => engine.write!(o.session, write, await o.context()))).catch((error) => o.session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
   }
 }
 
@@ -105,8 +107,8 @@ export function socketUpgrade<C>(
   engines: Record<string, SocketEngine<C>>,
   context: (request: Request, decl: SocketDecl, params: Record<string, string>) => Promise<C>,
   hostOf: (request: Request) => string,
-  pathOf: (request: Request) => string = (request) => new URL(request.url).pathname,
-  decide: (asked: unknown) => Promise<ScenarioServed | undefined> = async () => undefined,
+  pathOf: (request: Request) => string,
+  decide: (asked: unknown) => Promise<ScenarioServed | undefined>,
 ): WebSocketUpgrade {
   const matchFor = (request: Request): { decl: SocketDecl; params: Record<string, string> } | undefined => {
     const path = pathOf(request).replace(/\/+$/, '') || '/';
@@ -149,16 +151,17 @@ export function socketUpgrade<C>(
         },
         decide,
       };
-      const o: Open = { session, engine, context: () => context(request.clone(), decl, params), queue: Promise.resolve(), pending };
+      const tenant = storageTenant(service), run = <T>(fn: () => T): T => runWithStorageTenant(service, tenant, fn);
+      const o: Open = { tenant, run, session, engine, context: () => context(request.clone(), decl, params), queue: Promise.resolve(), pending };
       byPeer.set(peer, o);
       (sessions.get(key) ?? sessions.set(key, new Set()).get(key)!).add(o);
-      if (engine.open) o.queue = o.queue.then(async () => engine.open!(session, await o.context())).catch((error) => session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
+      if (engine.open) o.queue = o.queue.then(() => o.run(async () => engine.open!(session, await o.context()))).catch((error) => session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
     },
     message: (peer, data) => {
       const o = byPeer.get(peer);
       if (!o) return;
       const text = typeof data === 'string' ? data : new TextDecoder().decode(data);
-      o.queue = o.queue.then(async () => o.engine.message(o.session, text, await o.context())).catch((error) => o.session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
+      o.queue = o.queue.then(() => o.run(async () => o.engine.message(o.session, text, await o.context()))).catch((error) => o.session.close(1011, String((error as Error).message ?? error).slice(0, 120)));
     },
     close: (peer) => {
       const o = byPeer.get(peer);
@@ -168,7 +171,7 @@ export function socketUpgrade<C>(
       for (const [k, p] of o.pending) { clearTimeout(p.timer); p.reject(new Error('the session closed')); o.pending.delete(k); }
       // the end is written after what the session is still doing, over its own context
       // the session is gone, so a failure has no frame to go in: it is reported, never swallowed
-      if (o.engine.close) o.queue = o.queue.then(async () => o.engine.close!(o.session, await o.context())).catch((error) => {
+      if (o.engine.close) o.queue = o.queue.then(() => o.run(async () => o.engine.close!(o.session, await o.context()))).catch((error) => {
         console.error(`${service}: the ${o.session.socket} socket's end was not written: ${String((error as Error)?.message ?? error)}`);
       });
     },

package/src/world-account-name.ts

@@ -0,0 +1,4 @@
+/** The retained World-account name grammar, shared by registration and read-only authority selection. */
+export function isWorldAccountName(value: unknown): value is string {
+  return typeof value === 'string' && /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/.test(value);
+}