@liveblocks/core 3.20.0-perm4 → 3.20.0-perm5

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.20.0-perm4";
+var PKG_VERSION = "3.20.0-perm5";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -5170,40 +5170,37 @@ function createReceivingToolInvocation(invocationId, name, partialArgsText = "")
 // src/protocol/Permissions.ts
 var Permission = {
   /**
-   * Default permission for a room
+   * Default permission for a room.
    */
-  RoomWrite: "room:write",
-  RoomRead: "room:read",
+  Read: "*:read",
+  Write: "*:write",
   /**
-   * Presence (LiveRoom Websocket access)
+   * Legacy aliases for default room permissions.
    */
-  RoomPresenceRead: "room:presence:read",
-  RoomPresenceNone: "room:presence:none",
+  RoomWrite: "room:write",
+  RoomRead: "room:read",
   /**
    * Storage
    */
-  RoomStorageRead: "room:storage:read",
-  RoomStorageWrite: "room:storage:write",
-  RoomStorageNone: "room:storage:none",
+  StorageRead: "storage:read",
+  StorageWrite: "storage:write",
+  StorageNone: "storage:none",
   /**
    * Comments
    */
-  RoomCommentsWrite: "room:comments:write",
-  RoomCommentsRead: "room:comments:read",
-  RoomCommentsNone: "room:comments:none",
+  CommentsWrite: "comments:write",
+  CommentsRead: "comments:read",
+  CommentsNone: "comments:none",
   /**
    * Feeds
    */
-  RoomFeedsRead: "room:feeds:read",
-  RoomFeedsWrite: "room:feeds:write",
-  RoomFeedsNone: "room:feeds:none",
+  FeedsRead: "feeds:read",
+  FeedsWrite: "feeds:write",
+  FeedsNone: "feeds:none",
   /**
    * Legacy
    */
-  LegacyRoomPresenceWrite: "room:presence:write",
-  LegacyCommentsWrite: "comments:write",
-  LegacyCommentsRead: "comments:read",
-  LegacyFeedsWrite: "feeds:write"
+  LegacyRoomPresenceWrite: "room:presence:write"
 };
 var ACCESS_LEVELS = [
   "none",
@@ -5217,7 +5214,6 @@ var ACCESS_RANKS = {
 };
 var NO_PERMISSION_MATRIX = {
   room: "none",
-  presence: "none",
   storage: "none",
   comments: "none",
   feeds: "none",
@@ -5225,36 +5221,30 @@ var NO_PERMISSION_MATRIX = {
 };
 var RESOURCE_PERMISSIONS = {
   room: {
-    read: [Permission.RoomRead],
-    write: [Permission.RoomWrite]
+    read: [Permission.Read, Permission.RoomRead],
+    write: [Permission.Write, Permission.RoomWrite]
   },
   personal: {
     write: []
   },
-  presence: {
-    write: [Permission.LegacyRoomPresenceWrite],
-    read: [Permission.RoomPresenceRead],
-    none: [Permission.RoomPresenceNone]
-  },
   storage: {
-    write: [Permission.RoomStorageWrite],
-    read: [Permission.RoomStorageRead],
-    none: [Permission.RoomStorageNone]
+    write: [Permission.StorageWrite],
+    read: [Permission.StorageRead],
+    none: [Permission.StorageNone]
   },
   comments: {
-    write: [Permission.RoomCommentsWrite, Permission.LegacyCommentsWrite],
-    read: [Permission.RoomCommentsRead, Permission.LegacyCommentsRead],
-    none: [Permission.RoomCommentsNone]
+    write: [Permission.CommentsWrite],
+    read: [Permission.CommentsRead],
+    none: [Permission.CommentsNone]
   },
   feeds: {
-    write: [Permission.RoomFeedsWrite, Permission.LegacyFeedsWrite],
-    read: [Permission.RoomFeedsRead],
-    none: [Permission.RoomFeedsNone]
+    write: [Permission.FeedsWrite],
+    read: [Permission.FeedsRead],
+    none: [Permission.FeedsNone]
   }
 };
 var DEFAULT_PERMISSION_RESOURCE = "room";
 var ROOM_PERMISSION_RESOURCES = [
-  "presence",
   "storage",
   "comments",
   "feeds"
@@ -5272,7 +5262,7 @@ function resolveResourceAccess(scopes, resource) {
 }
 function resolveFullPermissionMatrix(resolved) {
   if (!resolved.hasDefaultPermission) {
-    return { ...NO_PERMISSION_MATRIX, ...resolved.matrix };
+    return NO_PERMISSION_MATRIX;
   }
   const matrix = {
     ...NO_PERMISSION_MATRIX,
@@ -5287,8 +5277,8 @@ function permissionMatrixFromScopes(scopes) {
   return resolveFullPermissionMatrix(resolvePermissionMatrix(scopes));
 }
 function resolvePermissionMatrix(scopes) {
-  const hasDefaultPermission = scopes.includes(Permission.RoomWrite) || scopes.includes(Permission.RoomRead);
-  const baseAccess = scopes.includes(Permission.RoomWrite) ? "write" : scopes.includes(Permission.RoomRead) ? "read" : "none";
+  const hasDefaultPermission = scopes.includes(Permission.Write) || scopes.includes(Permission.Read) || scopes.includes(Permission.RoomWrite) || scopes.includes(Permission.RoomRead);
+  const baseAccess = scopes.includes(Permission.Write) || scopes.includes(Permission.RoomWrite) ? "write" : scopes.includes(Permission.Read) || scopes.includes(Permission.RoomRead) ? "read" : "none";
   const matrix = {};
   for (const resource of ROOM_PERMISSION_RESOURCES) {
     const access = resolveResourceAccess(scopes, resource);
@@ -5309,10 +5299,6 @@ function isPermissionScopes(source) {
 
 // src/permissions.ts
 var VALID_PERMISSIONS = new Set(Object.values(Permission));
-var ROOM_PERMISSION_OBJECT_KEYS = /* @__PURE__ */ new Set([
-  "default",
-  ...ROOM_PERMISSION_RESOURCES
-]);
 function permissionForAccessLevel(resource, access, field = resource) {
   const levels = RESOURCE_PERMISSIONS[resource];
   const permissions = levels[access];
@@ -5333,8 +5319,10 @@ function resolveRoomPermissionMatrix(permissions, roomId) {
   let hasDefaultPermission = false;
   let baseAccess = "none";
   const explicitMatrix = {};
+  const explicitSpecificity = {};
   for (const permission of matchedPermissions) {
     const resolved = resolvePermissionMatrix(permission.scopes);
+    const specificity = getResourceSpecificity(permission.resource);
     if (resolved.hasDefaultPermission) {
       hasDefaultPermission = true;
       baseAccess = strongestAccess(baseAccess, resolved.baseAccess);
@@ -5342,10 +5330,16 @@ function resolveRoomPermissionMatrix(permissions, roomId) {
     for (const resource of ROOM_PERMISSION_RESOURCES) {
       const access = resolved.matrix[resource];
       if (access !== void 0) {
-        explicitMatrix[resource] = strongestAccess(
-          _nullishCoalesce(explicitMatrix[resource], () => ( "none")),
-          access
-        );
+        const currentSpecificity = _nullishCoalesce(explicitSpecificity[resource], () => ( -1));
+        if (specificity > currentSpecificity) {
+          explicitMatrix[resource] = access;
+          explicitSpecificity[resource] = specificity;
+        } else if (specificity === currentSpecificity) {
+          explicitMatrix[resource] = strongestAccess(
+            _nullishCoalesce(explicitMatrix[resource], () => ( "none")),
+            access
+          );
+        }
       }
     }
   }
@@ -5355,46 +5349,16 @@ function resolveRoomPermissionMatrix(permissions, roomId) {
     matrix: explicitMatrix
   });
 }
-function isRoomPermissionArray(input) {
-  return Array.isArray(input);
-}
 function normalizeRoomPermissionInput(input) {
-  if (isRoomPermissionArray(input)) {
-    return input.map((permission) => {
-      if (!VALID_PERMISSIONS.has(permission)) {
-        throw new Error(`Not a valid permission: ${permission}`);
-      }
-      return permission;
-    });
+  if (!Array.isArray(input)) {
+    throw new Error("Permission list must be an array");
   }
-  return normalizeRoomPermissionObject(input);
-}
-function normalizeRoomPermissionObject(objectInput) {
-  for (const key of Object.keys(objectInput)) {
-    if (!ROOM_PERMISSION_OBJECT_KEYS.has(key)) {
-      throw new Error(`Unknown permission field: ${key}`);
+  return input.map((permission) => {
+    if (!VALID_PERMISSIONS.has(permission)) {
+      throw new Error(`Not a valid permission: ${permission}`);
     }
-  }
-  const permissions = [];
-  if (objectInput.default !== void 0) {
-    permissions.push(
-      permissionForAccessLevel(
-        DEFAULT_PERMISSION_RESOURCE,
-        objectInput.default,
-        "default"
-      )
-    );
-  }
-  for (const resource of ROOM_PERMISSION_RESOURCES) {
-    const access = objectInput[resource];
-    if (access !== void 0) {
-      permissions.push(permissionForAccessLevel(resource, access));
-    }
-  }
-  if (permissions.length === 0) {
-    throw new Error("Permission object cannot be empty");
-  }
-  return permissions;
+    return permission;
+  });
 }
 function normalizeRoomAccessesInput(input) {
   if (input === void 0) {
@@ -5421,7 +5385,6 @@ function normalizeRoomAccessesUpdateInput(input) {
 function mergePermissionMatrices(sources) {
   return {
     room: strongestMatrixAccess(sources, "room"),
-    presence: strongestMatrixAccess(sources, "presence"),
     storage: strongestMatrixAccess(sources, "storage"),
     comments: strongestMatrixAccess(sources, "comments"),
     feeds: strongestMatrixAccess(sources, "feeds"),
@@ -5459,6 +5422,9 @@ function resourceMatchesRoomId(resource, roomId) {
   }
   return resource === roomId;
 }
+function getResourceSpecificity(resource) {
+  return resource.replace("*", "").length;
+}
 
 // src/protocol/AuthToken.ts
 function isValidAuthTokenPayload(data) {
@@ -11482,7 +11448,9 @@ function createRoom(options, config) {
       _dump: () => {
         const n = context.pool.nodes.size;
         return `Room "${roomId}" (${n} node${n === 1 ? "" : "s"}):
-${dumpPool(context.pool)}`;
+${dumpPool(
+          context.pool
+        )}`;
       },
       destroy: () => {
         pendingFeedsRequests.forEach(
@@ -11677,7 +11645,7 @@ function makeAuthDelegateForRoom(roomId, authManager) {
   return async () => {
     return authManager.getAuthValue({
       roomId,
-      resource: "presence",
+      resource: "room",
       access: "read"
     });
   };