castle-web-cli 0.4.238 → 0.4.240
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent.js +5 -1
- package/dist/api.d.ts +20 -0
- package/dist/api.js +57 -0
- package/dist/bundle.d.ts +38 -1
- package/dist/bundle.js +309 -13
- package/dist/castle-host/host.js +218 -11
- package/dist/castleJson.d.ts +10 -0
- package/dist/castleJson.js +46 -2
- package/dist/check.js +5 -2
- package/dist/devSessionServer.js +4 -1
- package/dist/devSessionStorage.d.ts +1 -0
- package/dist/devSessionStorage.js +32 -7
- package/dist/importOrder.d.ts +2 -0
- package/dist/importOrder.js +29 -0
- package/dist/index.js +22 -3
- package/dist/init.js +24 -2
- package/dist/multiplayerDoc.d.ts +1 -1
- package/dist/multiplayerDoc.js +9 -0
- package/dist/platformDoc.js +4 -2
- package/dist/playPagePolicy.d.ts +1 -0
- package/dist/playPagePolicy.js +12 -3
- package/dist/resetLeaderboards.d.ts +8 -1
- package/dist/resetLeaderboards.js +43 -8
- package/dist/roomLogs.d.ts +39 -0
- package/dist/roomLogs.js +166 -0
- package/dist/save-deck.d.ts +32 -2
- package/dist/save-deck.js +240 -39
- package/kits/base/CLAUDE.md +2 -1
- package/kits/base/castle.json +1 -1
- package/kits/base/sdk/README.md +240 -8
- package/kits/base/sdk/analytics.d.ts +8 -0
- package/kits/base/sdk/analytics.js +92 -0
- package/kits/base/sdk/castle.d.ts +8 -2
- package/kits/base/sdk/castle.js +3 -0
- package/kits/base/sdk/commands.d.ts +79 -0
- package/kits/base/sdk/commands.js +1 -0
- package/kits/base/sdk/debugConsole.d.ts +17 -0
- package/kits/base/sdk/debugConsole.js +154 -0
- package/kits/base/sdk/experiments.js +24 -1
- package/kits/base/sdk/hostRetry.d.ts +7 -0
- package/kits/base/sdk/hostRetry.js +57 -0
- package/kits/base/sdk/hub.d.ts +20 -2
- package/kits/base/sdk/hub.js +99 -13
- package/kits/base/sdk/multiplayer.d.ts +2 -0
- package/kits/base/sdk/multiplayer.js +198 -26
- package/kits/base/sdk/reconnectBudget.d.ts +6 -0
- package/kits/base/sdk/reconnectBudget.js +41 -1
- package/kits/base/sdk/rooms.d.ts +11 -0
- package/kits/base/sdk/rooms.js +22 -0
- package/kits/base/sdk/runtime.js +36 -19
- package/kits/base/sdk/server/hub.d.ts +19 -0
- package/kits/base/sdk/server/hub.js +12 -0
- package/kits/base/sdk/server/platformHandle.d.ts +1 -0
- package/kits/base/sdk/server/wrapper.d.ts +1 -1
- package/kits/base/sdk/server/wrapper.js +26 -1
- package/kits/base/sdk/store.d.ts +8 -2
- package/kits/base/sdk/store.js +5 -1
- package/kits/base/sdk/transport.d.ts +2 -1
- package/kits/base/sdk/transport.js +35 -0
- package/kits/hub-game/CLAUDE.md +66 -19
- package/kits/hub-game/castle.json +4 -4
- package/kits/hub-game/code/client/act.js +9 -6
- package/kits/hub-game/code/client/actCore.js +26 -6
- package/kits/hub-game/code/client/actGateLog.js +36 -0
- package/kits/hub-game/code/client/actionOverflow.js +29 -8
- package/kits/hub-game/code/client/actionRailSurface.js +186 -0
- package/kits/hub-game/code/client/actionRailTree.js +173 -0
- package/kits/hub-game/code/client/askSurface.js +85 -0
- package/kits/hub-game/code/client/askTree.js +51 -0
- package/kits/hub-game/code/client/attention.js +31 -6
- package/kits/hub-game/code/client/ballot.js +42 -5
- package/kits/hub-game/code/client/ballotSurface.js +115 -0
- package/kits/hub-game/code/client/ballotTree.js +180 -0
- package/kits/hub-game/code/client/catchingUp.js +19 -0
- package/kits/hub-game/code/client/celebrate.js +66 -0
- package/kits/hub-game/code/client/chrome.js +474 -53
- package/kits/hub-game/code/client/companion.js +93 -23
- package/kits/hub-game/code/client/companionDress.js +1 -1
- package/kits/hub-game/code/client/cornerSurface.js +106 -0
- package/kits/hub-game/code/client/cornerTree.js +83 -0
- package/kits/hub-game/code/client/decor.js +20 -11
- package/kits/hub-game/code/client/deviceStorage.js +121 -0
- package/kits/hub-game/code/client/disguise.js +23 -0
- package/kits/hub-game/code/client/disguiseDraw.js +87 -0
- package/kits/hub-game/code/client/dockSurface.js +206 -0
- package/kits/hub-game/code/client/dockTree.js +232 -0
- package/kits/hub-game/code/client/earned.js +29 -0
- package/kits/hub-game/code/client/emoteSurface.js +188 -0
- package/kits/hub-game/code/client/emoteTree.js +264 -0
- package/kits/hub-game/code/client/farAvatars.js +4 -3
- package/kits/hub-game/code/client/fpsTelemetry.js +3 -1
- package/kits/hub-game/code/client/grab.js +121 -50
- package/kits/hub-game/code/client/holdShow.js +19 -0
- package/kits/hub-game/code/client/hookLayer.js +96 -12
- package/kits/hub-game/code/client/hubControls.js +7 -1
- package/kits/hub-game/code/client/hudSurface.js +11 -3
- package/kits/hub-game/code/client/hudTree.js +7 -4
- package/kits/hub-game/code/client/idle.js +21 -3
- package/kits/hub-game/code/client/invites.js +24 -3
- package/kits/hub-game/code/client/keys.js +15 -0
- package/kits/hub-game/code/client/labelsNear.js +8 -1
- package/kits/hub-game/code/client/layoutCache.js +57 -8
- package/kits/hub-game/code/client/loadingCover.js +53 -4
- package/kits/hub-game/code/client/menuIcons.js +15 -0
- package/kits/hub-game/code/client/menuRows.js +8 -2
- package/kits/hub-game/code/client/menuSurface.js +102 -0
- package/kits/hub-game/code/client/menuTree.js +135 -0
- package/kits/hub-game/code/client/modelLook.js +41 -0
- package/kits/hub-game/code/client/pickerSurface.js +152 -0
- package/kits/hub-game/code/client/pickerTree.js +163 -0
- package/kits/hub-game/code/client/pushVisit.js +4 -2
- package/kits/hub-game/code/client/quality.js +188 -29
- package/kits/hub-game/code/client/qualityEntry.js +10 -1
- package/kits/hub-game/code/client/quickChatSurface.js +222 -0
- package/kits/hub-game/code/client/quickChatTree.js +201 -0
- package/kits/hub-game/code/client/rehello.js +75 -0
- package/kits/hub-game/code/client/renderVisibility.js +17 -0
- package/kits/hub-game/code/client/replay.js +118 -0
- package/kits/hub-game/code/client/role.js +3 -0
- package/kits/hub-game/code/client/safeLayout.js +441 -56
- package/kits/hub-game/code/client/safeStyle.js +13 -10
- package/kits/hub-game/code/client/say.js +2 -0
- package/kits/hub-game/code/client/soundSurface.js +77 -0
- package/kits/hub-game/code/client/soundTree.js +74 -0
- package/kits/hub-game/code/client/soundscape.js +12 -9
- package/kits/hub-game/code/client/soundscapeCues.js +1 -1
- package/kits/hub-game/code/client/state.js +67 -1
- package/kits/hub-game/code/client/stuckSurface.js +76 -0
- package/kits/hub-game/code/client/stuckTree.js +67 -0
- package/kits/hub-game/code/client/talk.js +42 -12
- package/kits/hub-game/code/client/talkTree.js +4 -2
- package/kits/hub-game/code/client/textAskSurface.js +147 -0
- package/kits/hub-game/code/client/textAskTree.js +67 -0
- package/kits/hub-game/code/client/tiers.js +252 -27
- package/kits/hub-game/code/client/together.js +4 -1
- package/kits/hub-game/code/client/uiDom.js +86 -8
- package/kits/hub-game/code/client/uiTree.js +33 -4
- package/kits/hub-game/code/client/vehicle.js +75 -52
- package/kits/hub-game/code/client/weakestTier.js +75 -31
- package/kits/hub-game/code/client/wear.js +159 -5
- package/kits/hub-game/code/client/worldLabels.js +215 -26
- package/kits/hub-game/code/companionSpec.js +4 -2
- package/kits/hub-game/code/server/act.js +3 -0
- package/kits/hub-game/code/server/actGate.js +83 -0
- package/kits/hub-game/code/server/actions.js +71 -15
- package/kits/hub-game/code/server/actors.js +20 -5
- package/kits/hub-game/code/server/analytics.js +40 -15
- package/kits/hub-game/code/server/ask.js +39 -3
- package/kits/hub-game/code/server/ballot.js +167 -4
- package/kits/hub-game/code/server/celebrate.js +64 -0
- package/kits/hub-game/code/server/companion.js +17 -2
- package/kits/hub-game/code/server/decor.js +11 -2
- package/kits/hub-game/code/server/disguise.js +63 -0
- package/kits/hub-game/code/server/doorAnalytics.js +2 -5
- package/kits/hub-game/code/server/earned.js +6 -2
- package/kits/hub-game/code/server/friendBests.js +13 -4
- package/kits/hub-game/code/server/friendsAmong.js +67 -8
- package/kits/hub-game/code/server/grab.js +12 -2
- package/kits/hub-game/code/server/heldOffers.js +142 -0
- package/kits/hub-game/code/server/holdShow.js +98 -0
- package/kits/hub-game/code/server/hub.js +854 -45
- package/kits/hub-game/code/server/idle.js +110 -9
- package/kits/hub-game/code/server/index.js +9 -0
- package/kits/hub-game/code/server/labels.js +13 -3
- package/kits/hub-game/code/server/loadAbandon.js +2 -5
- package/kits/hub-game/code/server/manifest.js +94 -6
- package/kits/hub-game/code/server/menu.js +26 -3
- package/kits/hub-game/code/server/npcs.js +55 -9
- package/kits/hub-game/code/server/observe.js +67 -6
- package/kits/hub-game/code/server/players.js +8 -1
- package/kits/hub-game/code/server/replay.js +135 -0
- package/kits/hub-game/code/server/storageLimit.js +4 -1
- package/kits/hub-game/code/server/townDay.js +74 -0
- package/kits/hub-game/code/server/trackQueue.js +29 -0
- package/kits/hub-game/code/server/vehicle.js +3 -0
- package/kits/hub-game/code/server/vis.js +26 -4
- package/kits/hub-game/code/server/wallet.js +677 -0
- package/kits/hub-game/code/server/wear.js +13 -3
- package/kits/hub-game/code/server/writerLease.js +191 -0
- package/kits/hub-game/code/shared/act.js +1 -1
- package/kits/hub-game/code/shared/expression.js +6 -0
- package/kits/hub-game/code/shared/replay.js +37 -0
- package/kits/hub-game/code/systems/hub.js +437 -57
- package/kits/hub-game/docs/analytics.md +20 -3
- package/kits/hub-game/docs/contract.md +942 -99
- package/kits/hub-game/docs/home-pieces.md +5 -6
- package/kits/hub-game/docs/observed-progress.md +49 -1
- package/kits/hub-game/docs/vehicle-preset.md +23 -0
- package/kits/hub-game/index.html +1 -0
- package/kits/hub-game/models/hats/baker-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/bat-clip.pxmodel +3 -3
- package/kits/hub-game/models/hats/beekeeper.pxmodel +3 -3
- package/kits/hub-game/models/hats/cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/captain.pxmodel +3 -3
- package/kits/hub-game/models/hats/chef-toque.pxmodel +3 -3
- package/kits/hub-game/models/hats/crooked-top.pxmodel +3 -3
- package/kits/hub-game/models/hats/delivery-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/fire-helmet.pxmodel +3 -3
- package/kits/hub-game/models/hats/flower-crown.pxmodel +3 -3
- package/kits/hub-game/models/hats/foam-crown.pxmodel +3 -3
- package/kits/hub-game/models/hats/hard-hat.pxmodel +3 -3
- package/kits/hub-game/models/hats/lantern.pxmodel +3 -3
- package/kits/hub-game/models/hats/laurel.pxmodel +3 -3
- package/kits/hub-game/models/hats/lighthouse.pxmodel +3 -3
- package/kits/hub-game/models/hats/nurse-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/police-cap.pxmodel +3 -3
- package/kits/hub-game/models/hats/sailor.pxmodel +3 -3
- package/kits/hub-game/models/hats/souwester.pxmodel +3 -3
- package/kits/hub-game/models/hats/straw.pxmodel +3 -3
- package/kits/hub-game/models/hats/sunflower.pxmodel +3 -3
- package/kits/hub-game/models/hats/sweatband.pxmodel +3 -3
- package/kits/hub-game/models/hats/teacher-beret.pxmodel +3 -3
- package/kits/hub-game/models/hats/witch.pxmodel +3 -3
- package/kits/hub-game/models/hold-show/daisy.pxmodel +231 -0
- package/kits/hub-game/models/hold-show/moonflower.pxmodel +171 -0
- package/kits/hub-game/models/hold-show/rose.pxmodel +191 -0
- package/kits/hub-game/models/hold-show/square/daisy.pxmodel +233 -0
- package/kits/hub-game/models/hold-show/square/moonflower.pxmodel +173 -0
- package/kits/hub-game/models/hold-show/square/rose.pxmodel +193 -0
- package/kits/hub-game/models/hold-show/square/sunflower.pxmodel +313 -0
- package/kits/hub-game/models/hold-show/square/tulip.pxmodel +133 -0
- package/kits/hub-game/models/hold-show/sunflower.pxmodel +311 -0
- package/kits/hub-game/models/hold-show/tulip.pxmodel +131 -0
- package/kits/hub-game/package-lock.json +3 -3
- package/kits/hub-game/package.json +4 -3
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +1 -0
- package/kits/hub-game/scripts/fixtures/hud-surface.json +12 -12
- package/kits/hub-game/scripts/fixtures/talk-surface.json +8 -8
- package/kits/hub-game/scripts/gen-hats.mjs +1 -1
- package/kits/hub-game/scripts/gen-hold-show.mjs +27 -0
- package/kits/hub-game/scripts/pack.mjs +89 -23
- package/kits/hub-game/scripts/test-act-client.mjs +5 -0
- package/kits/hub-game/scripts/test-act-core.mjs +32 -0
- package/kits/hub-game/scripts/test-act-gate.mjs +186 -0
- package/kits/hub-game/scripts/test-action-rail-crowded-dom.mjs +7 -1
- package/kits/hub-game/scripts/test-action-rail-default-dom.mjs +102 -0
- package/kits/hub-game/scripts/test-action-rail-never-silent-dom.mjs +50 -0
- package/kits/hub-game/scripts/test-action-rail-surface.mjs +368 -0
- package/kits/hub-game/scripts/test-action-rail-town-jobs-dom.mjs +118 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +5 -3
- package/kits/hub-game/scripts/test-actions.mjs +24 -0
- package/kits/hub-game/scripts/test-actors.mjs +19 -0
- package/kits/hub-game/scripts/test-again-corner-dom.mjs +59 -0
- package/kits/hub-game/scripts/test-analytics.mjs +80 -1
- package/kits/hub-game/scripts/test-arrival-pose-server.mjs +25 -8
- package/kits/hub-game/scripts/test-ask-client.mjs +9 -0
- package/kits/hub-game/scripts/test-ask-surface.mjs +188 -0
- package/kits/hub-game/scripts/test-attention.mjs +43 -1
- package/kits/hub-game/scripts/test-ballot-sheet-dom.mjs +71 -0
- package/kits/hub-game/scripts/test-ballot-surface.mjs +276 -0
- package/kits/hub-game/scripts/test-ballot.mjs +420 -3
- package/kits/hub-game/scripts/test-ban-join.mjs +1 -1
- package/kits/hub-game/scripts/test-celebrate-client.mjs +62 -0
- package/kits/hub-game/scripts/test-celebrate.mjs +116 -0
- package/kits/hub-game/scripts/test-chat.mjs +73 -0
- package/kits/hub-game/scripts/test-companion-client.mjs +203 -21
- package/kits/hub-game/scripts/test-companion.mjs +110 -3
- package/kits/hub-game/scripts/test-control-layout-dom.mjs +57 -10
- package/kits/hub-game/scripts/test-corner-surface.mjs +268 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +59 -3
- package/kits/hub-game/scripts/test-decor.mjs +27 -0
- package/kits/hub-game/scripts/test-device-class.mjs +4 -1
- package/kits/hub-game/scripts/test-disguise-client.mjs +281 -0
- package/kits/hub-game/scripts/test-disguise.mjs +176 -0
- package/kits/hub-game/scripts/test-dock-surface.mjs +404 -0
- package/kits/hub-game/scripts/test-door-analytics.mjs +1 -1
- package/kits/hub-game/scripts/test-door-stay-client.mjs +602 -0
- package/kits/hub-game/scripts/test-door-stay.mjs +613 -0
- package/kits/hub-game/scripts/test-earned-client.mjs +119 -0
- package/kits/hub-game/scripts/test-emote-surface.mjs +616 -0
- package/kits/hub-game/scripts/test-fps-telemetry.mjs +39 -4
- package/kits/hub-game/scripts/test-friend-bests.mjs +38 -12
- package/kits/hub-game/scripts/test-ghost-click-dom.mjs +75 -0
- package/kits/hub-game/scripts/test-grab-client.mjs +29 -2
- package/kits/hub-game/scripts/test-grab-orbit.mjs +260 -11
- package/kits/hub-game/scripts/test-grab.mjs +10 -1
- package/kits/hub-game/scripts/test-hats.mjs +28 -0
- package/kits/hub-game/scripts/test-held-offers.mjs +394 -0
- package/kits/hub-game/scripts/test-high-only.mjs +3 -3
- package/kits/hub-game/scripts/test-hold-show-client.mjs +175 -0
- package/kits/hub-game/scripts/test-hold-show.mjs +355 -0
- package/kits/hub-game/scripts/test-hub-controls.mjs +3 -1
- package/kits/hub-game/scripts/test-hub-idle.mjs +348 -0
- package/kits/hub-game/scripts/test-hub-leaving.mjs +21 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +147 -0
- package/kits/hub-game/scripts/test-hub-trip.mjs +260 -5
- package/kits/hub-game/scripts/test-hud-clear.mjs +83 -0
- package/kits/hub-game/scripts/test-hud-rate.mjs +2 -1
- package/kits/hub-game/scripts/test-idle.mjs +160 -0
- package/kits/hub-game/scripts/test-invites-client.mjs +53 -0
- package/kits/hub-game/scripts/test-labels.mjs +11 -0
- package/kits/hub-game/scripts/test-landscape-layout.mjs +20 -0
- package/kits/hub-game/scripts/test-load-abandon.mjs +2 -2
- package/kits/hub-game/scripts/test-loading-cover.mjs +67 -1
- package/kits/hub-game/scripts/test-manifest.mjs +27 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +55 -6
- package/kits/hub-game/scripts/test-menu-surface.mjs +236 -0
- package/kits/hub-game/scripts/test-npcs.mjs +128 -0
- package/kits/hub-game/scripts/test-observed.mjs +171 -3
- package/kits/hub-game/scripts/test-pack.mjs +166 -0
- package/kits/hub-game/scripts/test-picker-surface.mjs +321 -0
- package/kits/hub-game/scripts/test-placeat-server.mjs +395 -0
- package/kits/hub-game/scripts/test-placement-cache.mjs +1 -1
- package/kits/hub-game/scripts/test-pointer-clear-dom.mjs +82 -0
- package/kits/hub-game/scripts/test-progress-reset.mjs +184 -6
- package/kits/hub-game/scripts/test-push-visit.mjs +9 -0
- package/kits/hub-game/scripts/test-quality.mjs +312 -9
- package/kits/hub-game/scripts/test-quick-chat-surface.mjs +511 -0
- package/kits/hub-game/scripts/test-rehello.mjs +237 -0
- package/kits/hub-game/scripts/test-rejoin-yaw.mjs +138 -0
- package/kits/hub-game/scripts/test-relations-among.mjs +13 -7
- package/kits/hub-game/scripts/test-relations-refresh.mjs +90 -2
- package/kits/hub-game/scripts/test-replay-client.mjs +110 -0
- package/kits/hub-game/scripts/test-replay.mjs +178 -0
- package/kits/hub-game/scripts/test-resume-held.mjs +13 -0
- package/kits/hub-game/scripts/test-resume-pose-server.mjs +43 -5
- package/kits/hub-game/scripts/test-resync.mjs +13 -0
- package/kits/hub-game/scripts/test-role-client.mjs +10 -3
- package/kits/hub-game/scripts/test-safe-act.mjs +233 -0
- package/kits/hub-game/scripts/test-safe-caption.mjs +364 -0
- package/kits/hub-game/scripts/test-safe-layout.mjs +79 -0
- package/kits/hub-game/scripts/test-safe-prompt.mjs +163 -0
- package/kits/hub-game/scripts/test-sound-surface.mjs +256 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +85 -2
- package/kits/hub-game/scripts/test-stuck-surface.mjs +174 -0
- package/kits/hub-game/scripts/test-stuck.mjs +31 -0
- package/kits/hub-game/scripts/test-talk-surface.mjs +23 -6
- package/kits/hub-game/scripts/test-talk-walk-dom.mjs +123 -0
- package/kits/hub-game/scripts/test-text-ask-surface.mjs +273 -0
- package/kits/hub-game/scripts/test-tiers.mjs +453 -3
- package/kits/hub-game/scripts/test-toast-no-row-dom.mjs +71 -0
- package/kits/hub-game/scripts/test-together.mjs +11 -0
- package/kits/hub-game/scripts/test-town-day.mjs +90 -0
- package/kits/hub-game/scripts/test-track-queue.mjs +64 -0
- package/kits/hub-game/scripts/test-try-on.mjs +39 -0
- package/kits/hub-game/scripts/test-ui-dom-dom.mjs +49 -2
- package/kits/hub-game/scripts/test-ui-tree.mjs +28 -0
- package/kits/hub-game/scripts/test-vehicle-client.mjs +77 -1
- package/kits/hub-game/scripts/test-vis.mjs +145 -0
- package/kits/hub-game/scripts/test-wallet.mjs +650 -0
- package/kits/hub-game/scripts/test-weakest-tier.mjs +135 -1
- package/kits/hub-game/scripts/test-world-labels.mjs +380 -0
- package/kits/hub-game/scripts/test-writer-lease-server.mjs +234 -0
- package/kits/hub-game/scripts/test-writer-lease.mjs +281 -0
- package/kits/hub-game/scripts/writer-storage-fixture.mjs +37 -0
- package/kits/hub-game/tools/hubScene/export.mjs +6 -5
- package/kits/hub-game/tools/hubScene/hubdata.mjs +10 -0
- package/kits/hub-game/tools/hubScene/test/export-fixture.mjs +48 -2
- package/kits/hub-game/tools/hubScene/validate-manifest.mjs +21 -3
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/resumeGate.js +49 -2
- package/kits/multiplayer-3d/code/server/ownership.js +25 -6
- package/kits/multiplayer-3d/code/server/world.js +19 -4
- package/kits/multiplayer-3d/code/systems/multiplayer.js +67 -11
- package/kits/multiplayer-3d/package-lock.json +1 -1
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/test-ground-half.mjs +56 -0
- package/kits/multiplayer-3d/scripts/test-join-watchdog.mjs +54 -3
- package/kits/multiplayer-3d/scripts/test-owned-moves.mjs +190 -0
- package/kits/multiplayer-3d/scripts/test-resume-gate.mjs +191 -5
- package/kits/multiplayer-3d/scripts/test-resync-reconnect.mjs +68 -0
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/scene.js +10 -2
- package/kits/physics-3d/CLAUDE.md +14 -0
- package/kits/physics-3d/behaviors/Player.jsx +39 -3
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/engine-model-cache.md +109 -0
- package/kits/physics-3d/docs/engine-player.md +76 -0
- package/kits/physics-3d/docs/engine-skip-work.md +16 -0
- package/kits/physics-3d/docs/pxmodel-format.md +5 -1
- package/kits/physics-3d/engine3d/gait.js +16 -8
- package/kits/physics-3d/engine3d/groundsize.js +23 -0
- package/kits/physics-3d/engine3d/kithooks.js +50 -0
- package/kits/physics-3d/engine3d/look.js +110 -17
- package/kits/physics-3d/engine3d/lookbake.js +19 -1
- package/kits/physics-3d/engine3d/materialpresets.js +3 -2
- package/kits/physics-3d/engine3d/modelcache.js +280 -0
- package/kits/physics-3d/engine3d/modelcachedigest.js +37 -0
- package/kits/physics-3d/engine3d/modelcachegate.js +69 -0
- package/kits/physics-3d/engine3d/modelrefs.js +13 -0
- package/kits/physics-3d/engine3d/optimize.js +20 -9
- package/kits/physics-3d/engine3d/playerRun.js +26 -1
- package/kits/physics-3d/engine3d/pxmodel.js +7 -3
- package/kits/physics-3d/engine3d/templatecache.js +722 -0
- package/kits/physics-3d/engine3d/world3d.js +211 -17
- package/kits/physics-3d/package-lock.json +1 -1
- package/kits/physics-3d/package.json +2 -1
- package/kits/physics-3d/play/behaviors/Player.js +43 -3
- package/kits/physics-3d/scripts/render.mjs +56 -8
- package/kits/physics-3d/scripts/template-cache-fixtures.mjs +37 -0
- package/kits/physics-3d/scripts/template-cache-v1-bytes.json +49 -0
- package/kits/physics-3d/scripts/test-gait.mjs +53 -9
- package/kits/physics-3d/scripts/test-ground-half.mjs +120 -0
- package/kits/physics-3d/scripts/test-model-cache.mjs +600 -0
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +1 -0
- package/kits/physics-3d/scripts/test-sleeping-models.mjs +384 -0
- package/kits/physics-3d/scripts/test-template-cache-minified.mjs +106 -0
- package/kits/physics-3d/scripts/test-template-cache.mjs +519 -0
- package/kits/physics-3d/scripts/test-wall-slide.mjs +272 -0
- package/kits/physics-3d/systems/physics3d.js +51 -2
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/client/connection.js +3 -0
- package/package.json +2 -2
- package/vendor/three/examples/jsm/libs/fflate.module.js +2672 -0
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
|
|
21
21
|
import { warnOnce, isActor } from './actors.js';
|
|
22
22
|
import { danceFloors } from '../shared/danceIdle.js';
|
|
23
|
-
import { EXPRESSION_EMOTES } from '../shared/expression.js';
|
|
23
|
+
import { EXPRESSION_EMOTES, PLACE_EMOTES } from '../shared/expression.js';
|
|
24
24
|
import { bodySize, solids, footprintHas } from './standing.js';
|
|
25
25
|
|
|
26
26
|
const DEG = Math.PI / 180;
|
|
@@ -61,10 +61,18 @@ export function newIdleState() {
|
|
|
61
61
|
loops: new Map(),
|
|
62
62
|
danceIdle: null,
|
|
63
63
|
danceIdleUsed: false,
|
|
64
|
+
// v1.183: playerId -> JSON of the `hub-idle` last sent to that player
|
|
65
|
+
// alone, or `RESEND` for a client that joined afresh and is to be told
|
|
66
|
+
// again; and whether any player was ever sent one
|
|
67
|
+
sentIdleMe: new Map(),
|
|
68
|
+
idleAloneUsed: false,
|
|
64
69
|
shotBudget: { tokens: SHOT_BURST, at: null },
|
|
65
70
|
};
|
|
66
71
|
}
|
|
67
72
|
|
|
73
|
+
// v1.183: the `sentIdleMe` mark of a client that joined afresh.
|
|
74
|
+
const RESEND = 'resend';
|
|
75
|
+
|
|
68
76
|
function idleOf(h) {
|
|
69
77
|
return h.place?.idle ?? null;
|
|
70
78
|
}
|
|
@@ -97,8 +105,14 @@ function roleEmote(h, id) {
|
|
|
97
105
|
function duration(h, id) {
|
|
98
106
|
if (typeof id !== 'string') { return null; }
|
|
99
107
|
if (Object.hasOwn(EMOTES, id)) { return EMOTES[id]; }
|
|
100
|
-
|
|
101
|
-
|
|
108
|
+
const expression = idleOf(h)?.expression ? (Object.hasOwn(EXPRESSION_EMOTES, id) ? EXPRESSION_EMOTES[id].ms : roleEmote(h, id)?.ms) : null;
|
|
109
|
+
// v1.174: a place-only kit emote, unless a role of that id was declared.
|
|
110
|
+
return expression ?? (Object.hasOwn(PLACE_EMOTES, id) ? PLACE_EMOTES[id].ms : null);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// v1.174: an id only the place's own `hub.emote` may play.
|
|
114
|
+
function placeOnly(h, id) {
|
|
115
|
+
return Object.hasOwn(PLACE_EMOTES, id) && !roleEmote(h, id);
|
|
102
116
|
}
|
|
103
117
|
|
|
104
118
|
// Private visit grants never ride the shared snapshot.
|
|
@@ -121,6 +135,11 @@ export function emotesFor(h, playerId, ids) {
|
|
|
121
135
|
// A fresh client holds no grants: replay a non-empty list on its hello, and
|
|
122
136
|
// any list ever sent on a resume hello (it may have missed a clear).
|
|
123
137
|
export function joinedAfresh(h, playerId, held = false) {
|
|
138
|
+
// v1.183: what a fresh client holds of `hub-idle` is not known, so it goes
|
|
139
|
+
// again, empty or not; only in a place that has ever sent one.
|
|
140
|
+
if (h.idleAloneUsed) {
|
|
141
|
+
h.sentIdleMe.set(playerId, RESEND);
|
|
142
|
+
}
|
|
124
143
|
const ids = h.roleEmotes?.get(playerId);
|
|
125
144
|
if (idleOf(h)?.expression && ids && (held || ids.length)) {
|
|
126
145
|
h.session.send(playerId, { k: 'hub-emotes-for', ids: [...ids] });
|
|
@@ -139,10 +158,10 @@ function startEmote(h, playerId, id) {
|
|
|
139
158
|
|
|
140
159
|
// `{ k: 'hub-emote', id }` from a client: a kit emote, from a player who is
|
|
141
160
|
// here, at most one every EMOTE_EVERY_MS, and not vetoed by the place's
|
|
142
|
-
// `emote` hook. Anything else is dropped.
|
|
161
|
+
// `emote` hook. Anything else is dropped, a place-only emote (v1.174) too.
|
|
143
162
|
export function emoteMessage(h, playerId, data) {
|
|
144
163
|
const id = data?.id;
|
|
145
|
-
if (!idleOf(h)?.emotes || !h.sim || typeof id !== 'string' || !duration(h, id) || (roleEmote(h, id) && !h.roleEmotes?.get(playerId)?.includes(id))) {
|
|
164
|
+
if (!idleOf(h)?.emotes || !h.sim || typeof id !== 'string' || !duration(h, id) || placeOnly(h, id) || (roleEmote(h, id) && !h.roleEmotes?.get(playerId)?.includes(id))) {
|
|
146
165
|
return;
|
|
147
166
|
}
|
|
148
167
|
if (!present(h, playerId)) {
|
|
@@ -170,7 +189,7 @@ export function emote(h, playerId, id) {
|
|
|
170
189
|
return false;
|
|
171
190
|
}
|
|
172
191
|
if (!duration(h, id)) {
|
|
173
|
-
warnOnce(h, `emote:${id}`, `hub.emote: "${id}" is not an emote (${Object.keys(EMOTES).join(', ')})`);
|
|
192
|
+
warnOnce(h, `emote:${id}`, `hub.emote: "${id}" is not an emote (${[...Object.keys(EMOTES), ...Object.keys(PLACE_EMOTES)].join(', ')})`);
|
|
174
193
|
return false;
|
|
175
194
|
}
|
|
176
195
|
if (!h.sim?.players.has(playerId)) {
|
|
@@ -407,6 +426,31 @@ export function stand(h, playerId) {
|
|
|
407
426
|
return true;
|
|
408
427
|
}
|
|
409
428
|
|
|
429
|
+
// `hub.sitOn(playerId, seatId)`: the place seats a player itself (a meeting's
|
|
430
|
+
// stools, a bench), with none of a player's ask: no reach, no budget, no
|
|
431
|
+
// `sit` hook. Refused (false): a place without seats, a player not here, in
|
|
432
|
+
// a car, or held still by the place, a seat that is not one or is taken.
|
|
433
|
+
// A sitter, on the ground or a seat, moves to it. `null` stands them.
|
|
434
|
+
export function sitOn(h, placeAt, playerId, seatId) {
|
|
435
|
+
if (!idleOf(h)?.seats || !h.sim || !present(h, playerId)) {
|
|
436
|
+
return false;
|
|
437
|
+
}
|
|
438
|
+
if (seatId === null) {
|
|
439
|
+
return stand(h, playerId);
|
|
440
|
+
}
|
|
441
|
+
if (h.ctx?.vehicle?.(playerId)) {return false;}
|
|
442
|
+
const seat = seatOf(h, seatId);
|
|
443
|
+
const hold = h.held.get(playerId);
|
|
444
|
+
if (!seat || (hold && !hold.seat) || taken(h, seat.id, playerId)) {
|
|
445
|
+
return false;
|
|
446
|
+
}
|
|
447
|
+
h.held.set(playerId, { at: { ...seat.at }, facing: seat.facing, seat: seat.id });
|
|
448
|
+
h.seated.set(playerId, seat.id);
|
|
449
|
+
h.expressionStill?.delete(playerId);
|
|
450
|
+
placeAt(h, playerId, seat.at, seat.facing);
|
|
451
|
+
return true;
|
|
452
|
+
}
|
|
453
|
+
|
|
410
454
|
// `hub.seat(playerId)`: the seat actor id they sit on, or null.
|
|
411
455
|
export function seat(h, playerId) {
|
|
412
456
|
return sitting(h, playerId);
|
|
@@ -527,20 +571,76 @@ export function tick(h) {
|
|
|
527
571
|
}
|
|
528
572
|
|
|
529
573
|
// The idle fields for a snapshot: only the parts this place turned on.
|
|
530
|
-
|
|
574
|
+
// `hidden` (v1.183, `blockedPairs`): the player-keyed ones leave out everyone
|
|
575
|
+
// a block hides from someone here, as `hubAv` does; each viewer who may see
|
|
576
|
+
// them is told alone (`sendAlone`). With no blocks they are what they were.
|
|
577
|
+
export function fields(h, hidden = null) {
|
|
531
578
|
const idle = idleOf(h);
|
|
532
579
|
if (!idle) {
|
|
533
580
|
return {};
|
|
534
581
|
}
|
|
535
582
|
return {
|
|
536
583
|
...(h.danceIdleUsed ? { hubDanceIdle: danceIdleNow(h) } : {}),
|
|
537
|
-
...(idle.emotes ? { hubEmotes: emotesNow(h) } : {}),
|
|
584
|
+
...(idle.emotes ? { hubEmotes: omitHidden(emotesNow(h), hidden) } : {}),
|
|
538
585
|
...(idle.emotes ? h.npcs?.emoteFields() : {}),
|
|
539
|
-
...(idle.seats || idle.expression ? { hubSeated: seatedNow(h) } : {}),
|
|
586
|
+
...(idle.seats || idle.expression ? { hubSeated: omitHidden(seatedNow(h), hidden) } : {}),
|
|
540
587
|
...(idle.sounds.length ? { hubSounds: loopsNow(h) } : {}),
|
|
541
588
|
};
|
|
542
589
|
}
|
|
543
590
|
|
|
591
|
+
function omitHidden(byPlayer, hidden) {
|
|
592
|
+
if (hidden) {
|
|
593
|
+
for (const playerId of hidden.keys()) {
|
|
594
|
+
delete byPlayer[playerId];
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
return byPlayer;
|
|
598
|
+
}
|
|
599
|
+
|
|
600
|
+
// The ids of the players the place holds still (`held`), without anyone a
|
|
601
|
+
// block hides from someone here (v1.183).
|
|
602
|
+
export function heldShared(h, hidden) {
|
|
603
|
+
const ids = [...h.held.keys()];
|
|
604
|
+
return hidden ? ids.filter((id) => !hidden.has(id)) : ids;
|
|
605
|
+
}
|
|
606
|
+
|
|
607
|
+
// v1.183 `hub-idle`: the seats, emotes and holds of players in a hidden pair,
|
|
608
|
+
// each to the players who may see them (a player always sees their own), as
|
|
609
|
+
// one whole message when it changes. A session with no blocks sends nothing.
|
|
610
|
+
const EMPTY_ALONE = JSON.stringify({ hubSeated: {}, hubEmotes: {}, held: [] });
|
|
611
|
+
|
|
612
|
+
export function sendAlone(h, hidden) {
|
|
613
|
+
if (!hidden && !h.idleAloneUsed) {
|
|
614
|
+
return;
|
|
615
|
+
}
|
|
616
|
+
const idle = idleOf(h);
|
|
617
|
+
const seated = idle?.seats || idle?.expression ? seatedNow(h) : {};
|
|
618
|
+
const emotes = idle?.emotes ? emotesNow(h) : {};
|
|
619
|
+
for (const playerId of h.sim.players.keys()) {
|
|
620
|
+
const out = { hubSeated: {}, hubEmotes: {}, held: [] };
|
|
621
|
+
for (const shrouded of hidden?.keys() ?? []) {
|
|
622
|
+
if (hidden.get(playerId)?.has(shrouded)) {
|
|
623
|
+
continue;
|
|
624
|
+
}
|
|
625
|
+
if (Object.hasOwn(seated, shrouded)) {
|
|
626
|
+
out.hubSeated[shrouded] = seated[shrouded];
|
|
627
|
+
}
|
|
628
|
+
if (Object.hasOwn(emotes, shrouded)) {
|
|
629
|
+
out.hubEmotes[shrouded] = emotes[shrouded];
|
|
630
|
+
}
|
|
631
|
+
if (h.held.has(shrouded)) {
|
|
632
|
+
out.held.push(shrouded);
|
|
633
|
+
}
|
|
634
|
+
}
|
|
635
|
+
const json = JSON.stringify(out);
|
|
636
|
+
if ((h.sentIdleMe.get(playerId) ?? EMPTY_ALONE) !== json) {
|
|
637
|
+
h.sentIdleMe.set(playerId, json);
|
|
638
|
+
h.idleAloneUsed = true;
|
|
639
|
+
h.session?.send(playerId, { k: 'hub-idle', ...out });
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
}
|
|
643
|
+
|
|
544
644
|
// Set once after starting/changing a sound loop. Its epoch is the loop's
|
|
545
645
|
// server clock; latched snapshot deltas send changes, never beat traffic.
|
|
546
646
|
export function danceIdle(h, actorId, options) {
|
|
@@ -570,4 +670,5 @@ export function forget(h, playerId) {
|
|
|
570
670
|
h.emoteAt.delete(playerId);
|
|
571
671
|
h.seated.delete(playerId);
|
|
572
672
|
h.sitBudget.delete(playerId);
|
|
673
|
+
h.sentIdleMe.delete(playerId);
|
|
573
674
|
}
|
|
@@ -46,6 +46,7 @@ const engine = {
|
|
|
46
46
|
createBody: World.createBody,
|
|
47
47
|
removeActor: World.removeActor,
|
|
48
48
|
maxSpeed: () => Limits.MAX_SPEED,
|
|
49
|
+
moveSlack: () => Limits.MOVE_SLACK,
|
|
49
50
|
release: Ownership.release,
|
|
50
51
|
};
|
|
51
52
|
const hub = Hub.layer(castleJson, deckGame, placeHooks, (path) => resolveScenePath(path) === path, sceneGround, devDecks, engine);
|
|
@@ -67,6 +68,14 @@ if (hub.departed) {
|
|
|
67
68
|
hub.departed(session, player);
|
|
68
69
|
};
|
|
69
70
|
}
|
|
71
|
+
// v1.163: private ghost replay ends on every transport leave.
|
|
72
|
+
{
|
|
73
|
+
const leave = callbacks.onPlayerLeave;
|
|
74
|
+
callbacks.onPlayerLeave = (session, player) => {
|
|
75
|
+
leave?.(session, player);
|
|
76
|
+
hub.replayDeparted(session, player);
|
|
77
|
+
};
|
|
78
|
+
}
|
|
70
79
|
// v1.138: load-abandoned telemetry sees every connection start and end, and
|
|
71
80
|
// checks its timeout on every tick, even while the simulation is still building.
|
|
72
81
|
if (hub.transportJoin) {
|
|
@@ -17,7 +17,9 @@ const SPEECH_MAX = 240;
|
|
|
17
17
|
// the whole metre and only when finite and not negative; `distance: false`
|
|
18
18
|
// has it show none. Anything else, and any other style, is a label as before.
|
|
19
19
|
// v1.81: `edge: false` makes a goal a hint, drawn only over its actor.
|
|
20
|
-
|
|
20
|
+
// v1.201: `at: "self"` on a goal has each recipient's client draw it over its
|
|
21
|
+
// own avatar, `rise` metres up (0..4), so it never trails onto a neighbour.
|
|
22
|
+
export function setLabel(h, actorId, text, { style = 'tag', ttlMs, to, about, distanceM, distance, edge, at, rise } = {}, npc) {
|
|
21
23
|
if (!actorId) {
|
|
22
24
|
return;
|
|
23
25
|
}
|
|
@@ -34,7 +36,9 @@ export function setLabel(h, actorId, text, { style = 'tag', ttlMs, to, about, di
|
|
|
34
36
|
// Coordinates travel only on a private goal, never in shared actor poses.
|
|
35
37
|
const position = goal && at && ['x', 'y', 'z'].every((key) => Number.isFinite(at[key])) &&
|
|
36
38
|
Math.abs(at.x) <= 200 && Math.abs(at.z) <= 200 && at.y >= -30 && at.y <= 80
|
|
37
|
-
? { x: at.x, y: at.y, z: at.z } : null;
|
|
39
|
+
? { x: at.x, y: at.y, z: at.z } : goal && at === 'self' ? 'self' : null;
|
|
40
|
+
const lift = position === 'self' && typeof rise === 'number' && Number.isFinite(rise) && rise > 0
|
|
41
|
+
? { rise: Math.min(rise, 4) } : {};
|
|
38
42
|
const label = clear
|
|
39
43
|
? null
|
|
40
44
|
: {
|
|
@@ -49,6 +53,7 @@ export function setLabel(h, actorId, text, { style = 'tag', ttlMs, to, about, di
|
|
|
49
53
|
...(typeof about === 'string' ? { about } : {}),
|
|
50
54
|
...shown,
|
|
51
55
|
...(position ? { at: position } : {}),
|
|
56
|
+
...lift,
|
|
52
57
|
...(goal && edge === false ? { edge: false } : {}),
|
|
53
58
|
};
|
|
54
59
|
if (!targets) {
|
|
@@ -85,7 +90,12 @@ export function wireLabel(label) {
|
|
|
85
90
|
if (label.edge === false) {
|
|
86
91
|
wire.edge = false;
|
|
87
92
|
}
|
|
88
|
-
if (label.at) {
|
|
93
|
+
if (label.at === 'self') {
|
|
94
|
+
wire.at = 'self';
|
|
95
|
+
if (label.rise !== undefined) {
|
|
96
|
+
wire.rise = label.rise;
|
|
97
|
+
}
|
|
98
|
+
} else if (label.at) {
|
|
89
99
|
wire.at = { ...label.at };
|
|
90
100
|
}
|
|
91
101
|
return wire;
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
// arrived, LOAD_ABANDON_TIMEOUT_MS after it joined). A timeout suppresses the
|
|
9
9
|
// later close; an arrival suppresses both.
|
|
10
10
|
import { LOAD_STAGES, CLIENT_LOAD_STAGES, LOAD_REASONS } from '../shared/loadStages.js';
|
|
11
|
+
import { send } from './trackQueue.js';
|
|
11
12
|
export { LOAD_STAGES, CLIENT_LOAD_STAGES, LOAD_REASONS };
|
|
12
13
|
|
|
13
14
|
export const LOAD_ABANDONED_KIND = 27;
|
|
@@ -29,11 +30,7 @@ function loads(h) {
|
|
|
29
30
|
function emit(h, playerId, load, result, now) {
|
|
30
31
|
load.done = true;
|
|
31
32
|
const value = Math.max(0, Math.min(LOAD_ABANDON_MAX_MS, Math.round(now - load.at)));
|
|
32
|
-
|
|
33
|
-
const pending = h.session?.hub?.track?.(playerId, { kind: LOAD_ABANDONED_KIND, subject: load.stage, value, result, flags: 0 });
|
|
34
|
-
pending?.catch?.(() => {});
|
|
35
|
-
return pending !== undefined && pending !== false;
|
|
36
|
-
} catch {return false;}
|
|
33
|
+
return send(h.session, playerId, { kind: LOAD_ABANDONED_KIND, subject: load.stage, value, result, flags: 0 });
|
|
37
34
|
}
|
|
38
35
|
|
|
39
36
|
// The furthest stage the server can see now; never lowers a recorded one.
|
|
@@ -95,8 +95,11 @@ const PLACE_KEYS = [
|
|
|
95
95
|
'resume',
|
|
96
96
|
'resumeVisibility',
|
|
97
97
|
'resumePose',
|
|
98
|
+
'writerLease',
|
|
98
99
|
'resumeArrivalPose',
|
|
99
100
|
'houseResume',
|
|
101
|
+
'resumeWindowSec',
|
|
102
|
+
'heldOffers',
|
|
100
103
|
'freshFriends',
|
|
101
104
|
'under13Choices',
|
|
102
105
|
'talkLog',
|
|
@@ -131,7 +134,7 @@ export const SOUNDSCAPE_SURFACES = ['grass', 'street', 'wood', 'stone', 'sand',
|
|
|
131
134
|
// `unlocks` is the deck's (v1.53): the earned items its places may give
|
|
132
135
|
// (`earned.js`). The manifest carries it only when declared, so a deck
|
|
133
136
|
// without it reads as before.
|
|
134
|
-
const TOP_KEYS = ['firstVisit', 'act', 'bringFriend', 'frameBatch', 'defaultEnvironment', 'weakestTier', 'highOnly', 'weakestLookBake', 'pongTimeoutMs', 'contract', 'places', 'interest', 'tiers', 'quality', 'companionIdle', 'lowActorBudget', 'lowActorDistance', 'mergeFarAvatars', 'playOnlyEntry', 'loadTimings', 'loadingCover', 'cues', 'playCards', 'stuck', 'yourGames', 'avatarColors', 'labels', 'safeInsets', 'soundscape', 'unlocks', 'house', 'weeklyCup', 'spawnCap', ...PLACE_KEYS];
|
|
137
|
+
const TOP_KEYS = ['holdShow', 'firstVisit', 'act', 'actGateLog', 'bringFriend', 'frameBatch', 'defaultEnvironment', 'weakestTier', 'highOnly', 'weakestLookBake', 'pongTimeoutMs', 'contract', 'places', 'interest', 'tiers', 'quality', 'companionIdle', 'lowActorBudget', 'lowActorDistance', 'mergeFarAvatars', 'playOnlyEntry', 'loadTimings', 'loadingCover', 'cues', 'playCards', 'stuck', 'yourGames', 'avatarColors', 'labels', 'safeInsets', 'soundscape', 'unlocks', 'house', 'weeklyCup', 'spawnCap', 'wallet', ...PLACE_KEYS];
|
|
135
138
|
|
|
136
139
|
const DEFAULT_SCENE = 'scenes/main.scene';
|
|
137
140
|
|
|
@@ -141,6 +144,9 @@ export function readManifest(castleJson, sceneExists = () => true) {
|
|
|
141
144
|
if (!isObject(hub)) {
|
|
142
145
|
return { errors: ['castle.json has no `hub` block: a hub-game deck declares one.'], manifest: null };
|
|
143
146
|
}
|
|
147
|
+
if (Object.hasOwn(hub, 'holdShow') && hub.holdShow !== true) {
|
|
148
|
+
errors.push('hub.holdShow must be true or absent.');
|
|
149
|
+
}
|
|
144
150
|
if (Object.hasOwn(hub, 'frameBatch') && hub.frameBatch !== true) {
|
|
145
151
|
errors.push('hub.frameBatch must be true or absent.');
|
|
146
152
|
}
|
|
@@ -207,6 +213,7 @@ export function readManifest(castleJson, sceneExists = () => true) {
|
|
|
207
213
|
if (hub.spawnCap !== undefined && (!Number.isInteger(hub.spawnCap) || hub.spawnCap < 96 || hub.spawnCap > 192)) {
|
|
208
214
|
errors.push('hub.spawnCap must be an integer 96..192.');
|
|
209
215
|
}
|
|
216
|
+
const wallet = readWallet(hub.wallet, errors);
|
|
210
217
|
if (hub.yourGames !== undefined && typeof hub.yourGames !== 'boolean') {
|
|
211
218
|
errors.push('hub.yourGames must be true or false.');
|
|
212
219
|
}
|
|
@@ -239,6 +246,8 @@ export function readManifest(castleJson, sceneExists = () => true) {
|
|
|
239
246
|
}
|
|
240
247
|
}
|
|
241
248
|
if (hub.act !== undefined && typeof hub.act !== 'boolean') {errors.push('hub.act must be true or false.');}
|
|
249
|
+
if (hub.actGateLog !== undefined && typeof hub.actGateLog !== 'boolean') {errors.push('hub.actGateLog must be true or false.');}
|
|
250
|
+
if (hub.actGateLog === true && hub.act !== true) {errors.push('hub.actGateLog needs hub.act.');}
|
|
242
251
|
const soundscape = readSoundscape(hub.soundscape, errors);
|
|
243
252
|
const unlocks = readUnlocks(hub.unlocks, errors);
|
|
244
253
|
const defaultScene =
|
|
@@ -275,11 +284,37 @@ export function readManifest(castleJson, sceneExists = () => true) {
|
|
|
275
284
|
if (hub.act === true) {
|
|
276
285
|
for (const place of Object.values(places)) {
|
|
277
286
|
place.act = true;
|
|
287
|
+
if (hub.actGateLog === true) {place.actGateLog = true;}
|
|
278
288
|
place.grab ??= { ...GRAB_DEFAULTS };
|
|
279
289
|
place.idle = { emotes: false, sounds: [], ...place.idle, seats: true };
|
|
280
290
|
}
|
|
281
291
|
}
|
|
282
|
-
return errors.length ? { errors, manifest: null } : { errors, manifest: { contract: CONTRACT_VERSION, ...(quality ? { quality } : {}), ...(hub.act === true ? { act: true } : {}), cues: hub.cues === true, ...(hub.yourGames === true ? { yourGames: true } : {}), ...(hub.avatarColors === true ? { avatarColors: true } : {}), ...(hub.stuck === true ? { stuck: true } : {}), ...(hub.weeklyCup === true ? { weeklyCup: true } : {}), ...(soundscape ? { soundscape } : {}), ...(unlocks ? { unlocks } : {}), ...(house ? { house } : {}), ...(ballot ? { ballot: true } : {}), ...(hub.spawnCap !== undefined ? { spawnCap: hub.spawnCap } : {}), places } };
|
|
292
|
+
return errors.length ? { errors, manifest: null } : { errors, manifest: { contract: CONTRACT_VERSION, ...(hub.holdShow === true ? { holdShow: true } : {}), ...(quality ? { quality } : {}), ...(hub.act === true ? { act: true } : {}), cues: hub.cues === true, ...(hub.yourGames === true ? { yourGames: true } : {}), ...(hub.avatarColors === true ? { avatarColors: true } : {}), ...(hub.stuck === true ? { stuck: true } : {}), ...(hub.weeklyCup === true ? { weeklyCup: true } : {}), ...(soundscape ? { soundscape } : {}), ...(unlocks ? { unlocks } : {}), ...(house ? { house } : {}), ...(ballot ? { ballot: true } : {}), ...(hub.spawnCap !== undefined ? { spawnCap: hub.spawnCap } : {}), ...(wallet ? { wallet } : {}), places } };
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// v1.185 `hub.wallet`: the deck's (not a place's) and the server's alone --
|
|
296
|
+
// one coin wallet per account on conditional storage (`wallet.js`). Null where
|
|
297
|
+
// it is left out, so a deck without it reads, and is sent, as before.
|
|
298
|
+
export const WALLET_NAME = /^[a-z][a-z0-9_-]{0,23}$/;
|
|
299
|
+
function readWallet(value, errors) {
|
|
300
|
+
if (value === undefined) {
|
|
301
|
+
return null;
|
|
302
|
+
}
|
|
303
|
+
if (!isObject(value)) {
|
|
304
|
+
errors.push('hub.wallet must be { name, start? }.');
|
|
305
|
+
return null;
|
|
306
|
+
}
|
|
307
|
+
unknownKeys(value, ['name', 'start'], 'hub.wallet', errors);
|
|
308
|
+
let ok = true;
|
|
309
|
+
if (typeof value.name !== 'string' || !WALLET_NAME.test(value.name)) {
|
|
310
|
+
errors.push('hub.wallet.name must be a short id ([a-z][a-z0-9_-]{0,23}).');
|
|
311
|
+
ok = false;
|
|
312
|
+
}
|
|
313
|
+
if (value.start !== undefined && (!Number.isSafeInteger(value.start) || value.start < 0)) {
|
|
314
|
+
errors.push('hub.wallet.start must be a non-negative safe integer.');
|
|
315
|
+
ok = false;
|
|
316
|
+
}
|
|
317
|
+
return ok ? { name: value.name, start: value.start ?? 0 } : null;
|
|
283
318
|
}
|
|
284
319
|
|
|
285
320
|
// `hub.soundscape`: its parts where it is on, null where it is left out or
|
|
@@ -548,7 +583,7 @@ function readPlace(block, where, defaultScene, serverMax, sceneExists, errors, d
|
|
|
548
583
|
// The character API accepts non-empty ids up to 100 characters / 128 bytes.
|
|
549
584
|
if (
|
|
550
585
|
typeof chat.character !== 'string' || !chat.character.trim() || chat.character.length > 100 || chat.character.includes('\0') ||
|
|
551
|
-
/[\uD800-\
|
|
586
|
+
/[\uD800-\uDFFF]/u.test(chat.character) ||
|
|
552
587
|
new TextEncoder().encode(chat.character).length > 128 ||
|
|
553
588
|
!Array.isArray(bundle?.characters) || !bundle.characters.some((c) => c?.id === chat.character)
|
|
554
589
|
) {
|
|
@@ -594,6 +629,13 @@ function readPlace(block, where, defaultScene, serverMax, sceneExists, errors, d
|
|
|
594
629
|
place.resumeVisibility = true;
|
|
595
630
|
}
|
|
596
631
|
}
|
|
632
|
+
if (Object.hasOwn(block, 'writerLease')) {
|
|
633
|
+
if (block.writerLease !== true) {
|
|
634
|
+
errors.push(`${where}.writerLease must be true or absent.`);
|
|
635
|
+
} else {
|
|
636
|
+
place.writerLease = true;
|
|
637
|
+
}
|
|
638
|
+
}
|
|
597
639
|
// v1.98: town pose retention never changes result-place resume semantics.
|
|
598
640
|
if (Object.hasOwn(block, 'resumePose')) {
|
|
599
641
|
if (block.resumePose !== true) {
|
|
@@ -614,6 +656,20 @@ function readPlace(block, where, defaultScene, serverMax, sceneExists, errors, d
|
|
|
614
656
|
place.houseResume = true;
|
|
615
657
|
}
|
|
616
658
|
}
|
|
659
|
+
// v1.199: a door place's own reconnect window. Ghost pins it into the spec
|
|
660
|
+
// (reconnectWindowMs) on a capable host; pinnedResume does the retaining.
|
|
661
|
+
if (Object.hasOwn(block, 'resumeWindowSec')) {
|
|
662
|
+
const sec = block.resumeWindowSec;
|
|
663
|
+
if (!Number.isInteger(sec) || sec < 1 || sec > 180) {
|
|
664
|
+
errors.push(`${where}.resumeWindowSec must be a whole number of seconds from 1 to 180, or absent.`);
|
|
665
|
+
} else if (place.result) {
|
|
666
|
+
errors.push(`${where}.resumeWindowSec is only for a place without a result.`);
|
|
667
|
+
} else if (place.resumePose || place.houseResume || block.resumeArrivalPose !== undefined) {
|
|
668
|
+
errors.push(`${where}.resumeWindowSec cannot combine with resumePose, houseResume or resumeArrivalPose.`);
|
|
669
|
+
} else {
|
|
670
|
+
place.resumeWindowSec = sec;
|
|
671
|
+
}
|
|
672
|
+
}
|
|
617
673
|
// v1.99: private relationship freshness is per place and server-only.
|
|
618
674
|
if (Object.hasOwn(block, 'freshFriends')) {
|
|
619
675
|
if (block.freshFriends !== true) {
|
|
@@ -671,6 +727,29 @@ function readPlace(block, where, defaultScene, serverMax, sceneExists, errors, d
|
|
|
671
727
|
place.resumeArrivalPose = true;
|
|
672
728
|
}
|
|
673
729
|
}
|
|
730
|
+
// v1.180: offers kept for a retained player while away, server-only. A
|
|
731
|
+
// resume mode is resume: { keep: true }, resumePose, houseResume, or the
|
|
732
|
+
// reconnect window a host pins on a place without a result (pinnedResume in
|
|
733
|
+
// hub.js), which resumeArrivalPose turns off.
|
|
734
|
+
if (Object.hasOwn(block, 'heldOffers')) {
|
|
735
|
+
if (block.heldOffers !== true) {
|
|
736
|
+
errors.push(`${where}.heldOffers must be true or absent.`);
|
|
737
|
+
} else if (!(place.resumeKeep || place.resumePose || place.houseResume ||
|
|
738
|
+
(!place.result && place.resumeArrivalPose !== true))) {
|
|
739
|
+
errors.push(`${where}.heldOffers requires a resume mode: resume: { keep: true }, resumePose, houseResume, or a place without a result.`);
|
|
740
|
+
} else {
|
|
741
|
+
place.heldOffers = true;
|
|
742
|
+
}
|
|
743
|
+
}
|
|
744
|
+
// v1.179: `ballot.keepAway` needs a place that retains a dropped visit (the
|
|
745
|
+
// modes hub.js keeps `resumeKept` for): `resume: { keep: true }`,
|
|
746
|
+
// `resumePose`, `houseResume`, or a place without `result` or
|
|
747
|
+
// `resumeArrivalPose`, which a host's pinned reconnect window retains.
|
|
748
|
+
if (place.ballot?.keepAway === true && !(place.resumeKeep || place.resumePose || place.houseResume ||
|
|
749
|
+
(!place.result && place.resumeArrivalPose !== true))) {
|
|
750
|
+
errors.push(`${where}.ballot.keepAway needs a place that retains a dropped visit (resume: { keep: true }, resumePose, houseResume, or a place without result or resumeArrivalPose).`);
|
|
751
|
+
delete place.ballot.keepAway;
|
|
752
|
+
}
|
|
674
753
|
return place;
|
|
675
754
|
}
|
|
676
755
|
|
|
@@ -702,9 +781,16 @@ function readBallot(value, where, errors) {
|
|
|
702
781
|
errors.push(`${where} must be true, false or an object.`);
|
|
703
782
|
return null;
|
|
704
783
|
}
|
|
705
|
-
unknownKeys(value, ['lines'], where, errors);
|
|
784
|
+
unknownKeys(value, ['lines', 'keepAway'], where, errors);
|
|
785
|
+
// v1.179: a retained (dropped, not yet forgotten) player keeps their face on
|
|
786
|
+
// the card, marked away. Kept only when true; whether the place retains a
|
|
787
|
+
// visit at all is checked once the whole place block is read.
|
|
788
|
+
if (value.keepAway !== undefined && value.keepAway !== true) {
|
|
789
|
+
errors.push(`${where}.keepAway must be true or absent.`);
|
|
790
|
+
}
|
|
791
|
+
const extra = value.keepAway === true ? { keepAway: true } : {};
|
|
706
792
|
if (value.lines === undefined) {
|
|
707
|
-
return { lines: [] };
|
|
793
|
+
return { lines: [], ...extra };
|
|
708
794
|
}
|
|
709
795
|
if (!Array.isArray(value.lines) || value.lines.length > BALLOT_MAX_LINES) {
|
|
710
796
|
errors.push(`${where}.lines must be a list of at most ${BALLOT_MAX_LINES} lines.`);
|
|
@@ -733,7 +819,7 @@ function readBallot(value, where, errors) {
|
|
|
733
819
|
lines.push({ id: line.id, text, about: line.about });
|
|
734
820
|
}
|
|
735
821
|
});
|
|
736
|
-
return { lines };
|
|
822
|
+
return { lines, ...extra };
|
|
737
823
|
}
|
|
738
824
|
|
|
739
825
|
// `hud`: absent is none; an object turns each option on by name. `clear:
|
|
@@ -1163,6 +1249,8 @@ export function publicPlace(id, place) {
|
|
|
1163
1249
|
contract: CONTRACT_VERSION,
|
|
1164
1250
|
id,
|
|
1165
1251
|
...(place.act === true ? { act: true } : {}),
|
|
1252
|
+
// v1.203: only an opted-in deck's browsers report the Act/Jump gate.
|
|
1253
|
+
...(place.actGateLog === true ? { actGateLog: true } : {}),
|
|
1166
1254
|
title: place.title,
|
|
1167
1255
|
scene: place.scene,
|
|
1168
1256
|
controller: place.controller,
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { validPrivateText } from '../privateText.js';
|
|
3
3
|
import { EARNED_SHAPES } from '../client/earned.js';
|
|
4
4
|
import { HATS } from '../client/hats.js';
|
|
5
|
+
import * as Held from './heldOffers.js';
|
|
5
6
|
|
|
6
7
|
const ID = /^[a-z][a-z0-9_-]{0,31}$/;
|
|
7
8
|
const COLOR = /^#[0-9a-f]{6}$/i;
|
|
@@ -99,13 +100,16 @@ export function set(h, p, spec) {
|
|
|
99
100
|
if (error instanceof TypeError) {throw error;}
|
|
100
101
|
throw new TypeError('hub.menu: invalid spec');
|
|
101
102
|
}
|
|
102
|
-
|
|
103
|
+
// v1.180: a held visit away takes the call, recorded unsent.
|
|
104
|
+
const held = Held.on(h) ? Held.take(h, p) : null;
|
|
105
|
+
if (held === 'block' || (!held?.away && !arrived(h, p))) {return false;}
|
|
106
|
+
if (held && Held.gate(h, p, h.menuMe?.get(p)) === 'drop') {h.menuMe.delete(p);}
|
|
103
107
|
const state = current(h, p), json = JSON.stringify(checked);
|
|
104
|
-
if (state.json === json) {return true;}
|
|
108
|
+
if (state.json === json && state.hold === held?.hold) {return true;}
|
|
105
109
|
const n = state.n + 1;
|
|
106
110
|
need(Number.isSafeInteger(n), 'version counter exhausted');
|
|
107
111
|
(h.menuSeq ??= new Map()).set(p, n);
|
|
108
|
-
(h.menuMe ??= new Map()).set(p, { ...state, spec: checked, json, n });
|
|
112
|
+
(h.menuMe ??= new Map()).set(p, { ...state, spec: checked, json, n, ...(held ? { hold: held.hold } : {}) });
|
|
109
113
|
return true;
|
|
110
114
|
}
|
|
111
115
|
const PICK_KEYS = ['k', 'id', 'n'];
|
|
@@ -130,6 +134,11 @@ export function message(h, p, data) {
|
|
|
130
134
|
if (!arrived(h, p)) {return;}
|
|
131
135
|
if (!pickKeys(data)) { return; }
|
|
132
136
|
const d = fields(data, ['k', 'id', 'n']), state = current(h, p);
|
|
137
|
+
// v1.180: a held menu is picked from only by its own account, back on the
|
|
138
|
+
// visit's body and replayed to by a fresh hello.
|
|
139
|
+
const held = Held.on(h) ? Held.gate(h, p, h.menuMe?.get(p)) : null;
|
|
140
|
+
if (held === 'drop' || held === 'block') { h.menuMe?.delete(p); return; }
|
|
141
|
+
if (held === 'away') { return; }
|
|
133
142
|
if (d.k !== 'hub-menu-pick' || !Number.isSafeInteger(d.n) || d.n !== state.n || d.n !== state.sentN || !state.spec) {return;}
|
|
134
143
|
const item = d.id === 'close' ? null : [...state.spec.sections.flatMap((s) => s.items), ...(state.spec.footer ?? [])].find((i) => i.id === d.id);
|
|
135
144
|
if (d.id !== 'close' && (state.spec.readOnly || !item || item.readOnly)) {return;}
|
|
@@ -141,10 +150,21 @@ export function message(h, p, data) {
|
|
|
141
150
|
} catch { /* Refused wire data, including throwing accessors, is silent. */ }
|
|
142
151
|
}
|
|
143
152
|
export function joinedAfresh(h, p) {
|
|
153
|
+
if (Held.on(h)) {
|
|
154
|
+
const held = Held.gate(h, p, h.menuMe?.get(p));
|
|
155
|
+
if (held === 'drop' || held === 'block') { h.menuMe?.delete(p); }
|
|
156
|
+
if (held === 'away') { return; }
|
|
157
|
+
}
|
|
144
158
|
const state = h.menuMe?.get(p);
|
|
145
159
|
// An unused menu adds no private wire traffic. A delivered close needs no
|
|
146
160
|
// replay either; a close still waiting to send must reach the client.
|
|
147
161
|
if (!state || (state.spec === null && state.sentN === state.n)) {return;}
|
|
162
|
+
if (state.hold && Held.on(h)) {
|
|
163
|
+
// v1.180: a replay is a new menu; picks on the old version are refused.
|
|
164
|
+
state.n += 1;
|
|
165
|
+
need(Number.isSafeInteger(state.n), 'version counter exhausted');
|
|
166
|
+
h.menuSeq.set(p, state.n);
|
|
167
|
+
}
|
|
148
168
|
send(h, p, state);
|
|
149
169
|
}
|
|
150
170
|
export function forget(h, p) {
|
|
@@ -154,6 +174,9 @@ export function forget(h, p) {
|
|
|
154
174
|
}
|
|
155
175
|
export function prune(h) {
|
|
156
176
|
for (const p of new Set([...(h.menuMe?.keys() ?? []), ...(h.menuBudget?.keys() ?? [])])) {
|
|
177
|
+
const held = Held.on(h) ? Held.gate(h, p, h.menuMe?.get(p)) : null;
|
|
178
|
+
if (held === 'drop' || held === 'block') { forget(h, p); continue; }
|
|
179
|
+
if (held === 'away') { h.menuBudget?.delete(p); continue; }
|
|
157
180
|
if (!present(h, p)) { forget(h, p); continue; }
|
|
158
181
|
const state = h.menuMe?.get(p);
|
|
159
182
|
if (state && state.n !== state.sentN && h.sim.timeMs - state.sentAt >= 250) {send(h, p, state);}
|