fix(grpc-sdk): module inconsistency on momentary core unavailability (#…

…258)
ConduitPlatform · Jul 22, 2022 · d8c753c · d8c753c
1 parent ae78612
commit d8c753c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 366 deletions.
diff --git a/libraries/grpc-sdk/src/modules/config/index.ts b/libraries/grpc-sdk/src/modules/config/index.ts
@@ -156,15 +156,15 @@ export class Config extends ConduitModule<typeof ConfigDefinition> {
   async watchModules() {
     const self = this;
     this.emitter.setMaxListeners(150);
+    self.emitter.emit('serving-modules-update', await self.moduleList().catch());
     try {
       const call = this.client!.watchModules({});
       for await (const data of call) {
         self.emitter.emit('serving-modules-update', data.modules);
       }
     } catch (error) {
-      // uncomment for debug when needed
-      // currently is misleading if left on
-      // ConduitGrpcSdk.Logger.warn('Connection to gRPC server closed');
+      self.coreLive = false;
+      ConduitGrpcSdk.Logger.warn('Core unhealthy');
     }
   }
 }
diff --git a/packages/core/src/config-manager/service-discovery/index.ts b/packages/core/src/config-manager/service-discovery/index.ts
@@ -141,26 +141,19 @@ export class ServiceDiscovery {
   }
 
   moduleList(call: GrpcRequest<null>, callback: GrpcCallback<ModuleListResponse>) {
-    if (this.registeredModules.size !== 0) {
-      const modules: {
-        moduleName: string;
-        url: string;
-        serving: boolean;
-      }[] = [];
-      this.registeredModules.forEach((value: RegisteredModule, key: string) => {
-        modules.push({
-          moduleName: key,
-          url: value.address,
-          serving: value.serving,
-        });
+    const modules: {
+      moduleName: string;
+      url: string;
+      serving: boolean;
+    }[] = [];
+    this.registeredModules.forEach((value: RegisteredModule, key: string) => {
+      modules.push({
+        moduleName: key,
+        url: value.address,
+        serving: value.serving,
       });
-      callback(null, { modules });
-    } else {
-      callback({
-        code: status.NOT_FOUND,
-        message: 'Modules not available',
-      });
-    }
+    });
+    callback(null, { modules });
   }
 
   watchModules(call: ServerWritableStream<void, ModuleListResponse>) {