@rpgjs/client 5.0.0-beta.1 → 5.0.0-beta.11

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.
Files changed (245) hide show
  1. package/CHANGELOG.md +49 -0
  2. package/LICENSE +19 -0
  3. package/dist/Game/AnimationManager.d.ts +1 -1
  4. package/dist/Game/AnimationManager.js +18 -9
  5. package/dist/Game/AnimationManager.js.map +1 -1
  6. package/dist/Game/AnimationManager.spec.d.ts +1 -0
  7. package/dist/Game/Event.js.map +1 -1
  8. package/dist/Game/Map.d.ts +9 -1
  9. package/dist/Game/Map.js +63 -5
  10. package/dist/Game/Map.js.map +1 -1
  11. package/dist/Game/Object.d.ts +47 -15
  12. package/dist/Game/Object.js +82 -38
  13. package/dist/Game/Object.js.map +1 -1
  14. package/dist/Game/Player.js.map +1 -1
  15. package/dist/Game/ProjectileManager.d.ts +89 -0
  16. package/dist/Game/ProjectileManager.js +179 -0
  17. package/dist/Game/ProjectileManager.js.map +1 -0
  18. package/dist/Game/ProjectileManager.spec.d.ts +1 -0
  19. package/dist/Gui/Gui.d.ts +17 -4
  20. package/dist/Gui/Gui.js +78 -48
  21. package/dist/Gui/Gui.js.map +1 -1
  22. package/dist/Gui/Gui.spec.d.ts +1 -0
  23. package/dist/Gui/NotificationManager.js.map +1 -1
  24. package/dist/Resource.js +1 -1
  25. package/dist/Resource.js.map +1 -1
  26. package/dist/RpgClient.d.ts +110 -15
  27. package/dist/RpgClientEngine.d.ts +86 -10
  28. package/dist/RpgClientEngine.js +306 -49
  29. package/dist/RpgClientEngine.js.map +1 -1
  30. package/dist/Sound.js.map +1 -1
  31. package/dist/_virtual/{_@oxc-project_runtime@0.122.0 → _@oxc-project_runtime@0.130.0}/helpers/decorate.js +1 -1
  32. package/dist/_virtual/{_@oxc-project_runtime@0.122.0 → _@oxc-project_runtime@0.130.0}/helpers/decorateMetadata.js +1 -1
  33. package/dist/components/animations/animation.ce.js +4 -5
  34. package/dist/components/animations/animation.ce.js.map +1 -1
  35. package/dist/components/animations/hit.ce.js +19 -25
  36. package/dist/components/animations/hit.ce.js.map +1 -1
  37. package/dist/components/animations/index.js +4 -4
  38. package/dist/components/animations/index.js.map +1 -1
  39. package/dist/components/character.ce.js +422 -240
  40. package/dist/components/character.ce.js.map +1 -1
  41. package/dist/components/dynamics/bar.ce.js +97 -0
  42. package/dist/components/dynamics/bar.ce.js.map +1 -0
  43. package/dist/components/dynamics/image.ce.js +24 -0
  44. package/dist/components/dynamics/image.ce.js.map +1 -0
  45. package/dist/components/dynamics/parse-value.d.ts +3 -0
  46. package/dist/components/dynamics/parse-value.js +54 -35
  47. package/dist/components/dynamics/parse-value.js.map +1 -1
  48. package/dist/components/dynamics/parse-value.spec.d.ts +1 -0
  49. package/dist/components/dynamics/shape-utils.d.ts +16 -0
  50. package/dist/components/dynamics/shape-utils.js +73 -0
  51. package/dist/components/dynamics/shape-utils.js.map +1 -0
  52. package/dist/components/dynamics/shape-utils.spec.d.ts +1 -0
  53. package/dist/components/dynamics/shape.ce.js +84 -0
  54. package/dist/components/dynamics/shape.ce.js.map +1 -0
  55. package/dist/components/dynamics/text.ce.js +34 -56
  56. package/dist/components/dynamics/text.ce.js.map +1 -1
  57. package/dist/components/gui/box.ce.js +6 -8
  58. package/dist/components/gui/box.ce.js.map +1 -1
  59. package/dist/components/gui/dialogbox/index.ce.js +56 -62
  60. package/dist/components/gui/dialogbox/index.ce.js.map +1 -1
  61. package/dist/components/gui/gameover.ce.js +42 -65
  62. package/dist/components/gui/gameover.ce.js.map +1 -1
  63. package/dist/components/gui/hud/hud.ce.js +21 -30
  64. package/dist/components/gui/hud/hud.ce.js.map +1 -1
  65. package/dist/components/gui/menu/equip-menu.ce.js +112 -165
  66. package/dist/components/gui/menu/equip-menu.ce.js.map +1 -1
  67. package/dist/components/gui/menu/exit-menu.ce.js +8 -6
  68. package/dist/components/gui/menu/exit-menu.ce.js.map +1 -1
  69. package/dist/components/gui/menu/items-menu.ce.js +52 -69
  70. package/dist/components/gui/menu/items-menu.ce.js.map +1 -1
  71. package/dist/components/gui/menu/main-menu.ce.js +75 -92
  72. package/dist/components/gui/menu/main-menu.ce.js.map +1 -1
  73. package/dist/components/gui/menu/options-menu.ce.js +5 -4
  74. package/dist/components/gui/menu/options-menu.ce.js.map +1 -1
  75. package/dist/components/gui/menu/skills-menu.ce.js +12 -17
  76. package/dist/components/gui/menu/skills-menu.ce.js.map +1 -1
  77. package/dist/components/gui/mobile/index.js +2 -2
  78. package/dist/components/gui/mobile/index.js.map +1 -1
  79. package/dist/components/gui/mobile/mobile.ce.js +5 -4
  80. package/dist/components/gui/mobile/mobile.ce.js.map +1 -1
  81. package/dist/components/gui/notification/notification.ce.js +22 -24
  82. package/dist/components/gui/notification/notification.ce.js.map +1 -1
  83. package/dist/components/gui/save-load.ce.js +72 -249
  84. package/dist/components/gui/save-load.ce.js.map +1 -1
  85. package/dist/components/gui/shop/shop.ce.js +90 -127
  86. package/dist/components/gui/shop/shop.ce.js.map +1 -1
  87. package/dist/components/gui/title-screen.ce.js +45 -70
  88. package/dist/components/gui/title-screen.ce.js.map +1 -1
  89. package/dist/components/index.d.ts +2 -1
  90. package/dist/components/index.js +1 -0
  91. package/dist/components/player-components-utils.d.ts +67 -0
  92. package/dist/components/player-components-utils.js +162 -0
  93. package/dist/components/player-components-utils.js.map +1 -0
  94. package/dist/components/player-components-utils.spec.d.ts +1 -0
  95. package/dist/components/player-components.ce.js +189 -0
  96. package/dist/components/player-components.ce.js.map +1 -0
  97. package/dist/components/prebuilt/hp-bar.ce.js +42 -44
  98. package/dist/components/prebuilt/hp-bar.ce.js.map +1 -1
  99. package/dist/components/prebuilt/light-halo.ce.js +36 -59
  100. package/dist/components/prebuilt/light-halo.ce.js.map +1 -1
  101. package/dist/components/scenes/canvas.ce.js +165 -21
  102. package/dist/components/scenes/canvas.ce.js.map +1 -1
  103. package/dist/components/scenes/draw-map.ce.js +25 -32
  104. package/dist/components/scenes/draw-map.ce.js.map +1 -1
  105. package/dist/components/scenes/event-layer.ce.js +9 -8
  106. package/dist/components/scenes/event-layer.ce.js.map +1 -1
  107. package/dist/core/inject.js +1 -1
  108. package/dist/core/inject.js.map +1 -1
  109. package/dist/core/setup.js +1 -1
  110. package/dist/core/setup.js.map +1 -1
  111. package/dist/decorators/spritesheet.d.ts +1 -0
  112. package/dist/decorators/spritesheet.js +11 -0
  113. package/dist/decorators/spritesheet.js.map +1 -0
  114. package/dist/index.d.ts +4 -0
  115. package/dist/index.js +26 -21
  116. package/dist/module.js +15 -1
  117. package/dist/module.js.map +1 -1
  118. package/dist/node_modules/.pnpm/{@signe_di@2.9.0 → @signe_di@3.0.1}/node_modules/@signe/di/dist/index.js +7 -117
  119. package/dist/node_modules/.pnpm/@signe_di@3.0.1/node_modules/@signe/di/dist/index.js.map +1 -0
  120. package/dist/node_modules/.pnpm/@signe_reactive@3.0.1/node_modules/@signe/reactive/dist/index.js +239 -0
  121. package/dist/node_modules/.pnpm/@signe_reactive@3.0.1/node_modules/@signe/reactive/dist/index.js.map +1 -0
  122. package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js +13 -0
  123. package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/chunk-EUXUH3YW.js.map +1 -0
  124. package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/index.js +696 -0
  125. package/dist/node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/index.js.map +1 -0
  126. package/dist/node_modules/.pnpm/@signe_sync@3.0.1/node_modules/@signe/sync/dist/client/index.js +44 -0
  127. package/dist/node_modules/.pnpm/@signe_sync@3.0.1/node_modules/@signe/sync/dist/client/index.js.map +1 -0
  128. package/dist/node_modules/.pnpm/{@signe_sync@2.9.0 → @signe_sync@3.0.1}/node_modules/@signe/sync/dist/index.js +57 -141
  129. package/dist/node_modules/.pnpm/@signe_sync@3.0.1/node_modules/@signe/sync/dist/index.js.map +1 -0
  130. package/dist/node_modules/.pnpm/partysocket@1.1.3/node_modules/partysocket/dist/chunk-HAC622V3.js.map +1 -1
  131. package/dist/node_modules/.pnpm/partysocket@1.1.3/node_modules/partysocket/dist/chunk-S74YV6PU.js.map +1 -1
  132. package/dist/node_modules/.pnpm/zod@3.24.2/node_modules/zod/lib/index.js +27 -27
  133. package/dist/node_modules/.pnpm/zod@3.24.2/node_modules/zod/lib/index.js.map +1 -1
  134. package/dist/presets/animation.js.map +1 -1
  135. package/dist/presets/faceset.js.map +1 -1
  136. package/dist/presets/icon.js.map +1 -1
  137. package/dist/presets/index.js.map +1 -1
  138. package/dist/presets/lpc.js.map +1 -1
  139. package/dist/presets/rmspritesheet.js.map +1 -1
  140. package/dist/services/AbstractSocket.js.map +1 -1
  141. package/dist/services/actionInput.d.ts +12 -0
  142. package/dist/services/actionInput.js +27 -0
  143. package/dist/services/actionInput.js.map +1 -0
  144. package/dist/services/actionInput.spec.d.ts +1 -0
  145. package/dist/services/keyboardControls.js.map +1 -1
  146. package/dist/services/loadMap.d.ts +6 -0
  147. package/dist/services/loadMap.js +1 -1
  148. package/dist/services/loadMap.js.map +1 -1
  149. package/dist/services/mmorpg-connection.d.ts +5 -0
  150. package/dist/services/mmorpg-connection.js +50 -0
  151. package/dist/services/mmorpg-connection.js.map +1 -0
  152. package/dist/services/mmorpg-connection.spec.d.ts +1 -0
  153. package/dist/services/mmorpg.d.ts +10 -4
  154. package/dist/services/mmorpg.js +56 -33
  155. package/dist/services/mmorpg.js.map +1 -1
  156. package/dist/services/pointerContext.d.ts +11 -0
  157. package/dist/services/pointerContext.js +48 -0
  158. package/dist/services/pointerContext.js.map +1 -0
  159. package/dist/services/pointerContext.spec.d.ts +1 -0
  160. package/dist/services/save.js.map +1 -1
  161. package/dist/services/save.spec.d.ts +1 -0
  162. package/dist/services/standalone-message.d.ts +1 -0
  163. package/dist/services/standalone-message.js +9 -0
  164. package/dist/services/standalone-message.js.map +1 -0
  165. package/dist/services/standalone.js +4 -3
  166. package/dist/services/standalone.js.map +1 -1
  167. package/dist/services/standalone.spec.d.ts +1 -0
  168. package/dist/utils/getEntityProp.js +4 -3
  169. package/dist/utils/getEntityProp.js.map +1 -1
  170. package/dist/utils/getEntityProp.spec.d.ts +1 -0
  171. package/dist/utils/readPropValue.d.ts +2 -0
  172. package/dist/utils/readPropValue.js +13 -0
  173. package/dist/utils/readPropValue.js.map +1 -0
  174. package/package.json +13 -14
  175. package/src/Game/AnimationManager.spec.ts +30 -0
  176. package/src/Game/AnimationManager.ts +22 -10
  177. package/src/Game/Map.ts +91 -2
  178. package/src/Game/Object.ts +148 -69
  179. package/src/Game/ProjectileManager.spec.ts +338 -0
  180. package/src/Game/ProjectileManager.ts +324 -0
  181. package/src/Gui/Gui.spec.ts +273 -0
  182. package/src/Gui/Gui.ts +105 -50
  183. package/src/Resource.ts +1 -2
  184. package/src/RpgClient.ts +125 -17
  185. package/src/RpgClientEngine.ts +457 -87
  186. package/src/components/character.ce +441 -32
  187. package/src/components/dynamics/bar.ce +88 -0
  188. package/src/components/dynamics/image.ce +21 -0
  189. package/src/components/dynamics/parse-value.spec.ts +83 -0
  190. package/src/components/dynamics/parse-value.ts +111 -37
  191. package/src/components/dynamics/shape-utils.spec.ts +46 -0
  192. package/src/components/dynamics/shape-utils.ts +61 -0
  193. package/src/components/dynamics/shape.ce +90 -0
  194. package/src/components/dynamics/text.ce +35 -149
  195. package/src/components/gui/dialogbox/index.ce +18 -8
  196. package/src/components/gui/gameover.ce +2 -1
  197. package/src/components/gui/menu/equip-menu.ce +2 -1
  198. package/src/components/gui/menu/exit-menu.ce +2 -1
  199. package/src/components/gui/menu/items-menu.ce +3 -2
  200. package/src/components/gui/menu/main-menu.ce +2 -1
  201. package/src/components/gui/save-load.ce +2 -1
  202. package/src/components/gui/shop/shop.ce +3 -2
  203. package/src/components/gui/title-screen.ce +2 -1
  204. package/src/components/index.ts +2 -1
  205. package/src/components/player-components-utils.spec.ts +109 -0
  206. package/src/components/player-components-utils.ts +205 -0
  207. package/src/components/player-components.ce +222 -0
  208. package/src/components/prebuilt/hp-bar.ce +4 -3
  209. package/src/components/prebuilt/light-halo.ce +2 -2
  210. package/src/components/scenes/canvas.ce +175 -8
  211. package/src/components/scenes/draw-map.ce +18 -17
  212. package/src/components/scenes/event-layer.ce +1 -2
  213. package/src/core/setup.ts +2 -2
  214. package/src/decorators/spritesheet.ts +8 -0
  215. package/src/index.ts +4 -0
  216. package/src/module.ts +18 -1
  217. package/src/services/actionInput.spec.ts +101 -0
  218. package/src/services/actionInput.ts +53 -0
  219. package/src/services/loadMap.ts +2 -0
  220. package/src/services/mmorpg-connection.spec.ts +99 -0
  221. package/src/services/mmorpg-connection.ts +69 -0
  222. package/src/services/mmorpg.ts +68 -36
  223. package/src/services/pointerContext.spec.ts +36 -0
  224. package/src/services/pointerContext.ts +84 -0
  225. package/src/services/save.spec.ts +127 -0
  226. package/src/services/standalone-message.ts +7 -0
  227. package/src/services/standalone.spec.ts +34 -0
  228. package/src/services/standalone.ts +3 -2
  229. package/src/utils/getEntityProp.spec.ts +96 -0
  230. package/src/utils/getEntityProp.ts +4 -3
  231. package/src/utils/readPropValue.ts +16 -0
  232. package/dist/node_modules/.pnpm/@signe_di@2.9.0/node_modules/@signe/di/dist/index.js.map +0 -1
  233. package/dist/node_modules/.pnpm/@signe_reactive@2.8.3/node_modules/@signe/reactive/dist/index.js +0 -457
  234. package/dist/node_modules/.pnpm/@signe_reactive@2.8.3/node_modules/@signe/reactive/dist/index.js.map +0 -1
  235. package/dist/node_modules/.pnpm/@signe_reactive@2.9.0/node_modules/@signe/reactive/dist/index.js +0 -463
  236. package/dist/node_modules/.pnpm/@signe_reactive@2.9.0/node_modules/@signe/reactive/dist/index.js.map +0 -1
  237. package/dist/node_modules/.pnpm/@signe_room@2.9.0/node_modules/@signe/room/dist/index.js +0 -2191
  238. package/dist/node_modules/.pnpm/@signe_room@2.9.0/node_modules/@signe/room/dist/index.js.map +0 -1
  239. package/dist/node_modules/.pnpm/@signe_sync@2.9.0/node_modules/@signe/sync/dist/chunk-7QVYU63E.js +0 -10
  240. package/dist/node_modules/.pnpm/@signe_sync@2.9.0/node_modules/@signe/sync/dist/chunk-7QVYU63E.js.map +0 -1
  241. package/dist/node_modules/.pnpm/@signe_sync@2.9.0/node_modules/@signe/sync/dist/client/index.js +0 -91
  242. package/dist/node_modules/.pnpm/@signe_sync@2.9.0/node_modules/@signe/sync/dist/client/index.js.map +0 -1
  243. package/dist/node_modules/.pnpm/@signe_sync@2.9.0/node_modules/@signe/sync/dist/index.js.map +0 -1
  244. package/dist/node_modules/.pnpm/dset@3.1.4/node_modules/dset/dist/index.js +0 -14
  245. package/dist/node_modules/.pnpm/dset@3.1.4/node_modules/dset/dist/index.js.map +0 -1
@@ -0,0 +1,127 @@
1
+ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
2
+ import { SaveClientService, provideSaveClient } from "./save";
3
+
4
+ const createSocket = () => {
5
+ const listeners = new Map<string, (data: any) => void>();
6
+ const emitted: Array<{ event: string; data: any }> = [];
7
+
8
+ return {
9
+ listeners,
10
+ emitted,
11
+ on: vi.fn((event: string, callback: (data: any) => void) => {
12
+ listeners.set(event, callback);
13
+ }),
14
+ off: vi.fn((event: string) => {
15
+ listeners.delete(event);
16
+ }),
17
+ emit: vi.fn((event: string, data: any) => {
18
+ emitted.push({ event, data });
19
+ }),
20
+ };
21
+ };
22
+
23
+ const createService = (socket = createSocket()) => {
24
+ const service = Object.create(SaveClientService.prototype) as SaveClientService;
25
+ (service as any).webSocket = socket;
26
+ (service as any).pending = new Map();
27
+ (service as any).requestCounter = 0;
28
+ return { service, socket };
29
+ };
30
+
31
+ describe("SaveClientService", () => {
32
+ beforeEach(() => {
33
+ vi.useFakeTimers();
34
+ vi.setSystemTime(new Date("2026-01-02T03:04:05.000Z"));
35
+ });
36
+
37
+ afterEach(() => {
38
+ vi.useRealTimers();
39
+ });
40
+
41
+ test("registers save result listeners idempotently", () => {
42
+ const { service, socket } = createService();
43
+
44
+ service.initialize();
45
+
46
+ expect(socket.off).toHaveBeenCalledTimes(4);
47
+ expect(socket.on).toHaveBeenCalledTimes(4);
48
+ expect([...socket.listeners.keys()]).toEqual([
49
+ "save.list.result",
50
+ "save.save.result",
51
+ "save.load.result",
52
+ "save.error",
53
+ ]);
54
+ });
55
+
56
+ test("lists, saves and loads slots through request/response events", async () => {
57
+ const { service, socket } = createService();
58
+ service.initialize();
59
+
60
+ const listPromise = service.listSlots();
61
+ expect(socket.emitted[0]).toEqual({
62
+ event: "save.list",
63
+ data: { requestId: "1767323045000-1" },
64
+ });
65
+ socket.listeners.get("save.list.result")?.({
66
+ requestId: "1767323045000-1",
67
+ slots: [{ id: "slot-a" }],
68
+ });
69
+ await expect(listPromise).resolves.toEqual([{ id: "slot-a" }]);
70
+
71
+ const savePromise = service.saveSlot(2, { map: "forest" } as any);
72
+ expect(socket.emitted[1]).toEqual({
73
+ event: "save.save",
74
+ data: {
75
+ requestId: "1767323045000-2",
76
+ index: 2,
77
+ meta: { map: "forest" },
78
+ },
79
+ });
80
+ socket.listeners.get("save.save.result")?.({
81
+ requestId: "1767323045000-2",
82
+ index: 2,
83
+ slots: [null, null, { id: "slot-c" }],
84
+ });
85
+ await expect(savePromise).resolves.toEqual([null, null, { id: "slot-c" }]);
86
+
87
+ const loadPromise = service.loadSlot(2);
88
+ expect(socket.emitted[2]).toEqual({
89
+ event: "save.load",
90
+ data: { requestId: "1767323045000-3", index: 2 },
91
+ });
92
+ socket.listeners.get("save.load.result")?.({
93
+ requestId: "1767323045000-3",
94
+ index: 2,
95
+ ok: true,
96
+ });
97
+ await expect(loadPromise).resolves.toBe(true);
98
+ });
99
+
100
+ test("rejects matching pending requests on save errors and ignores stale responses", async () => {
101
+ const { service, socket } = createService();
102
+ service.initialize();
103
+
104
+ const listPromise = service.listSlots();
105
+
106
+ socket.listeners.get("save.list.result")?.({
107
+ requestId: "unknown",
108
+ slots: [{ id: "stale" }],
109
+ });
110
+ expect((service as any).pending.size).toBe(1);
111
+
112
+ socket.listeners.get("save.error")?.({
113
+ requestId: "1767323045000-1",
114
+ message: "Cannot save",
115
+ });
116
+
117
+ await expect(listPromise).rejects.toThrow("Cannot save");
118
+ expect((service as any).pending.size).toBe(0);
119
+ });
120
+
121
+ test("provides the client save service class", () => {
122
+ expect(provideSaveClient()).toEqual({
123
+ provide: SaveClientService,
124
+ useClass: SaveClientService,
125
+ });
126
+ });
127
+ });
@@ -0,0 +1,7 @@
1
+ export function normalizeStandaloneMessage(event: unknown): any {
2
+ const raw = event && typeof event === "object" && "data" in event
3
+ ? (event as MessageEvent).data
4
+ : event;
5
+
6
+ return typeof raw === "string" ? JSON.parse(raw) : raw;
7
+ }
@@ -0,0 +1,34 @@
1
+ import { describe, expect, test, vi } from "vitest";
2
+ import { normalizeStandaloneMessage } from "./standalone-message";
3
+
4
+ describe("standalone websocket bridge", () => {
5
+ test("dispatches mock room object broadcasts to named listeners", () => {
6
+ const onSpawn = vi.fn();
7
+ const object = normalizeStandaloneMessage({
8
+ type: "projectile:spawnBatch",
9
+ value: {
10
+ projectiles: [{ id: "p1", type: "bolt" }],
11
+ },
12
+ });
13
+
14
+ if (object.type === "projectile:spawnBatch") {
15
+ onSpawn(object.value);
16
+ }
17
+
18
+ expect(onSpawn).toHaveBeenCalledWith({
19
+ projectiles: [{ id: "p1", type: "bolt" }],
20
+ });
21
+ });
22
+
23
+ test("still accepts browser-style string messages", () => {
24
+ expect(normalizeStandaloneMessage({
25
+ data: JSON.stringify({
26
+ type: "projectile:spawnBatch",
27
+ value: { projectiles: [] },
28
+ }),
29
+ })).toEqual({
30
+ type: "projectile:spawnBatch",
31
+ value: { projectiles: [] },
32
+ });
33
+ });
34
+ });
@@ -7,6 +7,7 @@ import { LoadMapToken } from "./loadMap";
7
7
  import { RpgGui } from "../Gui/Gui";
8
8
  import { provideKeyboardControls } from "./keyboardControls";
9
9
  import { provideSaveClient } from "./save";
10
+ import { normalizeStandaloneMessage } from "./standalone-message";
10
11
 
11
12
  type ServerIo = any;
12
13
  type ClientIo = any;
@@ -58,16 +59,16 @@ class BridgeWebsocket extends AbstractWebsocket {
58
59
  }
59
60
  })
60
61
  listeners?.(this.socket)
61
- await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
62
62
  this.room.clients.set(this.socket.id, this.socket);
63
63
  this.pendingOn.forEach(({ event, callback }) => this.socket.addEventListener(event, callback));
64
64
  this.pendingOn = [];
65
+ await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
65
66
  return this.socket
66
67
  }
67
68
 
68
69
  on(key: string, callback: (data: any) => void) {
69
70
  const handler = (event) => {
70
- const object = JSON.parse(event);
71
+ const object = normalizeStandaloneMessage(event);
71
72
  if (object.type === key) {
72
73
  callback(object.value);
73
74
  }
@@ -0,0 +1,96 @@
1
+ import { describe, expect, test } from "vitest";
2
+ import { signal } from "canvasengine";
3
+ import { getEntityProp } from "./getEntityProp";
4
+
5
+ const createEntity = () => {
6
+ const name = signal("Alex");
7
+
8
+ return {
9
+ _level: signal(5),
10
+ _exp: signal(120),
11
+ _gold: signal(30),
12
+ hpSignal: signal(80),
13
+ spSignal: signal(12),
14
+ type: signal("player"),
15
+ x: signal(10),
16
+ y: signal(20),
17
+ z: signal(0),
18
+ tint: signal(0xffffff),
19
+ direction: signal(2),
20
+ hitbox: signal({ w: 32, h: 48 }),
21
+ animationName: signal("idle"),
22
+ graphics: signal(["hero"]),
23
+ items: signal([{ id: "potion" }]),
24
+ equipments: signal([]),
25
+ states: signal([]),
26
+ skills: signal([]),
27
+ _effects: signal([]),
28
+ componentsTop: signal(["nameplate"]),
29
+ componentsBottom: signal([]),
30
+ componentsCenter: signal([]),
31
+ componentsLeft: signal([]),
32
+ componentsRight: signal([]),
33
+ _param: signal({ maxHp: 100, custom: 7 }),
34
+ _canMove: signal(true),
35
+ get name() {
36
+ return name();
37
+ },
38
+ set name(value: string) {
39
+ name.set(value);
40
+ },
41
+ get speed() {
42
+ return 4;
43
+ },
44
+ get canMove() {
45
+ return true;
46
+ },
47
+ } as any;
48
+ };
49
+
50
+ describe("getEntityProp", () => {
51
+ test("returns undefined until a reactive entity becomes available", () => {
52
+ const entity = signal<any>(undefined);
53
+ const hp = getEntityProp(entity, "hp");
54
+ const maxHp = getEntityProp(entity, "params.maxHp");
55
+
56
+ expect(hp()).toBeUndefined();
57
+ expect(maxHp()).toBeUndefined();
58
+
59
+ const current = createEntity();
60
+ entity.set(current);
61
+
62
+ expect(hp()).toBe(80);
63
+ expect(maxHp()).toBe(100);
64
+
65
+ const next = createEntity();
66
+ next.hpSignal.set(42);
67
+ next._param.set({ maxHp: 90 });
68
+ entity.set(next);
69
+
70
+ expect(hp()).toBe(42);
71
+ expect(maxHp()).toBe(90);
72
+ });
73
+
74
+ test("reads built-in, param and unknown keys without throwing", () => {
75
+ const entity = createEntity();
76
+
77
+ expect(getEntityProp(entity, "name")()).toBe("Alex");
78
+ expect(getEntityProp(entity, "componentsTop")()).toEqual(["nameplate"]);
79
+ expect(getEntityProp(entity, "params.custom")()).toBe(7);
80
+ expect(getEntityProp(entity, "params.missing")()).toBeUndefined();
81
+ expect(getEntityProp(entity, "unknown" as any)()).toBeUndefined();
82
+ });
83
+
84
+ test("reads canMove from the synced value when available", () => {
85
+ const entity = createEntity();
86
+ const canMove = getEntityProp(entity, "canMove");
87
+
88
+ expect(canMove()).toBe(true);
89
+
90
+ entity._canMove.set(false);
91
+ expect(canMove()).toBe(false);
92
+
93
+ entity._canMove.set({ value: true } as any);
94
+ expect(canMove()).toBe(true);
95
+ });
96
+ });
@@ -1,5 +1,6 @@
1
1
  import { computed, Signal } from "canvasengine";
2
2
  import { RpgClientObject } from "../Game/Object";
3
+ import { readPropValue } from "./readPropValue";
3
4
 
4
5
  const BUILTIN_PARAM_KEYS = [
5
6
  "maxHp",
@@ -22,17 +23,17 @@ const entityPropMap = {
22
23
  gold: (entity: RpgClientObject) => entity._gold(),
23
24
  hp: (entity: RpgClientObject) => entity.hpSignal(),
24
25
  sp: (entity: RpgClientObject) => entity.spSignal(),
25
- name: (entity: RpgClientObject) => entity.name(),
26
+ name: (entity: RpgClientObject) => entity.name,
26
27
  type: (entity: RpgClientObject) => entity.type(),
27
28
  x: (entity: RpgClientObject) => entity.x(),
28
29
  y: (entity: RpgClientObject) => entity.y(),
29
30
  z: (entity: RpgClientObject) => entity.z(),
30
31
  tint: (entity: RpgClientObject) => entity.tint(),
31
32
  direction: (entity: RpgClientObject) => entity.direction(),
32
- speed: (entity: RpgClientObject) => entity.speed(),
33
+ speed: (entity: RpgClientObject) => entity.speed,
33
34
  hitbox: (entity: RpgClientObject) => entity.hitbox(),
34
35
  animation: (entity: RpgClientObject) => entity.animationName(),
35
- canMove: (entity: RpgClientObject) => entity.canMove(),
36
+ canMove: (entity: RpgClientObject) => readPropValue<boolean>((entity as any)._canMove ?? entity.canMove),
36
37
  graphics: (entity: RpgClientObject) => entity.graphics(),
37
38
  items: (entity: RpgClientObject) => entity.items(),
38
39
  equipments: (entity: RpgClientObject) => entity.equipments(),
@@ -0,0 +1,16 @@
1
+ export const readPropValue = <T = unknown>(value: unknown): T => {
2
+ if (typeof value === "function") {
3
+ return readPropValue((value as () => unknown)());
4
+ }
5
+
6
+ if (value && typeof value === "object" && "value" in value) {
7
+ return readPropValue((value as { value: unknown }).value);
8
+ }
9
+
10
+ return value as T;
11
+ };
12
+
13
+ export const getCanMoveValue = (entity: any): boolean => {
14
+ const value = readPropValue(entity?._canMove ?? entity?.canMove);
15
+ return value !== false;
16
+ };
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","names":[],"sources":["../../../../../../../../../../node_modules/.pnpm/@signe+di@2.9.0/node_modules/@signe/di/dist/index.js"],"sourcesContent":["var __defProp = Object.defineProperty;\nvar __name = (target, value) => __defProp(target, \"name\", { value, configurable: true });\n\n// src/inject.ts\nvar DEFAULT_INSTANCE_KEY = \"__default__\";\nfunction toTokenName(token) {\n return typeof token === \"function\" ? token.name : token;\n}\n__name(toTokenName, \"toTokenName\");\nfunction toInstanceKey(name) {\n return name ?? DEFAULT_INSTANCE_KEY;\n}\n__name(toInstanceKey, \"toInstanceKey\");\nfunction getRecord(context, token) {\n return context.get(\"inject:\" + toTokenName(token));\n}\n__name(getRecord, \"getRecord\");\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}\n__name(ensureRecord, \"ensureRecord\");\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}\n__name(provide, \"provide\");\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}\n__name(isInjected, \"isInjected\");\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}\n__name(isProvided, \"isProvided\");\nfunction hasInstance(context, token, options = {}) {\n return isProvided(context, token, options);\n}\n__name(hasInstance, \"hasInstance\");\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}\n__name(handleMissingInjection, \"handleMissingInjection\");\nfunction markInjected(record, key) {\n record.injected.add(key);\n}\n__name(markInjected, \"markInjected\");\nfunction markAllInjected(record) {\n for (const key of record.values.keys()) {\n record.injected.add(key);\n }\n}\n__name(markAllInjected, \"markAllInjected\");\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}\n__name(inject, \"inject\");\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}\n__name(override, \"override\");\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}\n__name(findProviders, \"findProviders\");\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__name(findProvider, \"findProvider\");\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}\n__name(processProvider, \"processProvider\");\nfunction mergeConfig(baseConfig, config) {\n const mergedConfig = {\n ...baseConfig,\n ...config,\n providers: [\n ...baseConfig.providers\n ]\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__name(mergeConfig, \"mergeConfig\");\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 {\n multi,\n name\n };\n}\n__name(extractProvideOptions, \"extractProvideOptions\");\nfunction getDeps(provider) {\n if (typeof provider === \"function\") {\n return provider.deps ?? [];\n }\n return provider.deps ?? [];\n}\n__name(getDeps, \"getDeps\");\nfunction sortProviders(providers) {\n const tokenName = /* @__PURE__ */ __name((t) => typeof t === \"function\" ? t.name : t, \"tokenName\");\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, [\n p\n ]);\n }\n }\n const result = [];\n const visited = /* @__PURE__ */ new Set();\n const stack = /* @__PURE__ */ new Set();\n const visit = /* @__PURE__ */ __name((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 }, \"visit\");\n for (const p of providers) {\n const token = typeof p === \"function\" ? p : p.provide;\n visit(token);\n }\n return result;\n}\n__name(sortProviders, \"sortProviders\");\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__name(injector, \"injector\");\n\n// src/context.ts\nvar Context = class {\n static {\n __name(this, \"Context\");\n }\n /** Internal storage for injected values */\n values = {};\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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"}