@ossy/resources 3.7.0 → 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.7.0",
+  "version": "3.7.1",
   "private": false,
   "type": "module",
   "main": "./src/index.js",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@ossy/event-store": "^3.7.0",
     "@ossy/fold": "^3.4.0",
-    "@ossy/platform": "^3.7.0",
+    "@ossy/platform": "^3.7.1",
     "@ossy/schema": "^3.6.1"
   },
   "peerDependencies": {
@@ -49,5 +49,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "622d97535abad08415963405ace2f5aaaecd7ca4"
+  "gitHead": "1ee220424da6b065034a7f52f52aa4a6ce7c88d5"
 }

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
   }