@openneuro/server 4.44.5 → 4.44.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.44.5",
+  "version": "4.44.7",
   "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.44.5",
+    "@openneuro/search": "^4.44.7",
     "@sentry/node": "^10.37.0",
     "@sentry/profiling-node": "^10.37.0",
     "base64url": "^3.0.0",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "337fffde4c5ea0c3f6f26f7f93d5357197036aa7"
+  "gitHead": "83fbb6f05dfcb66981ca52e3c2f8bda1c88380b8"
 }

package/src/datalad/analytics.ts

@@ -17,9 +17,6 @@ export const trackAnalytics = async (datasetId, tag, type) => {
           views: 1,
         },
       },
-      {
-        upsert: true,
-      },
     ).exec()
   } else if (type === "downloads") {
     return Dataset.updateOne(
@@ -31,9 +28,6 @@ export const trackAnalytics = async (datasetId, tag, type) => {
           downloads: 1,
         },
       },
-      {
-        upsert: true,
-      },
     ).exec()
   }
 }

package/src/datalad/dataset.ts

@@ -14,7 +14,7 @@ import * as subscriptions from "../handlers/subscriptions"
 import { generateDataladCookie } from "../libs/authentication/jwt"
 import { redis } from "../libs/redis"
 import CacheItem, { CacheType } from "../cache/item"
-import { updateDatasetRevision } from "./draft"
+import { getDraftRevision, updateDatasetRevision } from "./draft"
 import { encodeFilePath, filesUrl, fileUrl, getFileName } from "./files"
 import { getAccessionNumber } from "../libs/dataset"
 import Dataset from "../models/dataset"
@@ -80,28 +80,6 @@ export const createDataset = async (
   }
 }
 
-interface WorkerDraftFields {
-  // Commit id hash
-  ref: string
-  // Commit tree ref
-  tree: string
-  // Commit message
-  message: string
-  // Commit author time
-  modified: string
-}
-
-/**
- * Return the latest commit
- * @param {string} id Dataset accession number
- */
-export const getDraftHead = async (id): Promise<WorkerDraftFields> => {
-  const draftRes = await request
-    .get(`${getDatasetWorker(id)}/datasets/${id}/draft`)
-    .set("Accept", "application/json")
-  return draftRes.body
-}
-
 /**
  * Fetch dataset document and related fields
  */
@@ -109,7 +87,7 @@ export const getDataset = async (id) => {
   const dataset = await Dataset.findOne({ id }).lean()
   return {
     ...dataset,
-    revision: (await getDraftHead(id)).ref,
+    revision: getDraftRevision(id),
   }
 }
 
@@ -525,7 +503,6 @@ export async function updatePublic(datasetId, publicFlag, user) {
   await Dataset.updateOne(
     { id: datasetId },
     { public: publicFlag, publishDate: new Date() },
-    { upsert: true },
   ).exec()
   await updateEvent(event)
 }

package/src/datalad/snapshots.ts

@@ -103,13 +103,16 @@ const postSnapshot = async (
 export const getSnapshots = async (datasetId): Promise<SnapshotDocument[]> => {
   const dataset = await Dataset.findOne({ id: datasetId })
   if (!dataset) return null
-  const url = `${getDatasetWorker(datasetId)}/datasets/${datasetId}/snapshots`
-  return request
-    .get(url)
-    .set("Accept", "application/json")
-    .then(({ body: { snapshots } }) => {
-      return snapshots.sort(snapshotCreationComparison)
-    })
+  const cache = new CacheItem(redis, CacheType.snapshot, [datasetId], 432000)
+  return cache.get(() => {
+    const url = `${getDatasetWorker(datasetId)}/datasets/${datasetId}/snapshots`
+    return request
+      .get(url)
+      .set("Accept", "application/json")
+      .then(({ body: { snapshots } }) => {
+        return snapshots.sort(snapshotCreationComparison)
+      })
+  })
 }
 
 const announceNewSnapshot = async (snapshot, datasetId, user) => {
@@ -175,6 +178,11 @@ export const createSnapshot = async (
       updateDatasetName(datasetId),
     ])
 
+    const snapshotListCache = new CacheItem(redis, CacheType.snapshot, [
+      datasetId,
+    ])
+    await snapshotListCache.drop()
+
     // Version is created here and event is updated
     await updateEvent(event)
 
@@ -205,6 +213,10 @@ export const deleteSnapshot = (datasetId, tag) => {
       tag,
     ])
     await snapshotCache.drop()
+    const snapshotListCache = new CacheItem(redis, CacheType.snapshot, [
+      datasetId,
+    ])
+    await snapshotListCache.drop()
     return body
   })
 }

package/src/graphql/resolvers/dataset.ts

@@ -24,6 +24,7 @@ import { derivatives } from "./derivatives"
 import { promiseTimeout } from "../../utils/promiseTimeout"
 import { datasetEvents } from "./datasetEvents"
 import semver from "semver"
+import { getDraftInfo } from "../../datalad/draft"
 
 export const dataset = async (obj, { id }, { user, userInfo }) => {
   await checkDatasetRead(id, user, userInfo)
@@ -280,7 +281,7 @@ const worker = (obj) => getDatasetWorker(obj.id)
 const Dataset = {
   uploader: (ds, _, context) => user(ds, { id: ds.uploader }, context),
   draft: async (obj) => {
-    const draftHead = await datalad.getDraftHead(obj.id)
+    const draftHead = await getDraftInfo(obj.id)
     return {
       id: obj.id,
       revision: draftHead.ref,

package/src/graphql/resolvers/datasetType.ts

@@ -5,8 +5,10 @@ import { description } from "./description.js"
  * Return "schema" or "legacy" depending on the validator preferred for a dataset
  */
 export async function datasetType(dsOrSnapshot): Promise<"schema" | "legacy"> {
-  const ds = new Dataset({ id: dsOrSnapshot.datasetId })
-  if (ds.schemaValidator) {
+  const ds = await Dataset.findOne({
+    id: dsOrSnapshot.datasetId || dsOrSnapshot.id,
+  }).lean()
+  if (ds && ds.schemaValidator) {
     return "schema"
   } else {
     const dsDescription = await description(dsOrSnapshot)

package/src/graphql/resolvers/snapshots.ts

@@ -14,11 +14,11 @@ import DeprecatedSnapshot from "../../models/deprecatedSnapshot"
 import { redis } from "../../libs/redis"
 import CacheItem, { CacheType } from "../../cache/item"
 import { normalizeDOI } from "../../libs/doi/normalize"
-import { getDraftHead } from "../../datalad/dataset"
 import { downloadFiles } from "../../datalad/snapshots"
 import { snapshotValidation } from "./validation"
 import { advancedDatasetSearchConnection } from "./dataset-search"
 import { contributors } from "../../datalad/contributors"
+import { getDraftInfo } from "../../datalad/draft"
 
 export const snapshots = (obj) => {
   return datalad.getSnapshots(obj.id)
@@ -279,7 +279,7 @@ export const latestSnapshot = async (obj, _, context) => {
     // In the case where there are no real snapshots, return most recent commit as snapshot
     return await snapshot(
       obj,
-      { datasetId: obj.id, tag: (await getDraftHead(obj.id)).ref },
+      { datasetId: obj.id, tag: (await getDraftInfo(obj.id)).ref },
       context,
     )
   }

package/src/sentry.ts

@@ -4,7 +4,8 @@ import config from "./config"
 import { version } from "./lerna.json"
 
 Sentry.init({
-  dsn: config.sentry.DSN,
+  dsn:
+    "https://baebfdeb279ddb0c39c876feefd464c8@o4507748938350592.ingest.us.sentry.io/4507750879461376",
   environment: config.sentry.ENVIRONMENT,
   integrations: [
     nodeProfilingIntegration(),