castle-web-cli 0.4.233 → 0.4.235
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/api.d.ts +11 -0
- package/dist/api.js +43 -0
- package/dist/bundle.d.ts +64 -0
- package/dist/bundle.js +558 -2
- package/dist/castle-host/host.d.ts +17 -2
- package/dist/castle-host/host.js +793 -36
- package/dist/castleJson.d.ts +20 -1
- package/dist/castleJson.js +44 -2
- package/dist/check.js +9 -2
- package/dist/chunkLoader.d.ts +3 -0
- package/dist/chunkLoader.js +111 -0
- package/dist/devParty.d.ts +26 -0
- package/dist/devParty.js +231 -0
- package/dist/devSaveStorage.js +4 -0
- package/dist/devSessionStorage.js +3 -1
- package/dist/devSocial.d.ts +24 -0
- package/dist/devSocial.js +70 -0
- package/dist/ide.d.ts +2 -0
- package/dist/ide.js +119 -15
- package/dist/index.js +8 -2
- package/dist/init.js +1 -1
- package/dist/save-deck.d.ts +20 -1
- package/dist/save-deck.js +141 -5
- package/dist/serve.js +29 -11
- package/dist/shell/assets/{index-BjOxR-lW.js → index-DulbYIJm.js} +97 -97
- package/dist/shell/index.html +1 -1
- package/dist/vitePlugins.d.ts +2 -1
- package/dist/vitePlugins.js +13 -0
- package/kits/base/castle.json +1 -1
- package/kits/base/sdk/README.md +266 -3
- package/kits/base/sdk/castle.d.ts +7 -3
- package/kits/base/sdk/castle.js +2 -0
- package/kits/base/sdk/commands.d.ts +162 -1
- package/kits/base/sdk/commands.js +3 -0
- package/kits/base/sdk/display.d.ts +3 -0
- package/kits/base/sdk/display.js +9 -3
- package/kits/base/sdk/hub.d.ts +33 -6
- package/kits/base/sdk/hub.js +68 -5
- package/kits/base/sdk/hubRejoin.d.ts +4 -0
- package/kits/base/sdk/hubRejoin.js +15 -0
- package/kits/base/sdk/multiplayer.d.ts +7 -1
- package/kits/base/sdk/multiplayer.js +147 -40
- package/kits/base/sdk/multiplayerProtocol.d.ts +2 -0
- package/kits/base/sdk/party.d.ts +23 -0
- package/kits/base/sdk/party.js +91 -0
- package/kits/base/sdk/reconnectBudget.d.ts +23 -0
- package/kits/base/sdk/reconnectBudget.js +96 -0
- package/kits/base/sdk/save.d.ts +38 -1
- package/kits/base/sdk/save.js +79 -6
- package/kits/base/sdk/server/hub.d.ts +31 -1
- package/kits/base/sdk/server/hub.js +50 -3
- package/kits/base/sdk/server/platformHandle.d.ts +13 -1
- package/kits/base/sdk/server/storage.d.ts +4 -0
- package/kits/base/sdk/server/storage.js +19 -3
- package/kits/base/sdk/server/wrapper.d.ts +7 -1
- package/kits/base/sdk/server/wrapper.js +10 -1
- package/kits/base/sdk/social.d.ts +9 -0
- package/kits/base/sdk/social.js +5 -0
- package/kits/hub-game/CLAUDE.md +123 -3
- package/kits/hub-game/README.md +63 -0
- package/kits/hub-game/castle.json +5 -5
- package/kits/hub-game/code/client/act.js +312 -0
- package/kits/hub-game/code/client/actionLayout.js +147 -0
- package/kits/hub-game/code/client/actionOverflow.js +556 -0
- package/kits/hub-game/code/client/arrivalCamera.js +50 -0
- package/kits/hub-game/code/client/askSlot.js +117 -0
- package/kits/hub-game/code/client/avatar.js +4 -2
- package/kits/hub-game/code/client/avatarShare.js +2 -0
- package/kits/hub-game/code/client/backVisibility.js +13 -0
- package/kits/hub-game/code/client/ballot.js +15 -10
- package/kits/hub-game/code/client/build.js +16 -0
- package/kits/hub-game/code/client/chat.js +41 -5
- package/kits/hub-game/code/client/chatModeration.js +5 -0
- package/kits/hub-game/code/client/chrome.js +1148 -258
- package/kits/hub-game/code/client/crowdNames.js +241 -0
- package/kits/hub-game/code/client/decor.js +10 -4
- package/kits/hub-game/code/client/defaultEnvironment.js +194 -0
- package/kits/hub-game/code/client/doorErrors.js +39 -0
- package/kits/hub-game/code/client/fall.js +18 -0
- package/kits/hub-game/code/client/farAvatars.js +233 -0
- package/kits/hub-game/code/client/firstJoin.js +9 -2
- package/kits/hub-game/code/client/fpsTelemetry.js +50 -0
- package/kits/hub-game/code/client/frameBatch.js +5 -0
- package/kits/hub-game/code/client/grab.js +31 -11
- package/kits/hub-game/code/client/hookLayer.js +87 -8
- package/kits/hub-game/code/client/hudCopy.js +51 -0
- package/kits/hub-game/code/client/hudRate.js +20 -0
- package/kits/hub-game/code/client/idle.js +14 -2
- package/kits/hub-game/code/client/invites.js +231 -0
- package/kits/hub-game/code/client/joinError.js +9 -0
- package/kits/hub-game/code/client/labelsNear.js +31 -2
- package/kits/hub-game/code/client/landscapeLayout.js +17 -0
- package/kits/hub-game/code/client/layoutCache.js +264 -0
- package/kits/hub-game/code/client/loadTelemetry.js +20 -0
- package/kits/hub-game/code/client/loadingCover.js +148 -0
- package/kits/hub-game/code/client/loadingEntry.js +8 -0
- package/kits/hub-game/code/client/menuRows.js +43 -0
- package/kits/hub-game/code/client/modelReady.js +7 -0
- package/kits/hub-game/code/client/padCueArrival.js +23 -0
- package/kits/hub-game/code/client/padCues.js +112 -0
- package/kits/hub-game/code/client/padOccupancy.js +88 -0
- package/kits/hub-game/code/client/padReadability.js +26 -0
- package/kits/hub-game/code/client/padRings.js +69 -0
- package/kits/hub-game/code/client/pushVisit.js +14 -0
- package/kits/hub-game/code/client/quality.js +205 -0
- package/kits/hub-game/code/client/qualityEntry.js +55 -0
- package/kits/hub-game/code/client/safeLayout.js +338 -0
- package/kits/hub-game/code/client/safeStyle.js +42 -0
- package/kits/hub-game/code/client/say.js +12 -3
- package/kits/hub-game/code/client/shot.js +64 -10
- package/kits/hub-game/code/client/shotFit.js +56 -0
- package/kits/hub-game/code/client/signIn.js +28 -0
- package/kits/hub-game/code/client/state.js +53 -0
- package/kits/hub-game/code/client/talk.js +209 -45
- package/kits/hub-game/code/client/tiers.js +68 -66
- package/kits/hub-game/code/client/together.js +7 -2
- package/kits/hub-game/code/client/weakestLookBake.js +92 -0
- package/kits/hub-game/code/client/weakestTier.js +295 -0
- package/kits/hub-game/code/client/worldLabels.js +241 -0
- package/kits/hub-game/code/client/yours.js +10 -9
- package/kits/hub-game/code/npcDisplayText.js +55 -0
- package/kits/hub-game/code/server/act.js +124 -0
- package/kits/hub-game/code/server/actions.js +6 -1
- package/kits/hub-game/code/server/actors.js +2 -1
- package/kits/hub-game/code/server/analytics.js +83 -0
- package/kits/hub-game/code/server/anonymousEntry.js +49 -0
- package/kits/hub-game/code/server/arrivalPose.js +36 -0
- package/kits/hub-game/code/server/companion.js +28 -3
- package/kits/hub-game/code/server/doorAnalytics.js +52 -0
- package/kits/hub-game/code/server/earned.js +22 -5
- package/kits/hub-game/code/server/frameBatch.js +183 -0
- package/kits/hub-game/code/server/friendsAmong.js +49 -9
- package/kits/hub-game/code/server/history.js +2 -0
- package/kits/hub-game/code/server/hub.js +1306 -95
- package/kits/hub-game/code/server/idle.js +30 -1
- package/kits/hub-game/code/server/index.js +26 -4
- package/kits/hub-game/code/server/invites.js +19 -0
- package/kits/hub-game/code/server/labels.js +9 -1
- package/kits/hub-game/code/server/loadAbandon.js +106 -0
- package/kits/hub-game/code/server/manifest.js +211 -3
- package/kits/hub-game/code/server/menu.js +31 -3
- package/kits/hub-game/code/server/npcs.js +226 -64
- package/kits/hub-game/code/server/observe.js +408 -0
- package/kits/hub-game/code/server/padOccupancy.js +85 -0
- package/kits/hub-game/code/server/players.js +9 -1
- package/kits/hub-game/code/server/resumePose.js +152 -0
- package/kits/hub-game/code/server/say.js +1 -1
- package/kits/hub-game/code/server/standing.js +4 -5
- package/kits/hub-game/code/server/storageLimit.js +187 -0
- package/kits/hub-game/code/server/vis.js +67 -5
- package/kits/hub-game/code/shared/act.js +35 -0
- package/kits/hub-game/code/shared/danceIdle.js +28 -0
- package/kits/hub-game/code/shared/loadStages.js +12 -0
- package/kits/hub-game/code/shared/quality.js +74 -0
- package/kits/hub-game/code/shared/say.js +2 -0
- package/kits/hub-game/code/shared/shot.js +35 -1
- package/kits/hub-game/code/systems/hub.js +970 -169
- package/kits/hub-game/docs/analytics.md +279 -0
- package/kits/hub-game/docs/contract.md +1259 -42
- package/kits/hub-game/docs/home-pieces.md +9 -2
- package/kits/hub-game/docs/observed-progress.md +252 -0
- package/kits/hub-game/main.jsx +2 -0
- package/kits/hub-game/package-lock.json +10 -3
- package/kits/hub-game/package.json +6 -3
- package/kits/hub-game/play/player.js +142 -0
- package/kits/hub-game/play/registry.js +47 -0
- package/kits/hub-game/play.jsx +37 -0
- package/kits/hub-game/scripts/check.mjs +39 -5
- package/kits/hub-game/scripts/companion-follower-wire.json +1 -1
- package/kits/hub-game/scripts/fixtures/decor-keyless-draw.json +11 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless.json +5 -5
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +3 -0
- package/kits/hub-game/scripts/fixtures/fake-dom.mjs +19 -3
- package/kits/hub-game/scripts/fixtures/interest-legacy.json +3 -3
- package/kits/hub-game/scripts/fixtures/vis-shared-wire.json +1 -1
- package/kits/hub-game/scripts/pose-storage-fixture.mjs +46 -0
- package/kits/hub-game/scripts/test-act-client.mjs +186 -0
- package/kits/hub-game/scripts/test-act.mjs +171 -0
- package/kits/hub-game/scripts/test-action-layout.mjs +80 -0
- package/kits/hub-game/scripts/test-action-observers.mjs +46 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +367 -2
- package/kits/hub-game/scripts/test-actors.mjs +20 -7
- package/kits/hub-game/scripts/test-analytics.mjs +76 -0
- package/kits/hub-game/scripts/test-anonymous-entry.mjs +28 -0
- package/kits/hub-game/scripts/test-arrival-pose-server.mjs +196 -0
- package/kits/hub-game/scripts/test-arrival-pose.mjs +24 -0
- package/kits/hub-game/scripts/test-ask-slot.mjs +85 -0
- package/kits/hub-game/scripts/test-avatar-wire.mjs +49 -10
- package/kits/hub-game/scripts/test-avatar.mjs +44 -0
- package/kits/hub-game/scripts/test-back-visibility.mjs +82 -0
- package/kits/hub-game/scripts/test-ballot.mjs +11 -4
- package/kits/hub-game/scripts/test-ban-join.mjs +121 -13
- package/kits/hub-game/scripts/test-build.mjs +20 -2
- package/kits/hub-game/scripts/test-chat.mjs +206 -5
- package/kits/hub-game/scripts/test-companion-chat.mjs +20 -2
- package/kits/hub-game/scripts/test-control-layout-dom.mjs +120 -0
- package/kits/hub-game/scripts/test-crowd-names.mjs +205 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +45 -4
- package/kits/hub-game/scripts/test-decor.mjs +7 -0
- package/kits/hub-game/scripts/test-default-environment-root.mjs +95 -0
- package/kits/hub-game/scripts/test-default-environment.mjs +267 -0
- package/kits/hub-game/scripts/test-door-analytics.mjs +58 -0
- package/kits/hub-game/scripts/test-door-jump.mjs +100 -0
- package/kits/hub-game/scripts/test-earned.mjs +33 -3
- package/kits/hub-game/scripts/test-far-avatars.mjs +340 -0
- package/kits/hub-game/scripts/test-fps-telemetry.mjs +112 -0
- package/kits/hub-game/scripts/test-frame-batch.mjs +252 -0
- package/kits/hub-game/scripts/test-fresh-friends.mjs +118 -0
- package/kits/hub-game/scripts/test-grab-orbit.mjs +47 -4
- package/kits/hub-game/scripts/test-high-only.mjs +170 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +321 -2
- package/kits/hub-game/scripts/test-hub-trip.mjs +879 -11
- package/kits/hub-game/scripts/test-hud-clear.mjs +162 -59
- package/kits/hub-game/scripts/test-hud-defects-dom.mjs +100 -0
- package/kits/hub-game/scripts/test-hud-rate.mjs +224 -0
- package/kits/hub-game/scripts/test-hud-safe-visibility-dom.mjs +83 -0
- package/kits/hub-game/scripts/test-idle.mjs +66 -0
- package/kits/hub-game/scripts/test-interest-cells.mjs +20 -0
- package/kits/hub-game/scripts/test-interest.mjs +15 -0
- package/kits/hub-game/scripts/test-invites-client.mjs +430 -0
- package/kits/hub-game/scripts/test-invites.mjs +109 -0
- package/kits/hub-game/scripts/test-labels.mjs +71 -3
- package/kits/hub-game/scripts/test-landscape-layout.mjs +194 -0
- package/kits/hub-game/scripts/test-list-scroll-dom.mjs +49 -0
- package/kits/hub-game/scripts/test-load-abandon.mjs +246 -0
- package/kits/hub-game/scripts/test-loading-cover.mjs +162 -0
- package/kits/hub-game/scripts/test-manifest.mjs +265 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +105 -0
- package/kits/hub-game/scripts/test-menu.mjs +23 -0
- package/kits/hub-game/scripts/test-npcs.mjs +917 -10
- package/kits/hub-game/scripts/test-observed.mjs +745 -0
- package/kits/hub-game/scripts/test-pad-cues.mjs +304 -0
- package/kits/hub-game/scripts/test-pad-occupancy.mjs +177 -0
- package/kits/hub-game/scripts/test-picker.mjs +234 -7
- package/kits/hub-game/scripts/test-placement-cache.mjs +690 -0
- package/kits/hub-game/scripts/test-progress-reset.mjs +559 -0
- package/kits/hub-game/scripts/test-push-visit.mjs +26 -0
- package/kits/hub-game/scripts/test-quality.mjs +385 -0
- package/kits/hub-game/scripts/test-rehello.mjs +699 -5
- package/kits/hub-game/scripts/test-resume-action-order.mjs +598 -0
- package/kits/hub-game/scripts/test-resume-held.mjs +239 -0
- package/kits/hub-game/scripts/test-resume-pose.mjs +142 -0
- package/kits/hub-game/scripts/test-safe-events-dom.mjs +116 -0
- package/kits/hub-game/scripts/test-safe-layout.mjs +330 -0
- package/kits/hub-game/scripts/test-say.mjs +1 -1
- package/kits/hub-game/scripts/test-shot.mjs +145 -0
- package/kits/hub-game/scripts/test-signin-client.mjs +45 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +22 -17
- package/kits/hub-game/scripts/test-standing.mjs +35 -2
- package/kits/hub-game/scripts/test-storage-limit.mjs +333 -0
- package/kits/hub-game/scripts/test-stuck.mjs +5 -4
- package/kits/hub-game/scripts/test-talk-overlay-dom.mjs +130 -0
- package/kits/hub-game/scripts/test-tiers-render.mjs +86 -13
- package/kits/hub-game/scripts/test-tiers.mjs +7 -8
- package/kits/hub-game/scripts/test-vis.mjs +433 -6
- package/kits/hub-game/scripts/test-weakest-tier.mjs +924 -0
- package/kits/hub-game/scripts/test-world-labels.mjs +367 -0
- package/kits/hub-game/scripts/test-yours-chrome.mjs +50 -6
- package/kits/hub-game/scripts/test-yours.mjs +39 -8
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/joinFailure.js +27 -0
- package/kits/multiplayer-3d/code/client/resumeGate.js +139 -0
- package/kits/multiplayer-3d/code/systems/multiplayer.js +369 -30
- package/kits/multiplayer-3d/package-lock.json +8 -1
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/test-join-watchdog.mjs +436 -0
- package/kits/multiplayer-3d/scripts/test-resume-gate.mjs +624 -0
- package/kits/physics-2d/CLAUDE.md +10 -1
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/frozenActors.js +233 -0
- package/kits/physics-2d/engine/scene.js +87 -5
- package/kits/physics-2d/eslint.config.js +1 -1
- package/kits/physics-2d/play/behaviors/AnalogStick.js +198 -0
- package/kits/physics-2d/play/behaviors/Camera.js +40 -0
- package/kits/physics-2d/play/behaviors/Collider.js +122 -0
- package/kits/physics-2d/play/behaviors/Draggable.js +115 -0
- package/kits/physics-2d/play/behaviors/Goal.js +46 -0
- package/kits/physics-2d/play/behaviors/Joints.js +126 -0
- package/kits/physics-2d/play/behaviors/Layout.js +71 -0
- package/kits/physics-2d/play/behaviors/RigidBody.js +57 -0
- package/kits/physics-2d/play/behaviors/Slingshot.js +142 -0
- package/kits/physics-2d/play/behaviors/SoundPlayer.js +263 -0
- package/kits/physics-2d/play/behaviors/Sprite.js +406 -0
- package/kits/physics-2d/play/behaviors/Style.js +209 -0
- package/kits/physics-2d/play/behaviors/Text.js +85 -0
- package/kits/physics-2d/play/behaviors/Video.js +93 -0
- package/kits/physics-3d/CLAUDE.md +25 -1651
- package/kits/physics-3d/behaviors/Body.jsx +3 -0
- package/kits/physics-3d/behaviors/Model.jsx +3 -0
- package/kits/physics-3d/behaviors/Player.jsx +35 -18
- package/kits/physics-3d/behaviors/Shape.jsx +3 -0
- package/kits/physics-3d/behaviors/Solid.jsx +3 -0
- package/kits/physics-3d/behaviors/Transform.jsx +3 -0
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/engine-camera.md +542 -0
- package/kits/physics-3d/docs/engine-frame-cap.md +136 -0
- package/kits/physics-3d/docs/engine-load.md +149 -0
- package/kits/physics-3d/docs/engine-look.md +114 -0
- package/kits/physics-3d/docs/engine-shadows.md +372 -0
- package/kits/physics-3d/docs/engine-skip-work.md +187 -0
- package/kits/physics-3d/docs/engine-sky.md +198 -0
- package/kits/physics-3d/docs/engine-static-actors.md +226 -0
- package/kits/physics-3d/docs/engine-view.md +37 -0
- package/kits/physics-3d/docs/pxmodel-format.md +1 -1
- package/kits/physics-3d/engine3d/PlayOnly3D.jsx +5 -1
- package/kits/physics-3d/engine3d/Scene3DPlayer.jsx +19 -333
- package/kits/physics-3d/engine3d/actornode.js +1 -0
- package/kits/physics-3d/engine3d/branches.js +3 -13
- package/kits/physics-3d/engine3d/cage.js +2 -7
- package/kits/physics-3d/engine3d/cageops.js +2 -17
- package/kits/physics-3d/engine3d/dataBehaviors.js +12 -0
- package/kits/physics-3d/engine3d/framecap.js +4 -1
- package/kits/physics-3d/engine3d/frozenphysics.js +140 -0
- package/kits/physics-3d/engine3d/frozenstatics.js +273 -0
- package/kits/physics-3d/engine3d/gait.js +8 -0
- package/kits/physics-3d/engine3d/initialModelFiles.js +18 -0
- package/kits/physics-3d/engine3d/look.js +7 -0
- package/kits/physics-3d/engine3d/modelFiles.js +3 -17
- package/kits/physics-3d/engine3d/modelMath.js +49 -0
- package/kits/physics-3d/engine3d/modelready.js +16 -0
- package/kits/physics-3d/engine3d/motion.js +3 -3
- package/kits/physics-3d/engine3d/nearshadows.js +77 -10
- package/kits/physics-3d/engine3d/orbitinput.js +59 -25
- package/kits/physics-3d/engine3d/partgeometry.js +1 -16
- package/kits/physics-3d/engine3d/paths.js +1 -9
- package/kits/physics-3d/engine3d/playTimings.js +50 -0
- package/kits/physics-3d/engine3d/playerRun.js +372 -0
- package/kits/physics-3d/engine3d/pxmodel.js +3 -3
- package/kits/physics-3d/engine3d/rapier.js +27 -0
- package/kits/physics-3d/engine3d/scatter.js +1 -11
- package/kits/physics-3d/engine3d/shadowfade.js +23 -15
- package/kits/physics-3d/engine3d/sky.js +1 -1
- package/kits/physics-3d/engine3d/squarefirst.js +177 -0
- package/kits/physics-3d/engine3d/stillshadows.js +399 -0
- package/kits/physics-3d/engine3d/sweep.js +1 -25
- package/kits/physics-3d/engine3d/world3d.js +468 -18
- package/kits/physics-3d/eslint.config.js +2 -1
- package/kits/physics-3d/main.jsx +6 -3
- package/kits/physics-3d/package-lock.json +7 -0
- package/kits/physics-3d/package.json +5 -1
- package/kits/physics-3d/play/behaviors/Body.js +31 -0
- package/kits/physics-3d/play/behaviors/Door.js +37 -0
- package/kits/physics-3d/play/behaviors/Lookable.js +16 -0
- package/kits/physics-3d/play/behaviors/Model.js +23 -0
- package/kits/physics-3d/play/behaviors/Pickup.js +46 -0
- package/kits/physics-3d/play/behaviors/Player.js +1204 -0
- package/kits/physics-3d/play/behaviors/Shape.js +47 -0
- package/kits/physics-3d/play/behaviors/Solid.js +16 -0
- package/kits/physics-3d/play/behaviors/Transform.js +29 -0
- package/kits/physics-3d/pnpm-lock.yaml +8 -0
- package/kits/physics-3d/scripts/bench-shadow-fade.mjs +37 -0
- package/kits/physics-3d/scripts/build-rapier-gz.mjs +56 -0
- package/kits/physics-3d/scripts/frozen-statics-fixture.mjs +141 -0
- package/kits/physics-3d/scripts/test-camera-follow.mjs +5 -1
- package/kits/physics-3d/scripts/test-camera-orbit.mjs +52 -4
- package/kits/physics-3d/scripts/test-drop-empty-parts.mjs +1 -1
- package/kits/physics-3d/scripts/test-empty-gait-hints.mjs +89 -0
- package/kits/physics-3d/scripts/test-frame-cap-bob.mjs +6 -3
- package/kits/physics-3d/scripts/test-frame-cap.mjs +1 -1
- package/kits/physics-3d/scripts/test-frozen-nested.mjs +49 -0
- package/kits/physics-3d/scripts/test-frozen-statics-legacy-physics2d.mjs +123 -0
- package/kits/physics-3d/scripts/test-frozen-statics.mjs +434 -0
- package/kits/physics-3d/scripts/test-look-bake.mjs +1 -1
- package/kits/physics-3d/scripts/test-near-shadows.mjs +2 -2
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +88 -7
- package/kits/physics-3d/scripts/test-orbit-shift-lock.mjs +40 -3
- package/kits/physics-3d/scripts/test-orbit-shot.mjs +75 -1
- package/kits/physics-3d/scripts/test-rapier-gz.mjs +106 -0
- package/kits/physics-3d/scripts/test-sky.mjs +1 -1
- package/kits/physics-3d/scripts/test-square-first.mjs +921 -0
- package/kits/physics-3d/scripts/test-static-actors.mjs +3 -1
- package/kits/physics-3d/scripts/test-static-physics.mjs +4 -1
- package/kits/physics-3d/scripts/test-static-scenery.mjs +5 -2
- package/kits/physics-3d/scripts/test-steady-hover.mjs +5 -2
- package/kits/physics-3d/scripts/test-still-shadows.mjs +477 -0
- package/kits/physics-3d/systems/physics3d.js +37 -4
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/client/connection.js +33 -10
- package/kits/real-time/code/client/gameHooks.js +2 -0
- package/kits/real-time/code/client/joinOverlay.js +9 -4
- package/kits/real-time/code/server/session.js +6 -4
- package/kits/real-time/package-lock.json +1 -1
- package/package.json +2 -2
|
@@ -15,7 +15,13 @@
|
|
|
15
15
|
// ahead of the player's words; the server admits only notes it issued, and the
|
|
16
16
|
// player sees only their own words.
|
|
17
17
|
|
|
18
|
+
import { mindDue, talkActors } from './quality.js';
|
|
18
19
|
import { hub } from './state.js';
|
|
20
|
+
import { npcDisplayText } from '../npcDisplayText.js';
|
|
21
|
+
|
|
22
|
+
// Product's words, exactly: a mind an under-13 speaker cannot type to (the
|
|
23
|
+
// server says so, `ageOff`; the client never infers an age).
|
|
24
|
+
export const under13Talk = (name) => `Talking with ${name} is for players 13 and up`;
|
|
19
25
|
|
|
20
26
|
const TALK_RANGE_M = 3.5;
|
|
21
27
|
const POLL_MS = 1200;
|
|
@@ -29,6 +35,12 @@ const AUTHORED_WAIT_MS = 1200;
|
|
|
29
35
|
const ATTACH_WAIT_MS = 8000;
|
|
30
36
|
const INTERRUPTED_MS = 1800;
|
|
31
37
|
const INTERRUPTED_LINE = 'Lost the thread there. Tap to talk again.';
|
|
38
|
+
// A failed character read (inspect, greeting, status) holds the next inspect
|
|
39
|
+
// and greeting reads back, doubling to the cap; a turn's status poll gives up
|
|
40
|
+
// after this many failures.
|
|
41
|
+
export const READ_RETRY_MS = 5000;
|
|
42
|
+
const READ_RETRY_MAX_MS = 300_000;
|
|
43
|
+
const STATUS_FAILURES_MAX = 2;
|
|
32
44
|
// Lines the place said because the mind was not answering, and how the panel
|
|
33
45
|
// says so.
|
|
34
46
|
const SCRIPTED = {
|
|
@@ -43,12 +55,6 @@ const REFUSAL_WHY = {
|
|
|
43
55
|
CAULDRON_SHARED_CHARACTER_BUDGET: 'budget',
|
|
44
56
|
};
|
|
45
57
|
|
|
46
|
-
// The server strips a reply's wrapping quotes the same way for its bubble.
|
|
47
|
-
const unquote = (text) => {
|
|
48
|
-
const t = text.trim();
|
|
49
|
-
return t.length > 1 && /^["“]/.test(t) && /["”]$/.test(t) ? t.slice(1, -1).trim() : t;
|
|
50
|
-
};
|
|
51
|
-
|
|
52
58
|
const newId = () => globalThis.crypto?.randomUUID?.() ?? `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 12)}`;
|
|
53
59
|
|
|
54
60
|
export function makeTalk(chrome) {
|
|
@@ -60,10 +66,16 @@ export function makeTalk(chrome) {
|
|
|
60
66
|
net: null,
|
|
61
67
|
// v1.46: only a successful inspect remembers permission to type.
|
|
62
68
|
inspected: new WeakSet(),
|
|
63
|
-
// v1.47: approach starts one read;
|
|
69
|
+
// v1.47: approach starts one read; a refusal retries on a later open,
|
|
70
|
+
// once the read backoff has passed.
|
|
64
71
|
approached: new WeakSet(),
|
|
65
|
-
|
|
66
|
-
|
|
72
|
+
// This session's read backoff, logged failures, in-flight inspect
|
|
73
|
+
// (`session.inspecting`) and whether its last inspect was refused
|
|
74
|
+
// (`session.refused`); reset() starts anew.
|
|
75
|
+
session: {},
|
|
76
|
+
readFailures: 0,
|
|
77
|
+
readWait: null,
|
|
78
|
+
logged: new Set(),
|
|
67
79
|
// v1.76: ids only, consumed on approach or on opening that character.
|
|
68
80
|
hooks: new Map(),
|
|
69
81
|
greeted: new Set(),
|
|
@@ -85,6 +97,12 @@ export function makeTalk(chrome) {
|
|
|
85
97
|
ask(t, companion);
|
|
86
98
|
}
|
|
87
99
|
},
|
|
100
|
+
prepare(id) {
|
|
101
|
+
if (t.asking || t.open || !t.net) {return;}
|
|
102
|
+
t.asking = id;
|
|
103
|
+
t.abandonedOpens.delete(id);
|
|
104
|
+
dropHook(t, id);
|
|
105
|
+
},
|
|
88
106
|
typing: () => t.open !== null && chrome.talkFocused(),
|
|
89
107
|
talking: () => t.open !== null,
|
|
90
108
|
talkingToCompanion: () => Boolean(hub.place?.companionChat && t.open?.npc === `companion:${t.net?.selfId?.()}`),
|
|
@@ -96,6 +114,15 @@ export function makeTalk(chrome) {
|
|
|
96
114
|
resume() {
|
|
97
115
|
if (t.open && !t.open.interrupted) {
|
|
98
116
|
t.open.needsAttach = true;
|
|
117
|
+
if (childChoices(t.open) && t.waiting) {
|
|
118
|
+
// A restored WORLD cannot settle the old connection's request.
|
|
119
|
+
// Invalidate its continuations; attach afresh without replaying it.
|
|
120
|
+
t.open.operationId = null;
|
|
121
|
+
t.open.recoveryOperationId = null;
|
|
122
|
+
t.open.pendingText = null;
|
|
123
|
+
t.waiting = false;
|
|
124
|
+
t.chrome.talkWaiting(false);
|
|
125
|
+
}
|
|
99
126
|
if (!t.waiting) {
|
|
100
127
|
void reattach(t, t.open);
|
|
101
128
|
}
|
|
@@ -110,6 +137,16 @@ export function makeTalk(chrome) {
|
|
|
110
137
|
|
|
111
138
|
// Whatever was being said belongs to the session it was said in.
|
|
112
139
|
function reset(t) {
|
|
140
|
+
// So do reads: another player id on the same net registers itself afresh.
|
|
141
|
+
if (t.net) {
|
|
142
|
+
t.inspected.delete(t.net);
|
|
143
|
+
t.approached.delete(t.net);
|
|
144
|
+
}
|
|
145
|
+
t.session = {};
|
|
146
|
+
clearTimeout(t.readWait);
|
|
147
|
+
t.readWait = null;
|
|
148
|
+
t.readFailures = 0;
|
|
149
|
+
t.logged.clear();
|
|
113
150
|
clearAuthored(t.open);
|
|
114
151
|
if (t.open?.attachment) {
|
|
115
152
|
t.abandonedOpens.add(t.open.npc);
|
|
@@ -169,6 +206,12 @@ function frame(t, scene, mp, idle) {
|
|
|
169
206
|
continue;
|
|
170
207
|
}
|
|
171
208
|
open.prefix = null;
|
|
209
|
+
open.ageOff = msg.ageOff === true;
|
|
210
|
+
if (msg.choices !== undefined || open.choices !== undefined) {
|
|
211
|
+
open.choices = msg.choices === undefined ? undefined : choicesOf(msg.choices);
|
|
212
|
+
open.authoredChoices = msg.authoredChoices === true;
|
|
213
|
+
t.chrome.talkTyping(open.canType && open.choices === undefined);
|
|
214
|
+
}
|
|
172
215
|
open.questions = [...questionsOf(msg.opening?.asks), ...questionsOf(msg.opening?.more)];
|
|
173
216
|
delete open.persistentAsks;
|
|
174
217
|
delete open.withdrawnAsks;
|
|
@@ -195,19 +238,22 @@ function frame(t, scene, mp, idle) {
|
|
|
195
238
|
t.open = {
|
|
196
239
|
npc: msg.npc, name: msg.name, mind: Boolean(msg.mind), character: msg.character ?? null, prefix: null,
|
|
197
240
|
canType: !msg.mind || t.inspected.has(net),
|
|
241
|
+
ageOff: msg.ageOff === true,
|
|
242
|
+
...(Array.isArray(msg.choices) ? { choices: choicesOf(msg.choices), authoredChoices: msg.authoredChoices === true } : {}),
|
|
198
243
|
questions: [...questionsOf(msg.opening?.asks), ...questionsOf(msg.opening?.more)],
|
|
199
244
|
sent: new Set(),
|
|
200
245
|
};
|
|
201
|
-
t.chrome.openTalk(msg.name, { mind: t.open.mind, canType: t.open.canType });
|
|
246
|
+
t.chrome.openTalk(msg.name, { mind: t.open.mind, canType: t.open.canType && t.open.choices === undefined });
|
|
202
247
|
if (t.drafts.has(msg.npc)) {
|
|
203
248
|
t.chrome.talkDraft?.(t.drafts.get(msg.npc));
|
|
204
249
|
t.drafts.delete(msg.npc);
|
|
205
250
|
}
|
|
206
251
|
// v1.37: the NPC speaks first -- the place's own words, here at once,
|
|
207
252
|
// and what a player might ask it, each a tap away.
|
|
208
|
-
const first =
|
|
253
|
+
const first = childChoices(t.open) ? `Tap a question to talk with ${String(msg.name ?? '').split(',')[0].trim()}.`
|
|
254
|
+
: typeof msg.opening?.text === 'string' ? msg.opening.text : '';
|
|
209
255
|
if (first) {
|
|
210
|
-
t.chrome.talkLine('them', first);
|
|
256
|
+
t.chrome.talkLine('them', npcDisplayText(first));
|
|
211
257
|
}
|
|
212
258
|
refill(t);
|
|
213
259
|
if (t.open.mind) {
|
|
@@ -236,11 +282,13 @@ function frame(t, scene, mp, idle) {
|
|
|
236
282
|
t.asking = null;
|
|
237
283
|
}
|
|
238
284
|
} else if (msg.k === 'hub-npc-opening' && t.open?.npc === msg.npc) {
|
|
285
|
+
if (childChoices(t.open)) {continue;}
|
|
239
286
|
// v1.47: a late greeting changes the first line only before we speak.
|
|
240
287
|
if (!t.open.sent.size && typeof msg.text === 'string' && msg.text) {
|
|
241
|
-
t.chrome.talkOpening?.(msg.text);
|
|
288
|
+
t.chrome.talkOpening?.(npcDisplayText(msg.text));
|
|
242
289
|
}
|
|
243
290
|
} else if (msg.k === 'hub-npc-line' && t.open?.npc === msg.npc) {
|
|
291
|
+
if (childChoices(t.open)) {continue;}
|
|
244
292
|
if (t.open.interrupted) {
|
|
245
293
|
if (SCRIPTED[msg.why]) {
|
|
246
294
|
t.open.interruptionLine = msg.text;
|
|
@@ -249,7 +297,7 @@ function frame(t, scene, mp, idle) {
|
|
|
249
297
|
}
|
|
250
298
|
// With a mind, a line the place said instead is marked as scripted.
|
|
251
299
|
const scripted = t.open.mind ? SCRIPTED[msg.why] : null;
|
|
252
|
-
t.chrome.talkLine('them', msg.text, scripted ? `Scripted reply: ${t.open.name} ${scripted}` : null);
|
|
300
|
+
t.chrome.talkLine('them', npcDisplayText(msg.text), scripted ? `Scripted reply: ${t.open.name} ${scripted}` : null);
|
|
253
301
|
if (scripted && msg.op && msg.op === t.open.recoveryOperationId) {
|
|
254
302
|
// The line itself proves a recovery turn was refused. Cleanup must
|
|
255
303
|
// not depend on whether the request's rejection has arrived yet.
|
|
@@ -258,7 +306,7 @@ function frame(t, scene, mp, idle) {
|
|
|
258
306
|
interrupted(t, t.open);
|
|
259
307
|
continue;
|
|
260
308
|
}
|
|
261
|
-
if (!t.open.mind && t.open.authored && msg.why === 'authored' && (msg.rid === undefined || msg.rid === t.open.authored.rid)) {
|
|
309
|
+
if ((!t.open.mind || authoredTaps(t.open)) && t.open.authored && msg.why === 'authored' && (msg.rid === undefined || msg.rid === t.open.authored.rid)) {
|
|
262
310
|
finishAuthored(t, t.open, true);
|
|
263
311
|
} else if (t.open.mind && msg.op && msg.op === t.open.operationId) {
|
|
264
312
|
t.open.operationId = null;
|
|
@@ -269,6 +317,7 @@ function frame(t, scene, mp, idle) {
|
|
|
269
317
|
refill(t);
|
|
270
318
|
}
|
|
271
319
|
} else if (msg.k === 'hub-npc-notes' && t.open?.npc === msg.npc) {
|
|
320
|
+
if (childChoices(t.open)) {continue;}
|
|
272
321
|
t.open.prefix = typeof msg.prefix === 'string' ? msg.prefix : null;
|
|
273
322
|
t.open.notesVersion = (t.open.notesVersion ?? 0) + 1;
|
|
274
323
|
if (msg.persistentAsks !== undefined || t.open.persistentAsks !== undefined) {
|
|
@@ -305,8 +354,9 @@ function frame(t, scene, mp, idle) {
|
|
|
305
354
|
}
|
|
306
355
|
}
|
|
307
356
|
t.chrome.talkWaiting(t.waiting);
|
|
357
|
+
syncHint(t);
|
|
308
358
|
|
|
309
|
-
const near = idle && net && !t.open ? nearestNpc(scene, t.preferred) : null;
|
|
359
|
+
const near = idle && net && !t.open ? nearestNpc(scene, t.preferred, t.open?.npc) : null;
|
|
310
360
|
t.near = near;
|
|
311
361
|
t.chrome.talkPrompt(near ? near.name : null, near?.mind ?? false);
|
|
312
362
|
if (net && (near?.mind || companionNpc(scene)) && !t.approached.has(net)) {
|
|
@@ -316,7 +366,9 @@ function frame(t, scene, mp, idle) {
|
|
|
316
366
|
const character = near && !t.asking ? t.hooks.get(near.id) : null;
|
|
317
367
|
if (character) {
|
|
318
368
|
dropHook(t, near.id, character);
|
|
319
|
-
|
|
369
|
+
if (!t.readWait) {
|
|
370
|
+
void walkGreeting(t, net, character);
|
|
371
|
+
}
|
|
320
372
|
}
|
|
321
373
|
}
|
|
322
374
|
|
|
@@ -332,21 +384,64 @@ function dropHook(t, npc, character = t.hooks.get(npc)) {
|
|
|
332
384
|
}
|
|
333
385
|
}
|
|
334
386
|
|
|
335
|
-
async function walkGreeting(net, character) {
|
|
387
|
+
async function walkGreeting(t, net, character) {
|
|
388
|
+
const session = t.session;
|
|
336
389
|
try {
|
|
337
390
|
await net.characters.readCharacters({ requestId: newId(), query: { type: 'status', operationId: `greeting:${character}` } });
|
|
338
|
-
} catch {
|
|
391
|
+
} catch (err) {
|
|
339
392
|
// One attempt per hook; error details might contain private words.
|
|
340
|
-
|
|
393
|
+
readFailed(t, session, 'greeting read', err, false);
|
|
341
394
|
}
|
|
342
395
|
}
|
|
343
396
|
|
|
397
|
+
// A failed read backs this session's next inspect and greeting off, and is
|
|
398
|
+
// logged once per kind and code.
|
|
399
|
+
function readFailed(t, session, what, err, detail = true) {
|
|
400
|
+
if (t.session !== session) {
|
|
401
|
+
return;
|
|
402
|
+
}
|
|
403
|
+
const code = typeof err?.code === 'string' ? err.code : 'error';
|
|
404
|
+
if (!t.logged.has(`${what}:${code}`)) {
|
|
405
|
+
t.logged.add(`${what}:${code}`);
|
|
406
|
+
console.log(detail ? `[hub] NPC ${what} failed: ${code}` : `[hub] NPC ${what} failed`);
|
|
407
|
+
}
|
|
408
|
+
t.readFailures++;
|
|
409
|
+
clearTimeout(t.readWait);
|
|
410
|
+
t.readWait = setTimeout(() => {
|
|
411
|
+
if (t.session === session) {
|
|
412
|
+
t.readWait = null;
|
|
413
|
+
}
|
|
414
|
+
}, Math.min(READ_RETRY_MS * 2 ** (t.readFailures - 1), READ_RETRY_MAX_MS));
|
|
415
|
+
}
|
|
416
|
+
|
|
344
417
|
// v1.46: the next questions, without anything this player already sent.
|
|
345
418
|
function questionsOf(value) {
|
|
346
419
|
return Array.isArray(value) ? value.filter((ask) => typeof ask === 'string').map((ask) => ask.trim().slice(0, INPUT_MAX)).filter(Boolean) : [];
|
|
347
420
|
}
|
|
348
421
|
|
|
422
|
+
// v1.142: object choices are authored bundle chips, never model suggestions.
|
|
423
|
+
function choicesOf(value) {
|
|
424
|
+
if (Array.isArray(value) && value.length && value.every((ask) => typeof ask?.id === 'string' && ask.id && typeof ask.label === 'string' && ask.label)) {
|
|
425
|
+
return value.slice(0, 4).map(({ id, label }) => ({ id, label }));
|
|
426
|
+
}
|
|
427
|
+
return questionsOf(value).slice(0, 5);
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
function childChoices(open) {
|
|
431
|
+
return typeof open?.choices?.[0]?.id === 'string';
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
// v1.148: a mind's place asks for a speaker under 13, answered by the place.
|
|
435
|
+
function authoredTaps(open) {
|
|
436
|
+
return open?.authoredChoices === true && Array.isArray(open.choices) && !childChoices(open);
|
|
437
|
+
}
|
|
438
|
+
|
|
349
439
|
function refill(t, suggestions) {
|
|
440
|
+
if (childChoices(t.open)) {
|
|
441
|
+
t.suggestions = undefined;
|
|
442
|
+
t.chrome.talkAsks?.(t.open.canType ? t.open.choices : [], (ask) => send(t, ask));
|
|
443
|
+
return;
|
|
444
|
+
}
|
|
350
445
|
// Notes may change the offers between replies; keep that reply's source.
|
|
351
446
|
t.suggestions = suggestions;
|
|
352
447
|
const open = t.open;
|
|
@@ -356,22 +451,26 @@ function refill(t, suggestions) {
|
|
|
356
451
|
const persistent = open.persistentAsks;
|
|
357
452
|
asks = [...new Set([...persistent, ...source])].filter((ask) => persistent.includes(ask) || (!open.withdrawnAsks.has(ask) && !open.sent.has(ask))).slice(0, 3);
|
|
358
453
|
}
|
|
454
|
+
if (open?.choices !== undefined) {
|
|
455
|
+
asks = open.canType || authoredTaps(open) ? open.choices : [];
|
|
456
|
+
}
|
|
359
457
|
t.chrome.talkAsks?.(asks, (ask) => send(t, ask));
|
|
360
458
|
}
|
|
361
459
|
|
|
362
|
-
function nearestNpc(scene, preferred) {
|
|
460
|
+
function nearestNpc(scene, preferred, talking) {
|
|
363
461
|
const local = scene.actorWith('Player')?.components.Transform;
|
|
364
462
|
if (!local) {
|
|
365
463
|
return null;
|
|
366
464
|
}
|
|
367
465
|
let best = null;
|
|
368
466
|
let choice = null;
|
|
369
|
-
for (const actor of scene
|
|
467
|
+
for (const actor of talkActors(scene)) {
|
|
370
468
|
const props = actor.components?.HubNpc;
|
|
371
469
|
const at = actor.components?.Transform;
|
|
372
470
|
if (!props || !at) {
|
|
373
471
|
continue;
|
|
374
472
|
}
|
|
473
|
+
if (!mindDue(scene, actor, local, talking, performance.now())) {continue;}
|
|
375
474
|
const d = Math.hypot(at.x - local.x, at.z - local.z);
|
|
376
475
|
const range = typeof props.talkRange === 'number' ? props.talkRange : TALK_RANGE_M;
|
|
377
476
|
if (d <= range && (!best || d < best.d || actor.id === preferred)) {
|
|
@@ -525,6 +624,10 @@ function finishAuthored(t, open, replied) {
|
|
|
525
624
|
if (replied) {
|
|
526
625
|
open.sent.add(open.authored.text);
|
|
527
626
|
open.pendingText = null;
|
|
627
|
+
// v1.148: the place took its choice; the next open brings the next ones.
|
|
628
|
+
if (authoredTaps(open)) {
|
|
629
|
+
open.choices = [];
|
|
630
|
+
}
|
|
528
631
|
}
|
|
529
632
|
clearAuthored(open);
|
|
530
633
|
t.waiting = false;
|
|
@@ -532,62 +635,98 @@ function finishAuthored(t, open, replied) {
|
|
|
532
635
|
refill(t);
|
|
533
636
|
}
|
|
534
637
|
|
|
638
|
+
// A mind whose inspect was refused leaves no field: to a speaker the server
|
|
639
|
+
// says is under 13 (`ageOff`), the panel says why, under the opening, in the
|
|
640
|
+
// placeholder's short name, except where the place gives them choices (the
|
|
641
|
+
// refusal is not the age rule there). A guest is over 13 like anyone else and
|
|
642
|
+
// gets no line of their own. Not while the first inspect is still out, never
|
|
643
|
+
// for anyone else or a body without a mind, and gone once an inspect succeeds.
|
|
644
|
+
function syncHint(t) {
|
|
645
|
+
const open = t.open;
|
|
646
|
+
const show = Boolean(open?.mind && !open.canType && t.session.refused && open.ageOff === true && open.choices === undefined);
|
|
647
|
+
t.chrome.talkHint?.(show ? under13Talk(String(open.name ?? '').split(',')[0].trim()) : null);
|
|
648
|
+
}
|
|
649
|
+
|
|
535
650
|
// The world learns which player here is which participant from that player's
|
|
536
651
|
// own read; the place needs it to tell who a character chose to follow.
|
|
537
652
|
async function registerParticipant(t, net) {
|
|
538
653
|
const characters = net?.characters;
|
|
539
|
-
|
|
654
|
+
const session = t.session;
|
|
655
|
+
if (!characters || t.inspected.has(net) || session.inspecting || t.readWait) {
|
|
540
656
|
return;
|
|
541
657
|
}
|
|
542
|
-
|
|
658
|
+
session.inspecting = true;
|
|
543
659
|
try {
|
|
544
660
|
await characters.readCharacters({ requestId: newId(), query: { type: 'inspect' } });
|
|
661
|
+
if (t.session !== session) {
|
|
662
|
+
return;
|
|
663
|
+
}
|
|
545
664
|
t.inspected.add(net);
|
|
665
|
+
session.refused = false;
|
|
666
|
+
t.readFailures = 0;
|
|
667
|
+
clearTimeout(t.readWait);
|
|
668
|
+
t.readWait = null;
|
|
546
669
|
if (t.net === net && t.open?.mind) {
|
|
547
670
|
t.open.canType = true;
|
|
548
|
-
t.chrome.talkTyping(
|
|
671
|
+
t.chrome.talkTyping(t.open.choices === undefined);
|
|
549
672
|
refill(t);
|
|
550
673
|
}
|
|
674
|
+
syncHint(t);
|
|
551
675
|
} catch (err) {
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
t.inspectRefusals.add(code);
|
|
555
|
-
console.log(`[hub] NPC inspect failed: ${code}`);
|
|
676
|
+
if (t.session === session) {
|
|
677
|
+
session.refused = true;
|
|
556
678
|
}
|
|
679
|
+
readFailed(t, session, 'inspect', err);
|
|
680
|
+
syncHint(t);
|
|
557
681
|
} finally {
|
|
558
|
-
|
|
682
|
+
session.inspecting = false;
|
|
559
683
|
}
|
|
560
684
|
}
|
|
561
685
|
|
|
562
686
|
function send(t, raw) {
|
|
563
|
-
const text = String(raw ?? '').trim().slice(0, INPUT_MAX);
|
|
564
687
|
const open = t.open;
|
|
565
|
-
|
|
688
|
+
const choice = childChoices(open) ? open.choices.find((ask) => ask.id === raw?.id) : null;
|
|
689
|
+
const text = choice ? `choice:${choice.id}` : String(raw ?? '').trim().slice(0, INPUT_MAX);
|
|
690
|
+
if (!text || !(open?.canType || authoredTaps(open)) || open.interrupted || t.waiting || !t.net) {
|
|
691
|
+
return;
|
|
692
|
+
}
|
|
693
|
+
if (open.choices !== undefined && (childChoices(open) ? !choice : !open.choices.includes(text))) {
|
|
566
694
|
return;
|
|
567
695
|
}
|
|
568
|
-
if (!open.mind && performance.now() - t.saidAt < AUTHORED_GAP_MS) {
|
|
696
|
+
if ((!open.mind || authoredTaps(open)) && performance.now() - t.saidAt < AUTHORED_GAP_MS) {
|
|
569
697
|
return;
|
|
570
698
|
}
|
|
571
699
|
t.chrome.talkAsks?.([], null);
|
|
572
|
-
t.chrome.talkLine('me', text);
|
|
700
|
+
t.chrome.talkLine('me', choice?.label ?? text);
|
|
573
701
|
t.waiting = true;
|
|
574
702
|
open.pendingText = text;
|
|
575
703
|
t.chrome.talkWaiting(true);
|
|
704
|
+
// A tap keeps the path it was made on, across a reattach's new open.
|
|
705
|
+
const authored = authoredTaps(open);
|
|
576
706
|
if (open.needsAttach || open.attachment) {
|
|
577
707
|
void reattach(t, open).then((attached) => {
|
|
578
708
|
if (attached && t.open === open) {
|
|
579
|
-
dispatch(t, open, text, true);
|
|
709
|
+
dispatch(t, open, text, true, authored);
|
|
580
710
|
}
|
|
581
711
|
});
|
|
582
712
|
return;
|
|
583
713
|
}
|
|
584
|
-
dispatch(t, open, text);
|
|
714
|
+
dispatch(t, open, text, false, authored);
|
|
585
715
|
}
|
|
586
716
|
|
|
587
|
-
function dispatch(t, open, text, reattached = false) {
|
|
717
|
+
function dispatch(t, open, text, reattached = false, authored = authoredTaps(open)) {
|
|
588
718
|
reattached ||= open.reattached === true;
|
|
589
719
|
open.reattached = false;
|
|
590
|
-
|
|
720
|
+
// v1.148: an authored tap is never a mind turn; one the new open no longer
|
|
721
|
+
// offers is dropped.
|
|
722
|
+
if (authored && !(authoredTaps(open) && open.choices.includes(text))) {
|
|
723
|
+
open.pendingText = null;
|
|
724
|
+
t.waiting = false;
|
|
725
|
+
t.chrome.talkWaiting(false);
|
|
726
|
+
refill(t);
|
|
727
|
+
return;
|
|
728
|
+
}
|
|
729
|
+
if (!open.mind || authored) {
|
|
591
730
|
t.saidAt = performance.now();
|
|
592
731
|
// A reply to an earlier send must not acknowledge this question.
|
|
593
732
|
const rid = newId();
|
|
@@ -600,6 +739,7 @@ function dispatch(t, open, text, reattached = false) {
|
|
|
600
739
|
}
|
|
601
740
|
|
|
602
741
|
async function turn(t, open, text, attachRetried = false) {
|
|
742
|
+
const session = t.session;
|
|
603
743
|
const net = t.net;
|
|
604
744
|
const characters = net?.characters;
|
|
605
745
|
let operationId = null;
|
|
@@ -616,7 +756,7 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
616
756
|
requestId: newId(),
|
|
617
757
|
operationId,
|
|
618
758
|
characterId: open.character,
|
|
619
|
-
input: `${open.prefix ?? ''}${text}`,
|
|
759
|
+
input: childChoices(open) ? text : `${open.prefix ?? ''}${text}`,
|
|
620
760
|
// Nobody else hears a player's conversation with a character.
|
|
621
761
|
audience: { disclosure: 'participants', playerIds: [], characterIds: [] },
|
|
622
762
|
});
|
|
@@ -643,7 +783,7 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
643
783
|
}
|
|
644
784
|
// The notes changed under the words (a pad filled): once more, with
|
|
645
785
|
// the newest the server sent.
|
|
646
|
-
if (err?.code !== 'HUB_NPC_NOTES' || !active() || notesRetried || requests >= 2) {
|
|
786
|
+
if (childChoices(open) || err?.code !== 'HUB_NPC_NOTES' || !active() || notesRetried || requests >= 2) {
|
|
647
787
|
throw err;
|
|
648
788
|
}
|
|
649
789
|
notesRetried = true;
|
|
@@ -662,11 +802,21 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
662
802
|
} catch (err) {
|
|
663
803
|
// A refusal (busy, over budget, too far) comes with the place's own line,
|
|
664
804
|
// which ends the wait; this only covers a refusal that brought none.
|
|
665
|
-
|
|
805
|
+
const code = typeof err?.code === 'string' ? err.code : 'error';
|
|
806
|
+
if (t.session === session && !t.logged.has(`turn:${code}`)) {
|
|
807
|
+
t.logged.add(`turn:${code}`);
|
|
808
|
+
console.log(`[hub] NPC turn refused: ${code}`);
|
|
809
|
+
}
|
|
810
|
+
if (!active()) {return;}
|
|
811
|
+
if (childChoices(open) && attachRetried) {
|
|
812
|
+
// Children never receive the separate scripted refusal packet.
|
|
813
|
+
t.chrome.talkLine('them', INTERRUPTED_LINE);
|
|
814
|
+
open.needsAttach = err?.code === 'HUB_NPC_NOT_TALKING';
|
|
815
|
+
}
|
|
666
816
|
// The server holds no conversation for this panel (it ended there, or the
|
|
667
817
|
// session never had one) and sends no line with that: a panel left open
|
|
668
818
|
// would take more words and answer none. Closed, the talk button is back.
|
|
669
|
-
if (
|
|
819
|
+
if (!childChoices(open) && (err?.code === 'HUB_NPC_NOT_TALKING' || attachRetried)) {
|
|
670
820
|
const why = REFUSAL_WHY[err?.code];
|
|
671
821
|
if (why) {
|
|
672
822
|
// A rejection may precede its separate scripted-line packet. Keep
|
|
@@ -687,11 +837,18 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
687
837
|
if (active()) {
|
|
688
838
|
open.operationId = null;
|
|
689
839
|
t.waiting = false;
|
|
840
|
+
if (childChoices(open)) {
|
|
841
|
+
open.recoveryOperationId = null;
|
|
842
|
+
open.pendingText = null;
|
|
843
|
+
t.chrome.talkWaiting(false);
|
|
844
|
+
refill(t);
|
|
845
|
+
}
|
|
690
846
|
}
|
|
691
847
|
}, 1500);
|
|
692
848
|
return;
|
|
693
849
|
}
|
|
694
850
|
const started = performance.now();
|
|
851
|
+
let failures = 0;
|
|
695
852
|
while (active() && performance.now() - started < POLL_LIMIT_MS) {
|
|
696
853
|
await new Promise((resolve) => setTimeout(resolve, POLL_MS));
|
|
697
854
|
if (!active()) {
|
|
@@ -701,7 +858,10 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
701
858
|
try {
|
|
702
859
|
status = await characters.readCharacters({ requestId: newId(), query: { type: 'status', operationId } });
|
|
703
860
|
} catch (err) {
|
|
704
|
-
|
|
861
|
+
readFailed(t, session, 'status read', err);
|
|
862
|
+
if (++failures >= STATUS_FAILURES_MAX) {
|
|
863
|
+
break;
|
|
864
|
+
}
|
|
705
865
|
continue;
|
|
706
866
|
}
|
|
707
867
|
if (!active()) {
|
|
@@ -710,15 +870,19 @@ async function turn(t, open, text, attachRetried = false) {
|
|
|
710
870
|
if (status?.status === 'completed' || status?.status === 'interrupted') {
|
|
711
871
|
const reply = typeof status.response === 'string' ? status.response : status.response?.text;
|
|
712
872
|
if (typeof reply === 'string' && reply) {
|
|
713
|
-
t.chrome.talkLine('them',
|
|
873
|
+
t.chrome.talkLine('them', npcDisplayText(reply));
|
|
714
874
|
}
|
|
715
875
|
const suggestions = Array.isArray(status.suggestions) && status.suggestions.every((ask) => typeof ask === 'string') ? status.suggestions : status.response?.suggestions;
|
|
716
|
-
refill(t, suggestions);
|
|
876
|
+
if (!childChoices(open)) {refill(t, suggestions);}
|
|
717
877
|
break;
|
|
718
878
|
}
|
|
719
879
|
}
|
|
720
880
|
if (active()) {
|
|
721
881
|
open.operationId = null;
|
|
722
882
|
t.waiting = false;
|
|
883
|
+
if (childChoices(open)) {
|
|
884
|
+
t.chrome.talkWaiting(false);
|
|
885
|
+
refill(t);
|
|
886
|
+
}
|
|
723
887
|
}
|
|
724
888
|
}
|