@signe/room 2.9.3 → 2.10.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @signe/room
 
+## 2.10.0
+
+### Minor Changes
+
+- Reset the package line to the 2.9.0 runtime baseline for the 2.10 release.
+
+## 2.9.4
+
+### Patch Changes
+
+- Updated dependencies [35643c0]
+  - @signe/sync@2.9.4
+
 ## 2.9.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -528,8 +528,6 @@ declare class Server implements Server$1 {
      * @returns {Object} An object containing the path parameters
      */
     private extractPathParams;
-    private normalizeRequestPath;
-    private pathPatternToRegex;
     /**
      * @method handleShardRequest
      * @private
@@ -868,7 +866,7 @@ declare class WorldRoom implements RoomInterceptorPacket, RoomOnJoin {
     onJoin(user: any, conn: Connection, ctx: ConnectionContext): Promise<void>;
     interceptorPacket(_: any, obj: any, conn: Connection): any;
     private cleanupInactiveShards;
-    registerRoom(req: Request$1, res?: ServerResponse): Promise<Response>;
+    registerRoom(req: Request$1): Promise<void>;
     updateShardStats(req: Request$1, res: ServerResponse): Promise<Response>;
     scaleRoom(req: Request$1, res: ServerResponse): Promise<Response>;
     connect(req: Request$1, res: ServerResponse): Promise<Response>;

package/dist/index.js

@@ -76,11 +76,10 @@ function Guard(guards) {
 // ../sync/src/utils.ts
 function generateShortUUID() {
   const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-  const randomBytes = typeof globalThis.crypto?.getRandomValues === "function" ? globalThis.crypto.getRandomValues(new Uint8Array(8)) : null;
   let uuid = "";
   for (let i = 0; i < 8; i++) {
-    const randomValue = randomBytes?.[i] ?? Math.floor(Math.random() * 256);
-    uuid += chars[randomValue % chars.length];
+    const randomIndex = Math.floor(Math.random() * chars.length);
+    uuid += chars[randomIndex];
   }
   return uuid;
 }
@@ -882,7 +881,7 @@ var Server = class {
       conn.close();
       return;
     }
-    const sessionExpiryTime = subRoom.sessionExpiryTime ?? subRoom.constructor.sessionExpiryTime ?? 5 * 60 * 1e3;
+    const sessionExpiryTime = subRoom.constructor.sessionExpiryTime;
     await this.garbageCollector({ sessionExpiryTime });
     const roomGuards = subRoom.constructor["_roomGuards"] || [];
     for (const guard of roomGuards) {
@@ -1404,7 +1403,8 @@ var Server = class {
     }
     const url = new URL(req.url);
     const method = req.method;
-    const pathname = this.normalizeRequestPath(url.pathname);
+    let pathname = url.pathname;
+    pathname = "/" + pathname.split("/").slice(4).join("/");
     for (const [routeKey, handler] of requestHandlers.entries()) {
       const firstColonIndex = routeKey.indexOf(":");
       const handlerMethod = routeKey.substring(0, firstColonIndex);
@@ -1428,17 +1428,16 @@ var Server = class {
         if (handler.bodyValidation && ["POST", "PUT", "PATCH"].includes(method)) {
           try {
             const contentType = req.headers.get("content-type") || "";
-            if (!contentType.includes("application/json")) {
-              return res.badRequest("Content-Type must be application/json");
+            if (contentType.includes("application/json")) {
+              const body = await req.json();
+              const validation = handler.bodyValidation.safeParse(body);
+              if (!validation.success) {
+                return res.badRequest("Invalid request body", {
+                  details: validation.error
+                });
+              }
+              bodyData = validation.data;
             }
-            const body = await req.json();
-            const validation = handler.bodyValidation.safeParse(body);
-            if (!validation.success) {
-              return res.badRequest("Invalid request body", {
-                details: validation.error
-              });
-            }
-            bodyData = validation.data;
           } catch (error) {
             return res.badRequest("Failed to parse request body");
           }
@@ -1470,7 +1469,9 @@ var Server = class {
    * @returns {boolean} True if the paths match
    */
   pathMatches(requestPath, handlerPath) {
-    return this.pathPatternToRegex(handlerPath).test(requestPath);
+    const pathRegexString = handlerPath.replace(/\//g, "\\/").replace(/:([^\/]+)/g, "([^/]+)");
+    const pathRegex = new RegExp(`^${pathRegexString}`);
+    return pathRegex.test(requestPath);
   }
   /**
    * @method extractPathParams
@@ -1488,7 +1489,8 @@ var Server = class {
         paramNames.push(segment.substring(1));
       }
     });
-    const pathRegex = this.pathPatternToRegex(handlerPath);
+    const pathRegexString = handlerPath.replace(/\//g, "\\/").replace(/:([^\/]+)/g, "([^/]+)");
+    const pathRegex = new RegExp(`^${pathRegexString}`);
     const matches = requestPath.match(pathRegex);
     if (matches && matches.length > 1) {
       for (let i = 0; i < paramNames.length; i++) {
@@ -1497,23 +1499,6 @@ var Server = class {
     }
     return params;
   }
-  normalizeRequestPath(pathname) {
-    const parts = pathname.split("/").filter(Boolean);
-    if (parts[0] === "parties" && parts.length >= 3) {
-      const routePath = parts.slice(3).join("/");
-      return routePath ? `/${routePath}` : "/";
-    }
-    return pathname || "/";
-  }
-  pathPatternToRegex(handlerPath) {
-    const segments = handlerPath.split("/").map((segment) => {
-      if (segment.startsWith(":")) {
-        return "([^/]+)";
-      }
-      return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    });
-    return new RegExp(`^${segments.join("/")}$`);
-  }
   /**
    * @method handleShardRequest
    * @private
@@ -2168,8 +2153,13 @@ var RoomConfigSchema = z2.object({
   minShards: z2.number().int().min(0),
   maxShards: z2.number().int().positive().optional()
 });
-var UpdateShardStatsSchema = z2.object({
+var RegisterShardSchema = z2.object({
   shardId: z2.string(),
+  roomId: z2.string(),
+  url: z2.string().url(),
+  maxConnections: z2.number().int().positive()
+});
+var UpdateShardStatsSchema = z2.object({
   connections: z2.number().int().min(0),
   status: z2.enum(["active", "maintenance", "draining"]).optional()
 });
@@ -2289,14 +2279,8 @@ var WorldRoom = class {
     });
     setTimeout(() => this.cleanupInactiveShards(), 6e4);
   }
-  async registerRoom(req, res) {
-    const roomConfigResult = RoomConfigSchema.safeParse(await req.json());
-    if (!roomConfigResult.success) {
-      return res?.badRequest("Invalid room configuration", {
-        details: roomConfigResult.error
-      });
-    }
-    const roomConfig = roomConfigResult.data;
+  async registerRoom(req) {
+    const roomConfig = await req.json();
     const roomId = roomConfig.name;
     if (!this.rooms()[roomId]) {
       const newRoom = new RoomConfig();
@@ -2323,13 +2307,7 @@ var WorldRoom = class {
     }
   }
   async updateShardStats(req, res) {
-    const bodyResult = UpdateShardStatsSchema.safeParse(await req.json());
-    if (!bodyResult.success) {
-      return res.badRequest("Invalid shard statistics", {
-        details: bodyResult.error
-      });
-    }
-    const body = bodyResult.data;
+    const body = await req.json();
     const { shardId, connections, status } = body;
     const shard = this.shards()[shardId];
     if (!shard) {
@@ -2342,13 +2320,7 @@ var WorldRoom = class {
     shard.lastHeartbeat.set(Date.now());
   }
   async scaleRoom(req, res) {
-    const dataResult = ScaleRoomSchema.safeParse(await req.json());
-    if (!dataResult.success) {
-      return res.badRequest("Invalid scale request", {
-        details: dataResult.error
-      });
-    }
-    const data = dataResult.data;
+    const data = await req.json();
     const { targetShardCount, shardTemplate, roomId } = data;
     const room = this.rooms()[roomId];
     if (!room) {
@@ -2368,6 +2340,9 @@ var WorldRoom = class {
         if (a.status() !== "draining" && b.status() === "draining") return 1;
         return a.currentConnections() - b.currentConnections();
       }).slice(0, previousShardCount - targetShardCount);
+      const shardsToKeep = roomShards.filter(
+        (shard) => !shardsToRemove.some((s) => s.id === shard.id)
+      );
       for (const shard of shardsToRemove) {
         delete this.shards()[shard.id];
       }