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

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,