@openneuro/server 4.12.1 → 4.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.12.1",
+  "version": "4.12.2",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@apollo/client": "3.4.17",
     "@elastic/elasticsearch": "7.15.0",
-    "@openneuro/search": "^4.12.1",
+    "@openneuro/search": "^4.12.2",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.4",
@@ -105,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a3709e0ef915f32d178dc0fb1b9d6dacfd5f9e1d"
+  "gitHead": "d36002753b049a7d4d2fc8edd904c57a0bd35596"
 }

package/src/datalad/files.js

@@ -1,5 +1,4 @@
 import request from 'superagent'
-import { addFileUrl } from './utils'
 import { redis } from '../libs/redis'
 import CacheItem, { CacheType } from '../cache/item'
 import { getDatasetWorker } from '../libs/datalad-service'
@@ -79,7 +78,7 @@ export const getFiles = (datasetId, treeish) => {
           const {
             body: { files },
           } = response
-          return files.map(addFileUrl(datasetId, treeish))
+          return files
         }
       }),
   )

package/src/handlers/datalad.js

@@ -23,3 +23,26 @@ export const getFile = (req, res) => {
     : `${worker}/datasets/${datasetId}/files/${filename}`
   return request.get(uri).pipe(res)
 }
+
+/**
+ * Get a file from a dataset
+ */
+export const getObject = (req, res) => {
+  const { datasetId, key } = req.params
+  const worker = getDatasetWorker(datasetId)
+  // Backend depends on git object or git-annex key
+  if (key.length === 40) {
+    const uri = `${worker}/datasets/${datasetId}/objects/${key}`
+    res.set('Content-Type', 'application/octet-stream')
+    return request.get(uri).pipe(res)
+  } else if (key.startsWith('SHA256E-') || key.startsWith('MD5E-')) {
+    const uri = `${worker}/datasets/${datasetId}/annex/${key}`
+    res.set('Content-Type', 'application/octet-stream')
+    return request.get(uri).pipe(res)
+  } else {
+    res.set('Content-Type', 'application/json')
+    res.status(400).send({
+      error: 'Key must be a git object hash or git-annex key',
+    })
+  }
+}

package/src/routes.js

@@ -122,6 +122,11 @@ const routes = [
     url: '/datasets/:datasetId/snapshots/:snapshotId/files/:filename',
     handler: datalad.getFile,
   },
+  {
+    method: 'get',
+    url: '/datasets/:datasetId/objects/:key',
+    handler: datalad.getObject,
+  },
 
   // Authentication routes
 

package/src/datalad/utils.js

@@ -1,25 +0,0 @@
-import config from '../config.js'
-
-/**
- * @param {string} datasetId
- * @param {string} [tag]
- */
-export const addFileUrl = (datasetId, tag) => file => {
-  // Skip files annotated with a URL from datalad service
-  if (file.urls.length > 0) {
-    return file
-  } else {
-    // This is a draft, files are local and no URLs defined
-    const filePath = file.filename.replace(/\//g, ':')
-    if (tag) {
-      // Snapshot
-      // Backup URL for direct access for private datasets
-      const fileUrl = `${config.url}${config.apiPrefix}datasets/${datasetId}/snapshots/${tag}/files/${filePath}`
-      return { ...file, urls: [fileUrl] }
-    } else {
-      // Dataset draft
-      const fileUrl = `${config.url}${config.apiPrefix}datasets/${datasetId}/files/${filePath}`
-      return { ...file, urls: [fileUrl] }
-    }
-  }
-}