castle-web-cli 0.4.239 โ 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 +163 -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 +6 -3
- package/dist/init.js +24 -2
- package/dist/platformDoc.js +2 -1
- package/dist/playPagePolicy.js +5 -1
- package/dist/resetLeaderboards.d.ts +8 -1
- package/dist/resetLeaderboards.js +43 -8
- package/dist/save-deck.d.ts +32 -2
- package/dist/save-deck.js +240 -39
- package/kits/base/CLAUDE.md +1 -1
- package/kits/base/castle.json +1 -1
- package/kits/base/sdk/README.md +174 -6
- package/kits/base/sdk/analytics.d.ts +8 -0
- package/kits/base/sdk/analytics.js +92 -0
- package/kits/base/sdk/castle.d.ts +5 -1
- package/kits/base/sdk/castle.js +2 -0
- package/kits/base/sdk/commands.d.ts +48 -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 +168 -26
- package/kits/base/sdk/reconnectBudget.d.ts +6 -0
- package/kits/base/sdk/reconnectBudget.js +41 -1
- 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/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/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 +473 -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/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 +72 -51
- 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 +205 -25
- 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 +35 -3
- 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/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 +851 -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/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/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 +427 -54
- package/kits/hub-game/docs/analytics.md +16 -2
- 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 +79 -0
- 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-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 +119 -0
- package/kits/hub-game/scripts/test-hub-trip.mjs +240 -4
- 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-loading-cover.mjs +67 -1
- package/kits/hub-game/scripts/test-manifest.mjs +27 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +54 -5
- 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-role-client.mjs +2 -1
- 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-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 +68 -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 +340 -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 +36 -2
- package/kits/hub-game/tools/hubScene/validate-manifest.mjs +10 -2
- 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
|
@@ -0,0 +1,395 @@
|
|
|
1
|
+
// Real transport -> SDK wrapper -> real-time -> Rapier -> hub: a place's
|
|
2
|
+
// `hub.placeAt` wins over the move reports its client sent before it heard of
|
|
3
|
+
// the placement, and a leave right after one stores the placed pose.
|
|
4
|
+
//
|
|
5
|
+
// node scripts/test-placeat-server.mjs reports
|
|
6
|
+
// A client that goes on reporting its spawn for a while after the place
|
|
7
|
+
// moved it (its frames still on their way) still ends at the placed spot,
|
|
8
|
+
// server and client alike, and walks on from there as usual.
|
|
9
|
+
// node scripts/test-placeat-server.mjs walk | pinned | held | against
|
|
10
|
+
// A client that eases corrections as the shipped one does and walks on
|
|
11
|
+
// at full pace after placeAt is taken at once; a place putting a player
|
|
12
|
+
// where they stand every step arms nothing; a hold ends the wait.
|
|
13
|
+
// node scripts/test-placeat-server.mjs close
|
|
14
|
+
// A close in the same breath as the placement resumes the account's fresh
|
|
15
|
+
// socket at the placed spot, not where the last server step saw it.
|
|
16
|
+
//
|
|
17
|
+
// With no argument both run.
|
|
18
|
+
import assert from 'node:assert/strict';
|
|
19
|
+
import { cp, mkdir, mkdtemp, readFile, rm, symlink, writeFile } from 'node:fs/promises';
|
|
20
|
+
import path from 'node:path';
|
|
21
|
+
import { fileURLToPath } from 'node:url';
|
|
22
|
+
import { WebSocket } from 'ws';
|
|
23
|
+
import { startDevSessionServer } from '../../../cli/dist/devSessionServer.js';
|
|
24
|
+
|
|
25
|
+
const root = fileURLToPath(new URL('../../../', import.meta.url));
|
|
26
|
+
const scratch = path.join(root, '.castle');
|
|
27
|
+
await mkdir(scratch, { recursive: true });
|
|
28
|
+
const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
|
|
29
|
+
const spawn = { x: 0, y: 1, z: 0 };
|
|
30
|
+
const cold = { x: 6, y: 1, z: 8 };
|
|
31
|
+
const user = { userId: '102', username: 'Bo', isAnonymous: false };
|
|
32
|
+
const flat = (a, b) => Math.hypot(a.x - b.x, a.z - b.z);
|
|
33
|
+
const cases = { reports, close, walk, pinned, held, against };
|
|
34
|
+
const chosen = process.argv[2] ? [process.argv[2]] : Object.keys(cases);
|
|
35
|
+
for (const name of chosen) {
|
|
36
|
+
assert.ok(cases[name], `unknown case ${name}`);
|
|
37
|
+
await run(name, cases[name]);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
async function run(name, body) {
|
|
41
|
+
const dir = await mkdtemp(path.join(scratch, 'placeat-'));
|
|
42
|
+
const logs = [];
|
|
43
|
+
const sockets = [];
|
|
44
|
+
let server;
|
|
45
|
+
try {
|
|
46
|
+
await mkdir(path.join(dir, 'imports'), { recursive: true });
|
|
47
|
+
for (const kit of ['base', 'hub-game', 'real-time', 'multiplayer-3d', 'physics-3d', 'physics-2d']) {
|
|
48
|
+
await cp(path.join(root, 'kits', kit), path.join(dir, 'imports', `castle.${kit}`), {
|
|
49
|
+
recursive: true,
|
|
50
|
+
filter: source => !['node_modules', 'imports', '.castle'].includes(path.basename(source)),
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
await symlink(path.join(root, 'kits/hub-game/node_modules'), path.join(dir, 'node_modules'));
|
|
54
|
+
await mkdir(path.join(dir, 'code/server'), { recursive: true });
|
|
55
|
+
await mkdir(path.join(dir, 'scenes'), { recursive: true });
|
|
56
|
+
await writeFile(path.join(dir, 'package.json'), JSON.stringify({ type: 'module', private: true }));
|
|
57
|
+
await writeFile(path.join(dir, 'castle.json'), JSON.stringify({
|
|
58
|
+
hub: { contract: 1, title: 'Resume pose boundary', resumePose: true },
|
|
59
|
+
server: { main: 'code/server/main.js', tickRate: 20, maxPlayers: 8 },
|
|
60
|
+
}));
|
|
61
|
+
await writeFile(path.join(dir, 'scenes/main.scene'), JSON.stringify({ actors: [
|
|
62
|
+
{ id: 'player', components: { Player: {}, Transform: { ...spawn } } },
|
|
63
|
+
] }));
|
|
64
|
+
// Local serve refuses storage to an unsaved deck: the session sees a
|
|
65
|
+
// revision-checked store kept in a file, so it outlives one session process.
|
|
66
|
+
await writeFile(path.join(dir, 'code/server/poseStorage.js'), `
|
|
67
|
+
import fs from 'node:fs';
|
|
68
|
+
const file = ${JSON.stringify(path.join(dir, 'pose-rows.json'))};
|
|
69
|
+
const load = () => { try { return JSON.parse(fs.readFileSync(file, 'utf8')); } catch { return { rows: {}, revisions: {} }; } };
|
|
70
|
+
export function poseStorage() {
|
|
71
|
+
return {
|
|
72
|
+
async snapshot({ prefix }) {
|
|
73
|
+
const { rows, revisions } = load();
|
|
74
|
+
return { access: 'test-access', targets: [{ revision: revisions[prefix] ?? null,
|
|
75
|
+
rows: Object.fromEntries(Object.entries(rows).filter(([key]) => key.startsWith(prefix))) }] };
|
|
76
|
+
},
|
|
77
|
+
async transaction({ changes }) {
|
|
78
|
+
const state = load();
|
|
79
|
+
const { prefix, expectedRevision, replace } = changes[0];
|
|
80
|
+
if ((state.revisions[prefix] ?? null) !== expectedRevision) throw new Error('SAVE_CONFLICT');
|
|
81
|
+
for (const key of Object.keys(state.rows)) if (key.startsWith(prefix)) delete state.rows[key];
|
|
82
|
+
Object.assign(state.rows, structuredClone(replace));
|
|
83
|
+
const revision = process.pid + ':' + Date.now() + ':' + Math.random();
|
|
84
|
+
state.revisions[prefix] = revision;
|
|
85
|
+
fs.writeFileSync(file, JSON.stringify(state));
|
|
86
|
+
return { revisions: [{ revision }] };
|
|
87
|
+
},
|
|
88
|
+
async list({ prefix, limit }) {
|
|
89
|
+
const entries = Object.entries(load().rows).filter(([key]) => key.startsWith(prefix)).slice(0, limit);
|
|
90
|
+
return { entries: entries.map(([key, value]) => ({ key, value })), cursor: null };
|
|
91
|
+
},
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
`);
|
|
95
|
+
await writeFile(path.join(dir, 'code/server/main.js'), `
|
|
96
|
+
import callbacks from '@imports/castle.hub-game/code/server/index.js';
|
|
97
|
+
import { poseStorage } from './poseStorage.js';
|
|
98
|
+
const deck = poseStorage();
|
|
99
|
+
const seen = new WeakMap();
|
|
100
|
+
const wrap = (session) => {
|
|
101
|
+
if (!session || typeof session !== 'object') return session;
|
|
102
|
+
if (!seen.has(session)) {
|
|
103
|
+
seen.set(session, new Proxy(session, { get(target, key) {
|
|
104
|
+
if (key === 'storage') return { ...target.storage, deck };
|
|
105
|
+
const value = Reflect.get(target, key);
|
|
106
|
+
return typeof value === 'function' ? value.bind(target) : value;
|
|
107
|
+
} }));
|
|
108
|
+
}
|
|
109
|
+
return seen.get(session);
|
|
110
|
+
};
|
|
111
|
+
export default Object.fromEntries(Object.entries(callbacks).map(([key, value]) =>
|
|
112
|
+
[key, typeof value === 'function' ? (session, ...rest) => value(wrap(session), ...rest) : value]));
|
|
113
|
+
`);
|
|
114
|
+
await writeFile(path.join(dir, 'code/server/game.js'), `
|
|
115
|
+
// Server steps run: the kit records the pose a leave stores on a step.
|
|
116
|
+
let steps = 0;
|
|
117
|
+
// playerId -> { last, gap }: the longest the server went without taking a
|
|
118
|
+
// move report (its movedAt) since 'mark', in simulation ms.
|
|
119
|
+
const marks = new Map();
|
|
120
|
+
// A Dojo-like place: put the player where they stand, six steps running.
|
|
121
|
+
let pin = null;
|
|
122
|
+
export default {
|
|
123
|
+
step(h) {
|
|
124
|
+
steps += 1;
|
|
125
|
+
for (const [id, mark] of marks) {
|
|
126
|
+
const body = h.sim.players.get(id);
|
|
127
|
+
if (body && body.movedAt !== mark.last) { mark.gap = Math.max(mark.gap, body.movedAt - mark.last); mark.last = body.movedAt; }
|
|
128
|
+
}
|
|
129
|
+
if (pin && pin.n-- > 0) { const body = h.sim.players.get(pin.id); if (body) h.placeAt(pin.id, { ...body.at }); }
|
|
130
|
+
},
|
|
131
|
+
message(h, p, d) {
|
|
132
|
+
const id = p.playerId;
|
|
133
|
+
let body = h.sim.players.get(id);
|
|
134
|
+
if (d?.test === 'move') h.placeAt(id, ${JSON.stringify(cold)}, 40);
|
|
135
|
+
if (d?.test === 'shove') h.placeAt(id, { ...body.at, z: body.at.z + 1 });
|
|
136
|
+
if (d?.test === 'pin') pin = { id, n: 6 };
|
|
137
|
+
if (d?.test === 'back') h.placeAt(id, { ...body.at, x: body.at.x - 1.4 });
|
|
138
|
+
if (d?.test === 'hold-here') { h.placeAt(id, ${JSON.stringify(cold)}); h.hold(id, ${JSON.stringify(cold)}); }
|
|
139
|
+
if (d?.test === 'release') h.release(id);
|
|
140
|
+
if (d?.test === 'mark') marks.set(id, { last: body.movedAt, gap: 0 });
|
|
141
|
+
body = h.sim.players.get(id);
|
|
142
|
+
const mark = marks.get(id);
|
|
143
|
+
// clamped: false once the server took a report from where the body stands.
|
|
144
|
+
if (d?.test) h.send(id, { test: d.test, pose: body && { ...body.at }, clamped: body?.clamped, steps,
|
|
145
|
+
gap: mark && body ? Math.max(mark.gap, h.sim.timeMs - mark.last) : null });
|
|
146
|
+
},
|
|
147
|
+
};
|
|
148
|
+
`);
|
|
149
|
+
server = await startDevSessionServer({ projectDir: dir, log: (level, message) => logs.push(`${level}: ${message}`) });
|
|
150
|
+
await body({ dir, sockets, logs, server: () => server, restart: async () => {
|
|
151
|
+
await server.shutdown();
|
|
152
|
+
server = await startDevSessionServer({ projectDir: dir, log: (level, message) => logs.push(`${level}: ${message}`) });
|
|
153
|
+
return server;
|
|
154
|
+
} });
|
|
155
|
+
} catch (error) {
|
|
156
|
+
console.error(logs.join('\n'));
|
|
157
|
+
throw error;
|
|
158
|
+
} finally {
|
|
159
|
+
for (const socket of sockets) socket.terminate();
|
|
160
|
+
await server?.shutdown();
|
|
161
|
+
await rm(dir, { recursive: true, force: true });
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
// Arrive at the spawn and wait until the server takes the client's reports
|
|
167
|
+
// there (clamped false), so nothing about the arrival is still settling.
|
|
168
|
+
async function arrive(t) {
|
|
169
|
+
const server = t.server();
|
|
170
|
+
const a = await connect(t.sockets, `ws://127.0.0.1:${server.port}/__castle/mp?nonce=${server.mintNonce(user)}`);
|
|
171
|
+
await a.wait(f => f.t === 'hello');
|
|
172
|
+
a.send({ k: 'hub-hello', avatar: 0, party: 1 });
|
|
173
|
+
a.local = { ...spawn };
|
|
174
|
+
a.reporting = true;
|
|
175
|
+
await a.wait(f => f.t === 'm' && f.d?.k === 'hub-arrived');
|
|
176
|
+
await world(a);
|
|
177
|
+
const agreed = await until(a, 'state', {}, s => s.clamped === false && flat(s.pose, spawn) < 0.3);
|
|
178
|
+
assert.equal(agreed.clamped, false, `server takes the client's reports at the spawn ${JSON.stringify(agreed)}`);
|
|
179
|
+
// One step after that, so the leave has a pose from a step to fall back on.
|
|
180
|
+
await until(a, 'state', {}, s => s.steps > agreed.steps);
|
|
181
|
+
return a;
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
// The client keeps naming the spawn for 600 ms after asking to be moved,
|
|
185
|
+
// as a slow phone's reports still on their way do. Before the fix each such
|
|
186
|
+
// report pulled the body back toward the spawn (the movement clamp), and the
|
|
187
|
+
// clamped row sent back put the client there too, for good.
|
|
188
|
+
async function reports(t) {
|
|
189
|
+
const a = await arrive(t);
|
|
190
|
+
a.deafUntil = Date.now() + 600;
|
|
191
|
+
const moved = await query(a, 'move');
|
|
192
|
+
assert.ok(flat(moved.pose, cold) < 0.05, `placeAt moved the body ${JSON.stringify(moved)}`);
|
|
193
|
+
await sleep(700);
|
|
194
|
+
const at = s => s.clamped === false && flat(s.pose, cold) < 0.3;
|
|
195
|
+
const settled = await until(a, 'state', {}, at);
|
|
196
|
+
assert.ok(at(settled), `server body ends at the placed spot ${JSON.stringify(settled)}, client ${JSON.stringify(a.local)}`);
|
|
197
|
+
assert.ok(flat(a.local, cold) < 0.3, `client was put there too ${JSON.stringify(a.local)}`);
|
|
198
|
+
await sleep(1000);
|
|
199
|
+
const later = await query(a, 'state');
|
|
200
|
+
assert.ok(flat(later.pose, cold) < 0.3 && flat(a.local, cold) < 0.3, `both stay there ${JSON.stringify(later)}, client ${JSON.stringify(a.local)}`);
|
|
201
|
+
// Once caught up the client moves as usual: a step from the spot is taken.
|
|
202
|
+
a.local = { ...a.local, x: a.local.x + 1 };
|
|
203
|
+
const walked = await until(a, 'state', {}, s => s.clamped === false && flat(s.pose, a.local) < 0.05);
|
|
204
|
+
assert.ok(walked.clamped === false && flat(walked.pose, a.local) < 0.05, `a walk from the spot is taken ${JSON.stringify(walked)}`);
|
|
205
|
+
// And the movement limit still holds: reports 30 m off are cut to its pace.
|
|
206
|
+
a.deafUntil = Date.now() + 10000;
|
|
207
|
+
const from = walked.pose;
|
|
208
|
+
a.local = { ...from, x: from.x + 30 };
|
|
209
|
+
await sleep(300);
|
|
210
|
+
const leapt = await query(a, 'state');
|
|
211
|
+
assert.ok(leapt.clamped === true && flat(leapt.pose, from) < 15, `a 30 m leap is still clamped ${JSON.stringify(leapt)}`);
|
|
212
|
+
console.log('test-placeat-server reports: placeAt wins over the reports already on their way');
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
// A player walking at full pace when the place shoves them a metre aside:
|
|
216
|
+
// the reports a client that eased part of the way there and walked on sends
|
|
217
|
+
// are taken. Before, each one more than 0.25 m off the spot was dropped, for
|
|
218
|
+
// the whole 4 s give-up, since an easing, walking client is never that near.
|
|
219
|
+
async function walk(t) {
|
|
220
|
+
const a = await arrive(t);
|
|
221
|
+
a.vel = { x: 6, z: 0 };
|
|
222
|
+
await sleep(300);
|
|
223
|
+
await query(a, 'mark');
|
|
224
|
+
await query(a, 'shove');
|
|
225
|
+
await sleep(1500);
|
|
226
|
+
const s = await query(a, 'state');
|
|
227
|
+
// One report every 50 ms; one dropped (sent before it heard) is a 100 ms gap.
|
|
228
|
+
assert.ok(s.gap < 200, `a walk after placeAt is taken at once: ${s.gap} ms without a report taken`);
|
|
229
|
+
assert.ok(s.clamped === false && flat(s.pose, a.local) < 1, `the body follows the walk ${JSON.stringify(s)}, client ${JSON.stringify(a.local)}`);
|
|
230
|
+
console.log('test-placeat-server walk: a walk right after placeAt is taken');
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
// Put 1.4 m back while walking on at 6 m/s the other way: an easing client's
|
|
234
|
+
// reports stay nearer the old pose than the spot. That rule only holds for the
|
|
235
|
+
// kit's in-flight window (500 ms), so a report is taken within it and one
|
|
236
|
+
// report interval. Before, every one was dropped for the 4 s give-up.
|
|
237
|
+
async function against(t) {
|
|
238
|
+
const a = await arrive(t);
|
|
239
|
+
a.vel = { x: 6, z: 0 };
|
|
240
|
+
await sleep(300);
|
|
241
|
+
await query(a, 'mark');
|
|
242
|
+
await query(a, 'back');
|
|
243
|
+
await sleep(1500);
|
|
244
|
+
const s = await query(a, 'state');
|
|
245
|
+
assert.ok(s.gap < 650, `a walk against placeAt is taken within the window: ${s.gap} ms without a report taken`);
|
|
246
|
+
assert.ok(s.clamped === false && flat(s.pose, a.local) < 1, `the body follows the walk ${JSON.stringify(s)}, client ${JSON.stringify(a.local)}`);
|
|
247
|
+
console.log('test-placeat-server against: a walk against placeAt is taken after the in-flight window');
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
// Dojo-like: the place puts a walking player where they stand, every step for
|
|
251
|
+
// six steps. That arms nothing. Before, each renewed a 4 s wait.
|
|
252
|
+
async function pinned(t) {
|
|
253
|
+
const a = await arrive(t);
|
|
254
|
+
a.vel = { x: 6, z: 0 };
|
|
255
|
+
await sleep(300);
|
|
256
|
+
await query(a, 'mark');
|
|
257
|
+
await query(a, 'pin');
|
|
258
|
+
await sleep(1500);
|
|
259
|
+
const s = await query(a, 'state');
|
|
260
|
+
assert.ok(s.gap < 200, `placeAt(where they stand) does not stop a walk: ${s.gap} ms without a report taken`);
|
|
261
|
+
assert.ok(s.clamped === false && flat(s.pose, a.local) < 1, `the body follows the walk ${JSON.stringify(s)}, client ${JSON.stringify(a.local)}`);
|
|
262
|
+
console.log('test-placeat-server pinned: repeated placeAt to the current pose arms nothing');
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
// placeAt, then a hold at the same spot, then release: the hold is a placement
|
|
266
|
+
// of its own and ends the placeAt's wait, so after the release the client's
|
|
267
|
+
// reports are taken as any held player's are (here still from the spawn, as
|
|
268
|
+
// it never heard). Before, the wait survived a hold at the same spot.
|
|
269
|
+
async function held(t) {
|
|
270
|
+
const a = await arrive(t);
|
|
271
|
+
a.deafUntil = Date.now() + 60000;
|
|
272
|
+
await query(a, 'hold-here');
|
|
273
|
+
await sleep(300);
|
|
274
|
+
await query(a, 'release');
|
|
275
|
+
await query(a, 'mark');
|
|
276
|
+
await sleep(500);
|
|
277
|
+
const s = await query(a, 'state');
|
|
278
|
+
assert.ok(s.gap < 200 && flat(s.pose, cold) > 1, `after hold and release reports are taken again: ${JSON.stringify(s)}`);
|
|
279
|
+
console.log('test-placeat-server held: a hold ends the placeAt wait');
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
// The close goes out in the same breath as the ask, so the leave comes before
|
|
283
|
+
// any server step has seen the body at the placed spot. Before the fix the
|
|
284
|
+
// leave stored the pose that step had recorded: the spawn.
|
|
285
|
+
async function close(t) {
|
|
286
|
+
const a = await arrive(t);
|
|
287
|
+
a.reporting = false;
|
|
288
|
+
a.local = { ...cold };
|
|
289
|
+
a.send({ test: 'move' });
|
|
290
|
+
a.socket.close();
|
|
291
|
+
await new Promise(resolve => a.socket.once('close', resolve));
|
|
292
|
+
const rowsFile = path.join(t.dir, 'pose-rows.json');
|
|
293
|
+
const rows = async () => { try { return JSON.parse(await readFile(rowsFile, 'utf8')).rows; } catch { return {}; } };
|
|
294
|
+
for (const end = Date.now() + 10000; !Object.keys(await rows()).length && Date.now() < end;) await sleep(50);
|
|
295
|
+
const stored = await rows();
|
|
296
|
+
assert.equal(Object.keys(stored).length, 1, `one durable row ${JSON.stringify(stored)}`);
|
|
297
|
+
const server = await t.restart();
|
|
298
|
+
const b = await connect(t.sockets, `ws://127.0.0.1:${server.port}/__castle/mp?nonce=${server.mintNonce(user)}`);
|
|
299
|
+
await b.wait(f => f.t === 'hello');
|
|
300
|
+
b.local = { ...spawn };
|
|
301
|
+
b.reporting = true;
|
|
302
|
+
b.send({ k: 'hub-hello', avatar: 0, party: 1 });
|
|
303
|
+
await b.wait(f => f.t === 'm' && f.d?.k === 'hub-arrived');
|
|
304
|
+
await sleep(2000);
|
|
305
|
+
const after = (await query(b, 'state')).pose;
|
|
306
|
+
assert.ok(flat(after, cold) < 0.5, `fresh socket resumes at the placed spot: ${JSON.stringify(after)} (stored ${JSON.stringify(stored)})`);
|
|
307
|
+
assert.ok(flat(b.local, cold) < 0.5, `client was put there too ${JSON.stringify(b.local)}`);
|
|
308
|
+
console.log('test-placeat-server close: a leave right after placeAt stores the placed pose');
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
// The client's starting WORLD (the frame that places its body; see connect).
|
|
312
|
+
function world(client) {
|
|
313
|
+
return client.wait(f => f.t === 'm' && [].concat(f.d?.batch ?? f.d).some(d => d?.k === 'w' && !d.again));
|
|
314
|
+
}
|
|
315
|
+
// Asks again until `done` holds or the deadline passes, then returns the last
|
|
316
|
+
// answer, so the caller's assertion still decides (and fails) on it.
|
|
317
|
+
async function until(client, test, extra, done, ms = 10000) {
|
|
318
|
+
const deadline = Date.now() + ms;
|
|
319
|
+
let answer = await query(client, test, extra);
|
|
320
|
+
while (!done(answer) && Date.now() < deadline) {
|
|
321
|
+
await sleep(50);
|
|
322
|
+
answer = await query(client, test, extra);
|
|
323
|
+
}
|
|
324
|
+
return answer;
|
|
325
|
+
}
|
|
326
|
+
async function query(client, test, extra = {}) {
|
|
327
|
+
client.send({ test, ...extra });
|
|
328
|
+
return (await client.wait(f => f.t === 'm' && f.d?.test === test)).d;
|
|
329
|
+
}
|
|
330
|
+
async function connect(sockets, url) {
|
|
331
|
+
const socket = new WebSocket(url);
|
|
332
|
+
sockets.push(socket);
|
|
333
|
+
const frames = [];
|
|
334
|
+
const client = {
|
|
335
|
+
socket,
|
|
336
|
+
selfId: null,
|
|
337
|
+
local: null,
|
|
338
|
+
reporting: false,
|
|
339
|
+
deafUntil: 0,
|
|
340
|
+
vel: { x: 0, z: 0 },
|
|
341
|
+
clampedTo: null,
|
|
342
|
+
send: d => socket.send(JSON.stringify({ t: 'm', d })),
|
|
343
|
+
async wait(predicate) {
|
|
344
|
+
const deadline = Date.now() + 10000;
|
|
345
|
+
while (Date.now() < deadline) {
|
|
346
|
+
const index = frames.findIndex(predicate);
|
|
347
|
+
if (index >= 0) return frames.splice(index, 1)[0];
|
|
348
|
+
await sleep(20);
|
|
349
|
+
}
|
|
350
|
+
throw Error('multiplayer frame timed out');
|
|
351
|
+
},
|
|
352
|
+
};
|
|
353
|
+
// The browser's multiplayer system: the starting WORLD places the body, a
|
|
354
|
+
// clamped self row corrects it, nothing else moves it; it reports at 20 Hz.
|
|
355
|
+
socket.on('message', (data, binary) => {
|
|
356
|
+
if (binary) return;
|
|
357
|
+
const frame = JSON.parse(data);
|
|
358
|
+
if (frame.t === 'hello') client.selfId = frame.playerId;
|
|
359
|
+
for (const d of frame.t === 'm' ? [].concat(frame.d?.batch ?? frame.d) : []) {
|
|
360
|
+
for (const [id, x, y, z, , clamped] of d?.ps ?? []) {
|
|
361
|
+
// A deaf client stands for one whose frames are still on their way.
|
|
362
|
+
if (Date.now() < client.deafUntil || id !== client.selfId || !client.local) continue;
|
|
363
|
+
if (d.k === 'w' && !d.again) client.local = { x, y, z };
|
|
364
|
+
else if (clamped) client.clampedTo = { x, y, z };
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
frames.push(frame);
|
|
368
|
+
});
|
|
369
|
+
// Its frames, as multiplayer-3d's client runs them: walk at `vel`, then take
|
|
370
|
+
// the newest clamped row, at once from over CLAMP_SNAP (4 m) and otherwise
|
|
371
|
+
// CLAMP_EASE (a quarter) of the way, once per row.
|
|
372
|
+
let frameAt = Date.now();
|
|
373
|
+
const frameTimer = setInterval(() => {
|
|
374
|
+
const now = Date.now();
|
|
375
|
+
const dt = (now - frameAt) / 1000;
|
|
376
|
+
frameAt = now;
|
|
377
|
+
if (!client.local) return;
|
|
378
|
+
client.local = { ...client.local, x: client.local.x + client.vel.x * dt, z: client.local.z + client.vel.z * dt };
|
|
379
|
+
const to = client.clampedTo;
|
|
380
|
+
client.clampedTo = null;
|
|
381
|
+
if (!to) return;
|
|
382
|
+
const off = { x: to.x - client.local.x, y: to.y - client.local.y, z: to.z - client.local.z };
|
|
383
|
+
client.local = Math.hypot(off.x, off.y, off.z) > 4 ? { ...to }
|
|
384
|
+
: { x: client.local.x + off.x * 0.25, y: client.local.y + off.y * 0.25, z: client.local.z + off.z * 0.25 };
|
|
385
|
+
}, 16);
|
|
386
|
+
socket.on('close', () => clearInterval(frameTimer));
|
|
387
|
+
const timer = setInterval(() => {
|
|
388
|
+
if (client.reporting && client.local && socket.readyState === 1) {
|
|
389
|
+
client.send({ k: 'i', p: [client.local.x, client.local.y, client.local.z, 0], c: [], r: [], o: [] });
|
|
390
|
+
}
|
|
391
|
+
}, 50);
|
|
392
|
+
socket.on('close', () => clearInterval(timer));
|
|
393
|
+
await new Promise((resolve, reject) => { socket.once('open', resolve); socket.once('error', reject); });
|
|
394
|
+
return client;
|
|
395
|
+
}
|
|
@@ -420,7 +420,7 @@ const hubSource = readFileSync(new URL('../code/systems/hub.js', import.meta.url
|
|
|
420
420
|
const node = { style: {}, getBoundingClientRect: () => ({ left: 0, right: 100, top, bottom: top + 24, width: 100, height: 24 }) };
|
|
421
421
|
geometry.register(node); geometry.beginFrame(); top = 80;
|
|
422
422
|
const context = {
|
|
423
|
-
applyVisibility() {}, applyWear() {}, applyCars() {},
|
|
423
|
+
applyVisibility() {}, applyWear() {}, applyCars() {}, applyDisguise() {},
|
|
424
424
|
fadeNames() {assert.equal(geometry.rect(node).top, 20, 'late crowd geometry uses the read-phase sample');},
|
|
425
425
|
endLayoutFrame() {geometry.endFrame();},
|
|
426
426
|
};
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
// Goal pointers stay off the prompt pill and the controls through a whole
|
|
2
|
+
// layout frame: the world layout places them, and the frame's HUD clearance
|
|
3
|
+
// pass must not lift one back onto a control (844x390 legacy offers, 509x218
|
|
4
|
+
// and 412x870, with and without safe insets).
|
|
5
|
+
import assert from 'node:assert/strict';
|
|
6
|
+
import { readFile } from 'node:fs/promises';
|
|
7
|
+
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import { chromium } from 'playwright-core';
|
|
9
|
+
import { launchChromium, logRenderer } from '../../../experiments/hub-town/qa/launch.mjs';
|
|
10
|
+
const root = new URL('../../../', import.meta.url);
|
|
11
|
+
const browser = await launchChromium(chromium, { executablePath: process.env.CHROME });
|
|
12
|
+
try {
|
|
13
|
+
for (const [width, height] of [[844, 390], [509, 218], [412, 870]]) {
|
|
14
|
+
for (const safeInsets of [false, true]) {
|
|
15
|
+
const context = await browser.newContext({ viewport: { width, height }, isMobile: true, hasTouch: true });
|
|
16
|
+
const page = await context.newPage();
|
|
17
|
+
await page.route('http://pointer.test/**', async route => {
|
|
18
|
+
const pathname = new URL(route.request().url()).pathname;
|
|
19
|
+
if (pathname === '/') return route.fulfill({ contentType: 'text/html', body: '<meta name="viewport" content="width=device-width,initial-scale=1"><body style="margin:0"></body>' });
|
|
20
|
+
const url = new URL(`.${pathname}`, root);
|
|
21
|
+
assert(fileURLToPath(url).startsWith(fileURLToPath(root)));
|
|
22
|
+
await route.fulfill({ contentType: 'text/javascript', body: await readFile(url, 'utf8') });
|
|
23
|
+
});
|
|
24
|
+
await page.goto('http://pointer.test/');
|
|
25
|
+
await logRenderer(page, 'pointer clear');
|
|
26
|
+
const hits = await page.evaluate(async (safeInsets) => {
|
|
27
|
+
const { makeChrome } = await import('/kits/hub-game/code/client/chrome.js');
|
|
28
|
+
const chrome = makeChrome({ avatarCount: 4, onBack() {}, onAvatar() {}, safeInsets });
|
|
29
|
+
chrome.setWorldLabelFocus(false);
|
|
30
|
+
chrome.showBack(true, 'Back');
|
|
31
|
+
chrome.soundControl(true, { volume: 0.7, muted: false }, { onMuted() {}, onVolume() {} });
|
|
32
|
+
chrome.showPicker(true, 0, undefined, { onPick() {} });
|
|
33
|
+
chrome.setEmotes([['wave', '๐']]);
|
|
34
|
+
chrome.setSay({ reactions: [], phrases: [] });
|
|
35
|
+
chrome.setDoors([{ id: 'color', title: 'Color Call' }]);
|
|
36
|
+
chrome.setCompanionBadge(true, 'Chirp', () => {});
|
|
37
|
+
chrome.talkPrompt('Chirp', true);
|
|
38
|
+
chrome.setActions([{ id: 'invite-friend', label: 'Invite a friend' }, { id: 'market-looks', label: 'Market looks' }], () => {}, true, 1, !(innerWidth > innerHeight));
|
|
39
|
+
chrome.setHud({ title: 'Castle Town', text: 'Find your house' }, null);
|
|
40
|
+
const raf = () => new Promise(resolve => requestAnimationFrame(() => resolve()));
|
|
41
|
+
const frame = async (pointers) => {
|
|
42
|
+
for (let i = 0; i < 3; i++) {
|
|
43
|
+
chrome.beginLayoutFrame(); chrome.beginWorldLabels();
|
|
44
|
+
chrome.setPointers(pointers);
|
|
45
|
+
chrome.flushWorldLabels(); chrome.endLayoutFrame();
|
|
46
|
+
await raf();
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
await frame([]);
|
|
50
|
+
if (safeInsets) {await new Promise(resolve => setTimeout(resolve, 700)); await frame([]);}
|
|
51
|
+
const shown = n => {
|
|
52
|
+
if (!n?.isConnected) {return false;}
|
|
53
|
+
for (let p = n; p; p = p.parentElement) {const s = getComputedStyle(p); if (s.display === 'none' || s.visibility === 'hidden' || s.opacity === '0') {return false;}}
|
|
54
|
+
const r = n.getBoundingClientRect(); return r.width > 0 && r.height > 0;
|
|
55
|
+
};
|
|
56
|
+
// What a player sees and taps: labelled buttons and the prompt pill
|
|
57
|
+
// (not the follower's transparent tap area).
|
|
58
|
+
const controls = () => [...document.querySelectorAll('button'), document.querySelector('[data-hub="hud-prompt"]')]
|
|
59
|
+
.filter(n => shown(n) && n.textContent.trim() && n !== chrome.companionTalkButton);
|
|
60
|
+
const area = (a, b) => Math.max(0, Math.min(a.right, b.right) - Math.max(a.left, b.left)) * Math.max(0, Math.min(a.bottom, b.bottom) - Math.max(a.top, b.top));
|
|
61
|
+
const text = 'your house ยท 42 m';
|
|
62
|
+
const samples = [];
|
|
63
|
+
for (let x = 30; x < innerWidth; x += 37) {for (let y = 30; y < innerHeight; y += 31) {samples.push({ x, y, angle: null });}}
|
|
64
|
+
for (let x = 10; x < innerWidth; x += 46) {samples.push({ x, y: innerHeight - 18, angle: Math.PI / 2 });}
|
|
65
|
+
const found = [];
|
|
66
|
+
for (const s of samples) {
|
|
67
|
+
await frame([{ id: 'goal:house', ...s, text }]);
|
|
68
|
+
const chip = [...document.querySelectorAll('span')].find(n => n.textContent === text)?.parentElement;
|
|
69
|
+
if (!shown(chip)) {continue;}
|
|
70
|
+
for (const n of controls()) {
|
|
71
|
+
if (area(n.getBoundingClientRect(), chip.getBoundingClientRect()) > 1) {found.push(`${n.textContent.trim().slice(0, 24)} at ${s.x},${s.y}`);}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
chrome.dispose();
|
|
75
|
+
return found;
|
|
76
|
+
}, safeInsets);
|
|
77
|
+
assert.deepEqual(hits.slice(0, 5), [], `${width}x${height} safeInsets=${safeInsets}: the pointer stays off the prompt and controls`);
|
|
78
|
+
console.log(`${width}x${height} safeInsets=${safeInsets}: pointer clear`);
|
|
79
|
+
await context.close();
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
} finally { await browser.close(); }
|