Merge pull request #3052 from OpenNeuroOrg/3047-draft-cache-fix

Bust cache for draft files when file exists on S3

packages/openneuro-server/src/cache/types.ts

@@ -12,4 +12,5 @@ export enum CacheType {
   snapshotIndex = "snapshotIndex",
   participantCount = "participantCount",
   snapshotDownload = "download",
+  draftRevision = "revision",
 }

packages/openneuro-server/src/datalad/draft.ts

@@ -4,16 +4,21 @@
 import request from "superagent"
 import Dataset from "../models/dataset"
 import { getDatasetWorker } from "../libs/datalad-service"
+import CacheItem, { CacheType } from "../cache/item"
+import { redis } from "../libs/redis"
 
 export const getDraftRevision = async (datasetId) => {
-  const draftUrl = `http://${
-    getDatasetWorker(
-      datasetId,
-    )
-  }/datasets/${datasetId}/draft`
-  const response = await fetch(draftUrl)
-  const { hexsha } = await response.json()
-  return hexsha
+  const cache = new CacheItem(redis, CacheType.draftRevision, [datasetId], 10)
+  return cache.get(async (_doNotCache): Promise<string> => {
+    const draftUrl = `http://${
+      getDatasetWorker(
+        datasetId,
+      )
+    }/datasets/${datasetId}/draft`
+    const response = await fetch(draftUrl)
+    const { hexsha } = await response.json()
+    return hexsha
+  })
 }
 
 export const updateDatasetRevision = (datasetId, gitRef) => {

packages/openneuro-server/src/handlers/datalad.ts

@@ -3,6 +3,7 @@ import { Readable } from "node:stream"
 import mime from "mime-types"
 import { getFiles } from "../datalad/files"
 import { getDatasetWorker } from "../libs/datalad-service"
+import { getDraftRevision } from "../datalad/draft"
 
 /**
  * Handlers for datalad dataset manipulation
@@ -21,7 +22,9 @@ export const getFile = async (req, res) => {
   const worker = getDatasetWorker(datasetId)
   // Find the right tree
   const pathComponents = filename.split(":")
-  let tree = snapshotId || "HEAD"
+  // Get the draft commit for cache busting
+  const draftCommit = await getDraftRevision(datasetId)
+  let tree = snapshotId || draftCommit
   let file
   for (const level of pathComponents) {
     try {