simple room upgrade

RSamaium · Nov 19, 2023 · f60b141 · f60b141
1 parent dcefcd5
commit f60b141
Show file tree

Hide file tree

Showing 10 changed files with 15,360 additions and 1,820 deletions.
diff --git a/packages/client/package-lock.json b/packages/client/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -41,7 +41,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rxjs": "7.8.0",
-    "simple-room-client": "^2.0.6",
+    "simple-room-client": "^3.0.0",
     "vue": "^3.2.47"
   },
   "gitHead": "5abe6ca78be96524d74a052a230f2315c900ddee",

diff --git a/packages/client/src/RpgClientEngine.ts b/packages/client/src/RpgClientEngine.ts
@@ -170,7 +170,7 @@ export class RpgClientEngine {
             const id: any = isString(sound) ? extractId(sound) : undefined
             this.addSound(sound, id)
         })
-        
+
         // obsolete
         if (typeof __RPGJS_PRODUCTION__ != 'undefined' && __RPGJS_PRODUCTION__) {
             if ('serviceWorker' in navigator) {
@@ -451,12 +451,16 @@ export class RpgClientEngine {
             RpgPlugin.emit(HookClient.ConnectedError, [this, err, this.socket], true)
         })
 
-        this.socket.on('preLoadScene', (name: string) => {
-            if (this.lastScene == name) {
+        this.socket.on('preLoadScene', ({ id, reconnect }: { id: string, reconnect?: boolean }) => {
+            if (this.lastScene == id) {
                 return
             }
-            this.lastScene = name
-            this.renderer.transitionScene(name)
+            this.lastScene = id
+            this.renderer.transitionScene(id)
+            if (reconnect) {
+                this.roomJoin.next('')
+                this.roomJoin.complete() 
+            }
         })
 
         this.socket.on(SocketEvents.GameReload, () => {
@@ -617,7 +621,7 @@ export class RpgClientEngine {
                             paramsChanged,
                             isShape
                         })
-                        
+
                         // perform actions on the sprite after creation/update
                         callAction(key, paramsChanged)
                     }

diff --git a/packages/sample2/main/client.ts b/packages/sample2/main/client.ts
@@ -3,5 +3,8 @@ import { RpgClientEngine, Timeline, Ease } from "@rpgjs/client"
 export default {
     async onStart(engine: RpgClientEngine) {
 
+    },
+    onConnectError(engine, err) {
+        console.dir(err)
     }
 }