fix: ignore non 200 responses when proxying images

package.json

@@ -15,9 +15,8 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231218.0",
-    "better-sqlite3": "^8.7.0",
-    "prettier": "3.3.3",
-    "typescript": "^5.3.3"
+    "prettier": "3.1.1",
+    "typescript": "^5.5.4"
   },
   "packageManager": "[email protected]",
   "prettier": {

packages/image-proxy/package.json

@@ -14,7 +14,7 @@
     "@cloudflare/workers-types": "^4.20231218.0",
     "@oxc-node/core": "^0.0.14",
     "@types/node": "^20.10.5",
-    "tldts": "^6.1.1",
-    "typescript": "^5.3.3"
+    "tldts": "^6.1.38",
+    "typescript": "^5.5.4"
   }
 }

packages/image-proxy/src/index.ts

@@ -35,13 +35,22 @@ export async function imageProxy(request: Request) {
       },
     },
   });
-  const modifiedResponse = new Response(response.body);
-  modifiedResponse.headers.set('Access-Control-Allow-Origin', request.headers.get('Origin') ?? 'null');
-  modifiedResponse.headers.set('Vary', 'Origin');
-  modifiedResponse.headers.set('Access-Control-Allow-Methods', 'GET');
-  const contentType = response.headers.get('Content-Type');
-  contentType && modifiedResponse.headers.set('Content-Type', contentType);
-  const contentDisposition = response.headers.get('Content-Disposition');
-  contentDisposition && modifiedResponse.headers.set('Content-Disposition', contentDisposition);
-  return modifiedResponse;
+  if (response.ok) {
+    const modifiedResponse = new Response(response.body);
+    modifiedResponse.headers.set('Access-Control-Allow-Origin', request.headers.get('Origin') ?? 'null');
+    modifiedResponse.headers.set('Vary', 'Origin');
+    modifiedResponse.headers.set('Access-Control-Allow-Methods', 'GET');
+    const contentType = response.headers.get('Content-Type');
+    contentType && modifiedResponse.headers.set('Content-Type', contentType);
+    const contentDisposition = response.headers.get('Content-Disposition');
+    contentDisposition && modifiedResponse.headers.set('Content-Disposition', contentDisposition);
+    return modifiedResponse;
+  } else {
+    log('Failed to fetch image', 'ERROR', {
+      origin,
+      url: imageURL,
+      status: response.status,
+    });
+    return respBadRequest('Failed to fetch image', { allowOrigin: origin });
+  }
 }

packages/link-preview/package.json

@@ -10,6 +10,6 @@
     "@affine/utils": "workspace:*",
     "@cloudflare/workers-types": "^4.20231218.0",
     "@types/node": "^20.10.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.5.4"
   }
 }

packages/utils/package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20231218.0",
     "@types/node": "^20.10.5",
-    "tldts": "^6.1.1",
-    "typescript": "^5.3.3"
+    "tldts": "^6.1.38",
+    "typescript": "^5.5.4"
   }
 }

packages/worker/package.json

@@ -7,17 +7,17 @@
   "type": "module",
   "scripts": {
     "deploy": "wrangler deploy -c wrangler.toml",
-    "dev": "wrangler dev -c wrangler-prod.toml"
+    "dev": "wrangler dev -c wrangler.toml"
   },
   "devDependencies": {
     "@affine/image-proxy": "workspace:*",
     "@affine/link-preview": "workspace:*",
     "@affine/utils": "workspace:*",
     "@cloudflare/workers-types": "^4.20231218.0",
     "@types/node": "^20.10.5",
-    "itty-router": "4.2.2",
-    "tldts": "^6.1.1",
-    "typescript": "^5.3.3",
+    "itty-router": "^4.2.2",
+    "tldts": "^6.1.38",
+    "typescript": "^5.5.4",
     "wrangler": "^3.22.1"
   }
 }