@openneuro/server 4.14.3 → 4.15.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.14.3",
+  "version": "4.15.0-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@apollo/client": "3.7.2",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.14.3",
+    "@openneuro/search": "^4.15.0-alpha.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.4",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c6f70fbda1dd828cd801c46db3bb35e1f75b2080"
+  "gitHead": "dc1200c0cfaaf00ae5a2103e2ac2759c5355ddad"
 }

package/src/datalad/__tests__/description.spec.js

@@ -1,4 +1,3 @@
-import request from 'superagent'
 import {
   getDescriptionObject,
   repairDescriptionTypes,
@@ -6,7 +5,6 @@ import {
 } from '../description.js'
 
 // Mock requests to Datalad service
-vi.mock('superagent')
 vi.mock('ioredis')
 vi.mock('../../config.js')
 
@@ -89,25 +87,51 @@ describe('datalad dataset descriptions', () => {
       expect(Array.isArray(repaired.Funding)).toBe(true)
     })
   })
-  it('returns the parsed dataset_description.json object', async () => {
-    request.post.mockClear()
-    request.__setMockResponse({
-      body: { Name: 'Balloon Analog Risk-taking Task' },
-      type: 'application/json',
+  describe('getDescriptionObject()', () => {
+    beforeAll(() => {
+      global.fetch = vi.fn()
     })
-    const description = await getDescriptionObject('ds000001', '1.0.0')
-    expect(description).toEqual({ Name: 'Balloon Analog Risk-taking Task' })
-  })
-  it('handles a corrupted response', async () => {
-    request.post.mockClear()
-    request.__setMockResponse({
-      body: Buffer.from('0x5f3759df', 'hex'),
+    it('returns the parsed dataset_description.json object', async () => {
+      fetch.mockResolvedValue({
+        json: () =>
+          Promise.resolve({ Name: 'Balloon Analog Risk-taking Task' }),
+        headers: {
+          get: () => 'application/json',
+        },
+        status: 200,
+      })
+      const description = await getDescriptionObject('ds000001', '1.0.0')
+      expect(description).toEqual({ Name: 'Balloon Analog Risk-taking Task' })
+    })
+    it('handles a corrupted response', async () => {
+      global.fetch = vi.fn()
+      fetch.mockResolvedValue({
+        json: () => Promise.reject('JSON could not be parsed'),
+        headers: {
+          get: () => 'application/json',
+        },
+        status: 400,
+      })
+      await expect(getDescriptionObject('ds000001', '1.0.0')).rejects.toEqual(
+        Error(
+          'Backend request failed, dataset_description.json may not exist or may be non-JSON (type: application/json, status: 400)',
+        ),
+      )
+    })
+    it('throws an error when nothing is returned', async () => {
+      global.fetch = vi.fn()
+      fetch.mockResolvedValue({
+        json: () => Promise.reject('JSON could not be parsed'),
+        headers: {
+          get: () => 'application/json',
+        },
+        status: 404,
+      })
+      await expect(getDescriptionObject('ds000001', '1.0.0')).rejects.toEqual(
+        Error(
+          'Backend request failed, dataset_description.json may not exist or may be non-JSON (type: application/json, status: 404)',
+        ),
+      )
     })
-    const description = await getDescriptionObject('ds000001', '1.0.0')
-    expect(description).toEqual({ Name: 'ds000001', BIDSVersion: '1.8.0' })
-  })
-  it('works without a dataset_description.json being present', async () => {
-    const description = await getDescriptionObject('ds000001', '1.0.0')
-    expect(description).toEqual({ Name: 'ds000001', BIDSVersion: '1.8.0' })
   })
 })

package/src/datalad/description.js

@@ -16,22 +16,18 @@ import { datasetOrSnapshot } from '../utils/datasetOrSnapshot'
  * @param {string} datasetId
  * @returns {Promise<Record<string, unknown>>} Promise resolving to dataset_description.json contents or defaults
  */
-export const getDescriptionObject = (datasetId, revision) => {
-  const defaultDescription = {
-    Name: datasetId,
-    BIDSVersion: '1.8.0',
+export const getDescriptionObject = async (datasetId, revision) => {
+  const res = await fetch(
+    fileUrl(datasetId, '', 'dataset_description.json', revision),
+  )
+  const contentType = res.headers.get('content-type')
+  if (res.status === 200 && contentType.includes('application/json')) {
+    return await res.json()
+  } else {
+    throw new Error(
+      `Backend request failed, dataset_description.json may not exist or may be non-JSON (type: ${contentType}, status: ${res.status})`,
+    )
   }
-  return request
-    .get(fileUrl(datasetId, '', 'dataset_description.json', revision))
-    .then(({ body, type }) => {
-      // Guard against non-JSON responses
-      if (type === 'application/json') return body
-      else throw new Error('dataset_description.json is not JSON')
-    })
-    .catch(() => {
-      // dataset_description does not exist or is not JSON, return default fields
-      return defaultDescription
-    })
 }
 
 export const descriptionCacheKey = (datasetId, revision) => {
@@ -111,21 +107,28 @@ export const appendSeniorAuthor = description => {
  * Get a parsed dataset_description.json
  * @param {object} obj dataset or snapshot object
  */
-export const description = obj => {
+export const description = async obj => {
   // Obtain datasetId from Dataset or Snapshot objects
   const { datasetId, revision } = datasetOrSnapshot(obj)
+  // Default fallback if dataset_description.json is not valid or missing
+  const defaultDescription = {
+    Name: datasetId,
+    BIDSVersion: '1.8.0',
+  }
   const cache = new CacheItem(redis, CacheType.datasetDescription, [
     datasetId,
     revision.substring(0, 7),
   ])
-  return cache
-    .get(() => {
+  try {
+    const datasetDescription = await cache.get(() => {
       return getDescriptionObject(datasetId, revision).then(
         uncachedDescription => ({ id: revision, ...uncachedDescription }),
       )
     })
-    .then(description => repairDescriptionTypes(description))
-    .then(description => appendSeniorAuthor(description))
+    return appendSeniorAuthor(repairDescriptionTypes(datasetDescription))
+  } catch (err) {
+    return defaultDescription
+  }
 }
 
 export const setDescription = (datasetId, user, descriptionFieldUpdates) => {