@rpgjs/client 5.0.0-beta.7 → 5.0.0-beta.9
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/CHANGELOG.md +27 -0
- package/dist/Game/AnimationManager.js.map +1 -1
- package/dist/Game/Event.js.map +1 -1
- package/dist/Game/Map.d.ts +9 -1
- package/dist/Game/Map.js +63 -5
- package/dist/Game/Map.js.map +1 -1
- package/dist/Game/Object.d.ts +17 -9
- package/dist/Game/Object.js +1 -12
- package/dist/Game/Object.js.map +1 -1
- package/dist/Game/Player.js.map +1 -1
- package/dist/Gui/Gui.d.ts +17 -4
- package/dist/Gui/Gui.js +64 -34
- package/dist/Gui/Gui.js.map +1 -1
- package/dist/Gui/Gui.spec.d.ts +1 -0
- package/dist/Gui/NotificationManager.js.map +1 -1
- package/dist/Resource.js +1 -1
- package/dist/Resource.js.map +1 -1
- package/dist/RpgClient.d.ts +35 -2
- package/dist/RpgClientEngine.d.ts +41 -5
- package/dist/RpgClientEngine.js +50 -5
- package/dist/RpgClientEngine.js.map +1 -1
- package/dist/Sound.js.map +1 -1
- package/dist/_virtual/{_@oxc-project_runtime@0.128.0 → _@oxc-project_runtime@0.130.0}/helpers/decorate.js +1 -1
- package/dist/_virtual/{_@oxc-project_runtime@0.128.0 → _@oxc-project_runtime@0.130.0}/helpers/decorateMetadata.js +1 -1
- package/dist/components/animations/animation.ce.js.map +1 -1
- package/dist/components/animations/hit.ce.js.map +1 -1
- package/dist/components/animations/index.js.map +1 -1
- package/dist/components/character.ce.js +259 -5
- package/dist/components/character.ce.js.map +1 -1
- package/dist/components/dynamics/bar.ce.js +96 -0
- package/dist/components/dynamics/bar.ce.js.map +1 -0
- package/dist/components/dynamics/image.ce.js +23 -0
- package/dist/components/dynamics/image.ce.js.map +1 -0
- package/dist/components/dynamics/parse-value.d.ts +3 -0
- package/dist/components/dynamics/parse-value.js +51 -35
- package/dist/components/dynamics/parse-value.js.map +1 -1
- package/dist/components/dynamics/parse-value.spec.d.ts +1 -0
- package/dist/components/dynamics/shape-utils.d.ts +16 -0
- package/dist/components/dynamics/shape-utils.js +73 -0
- package/dist/components/dynamics/shape-utils.js.map +1 -0
- package/dist/components/dynamics/shape-utils.spec.d.ts +1 -0
- package/dist/components/dynamics/shape.ce.js +83 -0
- package/dist/components/dynamics/shape.ce.js.map +1 -0
- package/dist/components/dynamics/text.ce.js +28 -41
- package/dist/components/dynamics/text.ce.js.map +1 -1
- package/dist/components/gui/box.ce.js.map +1 -1
- package/dist/components/gui/dialogbox/index.ce.js +3 -3
- package/dist/components/gui/dialogbox/index.ce.js.map +1 -1
- package/dist/components/gui/gameover.ce.js +1 -1
- package/dist/components/gui/gameover.ce.js.map +1 -1
- package/dist/components/gui/hud/hud.ce.js +1 -1
- package/dist/components/gui/hud/hud.ce.js.map +1 -1
- package/dist/components/gui/menu/equip-menu.ce.js.map +1 -1
- package/dist/components/gui/menu/exit-menu.ce.js.map +1 -1
- package/dist/components/gui/menu/items-menu.ce.js.map +1 -1
- package/dist/components/gui/menu/main-menu.ce.js.map +1 -1
- package/dist/components/gui/menu/options-menu.ce.js.map +1 -1
- package/dist/components/gui/menu/skills-menu.ce.js.map +1 -1
- package/dist/components/gui/mobile/index.js.map +1 -1
- package/dist/components/gui/mobile/mobile.ce.js.map +1 -1
- package/dist/components/gui/notification/notification.ce.js.map +1 -1
- package/dist/components/gui/save-load.ce.js.map +1 -1
- package/dist/components/gui/shop/shop.ce.js +1 -1
- package/dist/components/gui/shop/shop.ce.js.map +1 -1
- package/dist/components/gui/title-screen.ce.js +2 -2
- package/dist/components/gui/title-screen.ce.js.map +1 -1
- package/dist/components/player-components-utils.d.ts +67 -0
- package/dist/components/player-components-utils.js +162 -0
- package/dist/components/player-components-utils.js.map +1 -0
- package/dist/components/player-components-utils.spec.d.ts +1 -0
- package/dist/components/player-components.ce.js +188 -0
- package/dist/components/player-components.ce.js.map +1 -0
- package/dist/components/prebuilt/hp-bar.ce.js.map +1 -1
- package/dist/components/prebuilt/light-halo.ce.js.map +1 -1
- package/dist/components/scenes/canvas.ce.js +147 -4
- package/dist/components/scenes/canvas.ce.js.map +1 -1
- package/dist/components/scenes/draw-map.ce.js +2 -8
- package/dist/components/scenes/draw-map.ce.js.map +1 -1
- package/dist/components/scenes/event-layer.ce.js.map +1 -1
- package/dist/core/inject.js +1 -1
- package/dist/core/inject.js.map +1 -1
- package/dist/core/setup.js +1 -1
- package/dist/core/setup.js.map +1 -1
- package/dist/decorators/spritesheet.d.ts +1 -0
- package/dist/decorators/spritesheet.js +11 -0
- package/dist/decorators/spritesheet.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -2
- package/dist/module.js +4 -1
- package/dist/module.js.map +1 -1
- package/dist/node_modules/.pnpm/{@signe_di@2.10.0 → @signe_di@3.0.1}/node_modules/@signe/di/dist/index.js +1 -1
- package/dist/node_modules/.pnpm/@signe_di@3.0.1/node_modules/@signe/di/dist/index.js.map +1 -0
- package/dist/node_modules/.pnpm/{@signe_reactive@2.9.2 → @signe_reactive@3.0.1}/node_modules/@signe/reactive/dist/index.js +15 -3
- package/dist/node_modules/.pnpm/@signe_reactive@3.0.1/node_modules/@signe/reactive/dist/index.js.map +1 -0
- package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js +13 -0
- package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js.map +1 -0
- package/dist/node_modules/.pnpm/{@signe_room@2.10.0 → @signe_room@3.0.1}/node_modules/@signe/room/dist/index.js +124 -39
- package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/index.js.map +1 -0
- package/dist/node_modules/.pnpm/{@signe_sync@2.10.0 → @signe_sync@3.0.1}/node_modules/@signe/sync/dist/client/index.js +1 -1
- package/dist/node_modules/.pnpm/@signe_sync@3.0.1/node_modules/@signe/sync/dist/client/index.js.map +1 -0
- package/dist/node_modules/.pnpm/{@signe_sync@2.10.0 → @signe_sync@3.0.1}/node_modules/@signe/sync/dist/index.js +36 -13
- package/dist/node_modules/.pnpm/@signe_sync@3.0.1/node_modules/@signe/sync/dist/index.js.map +1 -0
- package/dist/node_modules/.pnpm/partysocket@1.1.3/node_modules/partysocket/dist/chunk-HAC622V3.js.map +1 -1
- package/dist/node_modules/.pnpm/partysocket@1.1.3/node_modules/partysocket/dist/chunk-S74YV6PU.js.map +1 -1
- package/dist/node_modules/.pnpm/zod@3.24.2/node_modules/zod/lib/index.js.map +1 -1
- package/dist/presets/animation.js.map +1 -1
- package/dist/presets/faceset.js.map +1 -1
- package/dist/presets/icon.js.map +1 -1
- package/dist/presets/index.js.map +1 -1
- package/dist/presets/lpc.js.map +1 -1
- package/dist/presets/rmspritesheet.js.map +1 -1
- package/dist/services/AbstractSocket.js.map +1 -1
- package/dist/services/keyboardControls.js.map +1 -1
- package/dist/services/loadMap.d.ts +6 -0
- package/dist/services/loadMap.js +1 -1
- package/dist/services/loadMap.js.map +1 -1
- package/dist/services/mmorpg.js +7 -3
- package/dist/services/mmorpg.js.map +1 -1
- package/dist/services/save.js.map +1 -1
- package/dist/services/standalone.js +1 -1
- package/dist/services/standalone.js.map +1 -1
- package/dist/utils/getEntityProp.js.map +1 -1
- package/package.json +10 -10
- package/src/Game/Map.ts +91 -2
- package/src/Game/Object.ts +22 -35
- package/src/Gui/Gui.spec.ts +273 -0
- package/src/Gui/Gui.ts +105 -50
- package/src/Resource.ts +1 -2
- package/src/RpgClient.ts +36 -2
- package/src/RpgClientEngine.ts +74 -11
- package/src/components/character.ce +318 -9
- package/src/components/dynamics/bar.ce +87 -0
- package/src/components/dynamics/image.ce +20 -0
- package/src/components/dynamics/parse-value.spec.ts +41 -0
- package/src/components/dynamics/parse-value.ts +102 -37
- package/src/components/dynamics/shape-utils.spec.ts +46 -0
- package/src/components/dynamics/shape-utils.ts +61 -0
- package/src/components/dynamics/shape.ce +89 -0
- package/src/components/dynamics/text.ce +34 -149
- package/src/components/player-components-utils.spec.ts +109 -0
- package/src/components/player-components-utils.ts +205 -0
- package/src/components/player-components.ce +221 -0
- package/src/components/scenes/canvas.ce +165 -6
- package/src/components/scenes/draw-map.ce +2 -15
- package/src/components/scenes/event-layer.ce +1 -2
- package/src/core/setup.ts +2 -2
- package/src/decorators/spritesheet.ts +8 -0
- package/src/index.ts +1 -0
- package/src/module.ts +5 -1
- package/src/services/loadMap.ts +2 -0
- package/src/services/mmorpg.ts +8 -2
- package/dist/node_modules/.pnpm/@signe_di@2.10.0/node_modules/@signe/di/dist/index.js.map +0 -1
- package/dist/node_modules/.pnpm/@signe_reactive@2.10.0/node_modules/@signe/reactive/dist/index.js +0 -45
- package/dist/node_modules/.pnpm/@signe_reactive@2.10.0/node_modules/@signe/reactive/dist/index.js.map +0 -1
- package/dist/node_modules/.pnpm/@signe_reactive@2.9.2/node_modules/@signe/reactive/dist/index.js.map +0 -1
- package/dist/node_modules/.pnpm/@signe_room@2.10.0/node_modules/@signe/room/dist/index.js.map +0 -1
- package/dist/node_modules/.pnpm/@signe_sync@2.10.0/node_modules/@signe/sync/dist/client/index.js.map +0 -1
- package/dist/node_modules/.pnpm/@signe_sync@2.10.0/node_modules/@signe/sync/dist/index.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export * from './components';
|
|
|
16
16
|
export * from './components/gui';
|
|
17
17
|
export * from './Sound';
|
|
18
18
|
export * from './Resource';
|
|
19
|
+
export * from './decorators/spritesheet';
|
|
19
20
|
export * from './utils/getEntityProp';
|
|
20
21
|
export { Context } from '@signe/di';
|
|
21
22
|
export { KeyboardControls, Input } from 'canvasengine';
|
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context } from "./node_modules/.pnpm/@signe_di@
|
|
1
|
+
import { Context } from "./node_modules/.pnpm/@signe_di@3.0.1/node_modules/@signe/di/dist/index.js";
|
|
2
2
|
import { clearInject, context, inject, setInject } from "./core/inject.js";
|
|
3
3
|
import { AbstractWebsocket, WebSocketToken } from "./services/AbstractSocket.js";
|
|
4
4
|
import __ce_component$2 from "./components/gui/dialogbox/index.ce.js";
|
|
@@ -39,6 +39,7 @@ import { Presets } from "./presets/index.js";
|
|
|
39
39
|
import __ce_component$1 from "./components/character.ce.js";
|
|
40
40
|
import __ce_component$4 from "./components/scenes/event-layer.ce.js";
|
|
41
41
|
import "./components/index.js";
|
|
42
|
+
import { Spritesheet } from "./decorators/spritesheet.js";
|
|
42
43
|
import { withMobile } from "./components/gui/mobile/index.js";
|
|
43
44
|
import { Input, KeyboardControls } from "canvasengine";
|
|
44
|
-
export { AbstractWebsocket, __ce_component as BoxComponent, __ce_component$1 as CharacterComponent, Context, Control, __ce_component$2 as DialogboxComponent, __ce_component$3 as EquipMenuComponent, __ce_component$4 as EventLayerComponent, __ce_component$5 as ExitMenuComponent, __ce_component$6 as GameoverComponent, GlobalConfigToken, __ce_component$7 as HpBar, __ce_component$8 as HudComponent, Input, __ce_component$9 as ItemsMenuComponent, KeyboardControls, __ce_component$10 as LightHalo, LoadMapService, LoadMapToken, __ce_component$11 as MainMenuComponent, __ce_component$12 as NotificationComponent, __ce_component$13 as OptionsMenuComponent, PrebuiltComponentAnimations, Presets, RpgClientEngine, RpgClientEvent, RpgClientObject, RpgClientPlayer, RpgGui, RpgResource, RpgSound, SaveClientService, SaveClientToken, __ce_component$14 as SaveLoadComponent, __ce_component$15 as ShopComponent, __ce_component$16 as SkillsMenuComponent, Sound, __ce_component$17 as TitleScreenComponent, WebSocketToken, clearInject, context, getEntityProp, getSoundMetadata, inject, provideClientGlobalConfig, provideClientModules, provideGlobalConfig, provideLoadMap, provideMmorpg, provideRpg, provideSaveClient, setInject, startGame, withMobile };
|
|
45
|
+
export { AbstractWebsocket, __ce_component as BoxComponent, __ce_component$1 as CharacterComponent, Context, Control, __ce_component$2 as DialogboxComponent, __ce_component$3 as EquipMenuComponent, __ce_component$4 as EventLayerComponent, __ce_component$5 as ExitMenuComponent, __ce_component$6 as GameoverComponent, GlobalConfigToken, __ce_component$7 as HpBar, __ce_component$8 as HudComponent, Input, __ce_component$9 as ItemsMenuComponent, KeyboardControls, __ce_component$10 as LightHalo, LoadMapService, LoadMapToken, __ce_component$11 as MainMenuComponent, __ce_component$12 as NotificationComponent, __ce_component$13 as OptionsMenuComponent, PrebuiltComponentAnimations, Presets, RpgClientEngine, RpgClientEvent, RpgClientObject, RpgClientPlayer, RpgGui, RpgResource, RpgSound, SaveClientService, SaveClientToken, __ce_component$14 as SaveLoadComponent, __ce_component$15 as ShopComponent, __ce_component$16 as SkillsMenuComponent, Sound, Spritesheet, __ce_component$17 as TitleScreenComponent, WebSocketToken, clearInject, context, getEntityProp, getSoundMetadata, inject, provideClientGlobalConfig, provideClientModules, provideGlobalConfig, provideLoadMap, provideMmorpg, provideRpg, provideSaveClient, setInject, startGame, withMobile };
|
package/dist/module.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { inject } from "./node_modules/.pnpm/@signe_di@
|
|
1
|
+
import { inject } from "./node_modules/.pnpm/@signe_di@3.0.1/node_modules/@signe/di/dist/index.js";
|
|
2
2
|
import { RpgGui } from "./Gui/Gui.js";
|
|
3
3
|
import { getSoundMetadata } from "./Sound.js";
|
|
4
4
|
import { findModules, provideModules } from "@rpgjs/common";
|
|
@@ -144,6 +144,9 @@ function provideClientModules(modules) {
|
|
|
144
144
|
if (sprite.componentsInFront) sprite.componentsInFront.forEach((component) => {
|
|
145
145
|
engine.addSpriteComponentInFront(component);
|
|
146
146
|
});
|
|
147
|
+
if (sprite.components) Object.entries(sprite.components).forEach(([id, component]) => {
|
|
148
|
+
engine.registerSpriteComponent(id, component);
|
|
149
|
+
});
|
|
147
150
|
}
|
|
148
151
|
};
|
|
149
152
|
}
|
package/dist/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","names":[],"sources":["../src/module.ts"],"sourcesContent":["import { findModules, provideModules } from \"@rpgjs/common\";\nimport { FactoryProvider } from \"@signe/di\";\nimport { RpgClientEngine } from \"./RpgClientEngine\";\nimport { RpgClient } from \"./RpgClient\";\nimport { inject } from \"@signe/di\";\nimport { RpgGui } from \"./Gui/Gui\";\nimport { getSoundMetadata } from \"./Sound\";\n\n/**\n * Type for client modules that can be either:\n * - An object implementing RpgClient interface\n * - A class decorated with @RpgModule decorator\n */\nexport type RpgClientModule = RpgClient | (new () => any);\n\n/**\n * Provides client modules configuration to Dependency Injection\n * \n * This function accepts an array of client modules that can be either:\n * - Objects implementing the RpgClient interface\n * - Classes decorated with the @RpgModule decorator (which will be instantiated)\n * \n * @param modules - Array of client modules (objects or classes)\n * @returns FactoryProvider configuration for DI\n * @example\n * ```ts\n * // Using an object\n * provideClientModules([\n * {\n * engine: {\n * onConnected(engine) {\n * console.log('Client connected')\n * }\n * }\n * }\n * ])\n * \n * // Using a decorated class\n * @RpgModule<RpgClient>({\n * engine: {\n * onStart(engine) {\n * console.log('Client started')\n * }\n * }\n * })\n * class MyClientModule {}\n * \n * provideClientModules([MyClientModule])\n * ```\n */\nexport function provideClientModules(modules: RpgClientModule[]): FactoryProvider {\n return provideModules(modules, \"client\", (modules, context) => {\n const mainModuleClient = findModules(context, 'Client')\n modules = [...mainModuleClient, ...modules]\n modules = modules.map((module) => {\n // If module is a class (constructor function), instantiate it\n // The RpgModule decorator adds properties to the prototype, which will be accessible via the instance\n if (typeof module === 'function') {\n const instance = new module() as any;\n // Copy all enumerable properties (including from prototype) to a plain object\n const moduleObj: any = {};\n for (const key in instance) {\n moduleObj[key] = instance[key];\n }\n module = moduleObj;\n }\n if ('client' in module) {\n module = module.client as any;\n }\n if (module.spritesheets) {\n const spritesheets = [...module.spritesheets];\n module.spritesheets = {\n load: (engine: RpgClientEngine) => {\n spritesheets.forEach((spritesheet) => {\n engine.addSpriteSheet(spritesheet);\n });\n },\n };\n }\n if (module.spritesheetResolver) {\n const resolver = module.spritesheetResolver;\n module.spritesheetResolver = {\n load: (engine: RpgClientEngine) => {\n engine.setSpritesheetResolver(resolver);\n },\n };\n }\n if (module.sounds) {\n const sounds = [...module.sounds];\n module.sounds = {\n load: (engine: RpgClientEngine) => {\n sounds.forEach((sound) => {\n // Check if it's a class decorated with @Sound\n if (typeof sound === 'function' || (sound && sound.constructor && sound.constructor !== Object)) {\n const metadata = getSoundMetadata(sound);\n if (metadata) {\n // Handle single sound\n if (metadata.id && metadata.sound) {\n engine.addSound({\n id: metadata.id,\n src: metadata.sound,\n loop: metadata.loop,\n volume: metadata.volume,\n });\n }\n // Handle multiple sounds\n if (metadata.sounds) {\n Object.entries(metadata.sounds).forEach(([soundId, soundSrc]) => {\n engine.addSound({\n id: soundId,\n src: soundSrc,\n loop: metadata.loop,\n volume: metadata.volume,\n });\n });\n }\n } else {\n // Not a decorated class, treat as regular sound object\n engine.addSound(sound);\n }\n } else {\n // Regular sound object\n engine.addSound(sound);\n }\n });\n },\n };\n }\n if (module.soundResolver) {\n const resolver = module.soundResolver;\n module.soundResolver = {\n load: (engine: RpgClientEngine) => {\n engine.setSoundResolver(resolver);\n },\n };\n }\n if (module.gui) {\n const gui = [...module.gui];\n module.gui = {\n load: (engine: RpgClientEngine) => {\n const guiService = inject(engine.context, RpgGui) as RpgGui;\n gui.forEach((gui) => {\n guiService.add(gui);\n });\n },\n };\n }\n if (module.componentAnimations) {\n const componentAnimations = [...module.componentAnimations];\n module.componentAnimations = {\n load: (engine: RpgClientEngine) => {\n componentAnimations.forEach((componentAnimation) => {\n engine.addComponentAnimation(componentAnimation);\n });\n },\n };\n }\n if (module.transitions) {\n const transitions = [...module.transitions];\n module.transitions = {\n load: (engine: RpgClientEngine) => {\n const guiService = inject(engine.context, RpgGui) as RpgGui;\n transitions.forEach((transition) => {\n guiService.add({\n name: transition.id,\n component: transition.component,\n data: transition.props || {}\n });\n });\n },\n };\n }\n if (module.particles) {\n const particles = [...module.particles];\n module.particles = {\n load: (engine: RpgClientEngine) => {\n particles.forEach((particle) => {\n engine.addParticle(particle);\n });\n },\n };\n }\n if (module.sprite) {\n const sprite = {...module.sprite};\n module.sprite = {\n ...sprite,\n load: (engine: RpgClientEngine) => {\n if (sprite.componentsBehind) {\n sprite.componentsBehind.forEach((component) => {\n engine.addSpriteComponentBehind(component);\n });\n }\n if (sprite.componentsInFront) {\n sprite.componentsInFront.forEach((component) => {\n engine.addSpriteComponentInFront(component);\n });\n }\n },\n };\n }\n return module;\n });\n return modules\n });\n}\n\nexport const GlobalConfigToken = \"GlobalConfigToken\";\n\nexport function provideGlobalConfig(config: any) {\n return {\n provide: GlobalConfigToken,\n useValue: config ?? {},\n };\n}\n\nexport function provideClientGlobalConfig(config: any = {}) {\n if (!config.keyboardControls) {\n config.keyboardControls = {\n up: 'up',\n down: 'down',\n left: 'left',\n right: 'right',\n action: 'space',\n escape: 'escape'\n }\n }\n return provideGlobalConfig(config)\n}\n\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module.js","names":[],"sources":["../src/module.ts"],"sourcesContent":["import { findModules, provideModules } from \"@rpgjs/common\";\nimport { FactoryProvider } from \"@signe/di\";\nimport { RpgClientEngine } from \"./RpgClientEngine\";\nimport { RpgClient } from \"./RpgClient\";\nimport { inject } from \"@signe/di\";\nimport { RpgGui } from \"./Gui/Gui\";\nimport { getSoundMetadata } from \"./Sound\";\n\n/**\n * Type for client modules that can be either:\n * - An object implementing RpgClient interface\n * - A class decorated with @RpgModule decorator\n */\nexport type RpgClientModule = RpgClient | (new () => any);\n\n/**\n * Provides client modules configuration to Dependency Injection\n * \n * This function accepts an array of client modules that can be either:\n * - Objects implementing the RpgClient interface\n * - Classes decorated with the @RpgModule decorator (which will be instantiated)\n * \n * @param modules - Array of client modules (objects or classes)\n * @returns FactoryProvider configuration for DI\n * @example\n * ```ts\n * // Using an object\n * provideClientModules([\n * {\n * engine: {\n * onConnected(engine) {\n * console.log('Client connected')\n * }\n * }\n * }\n * ])\n * \n * // Using a decorated class\n * @RpgModule<RpgClient>({\n * engine: {\n * onStart(engine) {\n * console.log('Client started')\n * }\n * }\n * })\n * class MyClientModule {}\n * \n * provideClientModules([MyClientModule])\n * ```\n */\nexport function provideClientModules(modules: RpgClientModule[]): FactoryProvider {\n return provideModules(modules, \"client\", (modules, context) => {\n const mainModuleClient = findModules(context, 'Client')\n modules = [...mainModuleClient, ...modules]\n modules = modules.map((module) => {\n // If module is a class (constructor function), instantiate it\n // The RpgModule decorator adds properties to the prototype, which will be accessible via the instance\n if (typeof module === 'function') {\n const instance = new module() as any;\n // Copy all enumerable properties (including from prototype) to a plain object\n const moduleObj: any = {};\n for (const key in instance) {\n moduleObj[key] = instance[key];\n }\n module = moduleObj;\n }\n if ('client' in module) {\n module = module.client as any;\n }\n if (module.spritesheets) {\n const spritesheets = [...module.spritesheets];\n module.spritesheets = {\n load: (engine: RpgClientEngine) => {\n spritesheets.forEach((spritesheet) => {\n engine.addSpriteSheet(spritesheet);\n });\n },\n };\n }\n if (module.spritesheetResolver) {\n const resolver = module.spritesheetResolver;\n module.spritesheetResolver = {\n load: (engine: RpgClientEngine) => {\n engine.setSpritesheetResolver(resolver);\n },\n };\n }\n if (module.sounds) {\n const sounds = [...module.sounds];\n module.sounds = {\n load: (engine: RpgClientEngine) => {\n sounds.forEach((sound) => {\n // Check if it's a class decorated with @Sound\n if (typeof sound === 'function' || (sound && sound.constructor && sound.constructor !== Object)) {\n const metadata = getSoundMetadata(sound);\n if (metadata) {\n // Handle single sound\n if (metadata.id && metadata.sound) {\n engine.addSound({\n id: metadata.id,\n src: metadata.sound,\n loop: metadata.loop,\n volume: metadata.volume,\n });\n }\n // Handle multiple sounds\n if (metadata.sounds) {\n Object.entries(metadata.sounds).forEach(([soundId, soundSrc]) => {\n engine.addSound({\n id: soundId,\n src: soundSrc,\n loop: metadata.loop,\n volume: metadata.volume,\n });\n });\n }\n } else {\n // Not a decorated class, treat as regular sound object\n engine.addSound(sound);\n }\n } else {\n // Regular sound object\n engine.addSound(sound);\n }\n });\n },\n };\n }\n if (module.soundResolver) {\n const resolver = module.soundResolver;\n module.soundResolver = {\n load: (engine: RpgClientEngine) => {\n engine.setSoundResolver(resolver);\n },\n };\n }\n if (module.gui) {\n const gui = [...module.gui];\n module.gui = {\n load: (engine: RpgClientEngine) => {\n const guiService = inject(engine.context, RpgGui) as RpgGui;\n gui.forEach((gui) => {\n guiService.add(gui);\n });\n },\n };\n }\n if (module.componentAnimations) {\n const componentAnimations = [...module.componentAnimations];\n module.componentAnimations = {\n load: (engine: RpgClientEngine) => {\n componentAnimations.forEach((componentAnimation) => {\n engine.addComponentAnimation(componentAnimation);\n });\n },\n };\n }\n if (module.transitions) {\n const transitions = [...module.transitions];\n module.transitions = {\n load: (engine: RpgClientEngine) => {\n const guiService = inject(engine.context, RpgGui) as RpgGui;\n transitions.forEach((transition) => {\n guiService.add({\n name: transition.id,\n component: transition.component,\n data: transition.props || {}\n });\n });\n },\n };\n }\n if (module.particles) {\n const particles = [...module.particles];\n module.particles = {\n load: (engine: RpgClientEngine) => {\n particles.forEach((particle) => {\n engine.addParticle(particle);\n });\n },\n };\n }\n if (module.sprite) {\n const sprite = {...module.sprite};\n module.sprite = {\n ...sprite,\n load: (engine: RpgClientEngine) => {\n if (sprite.componentsBehind) {\n sprite.componentsBehind.forEach((component) => {\n engine.addSpriteComponentBehind(component);\n });\n }\n if (sprite.componentsInFront) {\n sprite.componentsInFront.forEach((component) => {\n engine.addSpriteComponentInFront(component);\n });\n }\n if (sprite.components) {\n Object.entries(sprite.components).forEach(([id, component]) => {\n engine.registerSpriteComponent(id, component);\n });\n }\n },\n };\n }\n return module;\n });\n return modules\n });\n}\n\nexport const GlobalConfigToken = \"GlobalConfigToken\";\n\nexport function provideGlobalConfig(config: any) {\n return {\n provide: GlobalConfigToken,\n useValue: config ?? {},\n };\n}\n\nexport function provideClientGlobalConfig(config: any = {}) {\n if (!config.keyboardControls) {\n config.keyboardControls = {\n up: 'up',\n down: 'down',\n left: 'left',\n right: 'right',\n action: 'space',\n escape: 'escape'\n }\n }\n return provideGlobalConfig(config)\n}\n"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//#region ../../node_modules/.pnpm/@signe+di@
|
|
1
|
+
//#region ../../node_modules/.pnpm/@signe+di@3.0.1/node_modules/@signe/di/dist/index.js
|
|
2
2
|
var DEFAULT_INSTANCE_KEY = "__default__";
|
|
3
3
|
function toTokenName(token) {
|
|
4
4
|
return typeof token === "function" ? token.name : token;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../../../../node_modules/.pnpm/@signe+di@3.0.1/node_modules/@signe/di/dist/index.js"],"sourcesContent":["// src/inject.ts\nvar DEFAULT_INSTANCE_KEY = \"__default__\";\nfunction toTokenName(token) {\n return typeof token === \"function\" ? token.name : token;\n}\nfunction toInstanceKey(name) {\n return name ?? DEFAULT_INSTANCE_KEY;\n}\nfunction getRecord(context, token) {\n return context.get(\"inject:\" + toTokenName(token));\n}\nfunction ensureRecord(context, token) {\n const key = \"inject:\" + toTokenName(token);\n let record = context.get(key);\n if (!record) {\n record = {\n multi: false,\n values: /* @__PURE__ */ new Map(),\n injected: /* @__PURE__ */ new Set()\n };\n }\n context.set(key, record);\n return record;\n}\nfunction provide(context, token, value, options = {}) {\n const record = ensureRecord(context, token);\n const instanceKey = toInstanceKey(options.name);\n if (options.multi) {\n record.multi = true;\n }\n if (!record.multi && instanceKey !== DEFAULT_INSTANCE_KEY) {\n record.multi = true;\n }\n record.values.set(instanceKey, value);\n return value;\n}\nfunction isInjected(context, token, options = {}) {\n const record = getRecord(context, token);\n if (!record) {\n return false;\n }\n if (options.name) {\n return record.injected.has(toInstanceKey(options.name));\n }\n if (record.multi) {\n return record.injected.size > 0;\n }\n return record.injected.has(DEFAULT_INSTANCE_KEY);\n}\nfunction isProvided(context, token, options = {}) {\n const record = getRecord(context, token);\n if (!record) {\n return false;\n }\n if (options.name) {\n return record.values.has(toInstanceKey(options.name));\n }\n if (record.multi) {\n return record.values.size > 0;\n }\n return record.values.has(DEFAULT_INSTANCE_KEY);\n}\nfunction hasInstance(context, token, options = {}) {\n return isProvided(context, token, options);\n}\nfunction handleMissingInjection(token, options) {\n const name = toTokenName(token);\n if (options.name) {\n throw new Error(`Injection provider ${name} with name ${options.name} not found`);\n }\n throw new Error(`Injection provider ${name} not found`);\n}\nfunction markInjected(record, key) {\n record.injected.add(key);\n}\nfunction markAllInjected(record) {\n for (const key of record.values.keys()) {\n record.injected.add(key);\n }\n}\nfunction inject(context, token, options = {}) {\n const record = getRecord(context, token);\n if (!record) {\n if (options.optional) {\n return options.multi ? [] : void 0;\n }\n return handleMissingInjection(token, options);\n }\n if (options.name) {\n const instanceKey = toInstanceKey(options.name);\n if (!record.values.has(instanceKey)) {\n if (options.optional) {\n return void 0;\n }\n return handleMissingInjection(token, options);\n }\n const value2 = record.values.get(instanceKey);\n markInjected(record, instanceKey);\n return value2;\n }\n if (options.multi || record.multi) {\n if (record.values.size === 0) {\n if (options.optional) {\n return [];\n }\n return handleMissingInjection(token, options);\n }\n markAllInjected(record);\n return Array.from(record.values.values());\n }\n const value = record.values.get(DEFAULT_INSTANCE_KEY);\n if (value === void 0) {\n if (options.optional) {\n return void 0;\n }\n return handleMissingInjection(token, options);\n }\n markInjected(record, DEFAULT_INSTANCE_KEY);\n return value;\n}\nfunction override(providers, newProvider, options) {\n let { upsert = false, key } = options ?? {};\n if (!key) {\n key = typeof newProvider === \"function\" ? newProvider.name : newProvider.provide;\n }\n const flatProviders = providers.flat();\n const exists = flatProviders.some((provider) => {\n if (typeof provider === \"function\") {\n return provider.name === key;\n } else if (typeof provider === \"object\") {\n return provider.provide === key;\n }\n return false;\n });\n const mappedProviders = flatProviders.map((provider) => {\n if (typeof provider === \"function\" && provider.name === key) {\n return newProvider;\n } else if (typeof provider === \"object\" && provider.provide === key) {\n return newProvider;\n }\n return provider;\n });\n if (upsert && !exists) {\n mappedProviders.push(newProvider);\n }\n return mappedProviders;\n}\nfunction findProviders(providers, name) {\n const results = [];\n for (const provider of providers) {\n if (Array.isArray(provider)) {\n results.push(...findProviders(provider, name));\n } else if (findProvider(provider, name)) {\n results.push(provider);\n }\n }\n return results;\n}\nfunction findProvider(providers, name) {\n if (!Array.isArray(providers)) {\n if (typeof providers === \"object\" && \"provide\" in providers) {\n const provider = providers;\n const providerName = typeof provider.provide === \"function\" ? provider.provide.name : provider.provide;\n if (name instanceof RegExp) {\n if (name.test(providerName)) return providers;\n } else {\n if (providerName === name) return providers;\n }\n }\n return null;\n }\n for (const provider of providers) {\n if (Array.isArray(provider)) {\n const found = findProvider(provider, name);\n if (found) return found;\n continue;\n }\n if (typeof provider === \"object\" && \"provide\" in provider) {\n const providerName = typeof provider.provide === \"function\" ? provider.provide.name : provider.provide;\n if (name instanceof RegExp) {\n if (name.test(providerName)) return provider;\n } else {\n if (providerName === name) return provider;\n }\n }\n }\n return null;\n}\n\n// src/merge-config.ts\nfunction processProvider(mergedConfig, baseConfig, provider) {\n if (Array.isArray(provider)) {\n for (const nestedProvider of provider) {\n processProvider(mergedConfig, baseConfig, nestedProvider);\n }\n return;\n }\n const existingProvider = findProvider(baseConfig.providers, provider.provide);\n if (existingProvider) {\n mergedConfig.providers = override(mergedConfig.providers, provider);\n } else {\n mergedConfig.providers.push(provider);\n }\n}\nfunction mergeConfig(baseConfig, config) {\n const mergedConfig = {\n ...baseConfig,\n ...config,\n providers: [...baseConfig.providers]\n // Start with a copy of base providers\n };\n for (const provider of config.providers) {\n processProvider(mergedConfig, baseConfig, provider);\n }\n return mergedConfig;\n}\n\n// src/provider.ts\nfunction extractProvideOptions(source) {\n if (!source) {\n return void 0;\n }\n const { multi, name } = source;\n if (multi === void 0 && name === void 0) {\n return void 0;\n }\n return { multi, name };\n}\nfunction getDeps(provider) {\n if (typeof provider === \"function\") {\n return provider.deps ?? [];\n }\n return provider.deps ?? [];\n}\nfunction sortProviders(providers) {\n const tokenName = (t) => typeof t === \"function\" ? t.name : t;\n const map = /* @__PURE__ */ new Map();\n for (const p of providers) {\n const token = tokenName(typeof p === \"function\" ? p : p.provide);\n const list = map.get(token);\n if (list) {\n list.push(p);\n } else {\n map.set(token, [p]);\n }\n }\n const result = [];\n const visited = /* @__PURE__ */ new Set();\n const stack = /* @__PURE__ */ new Set();\n const visit = (token) => {\n const name = tokenName(token);\n if (visited.has(name)) return;\n if (stack.has(name)) {\n throw new Error(`Circular dependency detected for provider ${name}`);\n }\n stack.add(name);\n const providersForToken = map.get(name);\n if (providersForToken) {\n for (const provider of providersForToken) {\n for (const dep of getDeps(provider)) {\n visit(dep);\n }\n result.push(provider);\n }\n visited.add(name);\n }\n stack.delete(name);\n };\n for (const p of providers) {\n const token = typeof p === \"function\" ? p : p.provide;\n visit(token);\n }\n return result;\n}\nasync function injector(context, providers) {\n providers = providers.flat();\n providers = sortProviders(providers);\n for (const provider of providers) {\n let token;\n let instance;\n let options;\n if (typeof provider === \"function\") {\n token = provider;\n instance = new provider(context);\n const diOptions = extractProvideOptions(provider.diOptions ?? provider.di);\n options = diOptions;\n } else {\n token = provider.provide;\n options = extractProvideOptions(provider);\n const provideUserClass = provider.useClass;\n const isClass = typeof provideUserClass === \"function\";\n if (isClass) {\n instance = new provideUserClass(context);\n } else if (\"useValue\" in provider) {\n instance = provider.useValue;\n } else if (\"useFactory\" in provider) {\n instance = provider.useFactory?.(context);\n if (instance instanceof Promise) {\n instance = await instance;\n }\n } else if (\"useExisting\" in provider) {\n instance = inject(context, provider.useExisting);\n }\n }\n provide(context, token, instance, options);\n }\n}\n\n// src/context.ts\nvar Context = class {\n constructor() {\n /** Internal storage for injected values */\n this.values = {};\n }\n /**\n * Sets a value in the context\n * @param key - Unique identifier for the value\n * @param value - Value to store\n */\n set(key, value) {\n this.values[key] = value;\n }\n /**\n * Retrieves a value from the context\n * @param key - Unique identifier for the value\n * @returns The stored value or undefined if not found\n */\n get(key) {\n return this.values[key];\n }\n};\nexport {\n Context,\n findProvider,\n findProviders,\n hasInstance,\n inject,\n injector,\n isInjected,\n isProvided,\n mergeConfig,\n override,\n provide\n};\n//# sourceMappingURL=index.js.map"],"x_google_ignoreList":[0],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BehaviorSubject, filter } from "rxjs";
|
|
2
|
-
//#region ../../node_modules/.pnpm/@signe+reactive@
|
|
2
|
+
//#region ../../node_modules/.pnpm/@signe+reactive@3.0.1/node_modules/@signe/reactive/dist/index.js
|
|
3
3
|
var ArraySubject = class extends BehaviorSubject {
|
|
4
4
|
constructor(items = []) {
|
|
5
5
|
super({
|
|
@@ -90,6 +90,9 @@ var ArraySubject = class extends BehaviorSubject {
|
|
|
90
90
|
});
|
|
91
91
|
}
|
|
92
92
|
};
|
|
93
|
+
var isArraySubject = (value) => {
|
|
94
|
+
return "_items" in value;
|
|
95
|
+
};
|
|
93
96
|
var ObjectSubject = class extends BehaviorSubject {
|
|
94
97
|
constructor(obj = {}) {
|
|
95
98
|
super({
|
|
@@ -141,6 +144,9 @@ var ObjectSubject = class extends BehaviorSubject {
|
|
|
141
144
|
});
|
|
142
145
|
}
|
|
143
146
|
};
|
|
147
|
+
var isObjectSubject = (value) => {
|
|
148
|
+
return "_obj" in value;
|
|
149
|
+
};
|
|
144
150
|
var getGlobalReactiveStore = () => {
|
|
145
151
|
const globalKey = "__REACTIVE_STORE__";
|
|
146
152
|
if (typeof globalThis !== "undefined") {
|
|
@@ -152,8 +158,8 @@ var getGlobalReactiveStore = () => {
|
|
|
152
158
|
}
|
|
153
159
|
let globalObj;
|
|
154
160
|
if (typeof window !== "undefined") globalObj = window;
|
|
161
|
+
else if (typeof process !== "undefined" && process.versions && process.versions.node) globalObj = Function("return this")();
|
|
155
162
|
else if (typeof self !== "undefined") globalObj = self;
|
|
156
|
-
else if (typeof Function !== "undefined") globalObj = Function("return this")();
|
|
157
163
|
else {
|
|
158
164
|
console.warn("Unable to find global object, using local instance");
|
|
159
165
|
return {
|
|
@@ -221,7 +227,13 @@ function signal(defaultValue, options) {
|
|
|
221
227
|
fn._subject = subject;
|
|
222
228
|
return fn;
|
|
223
229
|
}
|
|
230
|
+
function isSignal(value) {
|
|
231
|
+
return !!(value && value.observable);
|
|
232
|
+
}
|
|
233
|
+
function isComputed(value) {
|
|
234
|
+
return isSignal(value) && !!value.dependencies;
|
|
235
|
+
}
|
|
224
236
|
//#endregion
|
|
225
|
-
export { signal };
|
|
237
|
+
export { isArraySubject, isComputed, isObjectSubject, isSignal, signal };
|
|
226
238
|
|
|
227
239
|
//# sourceMappingURL=index.js.map
|
package/dist/node_modules/.pnpm/@signe_reactive@3.0.1/node_modules/@signe/reactive/dist/index.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","names":["BehaviorSubject2","BehaviorSubject3"],"sources":["../../../../../../../../../../node_modules/.pnpm/@signe+reactive@3.0.1/node_modules/@signe/reactive/dist/index.js"],"sourcesContent":["// src/ArraySubject.ts\nimport { BehaviorSubject } from \"rxjs\";\nvar ArraySubject = class extends BehaviorSubject {\n constructor(items = []) {\n super({ type: \"init\", items });\n this._items = [];\n this.createProxy(items);\n }\n createProxy(items) {\n this._items = new Proxy(items, {\n get: (target, prop, receiver) => {\n const origMethod = target[prop];\n if (typeof origMethod === \"function\") {\n return (...args) => {\n let changeType = \"update\";\n let index = void 0;\n let isMutateFn = false;\n let itemsToEmit = [];\n let changeSplice = true;\n switch (prop) {\n case \"push\":\n index = target.length;\n changeType = \"add\";\n isMutateFn = true;\n break;\n case \"pop\":\n index = target.length - 1;\n changeType = \"remove\";\n isMutateFn = true;\n break;\n case \"unshift\":\n index = 0;\n changeType = \"add\";\n isMutateFn = true;\n break;\n case \"shift\":\n index = 0;\n changeType = \"remove\";\n isMutateFn = true;\n break;\n case \"splice\":\n index = args[0];\n const deleteCount = args[1];\n const newItems = args.slice(2);\n itemsToEmit = newItems;\n if (deleteCount > 0 && newItems.length === 0) {\n changeType = \"remove\";\n } else if (deleteCount === 0 && newItems.length > 0) {\n changeType = \"add\";\n } else if (deleteCount === 0 && newItems.length === 0) {\n changeSplice = false;\n } else {\n changeType = \"update\";\n }\n isMutateFn = true;\n break;\n }\n const result = origMethod.apply(target, args);\n if (isMutateFn && changeSplice) {\n if (prop === \"splice\") {\n this.next({ type: changeType, index, items: itemsToEmit });\n } else {\n this.next({ type: changeType, index, items: args });\n }\n }\n return result;\n };\n }\n return Reflect.get(target, prop, receiver);\n },\n set: (target, prop, value) => {\n const index = !isNaN(Number(prop)) ? Number(prop) : void 0;\n target[prop] = value;\n this.next({ type: \"update\", index, items: [value] });\n return true;\n }\n });\n }\n get items() {\n return this._items;\n }\n set items(newItems) {\n this.createProxy(newItems);\n this.next({ type: \"reset\", items: newItems });\n }\n};\nvar isArraySubject = (value) => {\n return \"_items\" in value;\n};\n\n// src/ObjectSubject.ts\nimport { BehaviorSubject as BehaviorSubject2 } from \"rxjs\";\nvar ObjectSubject = class extends BehaviorSubject2 {\n constructor(obj = {}) {\n super({ type: \"init\", value: obj });\n this.createProxy(obj);\n }\n createProxy(obj) {\n this._obj = new Proxy(obj, {\n get: (target, prop, receiver) => {\n return Reflect.get(target, prop, receiver);\n },\n set: (target, prop, value, receiver) => {\n const key = prop;\n const changeType = key in target ? \"update\" : \"add\";\n target[key] = value;\n this.next({ type: changeType, key, value });\n return true;\n },\n deleteProperty: (target, prop) => {\n const key = prop;\n if (key in target) {\n const value = target[key];\n delete target[key];\n this.next({ type: \"remove\", key, value });\n return true;\n }\n return false;\n }\n });\n }\n get obj() {\n return this._obj;\n }\n set obj(newObj) {\n this.createProxy(newObj);\n this.next({ type: \"reset\", value: newObj });\n }\n};\nvar isObjectSubject = (value) => {\n return \"_obj\" in value;\n};\n\n// src/signal.ts\nimport { BehaviorSubject as BehaviorSubject3, combineLatest, filter, finalize, map, Observable } from \"rxjs\";\nvar getGlobalReactiveStore = () => {\n const globalKey = \"__REACTIVE_STORE__\";\n if (typeof globalThis !== \"undefined\") {\n if (!globalThis[globalKey]) {\n globalThis[globalKey] = {\n currentDependencyTracker: null,\n currentSubscriptionsTracker: null\n };\n }\n return globalThis[globalKey];\n }\n let globalObj;\n if (typeof window !== \"undefined\") {\n globalObj = window;\n } else if (typeof process !== \"undefined\" && process.versions && process.versions.node) {\n globalObj = Function(\"return this\")();\n } else if (typeof self !== \"undefined\") {\n globalObj = self;\n } else {\n console.warn(\"Unable to find global object, using local instance\");\n return {\n currentDependencyTracker: null,\n currentSubscriptionsTracker: null\n };\n }\n if (!globalObj[globalKey]) {\n globalObj[globalKey] = {\n currentDependencyTracker: null,\n currentSubscriptionsTracker: null\n };\n }\n return globalObj[globalKey];\n};\nvar reactiveStore = getGlobalReactiveStore();\nvar trackDependency = (signal2) => {\n if (reactiveStore.currentDependencyTracker) {\n reactiveStore.currentDependencyTracker(signal2);\n }\n};\nfunction signal(defaultValue, options) {\n let subject;\n if (Array.isArray(defaultValue)) {\n subject = new ArraySubject(defaultValue);\n } else if (typeof defaultValue === \"object\" && defaultValue !== null) {\n subject = new ObjectSubject(defaultValue);\n } else {\n subject = new BehaviorSubject3(defaultValue);\n }\n const getValue = () => {\n if (subject instanceof ArraySubject) {\n return subject.items;\n } else if (subject instanceof ObjectSubject) {\n return subject.obj;\n }\n return subject.value;\n };\n const fn = function() {\n trackDependency(fn);\n return getValue();\n };\n fn.set = (value) => {\n const currentValue = getValue();\n let shouldEmit = true;\n if (options?.equal) {\n shouldEmit = !options.equal(currentValue, value);\n } else {\n shouldEmit = currentValue !== value;\n }\n if (shouldEmit) {\n if (subject instanceof ArraySubject) {\n subject.items = value;\n } else if (subject instanceof ObjectSubject) {\n subject.obj = value;\n } else {\n subject.next(value);\n }\n }\n };\n fn._isFrozen = false;\n fn.freeze = () => {\n fn._isFrozen = true;\n };\n fn.unfreeze = () => {\n fn._isFrozen = false;\n if (subject instanceof ArraySubject) {\n subject.next({ type: \"init\", items: subject.items });\n } else if (subject instanceof ObjectSubject) {\n subject.next({ type: \"init\", value: subject.obj });\n } else {\n subject.next(subject.value);\n }\n };\n fn.mutate = (mutateFn) => {\n const value = getValue();\n mutateFn(value);\n };\n fn.update = (updateFn) => {\n const updatedValue = updateFn(getValue());\n fn.set(updatedValue);\n };\n fn.observable = subject.asObservable().pipe(\n filter(() => !fn._isFrozen)\n );\n fn._subject = subject;\n return fn;\n}\nfunction isSignal(value) {\n return !!(value && value.observable);\n}\nfunction isComputed(value) {\n return isSignal(value) && !!value.dependencies;\n}\nfunction computed(computeFunction, disposableFn) {\n const dependencies = /* @__PURE__ */ new Set();\n let init = true;\n let lastComputedValue;\n const previousTracker = reactiveStore.currentDependencyTracker;\n reactiveStore.currentDependencyTracker = (signal2) => {\n dependencies.add(signal2);\n };\n lastComputedValue = computeFunction();\n if (computeFunction[\"isEffect\"]) {\n disposableFn = lastComputedValue;\n }\n reactiveStore.currentDependencyTracker = previousTracker;\n const observables = [...dependencies].map((dep) => {\n if (isComputed(dep) && \"dependencies\" in dep) {\n const computedDep = dep;\n if (computedDep.dependencies.size === 0) {\n return new BehaviorSubject3(computedDep()).asObservable();\n }\n }\n return dep.observable;\n });\n const computedObservable = combineLatest(observables).pipe(\n filter(() => !init),\n map(() => computeFunction()),\n finalize(() => disposableFn?.())\n );\n const fn = function() {\n trackDependency(fn);\n return lastComputedValue;\n };\n fn.observable = computedObservable;\n fn.subscription = computedObservable.subscribe((value) => {\n lastComputedValue = value;\n });\n fn.dependencies = dependencies;\n reactiveStore.currentSubscriptionsTracker?.(fn.subscription);\n init = false;\n return fn;\n}\nfunction linkedSignal(computationOrOptions, simpleOptions) {\n const dependencies = /* @__PURE__ */ new Set();\n let init = true;\n let lastComputedValue;\n let computeFunction;\n let sourceSignal;\n let computationFn;\n let equalFn;\n let previousValue;\n let isOverridden = false;\n let overriddenValue;\n let lastComputedBeforeOverride;\n let depVersion = 0;\n let overrideDepVersion = null;\n if (typeof computationOrOptions === \"function\") {\n computeFunction = computationOrOptions;\n equalFn = simpleOptions?.equal;\n } else {\n const options = computationOrOptions;\n sourceSignal = options.source;\n computationFn = options.computation;\n equalFn = options.equal;\n if (typeof sourceSignal === \"function\" && !isSignal(sourceSignal)) {\n const sourceFn = sourceSignal;\n computeFunction = () => {\n const sourceValue = sourceFn();\n if (computationFn.length > 1) {\n const result = computationFn(sourceValue, previousValue);\n previousValue = {\n source: sourceValue,\n value: result\n };\n return result;\n } else {\n const result = computationFn(sourceValue);\n previousValue = {\n source: sourceValue,\n value: result\n };\n return result;\n }\n };\n } else {\n const source = typeof sourceSignal === \"function\" ? sourceSignal : sourceSignal;\n computeFunction = () => {\n const sourceValue = source();\n if (computationFn.length > 1) {\n const result = computationFn(sourceValue, previousValue);\n previousValue = {\n source: sourceValue,\n value: result\n };\n return result;\n } else {\n const result = computationFn(sourceValue);\n previousValue = {\n source: sourceValue,\n value: result\n };\n return result;\n }\n };\n }\n }\n const previousTracker = reactiveStore.currentDependencyTracker;\n reactiveStore.currentDependencyTracker = (signal2) => {\n dependencies.add(signal2);\n };\n if (sourceSignal && typeof sourceSignal === \"function\" && !isSignal(sourceSignal)) {\n lastComputedValue = computeFunction();\n lastComputedBeforeOverride = lastComputedValue;\n } else if (sourceSignal && isSignal(sourceSignal)) {\n dependencies.add(sourceSignal);\n lastComputedValue = computeFunction();\n lastComputedBeforeOverride = lastComputedValue;\n } else {\n lastComputedValue = computeFunction();\n lastComputedBeforeOverride = lastComputedValue;\n }\n reactiveStore.currentDependencyTracker = previousTracker;\n const subject = new BehaviorSubject3(lastComputedValue);\n const observables = [...dependencies].map((dep) => {\n if (isComputed(dep) && \"dependencies\" in dep) {\n const computedDep = dep;\n if (computedDep.dependencies.size === 0) {\n return new BehaviorSubject3(computedDep()).asObservable();\n }\n }\n return dep.observable;\n });\n let linkedObservable;\n if (observables.length > 0) {\n linkedObservable = combineLatest(observables).pipe(\n filter(() => !init),\n map(() => {\n const computed2 = computeFunction();\n if (equalFn) {\n if (!equalFn(lastComputedValue, computed2)) {\n lastComputedValue = computed2;\n isOverridden = false;\n }\n } else {\n if (lastComputedValue !== computed2) {\n lastComputedValue = computed2;\n isOverridden = false;\n }\n }\n return lastComputedValue;\n })\n );\n } else {\n linkedObservable = subject.asObservable().pipe(\n filter(() => !init)\n );\n }\n const fn = function() {\n trackDependency(fn);\n if (isOverridden && dependencies.size > 0) {\n if (overrideDepVersion !== depVersion) {\n const computed2 = computeFunction();\n isOverridden = false;\n overriddenValue = void 0;\n lastComputedValue = computed2;\n lastComputedBeforeOverride = computed2;\n overrideDepVersion = null;\n return computed2;\n }\n return overriddenValue;\n }\n if (isOverridden) {\n return overriddenValue;\n }\n if (dependencies.size === 0) {\n const computed2 = computeFunction();\n lastComputedValue = computed2;\n lastComputedBeforeOverride = computed2;\n }\n return lastComputedValue;\n };\n fn.observable = new Observable((observer) => {\n const depSubscription = linkedObservable.subscribe((value) => {\n if (dependencies.size > 0) {\n depVersion++;\n isOverridden = false;\n overrideDepVersion = null;\n lastComputedValue = value;\n lastComputedBeforeOverride = value;\n } else {\n lastComputedValue = value;\n lastComputedBeforeOverride = value;\n }\n observer.next(value);\n });\n let subjectSubscription;\n if (dependencies.size === 0) {\n subjectSubscription = subject.pipe(\n filter(() => !init)\n ).subscribe((value) => {\n observer.next(value);\n });\n }\n observer.next(lastComputedValue);\n return () => {\n depSubscription.unsubscribe();\n if (subjectSubscription) {\n subjectSubscription.unsubscribe();\n }\n };\n });\n fn.subscription = fn.observable.subscribe(() => {\n });\n fn.dependencies = dependencies;\n fn._subject = subject;\n fn.set = (value) => {\n if (!isOverridden) {\n lastComputedBeforeOverride = lastComputedValue;\n overrideDepVersion = depVersion;\n if (computationFn && sourceSignal) {\n const sourceValue = untracked(() => {\n if (typeof sourceSignal === \"function\") {\n const source = sourceSignal;\n return isSignal(source) ? source() : sourceSignal();\n }\n return sourceSignal();\n });\n previousValue = {\n source: sourceValue,\n value\n };\n }\n }\n isOverridden = true;\n overriddenValue = value;\n lastComputedValue = value;\n subject.next(value);\n };\n reactiveStore.currentSubscriptionsTracker?.(fn.subscription);\n init = false;\n return fn;\n}\nfunction untracked(fn) {\n const prevDepTracker = reactiveStore.currentDependencyTracker;\n const prevSubTracker = reactiveStore.currentSubscriptionsTracker;\n reactiveStore.currentDependencyTracker = null;\n reactiveStore.currentSubscriptionsTracker = null;\n try {\n return fn();\n } finally {\n reactiveStore.currentDependencyTracker = prevDepTracker;\n reactiveStore.currentSubscriptionsTracker = prevSubTracker;\n }\n}\n\n// src/effect.ts\nfunction effect(fn) {\n fn[\"isEffect\"] = true;\n return computed(fn);\n}\nexport {\n ArraySubject,\n ObjectSubject,\n computed,\n effect,\n isArraySubject,\n isComputed,\n isObjectSubject,\n isSignal,\n linkedSignal,\n signal,\n untracked\n};\n//# sourceMappingURL=index.js.map"],"x_google_ignoreList":[0],"mappings":"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"}
|
package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
//#region ../../node_modules/.pnpm/@signe+room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __decorateClass = (decorators, target, key, kind) => {
|
|
5
|
+
var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
|
|
6
|
+
for (var i = decorators.length - 1, decorator; i >= 0; i--) if (decorator = decorators[i]) result = (kind ? decorator(target, key, result) : decorator(result)) || result;
|
|
7
|
+
if (kind && result) __defProp(target, key, result);
|
|
8
|
+
return result;
|
|
9
|
+
};
|
|
10
|
+
//#endregion
|
|
11
|
+
export { __decorateClass };
|
|
12
|
+
|
|
13
|
+
//# sourceMappingURL=chunk-EUXUH3YW.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chunk-EUXUH3YW.js","names":[],"sources":["../../../../../../../../../../node_modules/.pnpm/@signe+room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js"],"sourcesContent":["var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __decorateClass = (decorators, target, key, kind) => {\n var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;\n for (var i = decorators.length - 1, decorator; i >= 0; i--)\n if (decorator = decorators[i])\n result = (kind ? decorator(target, key, result) : decorator(result)) || result;\n if (kind && result) __defProp(target, key, result);\n return result;\n};\n\nexport {\n __decorateClass\n};\n//# sourceMappingURL=chunk-EUXUH3YW.js.map"],"x_google_ignoreList":[0],"mappings":";AAAA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,mBAAmB,YAAY,QAAQ,KAAK,SAAS;CACvD,IAAI,SAAS,OAAO,IAAI,KAAK,IAAI,OAAO,iBAAiB,QAAQ,GAAG,IAAI;CACxE,KAAK,IAAI,IAAI,WAAW,SAAS,GAAG,WAAW,KAAK,GAAG,KACrD,IAAI,YAAY,WAAW,IACzB,UAAU,OAAO,UAAU,QAAQ,KAAK,MAAM,IAAI,UAAU,MAAM,MAAM;CAC5E,IAAI,QAAQ,QAAQ,UAAU,QAAQ,KAAK,MAAM;CACjD,OAAO;AACT"}
|
|
@@ -1,15 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { signal } from "../../../../../@signe_reactive@3.0.1/node_modules/@signe/reactive/dist/index.js";
|
|
2
|
+
import { id, persist, sync } from "../../../../../@signe_sync@3.0.1/node_modules/@signe/sync/dist/index.js";
|
|
3
|
+
import { __decorateClass } from "./chunk-EUXUH3YW.js";
|
|
2
4
|
import { z } from "../../../../../zod@3.24.2/node_modules/zod/lib/index.js";
|
|
3
|
-
|
|
4
|
-
//#region ../../node_modules/.pnpm/@signe+room@2.10.0/node_modules/@signe/room/dist/index.js
|
|
5
|
-
var __defProp = Object.defineProperty;
|
|
6
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
7
|
-
var __decorateClass = (decorators, target, key, kind) => {
|
|
8
|
-
var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
|
|
9
|
-
for (var i = decorators.length - 1, decorator; i >= 0; i--) if (decorator = decorators[i]) result = (kind ? decorator(target, key, result) : decorator(result)) || result;
|
|
10
|
-
if (kind && result) __defProp(target, key, result);
|
|
11
|
-
return result;
|
|
12
|
-
};
|
|
5
|
+
//#region ../../node_modules/.pnpm/@signe+room@3.0.1/node_modules/@signe/room/dist/index.js
|
|
13
6
|
function Request2(options, bodyValidation) {
|
|
14
7
|
return function(target, propertyKey) {
|
|
15
8
|
if (!target.constructor._requestMetadata) target.constructor._requestMetadata = /* @__PURE__ */ new Map();
|
|
@@ -55,33 +48,46 @@ var Storage = class {
|
|
|
55
48
|
this.memory = /* @__PURE__ */ new Map();
|
|
56
49
|
}
|
|
57
50
|
async put(key, value) {
|
|
58
|
-
|
|
51
|
+
if (typeof key === "string") {
|
|
52
|
+
this.memory.set(key, value);
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
for (const [entryKey, entryValue] of Object.entries(key)) this.memory.set(entryKey, entryValue);
|
|
59
56
|
}
|
|
60
57
|
async get(key) {
|
|
61
58
|
return this.memory.get(key);
|
|
62
59
|
}
|
|
63
60
|
async delete(key) {
|
|
64
|
-
|
|
61
|
+
if (Array.isArray(key)) {
|
|
62
|
+
let deleted = 0;
|
|
63
|
+
for (const entryKey of key) if (this.memory.delete(entryKey)) deleted += 1;
|
|
64
|
+
return deleted;
|
|
65
|
+
}
|
|
66
|
+
return this.memory.delete(key);
|
|
65
67
|
}
|
|
66
|
-
async list() {
|
|
67
|
-
return this.memory;
|
|
68
|
+
async list(options) {
|
|
69
|
+
if (!options?.prefix) return this.memory;
|
|
70
|
+
return new Map(Array.from(this.memory.entries()).filter(([key]) => String(key).startsWith(options.prefix)));
|
|
68
71
|
}
|
|
69
72
|
};
|
|
70
73
|
z.object({
|
|
71
74
|
action: z.string(),
|
|
72
75
|
value: z.any()
|
|
73
76
|
});
|
|
77
|
+
var INTERNAL_PREFIX = "$room:";
|
|
78
|
+
`${INTERNAL_PREFIX}`;
|
|
79
|
+
`${INTERNAL_PREFIX}`;
|
|
74
80
|
async function request(room, path, options = { method: "GET" }) {
|
|
75
81
|
const url = new URL("http://localhost" + path);
|
|
76
82
|
const request2 = new Request(url.toString(), options);
|
|
77
83
|
return await room.onRequest(request2);
|
|
78
84
|
}
|
|
79
85
|
var MockPartyClient = class {
|
|
80
|
-
constructor(server,
|
|
86
|
+
constructor(server, sessionId) {
|
|
81
87
|
this.server = server;
|
|
82
88
|
this.events = /* @__PURE__ */ new Map();
|
|
83
|
-
this.id =
|
|
84
|
-
this.conn = new MockConnection(this);
|
|
89
|
+
this.id = generateShortUUID();
|
|
90
|
+
this.conn = new MockConnection(this, sessionId || this.id);
|
|
85
91
|
}
|
|
86
92
|
addEventListener(event, cb) {
|
|
87
93
|
if (!this.events.has(event)) this.events.set(event, []);
|
|
@@ -107,8 +113,8 @@ var MockLobby = class {
|
|
|
107
113
|
this.server = server;
|
|
108
114
|
this.lobbyId = lobbyId;
|
|
109
115
|
}
|
|
110
|
-
socket(
|
|
111
|
-
return new MockPartyClient(this.server);
|
|
116
|
+
socket(init) {
|
|
117
|
+
return new MockPartyClient(this.server, init?.id);
|
|
112
118
|
}
|
|
113
119
|
async connection(idOrOptions, maybeOptions) {
|
|
114
120
|
const id2 = typeof idOrOptions === "string" ? idOrOptions : idOrOptions?.id;
|
|
@@ -174,7 +180,9 @@ var MockPartyRoom = class {
|
|
|
174
180
|
});
|
|
175
181
|
}
|
|
176
182
|
getConnection(id2) {
|
|
177
|
-
|
|
183
|
+
let connection;
|
|
184
|
+
for (const client of this.clients.values()) if (client.conn.id === id2 || client.conn.sessionId === id2) connection = client.conn;
|
|
185
|
+
return connection;
|
|
178
186
|
}
|
|
179
187
|
getConnections() {
|
|
180
188
|
return Array.from(this.clients.values()).map((client) => client.conn);
|
|
@@ -182,13 +190,21 @@ var MockPartyRoom = class {
|
|
|
182
190
|
clear() {
|
|
183
191
|
this.clients.clear();
|
|
184
192
|
}
|
|
193
|
+
deleteConnection(id2, connection) {
|
|
194
|
+
if (connection) {
|
|
195
|
+
this.clients.delete(connection.id);
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
for (const [connectionKey, client] of this.clients) if (client.conn.id === id2 || client.conn.sessionId === id2) this.clients.delete(connectionKey);
|
|
199
|
+
}
|
|
185
200
|
};
|
|
186
201
|
var MockConnection = class {
|
|
187
|
-
constructor(client) {
|
|
202
|
+
constructor(client, sessionId) {
|
|
188
203
|
this.client = client;
|
|
189
204
|
this.state = {};
|
|
190
205
|
this.server = client.server;
|
|
191
206
|
this.id = client.id;
|
|
207
|
+
this.sessionId = sessionId;
|
|
192
208
|
}
|
|
193
209
|
setState(value) {
|
|
194
210
|
this.state = value;
|
|
@@ -197,6 +213,7 @@ var MockConnection = class {
|
|
|
197
213
|
this.client._trigger("message", data);
|
|
198
214
|
}
|
|
199
215
|
close() {
|
|
216
|
+
this.server.room.deleteConnection?.(this.id, this);
|
|
200
217
|
this.server.onClose(this);
|
|
201
218
|
}
|
|
202
219
|
};
|
|
@@ -318,19 +335,30 @@ var guardManageWorld = async (_, req, room) => {
|
|
|
318
335
|
if (tokenShard !== room.env.SHARD_SECRET) return false;
|
|
319
336
|
return true;
|
|
320
337
|
}
|
|
321
|
-
const
|
|
322
|
-
const token = req.headers.get("Authorization") ?? url.searchParams.get("world-auth-token");
|
|
338
|
+
const token = getAuthToken(req, new URL(req.url));
|
|
323
339
|
if (!token) return false;
|
|
324
340
|
const jwt = new JWTAuth(room.env.AUTH_JWT_SECRET);
|
|
325
341
|
try {
|
|
326
|
-
|
|
342
|
+
const payload = await jwt.verify(token);
|
|
343
|
+
if (!payload) return false;
|
|
344
|
+
if (!canAccessWorld(payload, room.id)) return false;
|
|
327
345
|
} catch (error) {
|
|
328
346
|
return false;
|
|
329
347
|
}
|
|
330
348
|
return true;
|
|
331
349
|
};
|
|
350
|
+
function getAuthToken(req, url) {
|
|
351
|
+
const authorization = req.headers.get("Authorization");
|
|
352
|
+
if (authorization?.startsWith("Bearer ")) return authorization.slice(7).trim();
|
|
353
|
+
return authorization ?? url.searchParams.get("world-auth-token");
|
|
354
|
+
}
|
|
355
|
+
function canAccessWorld(payload, worldId) {
|
|
356
|
+
const worlds = payload.worlds;
|
|
357
|
+
if (!Array.isArray(worlds)) return false;
|
|
358
|
+
return worlds.some((world) => world === "*" || world === worldId);
|
|
359
|
+
}
|
|
332
360
|
var MAX_PLAYERS_PER_SHARD = 75;
|
|
333
|
-
z.object({
|
|
361
|
+
var RoomConfigSchema = z.object({
|
|
334
362
|
name: z.string(),
|
|
335
363
|
balancingStrategy: z.enum([
|
|
336
364
|
"round-robin",
|
|
@@ -345,10 +373,13 @@ z.object({
|
|
|
345
373
|
z.object({
|
|
346
374
|
shardId: z.string(),
|
|
347
375
|
roomId: z.string(),
|
|
376
|
+
worldId: z.string().optional(),
|
|
348
377
|
url: z.string().url(),
|
|
349
378
|
maxConnections: z.number().int().positive()
|
|
350
379
|
});
|
|
351
|
-
z.object({
|
|
380
|
+
var UpdateShardStatsSchema = z.object({
|
|
381
|
+
shardId: z.string(),
|
|
382
|
+
worldId: z.string().optional(),
|
|
352
383
|
connections: z.number().int().min(0),
|
|
353
384
|
status: z.enum([
|
|
354
385
|
"active",
|
|
@@ -356,7 +387,7 @@ z.object({
|
|
|
356
387
|
"draining"
|
|
357
388
|
]).optional()
|
|
358
389
|
});
|
|
359
|
-
z.object({
|
|
390
|
+
var ScaleRoomSchema = z.object({
|
|
360
391
|
roomId: z.string(),
|
|
361
392
|
targetShardCount: z.number().int().positive(),
|
|
362
393
|
shardTemplate: z.object({
|
|
@@ -384,6 +415,7 @@ __decorateClass([sync()], RoomConfig.prototype, "maxShards", 2);
|
|
|
384
415
|
var ShardInfo = class {
|
|
385
416
|
constructor() {
|
|
386
417
|
this.roomId = signal("");
|
|
418
|
+
this.worldId = signal("");
|
|
387
419
|
this.url = signal("");
|
|
388
420
|
this.currentConnections = signal(0);
|
|
389
421
|
this.maxConnections = signal(MAX_PLAYERS_PER_SHARD);
|
|
@@ -393,6 +425,7 @@ var ShardInfo = class {
|
|
|
393
425
|
};
|
|
394
426
|
__decorateClass([id()], ShardInfo.prototype, "id", 2);
|
|
395
427
|
__decorateClass([sync()], ShardInfo.prototype, "roomId", 2);
|
|
428
|
+
__decorateClass([sync()], ShardInfo.prototype, "worldId", 2);
|
|
396
429
|
__decorateClass([sync()], ShardInfo.prototype, "url", 2);
|
|
397
430
|
__decorateClass([sync({ persist: false })], ShardInfo.prototype, "currentConnections", 2);
|
|
398
431
|
__decorateClass([sync()], ShardInfo.prototype, "maxConnections", 2);
|
|
@@ -409,6 +442,7 @@ var WorldRoom = class {
|
|
|
409
442
|
const { AUTH_JWT_SECRET, SHARD_SECRET } = this.room.env;
|
|
410
443
|
if (!AUTH_JWT_SECRET) throw new Error("AUTH_JWT_SECRET env variable is not set");
|
|
411
444
|
if (!SHARD_SECRET) throw new Error("SHARD_SECRET env variable is not set");
|
|
445
|
+
this.scheduleInactiveShardCleanup();
|
|
412
446
|
}
|
|
413
447
|
async onJoin(user, conn, ctx) {
|
|
414
448
|
const canConnect = await guardManageWorld(user, ctx.request, this.room);
|
|
@@ -421,6 +455,12 @@ var WorldRoom = class {
|
|
|
421
455
|
if (!conn.state["isAdmin"]) return null;
|
|
422
456
|
return obj;
|
|
423
457
|
}
|
|
458
|
+
getWorldId() {
|
|
459
|
+
return this.room.id;
|
|
460
|
+
}
|
|
461
|
+
scheduleInactiveShardCleanup() {
|
|
462
|
+
setTimeout(() => this.cleanupInactiveShards(), 6e4)?.unref?.();
|
|
463
|
+
}
|
|
424
464
|
cleanupInactiveShards() {
|
|
425
465
|
const now = Date.now();
|
|
426
466
|
const timeout = 300 * 1e3;
|
|
@@ -428,10 +468,19 @@ var WorldRoom = class {
|
|
|
428
468
|
Object.values(shardsValue).forEach((shard) => {
|
|
429
469
|
if (now - shard.lastHeartbeat() > timeout) delete this.shards()[shard.id];
|
|
430
470
|
});
|
|
431
|
-
|
|
471
|
+
this.scheduleInactiveShardCleanup();
|
|
432
472
|
}
|
|
433
|
-
|
|
434
|
-
|
|
473
|
+
removeShard(shardId) {
|
|
474
|
+
delete this.shards()[shardId];
|
|
475
|
+
}
|
|
476
|
+
shouldCompleteDrain(shard) {
|
|
477
|
+
return shard.status() === "draining" && shard.currentConnections() === 0;
|
|
478
|
+
}
|
|
479
|
+
async registerRoom(req, res) {
|
|
480
|
+
const parseResult = RoomConfigSchema.safeParse(await req.json());
|
|
481
|
+
if (!parseResult.success) return res?.badRequest("Invalid room configuration", { details: parseResult.error });
|
|
482
|
+
const roomConfig = parseResult.data;
|
|
483
|
+
if (roomConfig.maxShards !== void 0 && roomConfig.minShards > roomConfig.maxShards) return res?.badRequest("minShards cannot be greater than maxShards");
|
|
435
484
|
const roomId = roomConfig.name;
|
|
436
485
|
if (!this.rooms()[roomId]) {
|
|
437
486
|
const newRoom = new RoomConfig();
|
|
@@ -452,17 +501,25 @@ var WorldRoom = class {
|
|
|
452
501
|
room.minShards.set(roomConfig.minShards);
|
|
453
502
|
room.maxShards.set(roomConfig.maxShards);
|
|
454
503
|
}
|
|
504
|
+
await this.ensureMinShards(roomId);
|
|
455
505
|
}
|
|
456
506
|
async updateShardStats(req, res) {
|
|
457
|
-
const
|
|
507
|
+
const parseResult = UpdateShardStatsSchema.safeParse(await req.json());
|
|
508
|
+
if (!parseResult.success) return res.badRequest("Invalid shard stats", { details: parseResult.error });
|
|
509
|
+
const body = parseResult.data;
|
|
510
|
+
const { shardId, connections, status } = body;
|
|
458
511
|
const shard = this.shards()[shardId];
|
|
459
512
|
if (!shard) return res.notFound(`Shard ${shardId} not found`);
|
|
513
|
+
if (body.worldId && body.worldId !== this.getWorldId()) return res.badRequest(`Shard ${shardId} belongs to world ${body.worldId}, not ${this.getWorldId()}`);
|
|
460
514
|
shard.currentConnections.set(connections);
|
|
461
515
|
if (status) shard.status.set(status);
|
|
462
516
|
shard.lastHeartbeat.set(Date.now());
|
|
517
|
+
if (this.shouldCompleteDrain(shard)) this.removeShard(shard.id);
|
|
463
518
|
}
|
|
464
519
|
async scaleRoom(req, res) {
|
|
465
|
-
const
|
|
520
|
+
const parseResult = ScaleRoomSchema.safeParse(await req.json());
|
|
521
|
+
if (!parseResult.success) return res.badRequest("Invalid scale room request", { details: parseResult.error });
|
|
522
|
+
const { targetShardCount, shardTemplate, roomId } = parseResult.data;
|
|
466
523
|
const room = this.rooms()[roomId];
|
|
467
524
|
if (!room) return res.notFound(`Room ${roomId} does not exist`);
|
|
468
525
|
const roomShards = Object.values(this.shards()).filter((shard) => shard.roomId() === roomId);
|
|
@@ -472,13 +529,15 @@ var WorldRoom = class {
|
|
|
472
529
|
currentShardCount: previousShardCount
|
|
473
530
|
});
|
|
474
531
|
if (targetShardCount < previousShardCount) {
|
|
475
|
-
const
|
|
532
|
+
const shardsToDrain = [...roomShards].sort((a, b) => {
|
|
476
533
|
if (a.status() === "draining" && b.status() !== "draining") return -1;
|
|
477
534
|
if (a.status() !== "draining" && b.status() === "draining") return 1;
|
|
478
535
|
return a.currentConnections() - b.currentConnections();
|
|
479
536
|
}).slice(0, previousShardCount - targetShardCount);
|
|
480
|
-
|
|
481
|
-
|
|
537
|
+
for (const shard of shardsToDrain) {
|
|
538
|
+
shard.status.set("draining");
|
|
539
|
+
if (this.shouldCompleteDrain(shard)) this.removeShard(shard.id);
|
|
540
|
+
}
|
|
482
541
|
return;
|
|
483
542
|
}
|
|
484
543
|
if (targetShardCount > previousShardCount) {
|
|
@@ -536,8 +595,18 @@ var WorldRoom = class {
|
|
|
536
595
|
};
|
|
537
596
|
else return { error: `Failed to create shard for room ${roomId}` };
|
|
538
597
|
} else return { error: `No shards available for room ${roomId}` };
|
|
539
|
-
|
|
540
|
-
if (activeShards.length === 0)
|
|
598
|
+
let activeShards = this.getAvailableShards(roomShards);
|
|
599
|
+
if (activeShards.length === 0) {
|
|
600
|
+
if (autoCreate && this.canCreateShard(room, roomShards.length)) {
|
|
601
|
+
const newShard = await this.createShard(roomId);
|
|
602
|
+
if (newShard) return {
|
|
603
|
+
shardId: newShard.id,
|
|
604
|
+
url: newShard.url()
|
|
605
|
+
};
|
|
606
|
+
}
|
|
607
|
+
if (roomShards.some((shard) => shard.status() === "active")) return { error: `No shard capacity available for room ${roomId}` };
|
|
608
|
+
return { error: `No active shards available for room ${roomId}` };
|
|
609
|
+
}
|
|
541
610
|
const balancingStrategy = room.balancingStrategy();
|
|
542
611
|
let selectedShard;
|
|
543
612
|
switch (balancingStrategy) {
|
|
@@ -559,18 +628,26 @@ var WorldRoom = class {
|
|
|
559
628
|
url: selectedShard.url()
|
|
560
629
|
};
|
|
561
630
|
}
|
|
631
|
+
getAvailableShards(shards) {
|
|
632
|
+
return shards.filter((shard) => shard && shard.status() === "active" && shard.currentConnections() < shard.maxConnections());
|
|
633
|
+
}
|
|
634
|
+
canCreateShard(room, currentShardCount) {
|
|
635
|
+
return room.maxShards() === void 0 || currentShardCount < room.maxShards();
|
|
636
|
+
}
|
|
562
637
|
async createShard(roomId, urlTemplate, maxConnections) {
|
|
563
638
|
const room = this.rooms()[roomId];
|
|
564
639
|
if (!room) {
|
|
565
640
|
console.error(`Cannot create shard for non-existent room: ${roomId}`);
|
|
566
641
|
return null;
|
|
567
642
|
}
|
|
568
|
-
const
|
|
643
|
+
const worldId = this.getWorldId();
|
|
644
|
+
const shardId = `${roomId}:${worldId}:${Date.now()}-${Math.floor(Math.random() * 1e4)}`;
|
|
569
645
|
const url = (urlTemplate || this.defaultShardUrlTemplate()).replace("{shardId}", shardId).replace("{roomId}", roomId);
|
|
570
646
|
const max = maxConnections || room.maxPlayersPerShard();
|
|
571
647
|
const newShard = new ShardInfo();
|
|
572
648
|
newShard.id = shardId;
|
|
573
649
|
newShard.roomId.set(roomId);
|
|
650
|
+
newShard.worldId.set(worldId);
|
|
574
651
|
newShard.url.set(url);
|
|
575
652
|
newShard.maxConnections.set(max);
|
|
576
653
|
newShard.currentConnections.set(0);
|
|
@@ -579,6 +656,14 @@ var WorldRoom = class {
|
|
|
579
656
|
this.shards()[shardId] = newShard;
|
|
580
657
|
return newShard;
|
|
581
658
|
}
|
|
659
|
+
async ensureMinShards(roomId) {
|
|
660
|
+
const room = this.rooms()[roomId];
|
|
661
|
+
if (!room) return;
|
|
662
|
+
const currentShardCount = Object.values(this.shards()).filter((shard) => shard.roomId() === roomId).length;
|
|
663
|
+
const targetShardCount = room.minShards();
|
|
664
|
+
if (currentShardCount >= targetShardCount) return;
|
|
665
|
+
for (let i = currentShardCount; i < targetShardCount; i++) await this.createShard(roomId);
|
|
666
|
+
}
|
|
582
667
|
};
|
|
583
668
|
__decorateClass([sync(RoomConfig)], WorldRoom.prototype, "rooms", 2);
|
|
584
669
|
__decorateClass([sync(ShardInfo)], WorldRoom.prototype, "shards", 2);
|