@openneuro/server 4.22.0-alpha.0 → 4.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.22.0-alpha.0",
+  "version": "4.23.0",
   "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.22.0-alpha.0",
+    "@openneuro/search": "^4.23.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "base64url": "^3.0.0",
@@ -52,8 +52,8 @@
     "passport-jwt": "^4.0.0",
     "passport-oauth2-refresh": "^2.0.0",
     "passport-orcid": "^0.0.3",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "redlock": "^4.0.0",
     "request": "^2.83.0",
     "semver": "^5.5.0",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9931842bb7afcac659af2a7b5a5d045aae1f4776"
+  "gitHead": "e86df78635d7ac6cfa03a2add5760b8539103583"
 }

package/src/graphql/resolvers/dataset.ts

@@ -20,11 +20,12 @@ import { getDatasetWorker } from "../../libs/datalad-service"
 import { getFileName } from "../../datalad/files"
 import { onBrainlife } from "./brainlife"
 import { derivatives } from "./derivatives"
+import { promiseTimeout } from "../../utils/promiseTimeout"
 import semver from "semver"
 
 export const dataset = async (obj, { id }, { user, userInfo }) => {
   await checkDatasetRead(id, user, userInfo)
-  return datalad.getDataset(id)
+  return promiseTimeout(datalad.getDataset(id), 30000)
 }
 
 export const datasets = (parent, args, { user, userInfo }) => {

package/src/types/promiseTimeoutError.ts

@@ -0,0 +1,6 @@
+export class PromiseTimeoutError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = "PromiseTimeoutError"
+  }
+}

package/src/utils/__tests__/promiseTimeout.spec.ts

@@ -0,0 +1,16 @@
+import { promiseTimeout } from "../promiseTimeout"
+
+describe("withTimeout", () => {
+  it("rejects with null when the promise exceeds timeout milliseconds", async () => {
+    const slowPromise = new Promise((resolve) =>
+      setTimeout(() => resolve("Slow Result"), 500)
+    )
+    expect(await promiseTimeout(slowPromise, 100)).toBeNull()
+  })
+  it("resolves when the promise returns before timeout", async () => {
+    const slowPromise = new Promise((resolve) =>
+      setTimeout(() => resolve("Fast Result"), 10)
+    )
+    expect(await promiseTimeout(slowPromise, 500)).toBe("Fast Result")
+  })
+})

package/src/utils/promiseTimeout.ts

@@ -0,0 +1,31 @@
+import { PromiseTimeoutError } from "../types/promiseTimeoutError"
+
+/**
+ * Add a timeout to a promise and return null if timeout occurs before the promise resolves
+ * @param promise Promise to timeout
+ * @param timeout Timeout in milliseconds
+ */
+export async function promiseTimeout<T>(
+  promise: Promise<T>,
+  timeout: number,
+): Promise<T | null> {
+  try {
+    const result = await Promise.race([
+      promise,
+      new Promise((_, reject) =>
+        setTimeout(
+          () => reject(new PromiseTimeoutError("Operation timed out")),
+          timeout,
+        )
+      ),
+    ])
+    // @ts-expect-error This does return the original promise except in failure cases where it returns the expected null
+    return result
+  } catch (error) {
+    if (error instanceof PromiseTimeoutError) {
+      return null
+    } else {
+      throw error // Re-throw other errors
+    }
+  }
+}