@openneuro/server 4.43.0 → 4.44.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.43.0",
+  "version": "4.44.0-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^4.5.0",
-    "@openneuro/search": "^4.43.0",
+    "@openneuro/search": "^4.44.0-alpha.0",
     "@sentry/node": "^8.25.0",
     "@sentry/profiling-node": "^8.25.0",
     "base64url": "^3.0.0",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4744c0f70be2518a5660efdd54fa874f79cbe57f"
+  "gitHead": "ca0842ef4139407364515814218ed254fd13afb3"
 }

package/src/graphql/resolvers/issues.ts

@@ -18,7 +18,7 @@ export const issues = async (dataset, _, { userInfo }) => {
     .exec()
     .then((data) => {
       if (!data && userInfo) {
-        // If no results were found, acquire a lock and run validation
+        // If no results were found, request to run validation
         revalidate(
           null,
           { datasetId: dataset.id, ref: dataset.revision },

package/src/graphql/resolvers/validation.ts

@@ -2,7 +2,7 @@ import config from "../../config"
 import { generateDataladCookie } from "../../libs/authentication/jwt"
 import { getDatasetWorker } from "../../libs/datalad-service"
 import Validation from "../../models/validation"
-import { redis, redlock } from "../../libs/redis"
+import { redis } from "../../libs/redis"
 import CacheItem from "../../cache/item"
 import { CacheType } from "../../cache/types"
 
@@ -134,8 +134,6 @@ export const validationUrl = (datasetId, ref) => {
  */
 export const revalidate = async (obj, { datasetId, ref }, { userInfo }) => {
   try {
-    // Lock for five minutes to avoid stacking up multiple validation requests
-    await redlock.lock(`openneuro:revalidate-lock:${datasetId}:${ref}`, 300000)
     const response = await fetch(validationUrl(datasetId, ref), {
       method: "POST",
       body: JSON.stringify({}),

package/src/handlers/datalad.ts

@@ -2,7 +2,7 @@ import request from "superagent"
 import { Readable } from "node:stream"
 import mime from "mime-types"
 import { getFiles } from "../datalad/files"
-import { getDatasetWorker } from "../libs/datalad-service"
+import { getDatasetEndpoint, getDatasetWorker } from "../libs/datalad-service"
 import { getDraftRevision } from "../datalad/draft"
 
 /**
@@ -103,3 +103,16 @@ export const getObject = (req, res) => {
     })
   }
 }
+
+/**
+ * Redirect to the appropriate git endpoint for a dataset
+ */
+export function gitRepo(req, res) {
+  const { datasetId } = req.params
+  const worker = getDatasetEndpoint(datasetId)
+  const newUrl = req.originalUrl.replace(
+    `${req.baseUrl}/git/`,
+    `/git/${worker}/`,
+  )
+  return res.redirect(301, newUrl)
+}

package/src/routes.ts

@@ -187,6 +187,11 @@ const routes = [
     url: "/sitemap",
     handler: sitemapHandler,
   },
+  // git redirect routes
+  { method: "get", url: "/git/:datasetId", handler: datalad.gitRepo },
+  { method: "post", url: "/git/:datasetId", handler: datalad.gitRepo },
+  { method: "get", url: "/git/:datasetId/*", handler: datalad.gitRepo },
+  { method: "post", url: "/git/:datasetId/*", handler: datalad.gitRepo },
 ]
 
 // initialize routes -------------------------------