address png encoding bug, path changes

JoshuaWhite1 · elanalynn · commit e70418a233c0 · 2026-04-23T10:59:39.000-06:00
diff --git a/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts b/packages/app/src/cli/services/dev/extension/server/middlewares.test.ts
@@ -133,7 +133,7 @@ describe('fileServerMiddleware()', async () => {
       })
 
       expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', 'text/html')
-      expect(result).toBe('<html></html>')
+      expect(result?.toString()).toBe('<html></html>')
     })
   })
 
@@ -166,7 +166,7 @@ describe('fileServerMiddleware()', async () => {
       })
 
       expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', contentType)
-      expect(result).toBe(fileContent)
+      expect(result?.toString()).toBe(fileContent)
     })
   })
 
@@ -183,7 +183,7 @@ describe('fileServerMiddleware()', async () => {
       })
 
       expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', 'text/plain')
-      expect(result).toBe('Content for bar.foo')
+      expect(result?.toString()).toBe('Content for bar.foo')
     })
   })
 })
@@ -244,7 +244,7 @@ describe('getExtensionAssetMiddleware()', () => {
       const result = await getExtensionAssetMiddleware(options)(event)
 
       expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', 'application/json')
-      expect(result).toBe('{"tools": []}')
+      expect(result?.toString()).toBe('{"tools": []}')
     })
   })
 
@@ -275,7 +275,7 @@ describe('getExtensionAssetMiddleware()', () => {
       const result = await getExtensionAssetMiddleware(options)(event)
 
       expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', 'text/javascript')
-      expect(result).toBe('compiled bundle content')
+      expect(result?.toString()).toBe('compiled bundle content')
     })
   })
 
@@ -306,7 +306,50 @@ describe('getExtensionAssetMiddleware()', () => {
       const result = await getExtensionAssetMiddleware(options)(event)
 
       // Built asset takes priority
-      expect(result).toBe('built content')
+      expect(result?.toString()).toBe('built content')
+    })
+  })
+
+  test('falls back to the extension point assets folder for static assets', async () => {
+    await inTemporaryDirectory(async (tmpDir: string) => {
+      const extension = await testUIExtension({
+        directory: tmpDir,
+        configuration: {
+          name: 'test-ui-extension',
+          type: 'ui_extension',
+          handle: 'test-ui-extension',
+          extension_points: [
+            {
+              target: 'admin.app.home.render',
+              module: './src/index.tsx',
+              assets: './assets',
+            },
+          ],
+        } as any,
+      })
+
+      const options = getOptions({
+        devOptions: {
+          extensions: [extension],
+        },
+      })
+
+      // Static asset lives under the extension-declared assets folder.
+      const assetsDir = joinPath(tmpDir, 'assets')
+      await mkdir(assetsDir)
+      await writeFile(joinPath(assetsDir, 'logo.png'), 'png-bytes')
+
+      const event = getMockEvent({
+        params: {
+          extensionId: extension.devUUID,
+          assetPath: 'logo.png',
+        },
+      })
+
+      const result = await getExtensionAssetMiddleware(options)(event)
+
+      expect(event.node.res.setHeader).toHaveBeenCalledWith('Content-Type', 'image/png')
+      expect(result?.toString()).toBe('png-bytes')
     })
   })
 })
diff --git a/packages/app/src/cli/services/dev/extension/server/middlewares.ts b/packages/app/src/cli/services/dev/extension/server/middlewares.ts
@@ -41,7 +41,7 @@ export async function fileServerMiddleware(event: H3Event, options: {filePath: s
     return sendError(event, {statusCode: 404, statusMessage: `Not Found: ${filePath}`})
   }
 
-  const fileContent = await readFile(filePath)
+  const fileContent = await readFile(filePath, {})
   const extensionToContent = {
     '.ico': 'image/x-icon',
     '.html': 'text/html',
@@ -79,16 +79,35 @@ export function getExtensionAssetMiddleware({getExtensions}: GetExtensionsMiddle
     }
 
     const resolvedExtensionDirectory = resolvePath(extension.directory)
-    const builtAssetPath = joinPath(
-      dirname(joinPath(resolvedExtensionDirectory, extension.outputRelativePath)),
-      assetPath,
-    )
-
-    // Try the build output directory first (for compiled assets like dist/handle.js),
-    // then fall back to the extension's source directory (for static assets like tools, instructions).
-    const filePath = (await fileExists(builtAssetPath))
-      ? builtAssetPath
-      : joinPath(resolvedExtensionDirectory, assetPath)
+    const sourceAssetPath = joinPath(resolvedExtensionDirectory, assetPath)
+
+    // Candidate locations to try, in order:
+    // 1. Build output directory (for compiled assets like dist/handle.js)
+    // 2. Extension source directory (for assets at the root like tools, instructions)
+    // 3. Per-extension-point static asset folders (declared via the `assets` config key).
+    //    Mirrors how the admin spec's `static_root` serves a whole directory.
+    const candidates: string[] = [
+      joinPath(dirname(joinPath(resolvedExtensionDirectory, extension.outputRelativePath)), assetPath),
+      sourceAssetPath,
+    ]
+
+    const config = extension.configuration as {extension_points?: unknown}
+    const extensionPoints = Array.isArray(config.extension_points) ? config.extension_points : []
+    for (const ep of extensionPoints) {
+      const assetsDir = (ep as {assets?: unknown} | null)?.assets
+      if (typeof assetsDir === 'string' && assetsDir !== '') {
+        candidates.push(joinPath(resolvedExtensionDirectory, assetsDir, assetPath))
+      }
+    }
+
+    let filePath: string = sourceAssetPath
+    for (const candidate of candidates) {
+      // eslint-disable-next-line no-await-in-loop
+      if (await fileExists(candidate)) {
+        filePath = candidate
+        break
+      }
+    }
 
     if (!filePath.startsWith(resolvedExtensionDirectory)) {
       return sendError(event, {statusCode: 403, statusMessage: 'Path traversal is not allowed'})
