@worldmesh/runtime 0.2.0 → 0.2.2

package/dist/avatar/share.js

@@ -0,0 +1,203 @@
+import { parseAvatarShare } from './descriptor.js';
+/**
+ * Which avatar other players may see, keeping its link fresh, and checking the
+ * links other players send.
+ *
+ * Other players download a model straight from the platform, so a link must
+ * never be one a player made up: a server of their own would learn the IP
+ * address of everyone in the room. So only links the WorldMesh hub signed
+ * (Ed25519) when it resolved the avatar are sent, and a link from someone
+ * else is downloaded only if its signature checks out against the hub's
+ * public key. The hub signs Sketchfab links and at3d links on Bluesky's hosts;
+ * never VRoid Hub (its license needs "Multiplay" approval for other players)
+ * or a self-hosted AT Protocol server.
+ *
+ * Links and signatures expire (Sketchfab's links within minutes), so the owner
+ * asks for a fresh one before the old runs out; someone joining later still
+ * gets a working link. Players who already loaded the model keep it.
+ */
+/** Never shown to other players, even if a hub signed it. */
+const PRIVATE_PROVIDERS = ['vroid'];
+/** Ask for a new link this long before the old one expires. */
+const REFRESH_EARLY_MS = 45_000;
+const MIN_REFRESH_MS = 30_000;
+const SHARE_CONTEXT = 'worldmesh-avatar-share-v1';
+/** The hub-signed link other players may be shown, or null when there is none. */
+export function shareableAvatar(descriptor) {
+    if (!descriptor || PRIVATE_PROVIDERS.includes(descriptor.provider))
+        return null;
+    return parseAvatarShare(descriptor.share);
+}
+/** Same avatar, possibly a different link. */
+function sameAvatar(a, b) {
+    if (a.avatarId || b.avatarId)
+        return a.provider === b.provider && a.avatarId === b.avatarId;
+    return a.modelUrl === b.modelUrl;
+}
+/**
+ * The avatar this visitor shows other players. Set it whenever the local
+ * avatar changes; with `resolve` (asks the hub again), it keeps the signed
+ * link current, and fetches one if the descriptor came without.
+ */
+export class SharedAvatarLink {
+    resolve;
+    descriptor = null;
+    shared = null;
+    timer = 0;
+    turn = 0;
+    constructor(resolve) {
+        this.resolve = resolve;
+    }
+    set(descriptor) {
+        this.turn += 1;
+        window.clearTimeout(this.timer);
+        this.descriptor = descriptor;
+        this.shared = shareableAvatar(descriptor);
+        // Handed over without a signed link (e.g. by an older hub): ask for one now.
+        if (descriptor && !this.shared && !PRIVATE_PROVIDERS.includes(descriptor.provider) && descriptor.share === undefined && this.resolve) {
+            const turn = this.turn;
+            this.timer = window.setTimeout(() => void this.refresh(turn), 0);
+            return;
+        }
+        this.schedule();
+    }
+    get() {
+        return this.shared;
+    }
+    dispose() {
+        this.turn += 1;
+        window.clearTimeout(this.timer);
+        this.resolve = null;
+    }
+    schedule() {
+        const descriptor = this.descriptor;
+        const shared = this.shared;
+        if (!this.resolve || !shared || !descriptor)
+            return;
+        const linkExpires = descriptor.expiresAt ? Date.parse(descriptor.expiresAt) : Infinity;
+        const expires = Math.min(shared.x * 1000, Number.isFinite(linkExpires) ? linkExpires : Infinity);
+        const delay = Math.max(MIN_REFRESH_MS, expires - Date.now() - REFRESH_EARLY_MS);
+        const turn = this.turn;
+        this.timer = window.setTimeout(() => void this.refresh(turn), delay);
+    }
+    async refresh(turn) {
+        if (turn !== this.turn || !this.resolve)
+            return;
+        // Nobody new sees a hidden tab's link expire; ask again once it is back.
+        if (document.hidden) {
+            this.timer = window.setTimeout(() => void this.refresh(turn), MIN_REFRESH_MS);
+            return;
+        }
+        let fresh = null;
+        try {
+            fresh = await this.resolve();
+        }
+        catch {
+            // The hub could not be reached just now. Ask again shortly, or the link
+            // runs out for anyone joining later.
+            if (turn === this.turn)
+                this.timer = window.setTimeout(() => void this.refresh(turn), MIN_REFRESH_MS);
+            return;
+        }
+        if (turn !== this.turn || !this.descriptor)
+            return;
+        // A different avatar (picked on the hub since) is not swapped in here; the
+        // body this visitor sees and the one others see stay the same.
+        if (!fresh || !sameAvatar(fresh, this.descriptor))
+            return;
+        this.descriptor = fresh;
+        this.shared = shareableAvatar(fresh);
+        this.schedule();
+    }
+}
+/** The exact bytes the hub signs (workers/auth/src/avatars/share.ts). */
+function sharePayload(share) {
+    return new TextEncoder().encode(`${SHARE_CONTEXT}\n${share.u}\n${share.f}\n${share.i}\n${share.x}`);
+}
+const verifiers = new Map();
+/** After the hub's key failed to load, wait this long before asking for it again. */
+const KEY_RETRY_MS = 30_000;
+/**
+ * Checks links other players send against the public key of the hub at
+ * `hubUrl` (fetched once from its resolve endpoint). Says no when the hub has
+ * no key or the browser cannot check Ed25519, so nothing unchecked is ever
+ * downloaded. Throws when the key could not be fetched just now (offline for a
+ * moment, the hub mid-deploy): the link may well be fine, so ask again later.
+ */
+export function createShareVerifier(hubUrl) {
+    let endpoint;
+    try {
+        endpoint = new URL('/api/account/avatar/resolve', hubUrl).toString();
+    }
+    catch {
+        return async () => false;
+    }
+    const existing = verifiers.get(endpoint);
+    if (existing)
+        return existing;
+    // Resolves to null when links can never be checked here; rejects when the key could not be fetched.
+    let key = null;
+    let failedAt = 0;
+    const loadKey = () => {
+        // After a failure, fetch again a little later rather than for every link.
+        if (key && !(failedAt && Date.now() - failedAt > KEY_RETRY_MS))
+            return key;
+        failedAt = 0;
+        key = (async () => {
+            let x;
+            try {
+                const response = await fetch(endpoint, { method: 'GET', mode: 'cors', credentials: 'omit', referrerPolicy: 'no-referrer' });
+                if (!response.ok)
+                    throw new Error(`Key request failed (${response.status})`);
+                const body = (await response.json());
+                const jwk = body.key;
+                if (jwk === null)
+                    x = null;
+                else if (!jwk || jwk.kty !== 'OKP' || jwk.crv !== 'Ed25519' || typeof jwk.x !== 'string')
+                    throw new Error('Unexpected share key');
+                else
+                    x = jwk.x;
+            }
+            catch (error) {
+                failedAt = Date.now();
+                console.warn('[worldmesh] Cannot load the hub’s avatar key yet; showing default bodies for now.', error);
+                throw error;
+            }
+            if (!x) {
+                console.warn('[worldmesh] This hub does not vouch for avatar links; showing default bodies.');
+                return null;
+            }
+            try {
+                return await crypto.subtle.importKey('jwk', { kty: 'OKP', crv: 'Ed25519', x }, { name: 'Ed25519' }, false, ['verify']);
+            }
+            catch (error) {
+                console.warn('[worldmesh] This browser cannot check other players’ avatar links; showing default bodies.', error);
+                return null;
+            }
+        })();
+        return key;
+    };
+    const verify = async (share) => {
+        // Throws while the key cannot be fetched: the caller tries again later.
+        const publicKey = await loadKey();
+        if (!publicKey)
+            return false;
+        try {
+            return await crypto.subtle.verify({ name: 'Ed25519' }, publicKey, fromBase64url(share.s), sharePayload(share));
+        }
+        catch {
+            return false;
+        }
+    };
+    verifiers.set(endpoint, verify);
+    return verify;
+}
+function fromBase64url(text) {
+    const base64 = text.replace(/-/g, '+').replace(/_/g, '/');
+    const binary = atob(base64 + '='.repeat((4 - (base64.length % 4)) % 4));
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++)
+        bytes[i] = binary.charCodeAt(i);
+    return bytes;
+}
+//# sourceMappingURL=share.js.map

package/dist/avatar/share.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"share.js","sourceRoot":"","sources":["../../src/avatar/share.ts"],"names":[],"mappings":"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"}

package/dist/camera/cameraRig.d.ts

@@ -25,10 +25,14 @@ export declare class CameraRig {
     private offset;
     /** Smoothed boom length so the camera does not pop when it clears a wall. */
     private currentBoom;
+    /** After snapBoom: ease back out slowly, a pull-back rather than a jump. */
+    private gentle;
     constructor(options: CameraRigOptions);
     look(dx: number, dy: number): void;
     zoom(wheel: number): void;
     setMode(mode: ViewMode): void;
+    /** Put the third-person camera this far back right now; it eases back to `distance` from there. */
+    snapBoom(length: number): void;
     toggleMode(): ViewMode;
     /** Point the camera at the player. `feet` is the player's base position. */
     update(dt: number, feet: Vector3, eyeHeight: number): void;

package/dist/camera/cameraRig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cameraRig.d.ts","sourceRoot":"","sources":["../../src/camera/cameraRig.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAKzD,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBAAa,SAAS;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAiB;IAC/B,6EAA6E;IAC7E,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,EAAE,gBAAgB;IAarC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAMlC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKzB,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAK7B,UAAU,IAAI,QAAQ;IAKtB,4EAA4E;IAC5E,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAqB1D,gEAAgE;IAChE,UAAU,CAAC,GAAG,UAAgB,GAAG,OAAO;IAIxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAM5C"}
+{"version":3,"file":"cameraRig.d.ts","sourceRoot":"","sources":["../../src/camera/cameraRig.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAKzD,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBAAa,SAAS;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,MAAM,CAAiB;IAC/B,6EAA6E;IAC7E,OAAO,CAAC,WAAW,CAAS;IAC5B,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,EAAE,gBAAgB;IAarC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAMlC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKzB,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAK7B,mGAAmG;IACnG,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK9B,UAAU,IAAI,QAAQ;IAKtB,4EAA4E;IAC5E,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAsB1D,gEAAgE;IAChE,UAAU,CAAC,GAAG,UAAgB,GAAG,OAAO;IAIxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;CAM5C"}

package/dist/camera/cameraRig.js

@@ -21,6 +21,8 @@ export class CameraRig {
     offset = new Vector3();
     /** Smoothed boom length so the camera does not pop when it clears a wall. */
     currentBoom;
+    /** After snapBoom: ease back out slowly, a pull-back rather than a jump. */
+    gentle = false;
     constructor(options) {
         this.camera = options.camera;
         this.collision = options.collision;
@@ -48,6 +50,11 @@ export class CameraRig {
         if (mode === 'third')
             this.currentBoom = this.distance;
     }
+    /** Put the third-person camera this far back right now; it eases back to `distance` from there. */
+    snapBoom(length) {
+        this.currentBoom = clamp(length, 0.4, this.maxDistance);
+        this.gentle = true;
+    }
     toggleMode() {
         this.setMode(this.mode === 'first' ? 'third' : 'first');
         return this.mode;
@@ -67,8 +74,10 @@ export class CameraRig {
         const wanted = this.collision.castDistance(this.target, this.offset, this.distance + 0.3) - 0.3;
         const boom = clamp(wanted, 0.4, this.distance);
         // Snap in fast, ease out slowly: popping into geometry is worse than lag.
-        const rate = boom < this.currentBoom ? 1 : 1 - Math.exp(-8 * dt);
+        const rate = boom < this.currentBoom ? 1 : 1 - Math.exp(-(this.gentle ? 1.6 : 8) * dt);
         this.currentBoom += (boom - this.currentBoom) * rate;
+        if (this.gentle && (boom < this.currentBoom || this.currentBoom > boom - 0.05))
+            this.gentle = false;
         this.camera.position.copy(this.target).addScaledVector(this.offset, this.currentBoom);
     }
     /** Horizontal forward vector, for spawn orientation helpers. */

package/dist/camera/cameraRig.js.map

@@ -1 +1 @@
-{"version":3,"file":"cameraRig.js","sourceRoot":"","sources":["../../src/camera/cameraRig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cameraRig.js","sourceRoot":"","sources":["../../src/camera/cameraRig.ts"],"names":[],"mappings":"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"}

package/dist/camera/viewHandoff.d.ts

@@ -0,0 +1,20 @@
+import type { ViewMode } from '../types.js';
+/**
+ * Remembering the visitor's camera view (first or third person) between worlds.
+ *
+ * Worlds live on different origins, so storage alone cannot carry it: travel
+ * URLs add it to the fragment (`#wm-view=third`), and each world also keeps it
+ * in localStorage so it holds across reloads and later visits.
+ *
+ * Only a view the visitor picked (or was handed) is carried. Until then every
+ * world opens in its own default.
+ */
+export declare const VIEW_PARAM = "wm-view";
+export declare const VIEW_STORAGE_KEY = "worldmesh.view";
+/** Moves a view from this page's URL fragment into storage, and returns the remembered one. */
+export declare function takeViewHandoff(): ViewMode | null;
+export declare function getRememberedView(): ViewMode | null;
+export declare function rememberView(mode: ViewMode): void;
+/** Adds the remembered view to a destination URL's fragment, next to any other WorldMesh handoff. */
+export declare function withView(url: URL): URL;
+//# sourceMappingURL=viewHandoff.d.ts.map

package/dist/camera/viewHandoff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewHandoff.d.ts","sourceRoot":"","sources":["../../src/camera/viewHandoff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;;GASG;AAEH,eAAO,MAAM,UAAU,YAAY,CAAC;AACpC,eAAO,MAAM,gBAAgB,mBAAmB,CAAC;AAQjD,+FAA+F;AAC/F,wBAAgB,eAAe,IAAI,QAAQ,GAAG,IAAI,CAqBjD;AAED,wBAAgB,iBAAiB,IAAI,QAAQ,GAAG,IAAI,CAEnD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAOjD;AAED,qGAAqG;AACrG,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAMtC"}

package/dist/camera/viewHandoff.js

@@ -0,0 +1,64 @@
+/**
+ * Remembering the visitor's camera view (first or third person) between worlds.
+ *
+ * Worlds live on different origins, so storage alone cannot carry it: travel
+ * URLs add it to the fragment (`#wm-view=third`), and each world also keeps it
+ * in localStorage so it holds across reloads and later visits.
+ *
+ * Only a view the visitor picked (or was handed) is carried. Until then every
+ * world opens in its own default.
+ */
+export const VIEW_PARAM = 'wm-view';
+export const VIEW_STORAGE_KEY = 'worldmesh.view';
+let current = null;
+function isViewMode(value) {
+    return value === 'first' || value === 'third';
+}
+/** Moves a view from this page's URL fragment into storage, and returns the remembered one. */
+export function takeViewHandoff() {
+    const hash = window.location.hash.slice(1);
+    if (hash) {
+        const params = new URLSearchParams(hash);
+        const view = params.get(VIEW_PARAM);
+        if (view !== null) {
+            params.delete(VIEW_PARAM);
+            const rest = params.toString();
+            history.replaceState(history.state, '', `${window.location.pathname}${window.location.search}${rest ? `#${rest}` : ''}`);
+            if (isViewMode(view))
+                rememberView(view);
+        }
+    }
+    if (!current) {
+        try {
+            const stored = localStorage.getItem(VIEW_STORAGE_KEY);
+            if (isViewMode(stored))
+                current = stored;
+        }
+        catch {
+            // Storage blocked: the view still follows through travel URLs.
+        }
+    }
+    return current;
+}
+export function getRememberedView() {
+    return current;
+}
+export function rememberView(mode) {
+    current = mode;
+    try {
+        localStorage.setItem(VIEW_STORAGE_KEY, mode);
+    }
+    catch {
+        // Storage blocked: the view still follows through travel URLs.
+    }
+}
+/** Adds the remembered view to a destination URL's fragment, next to any other WorldMesh handoff. */
+export function withView(url) {
+    if (!current || !/^https?:$/.test(url.protocol))
+        return url;
+    const params = new URLSearchParams(url.hash.slice(1));
+    params.set(VIEW_PARAM, current);
+    url.hash = params.toString();
+    return url;
+}
+//# sourceMappingURL=viewHandoff.js.map

package/dist/camera/viewHandoff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"viewHandoff.js","sourceRoot":"","sources":["../../src/camera/viewHandoff.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC;AACpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAEjD,IAAI,OAAO,GAAoB,IAAI,CAAC;AAEpC,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO,CAAC;AAChD,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC/B,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACzH,IAAI,UAAU,CAAC,IAAI,CAAC;gBAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACtD,IAAI,UAAU,CAAC,MAAM,CAAC;gBAAE,OAAO,GAAG,MAAM,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,+DAA+D;QACjE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,OAAO,GAAG,IAAI,CAAC;IACf,IAAI,CAAC;QACH,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;IACjE,CAAC;AACH,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,QAAQ,CAAC,GAAQ;IAC/B,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,GAAG,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAChC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC7B,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/controls/input.d.ts

@@ -37,16 +37,45 @@ export declare class Input {
     private onEscape?;
     private touch?;
     private disposed;
+    /** Letting go of the cursor to leave the page, not to pause. */
+    private releasing;
+    private xrSession;
+    private xrMoveX;
+    private xrMoveZ;
+    private xrTurn;
+    private xrSprint;
+    private xrJumpHeld;
+    private xrInteractHeld;
+    /** Movement carried over from outside (a hub's joystick, still held as the visitor walked in). */
+    private carriedX;
+    private carriedZ;
     constructor(options: InputOptions);
     requestPointerLock(touchTriggered?: boolean): void;
     setLocked(locked: boolean): void;
     exitPointerLock(): void;
+    /**
+     * Free the cursor without bringing up the pause screen, for leaving the page.
+     * With moveBeforeLock the visitor stays walking, so coming back with the
+     * browser's back button finds them in the world instead of on the menu.
+     */
+    release(): void;
     triggerAction(action: InputAction): void;
+    /** WebXR controllers join the same move / jump / interact actions as the keyboard. */
+    setXrSession(session: XRSession | null): void;
+    /**
+     * Read XR gamepads for this frame. Left stick walks, right stick turns,
+     * trigger or A/X jumps, squeeze interacts.
+     */
+    pollXr(dt: number): void;
+    /** Radians to apply to the XR play-space this frame (right stick). */
+    readXrTurn(): number;
     isDown(action: InputAction): boolean;
     /** True once per key press. Reading it clears the flag. */
     consume(action: InputAction): boolean;
     /** The number key (0–9) pressed this frame, once. Reading it clears it. */
     consumeDigit(): number | null;
+    /** Keep moving this way (same axes as getMoveAxis) until told otherwise; 0, 0 stops. */
+    carry(x: number, z: number): void;
     /** Movement intent on the local XZ plane, already normalized. */
     getMoveAxis(): {
         x: number;

package/dist/controls/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/controls/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIvD,MAAM,WAAW,YAAY;IAC3B,8CAA8C;IAC9C,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,iEAAiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,GAAG,IAAI,CAAC;CACjC;AAED;;;;GAIG;AACH,qBAAa,KAAK;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,iEAAiE;IACjE,WAAW,SAAK;IAChB,WAAW,SAAK;IAChB,sDAAsD;IACtD,UAAU,SAAK;IACf,MAAM,UAAS;IAEf,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,OAAO,CAAqB;IACpC,wEAAwE;IACxE,OAAO,CAAC,WAAW,CAA0B;IAC7C,sDAAsD;IACtD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,mBAAmB,CAAC,CAA4B;IACxD,OAAO,CAAC,QAAQ,CAAC,CAAuB;IACxC,OAAO,CAAC,KAAK,CAAC,CAAgB;IAC9B,OAAO,CAAC,QAAQ,CAAS;gBAEb,OAAO,EAAE,YAAY;IAqCjC,kBAAkB,CAAC,cAAc,UAAQ,GAAG,IAAI;IA4BhD,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAYhC,eAAe,IAAI,IAAI;IAevB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAIxC,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO;IAMpC,2DAA2D;IAC3D,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO;IAOrC,2EAA2E;IAC3E,YAAY,IAAI,MAAM,GAAG,IAAI;IAM7B,iEAAiE;IACjE,WAAW,IAAI;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE;IAgBvC,8EAA8E;IAC9E,QAAQ,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAerD,sDAAsD;IACtD,QAAQ,IAAI,IAAI;IAKhB,OAAO,IAAI,IAAI;IAgBf;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAKlB;IAEF,OAAO,CAAC,aAAa,CAcnB;IAEF,OAAO,CAAC,WAAW,CAEjB;IAEF,oDAAoD;IACpD,OAAO,CAAC,UAAU,CAGhB;IAEF;;;OAGG;IACH,OAAO,CAAC,iBAAiB,CAMvB;IAEF;;;OAGG;IACH,OAAO,CAAC,eAAe,CAIrB;IAEF,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,WAAW,CAGjB;IAEF,OAAO,CAAC,uBAAuB,CAQ7B;IAEF,OAAO,CAAC,sBAAsB,CAK5B;CACH"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/controls/input.ts"],"names":[],"mappings":"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"}

package/dist/controls/input.js

@@ -25,6 +25,18 @@ export class Input {
     onEscape;
     touch;
     disposed = false;
+    /** Letting go of the cursor to leave the page, not to pause. */
+    releasing = false;
+    xrSession = null;
+    xrMoveX = 0;
+    xrMoveZ = 0;
+    xrTurn = 0;
+    xrSprint = false;
+    xrJumpHeld = false;
+    xrInteractHeld = false;
+    /** Movement carried over from outside (a hub's joystick, still held as the visitor walked in). */
+    carriedX = 0;
+    carriedZ = 0;
     constructor(options) {
         this.element = options.element;
         this.moveBeforeLock = options.moveBeforeLock === true;
@@ -60,7 +72,7 @@ export class Input {
             this.touch?.setVisible(true);
     }
     requestPointerLock(touchTriggered = false) {
-        if (this.disposed || this.locked)
+        if (this.disposed || this.locked || this.xrSession)
             return;
         // Mobile / touch devices do not support pointer lock. Enter directly.
         if (touchTriggered || isTouchDevice()) {
@@ -114,12 +126,98 @@ export class Input {
             this.onPointerLockChange?.(false);
         }
     }
+    /**
+     * Free the cursor without bringing up the pause screen, for leaving the page.
+     * With moveBeforeLock the visitor stays walking, so coming back with the
+     * browser's back button finds them in the world instead of on the menu.
+     */
+    release() {
+        if (!this.moveBeforeLock) {
+            this.exitPointerLock();
+            return;
+        }
+        this.pressed.clear();
+        this.justPressed.clear();
+        this.touch?.reset();
+        if (document.pointerLockElement === this.element) {
+            this.releasing = true;
+            document.exitPointerLock();
+        }
+    }
     triggerAction(action) {
         this.justPressed.add(action);
     }
+    /** WebXR controllers join the same move / jump / interact actions as the keyboard. */
+    setXrSession(session) {
+        this.xrSession = session;
+        this.xrMoveX = 0;
+        this.xrMoveZ = 0;
+        this.xrTurn = 0;
+        this.xrSprint = false;
+        this.xrJumpHeld = false;
+        this.xrInteractHeld = false;
+        if (session)
+            this.touch?.setVisible(false);
+        else
+            this.touch?.setVisible(this.locked && isTouchDevice());
+    }
+    /**
+     * Read XR gamepads for this frame. Left stick walks, right stick turns,
+     * trigger or A/X jumps, squeeze interacts.
+     */
+    pollXr(dt) {
+        this.xrMoveX = 0;
+        this.xrMoveZ = 0;
+        this.xrTurn = 0;
+        this.xrSprint = false;
+        let jump = false;
+        let interact = false;
+        if (this.xrSession) {
+            for (const source of this.xrSession.inputSources) {
+                const pad = source.gamepad;
+                if (!pad)
+                    continue;
+                const stick = readThumbstick(pad);
+                if (source.handedness === 'right') {
+                    this.xrTurn += stick.x * XR_TURN_SPEED * dt;
+                }
+                else {
+                    this.xrMoveX += stick.x;
+                    this.xrMoveZ += stick.y;
+                }
+                if (pad.buttons[0]?.pressed || pad.buttons[4]?.pressed)
+                    jump = true;
+                if (pad.buttons[1]?.pressed)
+                    interact = true;
+                if (pad.buttons[3]?.pressed)
+                    this.xrSprint = true;
+            }
+            const length = Math.hypot(this.xrMoveX, this.xrMoveZ);
+            if (length > 1) {
+                this.xrMoveX /= length;
+                this.xrMoveZ /= length;
+            }
+        }
+        if (jump && !this.xrJumpHeld)
+            this.justPressed.add('jump');
+        if (interact && !this.xrInteractHeld)
+            this.justPressed.add('interact');
+        this.xrJumpHeld = jump;
+        this.xrInteractHeld = interact;
+    }
+    /** Radians to apply to the XR play-space this frame (right stick). */
+    readXrTurn() {
+        const turn = this.xrTurn;
+        this.xrTurn = 0;
+        return turn;
+    }
     isDown(action) {
         if (this.touch?.isDown(action))
             return true;
+        if (action === 'sprint' && this.xrSprint)
+            return true;
+        if (action === 'jump' && this.xrJumpHeld)
+            return true;
         for (const code of this.keymap[action])
             if (this.pressed.has(code))
                 return true;
@@ -140,6 +238,11 @@ export class Input {
         this.pendingDigit = null;
         return digit;
     }
+    /** Keep moving this way (same axes as getMoveAxis) until told otherwise; 0, 0 stops. */
+    carry(x, z) {
+        this.carriedX = Number.isFinite(x) ? Math.max(-1, Math.min(1, x)) : 0;
+        this.carriedZ = Number.isFinite(z) ? Math.max(-1, Math.min(1, z)) : 0;
+    }
     /** Movement intent on the local XZ plane, already normalized. */
     getMoveAxis() {
         let x = (this.isDown('right') ? 1 : 0) - (this.isDown('left') ? 1 : 0);
@@ -149,6 +252,10 @@ export class Input {
             x += touchAxis.x;
             z += touchAxis.z;
         }
+        x += this.xrMoveX;
+        z += this.xrMoveZ;
+        x += this.carriedX;
+        z += this.carriedZ;
         const length = Math.hypot(x, z);
         if (length === 0)
             return { x: 0, z: 0 };
@@ -232,6 +339,7 @@ export class Input {
     handleBlur = () => {
         this.pressed.clear();
         this.justPressed.clear();
+        this.touch?.reset();
     };
     /**
      * A click captures the cursor for looking. Touch is left alone: the joysticks
@@ -270,6 +378,12 @@ export class Input {
     };
     handlePointerLockChange = () => {
         const isLocked = document.pointerLockElement === this.element;
+        if (!isLocked && this.releasing) {
+            // Quiet: the overlay keeps its walking state.
+            this.releasing = false;
+            this.locked = false;
+            return;
+        }
         if (isLocked) {
             this.setLocked(true);
         }
@@ -285,6 +399,15 @@ export class Input {
         }
     };
 }
+const XR_TURN_SPEED = 2.4;
+const XR_DEADZONE = 0.18;
+function readThumbstick(pad) {
+    const x = pad.axes.length >= 4 ? pad.axes[2] : (pad.axes[0] ?? 0);
+    const y = pad.axes.length >= 4 ? pad.axes[3] : (pad.axes[1] ?? 0);
+    if (Math.hypot(x, y) < XR_DEADZONE)
+        return { x: 0, y: 0 };
+    return { x, y };
+}
 function isTypingTarget(target) {
     if (!(target instanceof HTMLElement))
         return false;