@openneuro/server 4.21.1 → 4.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.21.1",
+  "version": "4.21.2",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "7.15.0",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^2.7.0",
-    "@openneuro/search": "^4.21.1",
+    "@openneuro/search": "^4.21.2",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "base64url": "^3.0.0",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17fab5325ea133c2a19779472a289ec2b30fa333"
+  "gitHead": "5607a295f9130a0e51bffdaf8d3d6235c8eab8f8"
 }

package/src/datalad/files.ts

@@ -92,11 +92,16 @@ export const getFiles = (datasetId, treeish): Promise<[DatasetFile?]> => {
   ])
   return cache.get(
     async (doNotCache): Promise<[DatasetFile?]> => {
-      const response = await fetch(`http://${
-        getDatasetWorker(
-          datasetId,
-        )
-      }/datasets/${datasetId}/tree/${treeish}`)
+      const response = await fetch(
+        `http://${
+          getDatasetWorker(
+            datasetId,
+          )
+        }/datasets/${datasetId}/tree/${treeish}`,
+        {
+          signal: AbortSignal.timeout(10000),
+        },
+      )
       const body = await response.json()
       const files = body?.files
       if (files) {

package/src/handlers/datalad.ts

@@ -24,11 +24,30 @@ export const getFile = async (req, res) => {
   let tree = snapshotId || "HEAD"
   let file
   for (const level of pathComponents) {
-    const files = await getFiles(datasetId, tree)
-    if (level == pathComponents.slice(-1)) {
-      file = files.find((f) => !f.directory && f.filename === level)
-    } else {
-      tree = files.find((f) => f.directory && f.filename === level).id
+    try {
+      const files = await getFiles(datasetId, tree)
+      if (level == pathComponents.slice(-1)) {
+        file = files.find((f) => !f.directory && f.filename === level)
+      } else {
+        // This tree may exist but have no children
+        if (files) {
+          tree = files.find((f) => f.directory && f.filename === level).id
+        }
+      }
+    } catch (err) {
+      // ConnectTimeoutError is Node/Undici and TimeoutError is the standard DOMException name
+      if (
+        err?.cause?.name === "ConnectTimeoutError" ||
+        err?.name === "TimeoutError"
+      ) {
+        // Unreachable backend, forward this error
+        // Usually this is the service restarting due to node migrations or upgrades
+        res.status(503).send("Worker could not be reached")
+        return
+      } else {
+        // Unknown error should bubble up
+        throw err
+      }
     }
   }
   // Get the file URL and redirect if external or serve if local