@ossy/resources 3.6.2 → 3.7.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/resources",
   "description": "Resource domain — aggregate and events for the Ossy resource model",
-  "version": "3.6.2",
+  "version": "3.7.1",
   "private": false,
   "type": "module",
   "main": "./src/index.js",
@@ -23,9 +23,9 @@
     "src": "./src"
   },
   "dependencies": {
-    "@ossy/event-store": "^3.6.2",
+    "@ossy/event-store": "^3.7.0",
     "@ossy/fold": "^3.4.0",
-    "@ossy/platform": "^3.6.2",
+    "@ossy/platform": "^3.7.1",
     "@ossy/schema": "^3.6.1"
   },
   "peerDependencies": {
@@ -49,5 +49,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "d81b840c5421995e8ac7550e5b37ae1145abcba9"
+  "gitHead": "1ee220424da6b065034a7f52f52aa4a6ce7c88d5"
 }

package/src/access-filter.spec.js

@@ -1,4 +1,4 @@
-import { accessFilter } from './resources.queries.js'
+import { accessFilter, ResourcesQueries } from './resources.queries.js'
 
 // Helper to build a minimal Policy aggregate document that policyToQueryClause expects.
 function makePolicy({ effect = 'allow', actions = ['resource:read'], where = {} } = {}) {
@@ -132,3 +132,41 @@ describe('accessFilter', () => {
   })
 
 })
+
+describe('ResourcesQueries.buildMongoQuery', () => {
+  it('scopes a folder list to belongsTo, location, and status — not document type', () => {
+    const query = ResourcesQueries.buildMongoQuery({
+      belongsTo: 'ws-1',
+      location: '/Marketing/',
+    })
+    expect(query).toEqual({
+      'state.belongsTo': 'ws-1',
+      'state.location': '/Marketing/',
+      'state.status': { $ne: 'removed' },
+    })
+    expect(query.type).toBeUndefined()
+  })
+
+  it('does not add a schema-id type regex', () => {
+    const query = ResourcesQueries.buildMongoQuery({ belongsTo: 'ws-1', location: '/' })
+    expect(JSON.stringify(query)).not.toMatch(/schema\//)
+  })
+
+  it('AND-combines the folder query with accessFilter when a user is passed', () => {
+    const user = { id: 'u-1', workspaces: ['ws-1'], policies: [] }
+    const query = ResourcesQueries.buildMongoQuery(
+      { belongsTo: 'ws-1', location: '/@ossy/jobs/' },
+      user,
+    )
+    expect(query).toEqual({
+      $and: [
+        {
+          'state.belongsTo': 'ws-1',
+          'state.location': '/@ossy/jobs/',
+          'state.status': { $ne: 'removed' },
+        },
+        accessFilter(user),
+      ],
+    })
+  })
+})

package/src/resources.action-media.js

@@ -1,4 +1,7 @@
 import { attachResourceMediaUrls } from './resources.attach-media-urls.js'
+import { createLogger } from '@ossy/observability'
+
+const log = createLogger('resources')
 
 export function mediaContextFromRun({ payload, req }) {
   return {
@@ -7,12 +10,24 @@ export function mediaContextFromRun({ payload, req }) {
   }
 }
 
+async function attachOrKeep (resource, context) {
+  try {
+    return await attachResourceMediaUrls(resource, context)
+  } catch (error) {
+    log.warn('[withResourceMedia] skipping media urls', {
+      resourceId: resource?.id,
+      error: error?.message,
+    })
+    return resource
+  }
+}
+
 export async function withResourceMedia(result, context) {
   if (Array.isArray(result)) {
-    return Promise.all(result.map(r => attachResourceMediaUrls(r, context)))
+    return Promise.all(result.map(r => attachOrKeep(r, context)))
   }
   if (result && typeof result === 'object' && result.id) {
-    return attachResourceMediaUrls(result, context)
+    return attachOrKeep(result, context)
   }
   return result
 }

package/src/resources.attach-media-urls.js

@@ -1,6 +1,10 @@
 import { StorageClient } from '@ossy/platform'
 import { Aggregate } from '@ossy/event-store'
+import { coerceStorageKey } from '@ossy/platform/storage-keys'
 import { Workspace } from '@ossy/workspaces/server'
+import { createLogger } from '@ossy/observability'
+
+const log = createLogger('resources')
 
 /**
  * Adds `content.src` (and `content.sizes[*]` URLs) for file resources, respecting
@@ -39,11 +43,19 @@ export async function attachResourceMediaUrls(resource, { userId, workspaceId }
     return { ...resource, content: nextContent }
   }
 
-  if (Key) {
+  const originalKey = coerceStorageKey(Key, resource.id)
+  if (Key && !originalKey) {
+    log.warn('[attachResourceMediaUrls] skipping invalid storage key', {
+      resourceId: resource.id,
+      key: Key,
+    })
+  }
+
+  if (originalKey) {
     nextContent.src =
       access === 'public'
-        ? StorageClient.createDownloadUrl(Key)
-        : await StorageClient.createPresignedDownloadUrl(Key)
+        ? StorageClient.createDownloadUrl(originalKey)
+        : await StorageClient.createPresignedDownloadUrl(originalKey)
   }
 
   if (hasSizes) {
@@ -54,10 +66,15 @@ export async function attachResourceMediaUrls(resource, { userId, workspaceId }
         nextSizes[name] = value
         continue
       }
+      const sizeFallback = resource.id && /^[A-Za-z0-9_-]+$/.test(name)
+        ? `${resource.id}:${name}`
+        : resource.id
+      const logical = coerceStorageKey(value, sizeFallback)
+      if (!logical) continue
       nextSizes[name] =
         access === 'public'
-          ? StorageClient.createDownloadUrl(value)
-          : await StorageClient.createPresignedDownloadUrl(value)
+          ? StorageClient.createDownloadUrl(logical)
+          : await StorageClient.createPresignedDownloadUrl(logical)
     }
     nextContent.sizes = nextSizes
   }

package/src/resources.queries.js

@@ -67,18 +67,23 @@ export class ResourcesQueries {
     return query
   }
 
+  /**
+   * Folder list/search query. Scope is `state.belongsTo` + `state.location`
+   * (any schema in that folder). Do not filter document `type` with a schema-id
+   * regex — that matches audit snapshots in the same collection and hides
+   * leftover `Resource` docs that still live in folders.
+   */
+  static buildMongoQuery(_query = {}, user = null) {
+    const query = ResourcesQueries.#prefixQuery({ ..._query, status: { $ne: 'removed' } })
+    return user ? { $and: [query, accessFilter(user)] } : query
+  }
+
   static GetResources(_query = {}, user = null) {
     log.info('[ResourcesQueries][GetResources] Building query')
-    const query = ResourcesQueries.#prefixQuery({ ..._query, status: { $ne: 'removed' } })
-    const workspaceScope = query['state.belongsTo'] ?? '(no workspace scope)'
+    const mongoQuery = ResourcesQueries.buildMongoQuery(_query, user)
+    const workspaceScope = _query.belongsTo ?? '(no workspace scope)'
     log.info(`[ResourcesQueries][GetResources] Fetching resources for ${workspaceScope}`)
 
-    const baseQuery = {
-      ...query,
-      type: { $regex: /^@[^/]+\/[^/]+\/schema\// },
-    }
-    const mongoQuery = user ? { $and: [baseQuery, accessFilter(user)] } : baseQuery
-
     return Aggregate.Collection.find(mongoQuery, { state: true }).toArray()
       .then(resources => {
         log.info(`[ResourcesQueries][GetResources] Found ${resources.length} resources`)