@signe/room 2.7.2 → 2.8.0

package/dist/index.js

@@ -100,7 +100,7 @@ var Storage = class {
 // src/server.ts
 import { dset as dset2 } from "dset";
 import z from "zod";
-import { createStatesSnapshot, getByPath, load, syncClass, DELETE_TOKEN, generateShortUUID as generateShortUUID2 } from "@signe/sync";
+import { createStatesSnapshot, getByPath, load, syncClass, DELETE_TOKEN, generateShortUUID as generateShortUUID2, createStatesSnapshotDeep } from "@signe/sync";
 
 // src/utils.ts
 import { dset } from "dset";
@@ -616,6 +616,7 @@ var Server = class {
     instance.$memoryAll = {};
     instance.$autoSync = instance["autoSync"] !== false;
     instance.$pendingSync = /* @__PURE__ */ new Map();
+    instance.$pendingInitialSync = /* @__PURE__ */ new Map();
     instance.$send = (conn, obj) => {
       return this.send(conn, obj, instance);
     };
@@ -633,10 +634,25 @@ var Server = class {
       } else {
         packet = instance.$memoryAll;
       }
-      this.broadcast({
-        type: "sync",
-        value: packet
-      }, instance);
+      const pendingConnections = new Set(instance.$pendingInitialSync.keys());
+      for (const [conn, publicId] of instance.$pendingInitialSync) {
+        this.send(conn, {
+          type: "sync",
+          value: {
+            pId: publicId,
+            ...packet
+          }
+        }, instance);
+      }
+      instance.$pendingInitialSync.clear();
+      for (const conn of this.room.getConnections()) {
+        if (!pendingConnections.has(conn)) {
+          this.send(conn, {
+            type: "sync",
+            value: packet
+          }, instance);
+        }
+      }
     };
     instance.$sessionTransfer = async (conn, targetRoomId) => {
       let user;
@@ -670,7 +686,7 @@ var Server = class {
         console.error("[sessionTransfer] `users` property not defined in the room.");
         return null;
       }
-      const userSnapshot = createStatesSnapshot(user);
+      const userSnapshot = createStatesSnapshotDeep(user);
       const transferData = {
         privateId,
         userSnapshot,
@@ -925,7 +941,7 @@ var Server = class {
         } else {
           user = isClass(classType) ? new classType() : classType(conn, ctx);
           signal2()[publicId] = user;
-          const snapshot = createStatesSnapshot(user);
+          const snapshot = createStatesSnapshotDeep(user);
           this.room.storage.put(`${usersPropName}.${publicId}`, snapshot);
         }
       } else {
@@ -954,6 +970,8 @@ var Server = class {
           ...subRoom.$memoryAll
         }
       }, subRoom);
+    } else {
+      subRoom.$pendingInitialSync.set(conn, publicId);
     }
   }
   /**
@@ -1239,6 +1257,9 @@ var Server = class {
     if (!subRoom) {
       return;
     }
+    if (subRoom.$pendingInitialSync) {
+      subRoom.$pendingInitialSync.delete(conn);
+    }
     const signal2 = this.getUsersProperty(subRoom);
     if (!conn.state) {
       return;
@@ -1321,9 +1342,16 @@ var Server = class {
         if (signal2 && usersPropName) {
           const { classType } = signal2.options;
           const user = isClass(classType) ? new classType() : classType();
-          load(user, userSnapshot, true);
+          const hydratedSnapshot = await awaitReturn(subRoom["onSessionRestore"]?.({
+            userSnapshot,
+            publicId,
+            privateId,
+            sessionState,
+            room: this.room
+          })) ?? userSnapshot;
+          load(user, hydratedSnapshot, true);
           signal2()[publicId] = user;
-          await this.room.storage.put(`${usersPropName}.${publicId}`, userSnapshot);
+          await this.room.storage.put(`${usersPropName}.${publicId}`, hydratedSnapshot);
         }
       }
       const transferToken = generateShortUUID2();