fix: Defer initialization of elasticsearch

Author: effigies

packages/openneuro-server/src/elasticsearch/elastic-client.ts

@@ -1,11 +1,16 @@
 import config from "../config"
 import { Client } from "@elastic/elasticsearch"
 
-const elasticConfig = {
-  node: config.elasticsearch.connection || "http://mock-client",
-  maxRetries: 3,
-}
+let _client: Client | null = null
 
-export const elasticClient = new Client(elasticConfig)
+export function getElasticClient(): Client {
+  if (!_client) {
+    _client = new Client({
+      node: config.elasticsearch.connection || "http://mock-client",
+      maxRetries: 3,
+    })
+  }
+  return _client
+}
 
-export default elasticClient
+export default getElasticClient

packages/openneuro-server/src/elasticsearch/reindex-dataset.ts

@@ -1,6 +1,6 @@
 import config from "../config"
 import { indexDataset, indexingToken, queryForIndex } from "@openneuro/search"
-import { elasticClient } from "./elastic-client"
+import { getElasticClient } from "./elastic-client"
 import { ApolloClient, from, InMemoryCache } from "@apollo/client"
 import type { NormalizedCacheObject } from "@apollo/client"
 import { setContext } from "@apollo/client/link/context"
@@ -28,9 +28,13 @@ export const schemaLinkClient = (): ApolloClient<NormalizedCacheObject> => {
   })
 }
 
-const client = schemaLinkClient()
+let _client: ApolloClient<NormalizedCacheObject> | null = null
+function getClient(): ApolloClient<NormalizedCacheObject> {
+  if (!_client) _client = schemaLinkClient()
+  return _client
+}
 
 export const reindexDataset = async (datasetId: string): Promise<void> => {
-  const datasetIndexQueryResult = await queryForIndex(client, datasetId)
-  await indexDataset(elasticClient, datasetIndexQueryResult.data.dataset)
+  const datasetIndexQueryResult = await queryForIndex(getClient(), datasetId)
+  await indexDataset(getElasticClient(), datasetIndexQueryResult.data.dataset)
 }

packages/openneuro-server/src/graphql/resolvers/dataset-search.ts

@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/node"
-import { elasticClient } from "../../elasticsearch/elastic-client"
+import { getElasticClient } from "../../elasticsearch/elastic-client"
 import { dataset } from "./dataset"
 import Star from "../../models/stars"
 import Subscription from "../../models/subscription"
@@ -17,7 +17,7 @@ const elasticIndex = "datasets"
  * @returns {Promise}
  */
 export const removeDatasetSearchDocument = (id) =>
-  elasticClient.delete({ id, index: elasticIndex })
+  getElasticClient().delete({ id, index: elasticIndex })
 
 /**
  * Accepts an array of fields representing the sort order for the search
@@ -101,7 +101,7 @@ export const datasetSearchConnection = async (
       // Don't include search_after if parsing fails
     }
   }
-  await elasticClient.search({
+  await getElasticClient().search({
     index: elasticIndex,
     size: first,
     q: `${q} AND public:true`,
@@ -270,7 +270,7 @@ export const advancedDatasetSearchConnection = async (
     search_after,
   }
   // Run the query
-  const result = await elasticClient.search(requestBody)
+  const result = await getElasticClient().search(requestBody)
   // Extend with relay connection pagination
   return elasticRelayConnection(
     result,