fix(runtime): fix db stream initialize

labring · skyoct · Oct 17, 2023 · Oct 17, 2023 · Oct 17, 2023 · Oct 17, 2023
commit 80fffab213ebd44c230a73861b43894a976fd3da
diff --git a/runtimes/nodejs/src/index.ts b/runtimes/nodejs/src/index.ts
@@ -21,13 +21,11 @@ import xmlparser from 'express-xml-bodyparser'
 import './support/cloud-sdk'
 import storageServer from './storage-server'
 import { DatabaseChangeStream } from './support/database-change-stream'
-import { FunctionCache } from './support/function-engine/cache'
 
 const app = express()
 
 DatabaseAgent.accessor.ready.then(() => {
   DatabaseChangeStream.initialize()
-  FunctionCache.initialize()
 })
 
 if (process.env.NODE_ENV === 'development') {

diff --git a/runtimes/nodejs/src/storage-server.ts b/runtimes/nodejs/src/storage-server.ts
@@ -1,18 +1,13 @@
 import express from 'express'
 import Config from './config'
 import { logger } from './support/logger'
-import { DatabaseAgent } from './db'
 import './support/cloud-sdk'
 import { WebsiteHostingChangeStream } from './support/database-change-stream/website-hosting-change-stream'
 import proxy from 'express-http-proxy'
 import axios from 'axios'
 
 const app = express()
 
-DatabaseAgent.accessor.ready.then(() => {
-  WebsiteHostingChangeStream.initialize()
-})
-
 const tryPath = (bucket: string, path: string) => {
   const testPaths = path.endsWith('/')
     ? [path + 'index.html', '/index.html']

diff --git a/runtimes/nodejs/src/support/database-change-stream/conf-change-stream.ts b/runtimes/nodejs/src/support/database-change-stream/conf-change-stream.ts
@@ -4,6 +4,8 @@ import { DatabaseChangeStream } from '.'
 
 export class ConfChangeStream {
   static initialize() {
+    this.updateEnvironments()
+
     DatabaseChangeStream.onStreamChange(
       CONFIG_COLLECTION,
       this.updateEnvironments,

diff --git a/runtimes/nodejs/src/support/database-change-stream/index.ts b/runtimes/nodejs/src/support/database-change-stream/index.ts
@@ -7,12 +7,25 @@ import {
   CONFIG_COLLECTION,
   WEBSITE_HOSTING_COLLECTION,
 } from '../../constants'
+import { ConfChangeStream } from './conf-change-stream'
+import { WebsiteHostingChangeStream } from './website-hosting-change-stream'
+import { FunctionCache } from '../function-engine/cache'
 
 const collectionsToWatch = [
-  CONFIG_COLLECTION,
-  CLOUD_FUNCTION_COLLECTION,
-  WEBSITE_HOSTING_COLLECTION,
+  {
+    name: CONFIG_COLLECTION,
+    handler: () => ConfChangeStream,
+  },
+  {
+    name: WEBSITE_HOSTING_COLLECTION,
+    handler: () => WebsiteHostingChangeStream,
+  },
+  {
+    name: CLOUD_FUNCTION_COLLECTION,
+    handler: () => FunctionCache,
+  },
 ] as const
+
 export class DatabaseChangeStream extends EventEmitter {
   private static instance: DatabaseChangeStream
 
@@ -50,13 +63,14 @@ export class DatabaseChangeStream extends EventEmitter {
   static initialize() {
     const instance = DatabaseChangeStream.getInstance()
 
-    collectionsToWatch.forEach((collectionName) => {
-      instance.initializeForCollection(collectionName)
+    collectionsToWatch.forEach((v) => {
+      instance.initializeForCollection(v.name)
+      v.handler().initialize()
     })
   }
 
   static onStreamChange(
-    collectionName: (typeof collectionsToWatch)[number],
+    collectionName: (typeof collectionsToWatch)[number]['name'],
     listener: (...args: any[]) => void,
   ) {
     const instance = DatabaseChangeStream.getInstance()

diff --git a/runtimes/nodejs/src/support/database-change-stream/website-hosting-change-stream.ts b/runtimes/nodejs/src/support/database-change-stream/website-hosting-change-stream.ts
@@ -6,6 +6,8 @@ export class WebsiteHostingChangeStream {
   static websiteHosting = []
 
   static initialize() {
+    this.onStreamChange()
+
     DatabaseChangeStream.onStreamChange(
       WEBSITE_HOSTING_COLLECTION,
       this.onStreamChange.bind(this),