@openneuro/server 4.47.7 → 5.0.0

package/src/models/doi.ts

@@ -1,17 +1,24 @@
 import mongoose from "mongoose"
 import type { Document } from "mongoose"
+import type { DoiState } from "../types/datacite"
 const { Schema, model } = mongoose
 
 export interface DoiDocument extends Document {
   datasetId: string
   snapshotId: string
   doi: string
+  state: DoiState
 }
 
 const doiSchema = new Schema({
   datasetId: String,
   snapshotId: String,
   doi: String,
+  state: {
+    type: String,
+    enum: ["draft", "registered", "findable"],
+    default: "draft",
+  },
 })
 
 const Doi = model<DoiDocument>("Doi", doiSchema)

package/src/queues/producer-methods.ts

@@ -25,14 +25,18 @@ export function queueIndexDataset(datasetId: string) {
  * Queue data retention check for a dataset
  * @param datasetId Dataset to check
  */
-export function queueDataRetentionCheck(datasetId: string) {
+export async function queueDataRetentionCheck(
+  datasetId: string,
+): Promise<void> {
   try {
     const msg = new ProducibleMessage()
     msg.setQueue(OpenNeuroQueues.DATARETENTION).setBody({ datasetId })
-    producer.produce(msg, (err) => {
-      if (err) {
-        Sentry.captureException(err)
-      }
+    msg.setTTL(64800000) // 18 hours in ms to survive the consumer rate limits
+    await new Promise<void>((resolve, reject) => {
+      producer.produce(msg, (err) => {
+        if (err) reject(err)
+        else resolve()
+      })
     })
   } catch (err) {
     Sentry.captureException(err)

package/src/queues/queue-schedule.ts

@@ -14,7 +14,7 @@ async function enqueueAllDatasetChecks(): Promise<void> {
   const cursor = Dataset.find({}, "id").cursor()
   for await (const dataset of cursor) {
     // Check data retention policy status and send notifications
-    queueDataRetentionCheck(dataset.id)
+    await queueDataRetentionCheck(dataset.id)
   }
 }
 

package/src/queues/queues.ts

@@ -55,6 +55,6 @@ export async function setupQueues(): Promise<void> {
   // Limit indexing queue to 8 runs per minute to avoid stacking indexing excessively
   await setRateLimit(OpenNeuroQueues.INDEXING, 8, 60000)
 
-  // Rate limit data retention queue to 16 runs per minute
-  await setRateLimit(OpenNeuroQueues.DATARETENTION, 16, 60000)
+  // Rate limit data retention queue to 60 runs per minute
+  await setRateLimit(OpenNeuroQueues.DATARETENTION, 60, 60000)
 }

package/src/routes.ts

@@ -190,8 +190,16 @@ const routes = [
   // 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 },
+  {
+    method: "get",
+    url: "/git/:datasetId/*arguments",
+    handler: datalad.gitRepo,
+  },
+  {
+    method: "post",
+    url: "/git/:datasetId/*arguments",
+    handler: datalad.gitRepo,
+  },
 ]
 
 // initialize routes -------------------------------

package/src/types/datacite/LICENSE

@@ -0,0 +1,37 @@
+DataCite is free software; you can redistribute it and/or modify
+it under the terms of the Revised BSD License quoted below.
+
+Copyright (C) 2015-2018 CERN.
+Copyright (C) 2018 Center for Open Science.
+Copyright (C) 2019-2024 Caltech.
+Copyright (C) 2024 Institute of Biotechnology of the Czech Academy of Sciences.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.

package/src/types/datacite/README.md

@@ -0,0 +1,3 @@
+Generate `datacite-v4.5.ts` with `npx json-schema-to-typescript datacite-v4.5.json`.
+
+`datacite-v4.5.json` sourced from https://github.com/inveniosoftware/datacite/blob/5506d1347a070952d2c2b96c213f44c5fa46d0dd/datacite/schemas/datacite-v4.5.json