@rpgjs/client 5.0.0-beta.26 → 5.0.0-beta.27

package/src/services/loadMap.ts

@@ -1,5 +1,5 @@
 import { Context, inject } from "@signe/di";
-import { UpdateMapToken, UpdateMapService, type LightingState } from "@rpgjs/common";
+import { UpdateMapToken, UpdateMapService, type LightingState, type RpgContext, type RpgProvider } from "@rpgjs/common";
 import type { RpgClientMap } from "../Game/Map";
 
 export const LoadMapToken = 'LoadMapToken'
@@ -47,8 +47,8 @@ export type LoadMapOptions = (mapId: string) => Promise<MapData> | MapData
 export class LoadMapService {
   private updateMapService: UpdateMapService;
 
-  constructor(private context: Context, private options: LoadMapOptions) {
-    if (context['side'] === 'server') {
+  constructor(private context: RpgContext, private options: LoadMapOptions) {
+    if (context.side === 'server') {
       return
     }
   }
@@ -56,7 +56,7 @@ export class LoadMapService {
   initialize(): void {}
 
   async load(mapId: string) {
-    this.updateMapService ??= inject(this.context, UpdateMapToken);
+    this.updateMapService ??= inject(this.context as Context, UpdateMapToken);
     const map = await this.options(mapId.replace('map-', ''))
     await this.updateMapService.update(map);
     return map;
@@ -154,12 +154,12 @@ export class LoadMapService {
  * @see {@link LoadMapOptions} for callback function signature
  * @see {@link MapData} for return data structure
  */
-export function provideLoadMap(options: LoadMapOptions) {
+export function provideLoadMap(options: LoadMapOptions): RpgProvider[] {
   return [
     {
       provide: UpdateMapToken,
-      useFactory: (context: Context) => {
-        if (context['side'] === 'client') {
+      useFactory: (context: RpgContext) => {
+        if (context.side === 'client') {
           console.warn('UpdateMapToken is not overridden')
         }
         return
@@ -167,7 +167,7 @@ export function provideLoadMap(options: LoadMapOptions) {
     },
     {
       provide: LoadMapToken,
-      useFactory: (context: Context) => new LoadMapService(context, options),
+      useFactory: (context: RpgContext) => new LoadMapService(context, options),
     },
   ];
 }

package/src/services/mapStreaming.ts

@@ -6,6 +6,8 @@ import {
   type MapStreamChunk,
   type MapStreamManifest,
   type MapStreamPacket,
+  type RpgContext,
+  type RpgProvider,
 } from "@rpgjs/common";
 import { AbstractWebsocket, WebSocketToken } from "./AbstractSocket";
 import { LoadMapToken, type MapData, type LoadMapOptions } from "./loadMap";
@@ -221,13 +223,13 @@ class MapStreamingLoadMapService<TManifestData, TChunkData, TState> {
   private updateMap?: UpdateMapService;
 
   constructor(
-    private readonly context: Context,
+    private readonly context: RpgContext,
     private readonly options: ClientMapStreamingOptions<TManifestData, TChunkData, TState>,
   ) {}
 
   initialize(): void {
     if (this.stream) return;
-    this.socket = inject<AbstractWebsocket>(this.context, WebSocketToken);
+    this.socket = inject<AbstractWebsocket>(this.context as Context, WebSocketToken);
     this.stream = new MapStreamingClientService(this.socket, this.options);
   }
 
@@ -236,7 +238,7 @@ class MapStreamingLoadMapService<TManifestData, TChunkData, TState> {
     const map = this.socket?.mode === "standalone" && this.options.directLoad
       ? await this.options.directLoad(mapId.replace(/^map-/, ""))
       : await this.stream!.load(mapId);
-    this.updateMap ??= inject<UpdateMapService>(this.context, UpdateMapToken);
+    this.updateMap ??= inject<UpdateMapService>(this.context as Context, UpdateMapToken);
     await this.updateMap.update(map);
     return map;
   }
@@ -265,11 +267,11 @@ class MapStreamingLoadMapService<TManifestData, TChunkData, TState> {
  */
 export function provideClientMapStreaming<TManifestData, TChunkData, TState>(
   options: ClientMapStreamingOptions<TManifestData, TChunkData, TState>,
-) {
+): RpgProvider[] {
   return [
     {
       provide: LoadMapToken,
-      useFactory: (context: Context) => new MapStreamingLoadMapService(context, options),
+      useFactory: (context: RpgContext) => new MapStreamingLoadMapService(context, options),
     },
   ];
 }

package/src/services/mmorpg.ts

@@ -1,9 +1,8 @@
-import { Context } from "@signe/di";
 import { connectionRoom } from "@signe/sync/client";
 import { RpgGui } from "../Gui/Gui";
 import { RpgClientEngine } from "../RpgClientEngine";
 import { AbstractWebsocket, SocketQuery, SocketUpdateProperties, WebSocketToken } from "./AbstractSocket";
-import { UpdateMapService, UpdateMapToken } from "@rpgjs/common";
+import { UpdateMapService, UpdateMapToken, type RpgContext, type RpgProvider } from "@rpgjs/common";
 import { provideKeyboardControls } from "./keyboardControls";
 import { provideSaveClient } from "./save";
 import { isNativeSocketEvent, waitForRpgjsConnected } from "./mmorpg-connection";
@@ -31,7 +30,7 @@ export class BridgeWebsocket extends AbstractWebsocket {
   private acceptedOpenListeners = new Set<(data: any) => void>();
   private targetRoom = "lobby-1";
 
-  constructor(protected context: Context, private options: MmorpgOptions = {}) {
+  constructor(protected context: RpgContext, private options: MmorpgOptions = {}) {
     super(context);
     this.privateId = this.resolveConnectionId();
   }
@@ -186,7 +185,7 @@ export class BridgeWebsocket extends AbstractWebsocket {
 }
 
 class UpdateMapStandaloneService extends UpdateMapService {
-  constructor(protected context: Context, private _options: MmorpgOptions) {
+  constructor(protected context: RpgContext, private _options: MmorpgOptions) {
     super(context);
   }
 
@@ -197,15 +196,15 @@ class UpdateMapStandaloneService extends UpdateMapService {
   }
 }
 
-export function provideMmorpg(options: MmorpgOptions) {
+export function provideMmorpg(options: MmorpgOptions): RpgProvider[] {
   return [
     {
       provide: WebSocketToken,
-      useFactory: (context: Context) => new BridgeWebsocket(context, options),
+      useFactory: (context: RpgContext) => new BridgeWebsocket(context, options),
     },
     {
       provide: UpdateMapToken,
-      useFactory: (context: Context) => new UpdateMapStandaloneService(context, options),
+      useFactory: (context: RpgContext) => new UpdateMapStandaloneService(context, options),
     },
     provideKeyboardControls(),
     provideSaveClient(),

package/src/services/standalone.ts

@@ -1,8 +1,7 @@
 import { AbstractWebsocket, SocketUpdateProperties, WebSocketToken } from "./AbstractSocket";
 import { ClientIo, ServerIo } from "@signe/room";
-import { Context } from "@signe/di";
 import { RpgClientEngine } from "../RpgClientEngine";
-import { UpdateMapService, UpdateMapToken } from "@rpgjs/common";
+import { UpdateMapService, UpdateMapToken, type RpgContext, type RpgProvider } from "@rpgjs/common";
 import { LoadMapToken } from "./loadMap";
 import { RpgGui } from "../Gui/Gui";
 import { provideKeyboardControls } from "./keyboardControls";
@@ -43,7 +42,7 @@ class BridgeWebsocket extends AbstractWebsocket {
   }
   private serverInstance: any;
 
-  constructor(protected context: Context, private server: any, options: StandaloneOptions = {}) {
+  constructor(protected context: RpgContext, private server: any, options: StandaloneOptions = {}) {
     super(context);
     // fake room
     this.rooms.env = options.env || {};
@@ -240,11 +239,11 @@ class UpdateMapStandaloneService extends UpdateMapService {
   }
 }
 
-export function provideRpg(server: any, options: StandaloneOptions = {}) {
+export function provideRpg(server: any, options: StandaloneOptions = {}): RpgProvider[] {
   return [
     {
       provide: WebSocketToken,
-      useFactory: (context: Context) => new BridgeWebsocket(context, server, options),
+      useFactory: (context: RpgContext) => new BridgeWebsocket(context, server, options),
     },
     {
       provide: UpdateMapToken,