@openneuro/server 4.5.1 → 4.6.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.5.1",
+  "version": "4.6.0-alpha.0",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -18,6 +18,7 @@
   "dependencies": {
     "@apollo/client": "3.4.17",
     "@elastic/elasticsearch": "7.15.0",
+    "@openneuro/search": "^4.6.0-alpha.0",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "apollo-server": "2.25.3",
@@ -104,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "92a2879d0f00400c240bfe3319f26c38db8ef866"
+  "gitHead": "ce2db27f750c2614e9cf2f0461add04ca8c3cb48"
 }

package/src/datalad/snapshots.js

@@ -2,6 +2,7 @@
  * Get snapshots from datalad-service tags
  */
 import request from 'superagent'
+import { reindexDataset } from '../elasticsearch/reindex-dataset'
 import { redis, redlock } from '../libs/redis'
 import CacheItem, { CacheType } from '../cache/item'
 import config from '../config.js'
@@ -169,15 +170,17 @@ export const createSnapshot = async (
       updateDatasetName(datasetId),
     ])
 
-    snapshotLock.unlock()
+    await reindexDataset(datasetId)
+
     announceNewSnapshot(snapshot, datasetId, user)
     return snapshot
   } catch (err) {
     // delete the keys if any step fails
     // this avoids inconsistent cache state after failures
     snapshotCache.drop()
-    snapshotLock.unlock()
     return err
+  } finally {
+    snapshotLock.unlock()
   }
 }
 

package/src/elasticsearch/elastic-client.js

@@ -6,6 +6,6 @@ const elasticConfig = {
   maxRetries: 3,
 }
 
-const elasticClient = new Client(elasticConfig)
+export const elasticClient = new Client(elasticConfig)
 
 export default elasticClient

package/src/elasticsearch/reindex-dataset.ts

@@ -0,0 +1,41 @@
+import { indexDataset, queryForIndex, indexingToken } from '@openneuro/search'
+import { elasticClient } from './elastic-client'
+import {
+  from,
+  ApolloClient,
+  InMemoryCache,
+  NormalizedCacheObject,
+} from '@apollo/client'
+import { setContext } from '@apollo/client/link/context'
+import { HttpLink } from '@apollo/client/link/http'
+import fetch from 'node-fetch'
+
+/**
+ * Setup SchemaLink based client for querying
+ */
+export const schemaLinkClient = (): ApolloClient<NormalizedCacheObject> => {
+  const accessToken = indexingToken()
+  const authLink = setContext((_, { headers }) => {
+    return {
+      headers: {
+        ...headers,
+        Cookie: `accessToken=${accessToken}`,
+      },
+    }
+  })
+  const httpLink = new HttpLink({
+    uri: process.env.GRAPHQL_URI,
+    fetch,
+  })
+  return new ApolloClient({
+    link: from([authLink, httpLink]),
+    cache: new InMemoryCache(),
+  })
+}
+
+const client = schemaLinkClient()
+
+export const reindexDataset = async (datasetId: string): Promise<void> => {
+  const datasetIndexQueryResult = await queryForIndex(client, datasetId)
+  await indexDataset(elasticClient, datasetIndexQueryResult.data.dataset)
+}

package/tsconfig.json

@@ -7,5 +7,8 @@
   },
   "include": ["./src"],
   "files": ["./src/lerna.json"],
-  "references": [{ "path": "../openneuro-client" }]
+  "references": [
+    { "path": "../openneuro-client" },
+    { "path": "../openneuro-search" }
+  ]
 }