@things-factory/integration-base 8.0.90 → 8.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.90",
+  "version": "8.0.92",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -44,5 +44,5 @@
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "196118cd2941406d5927e6fe3558a9a8b0623df0"
+  "gitHead": "7f6ea0914d9117e9fe4ca3fff64a8a0faedb616f"
 }

package/server/engine/connector/operato-connector.ts

@@ -130,9 +130,10 @@ export class OperatoConnector implements Connector {
     })
 
     const subscriptions: SubscriberData[] = []
-    Object.keys(subscriptionHandlers).forEach(async tag => {
-      if (!tag || !subscriptionHandlers[tag]) return
+    const tags = Object.keys(subscriptionHandlers).filter(tag => tag && subscriptionHandlers[tag])
 
+    /* 시나리오 조회 및 subscription 등록을 순차적으로 처리 */
+    for (const tag of tags) {
       const scenarioName = subscriptionHandlers[tag]
 
       // fetch a scenario
@@ -143,6 +144,14 @@ export class OperatoConnector implements Connector {
         relations: ['steps', 'domain']
       })
 
+      /* 시나리오가 DB에 없으면 경고 로그를 남기고 건너뜀 */
+      if (!selectedScenario) {
+        ConnectionManager.logger.warn(
+          `(${connection.name}) scenario not found for tag "${tag}" (scenarioName: "${scenarioName}") - skipping subscription`
+        )
+        continue
+      }
+
       const subscription = client.subscribe({
         query: gql`
           subscription {
@@ -156,8 +165,13 @@ export class OperatoConnector implements Connector {
 
       const subscriptionObserver = subscription.subscribe({
         next: async data => {
-          debug('received pubsub msg.:', data?.data)
-          await this.runScenario(subscriptions, data?.data?.data)
+          /* subscription 수신 시 에러가 발생해도 프로세스가 죽지 않도록 catch 처리 */
+          try {
+            debug('received pubsub msg.:', data?.data)
+            await this.runScenario(subscriptions, data?.data?.data)
+          } catch (e) {
+            ConnectionManager.logger.error(`(${connection.name}:${tag}) runScenario failed`, e)
+          }
         },
         error: error => {
           ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error`, error)
@@ -177,7 +191,7 @@ export class OperatoConnector implements Connector {
         subscriptionObserver
       })
       ConnectionManager.logger.info(`(${tag}:${scenarioName}) subscription closed flag: ${subscriptionObserver.closed}`)
-    })
+    }
 
     client['subscriptions'] = subscriptions
     ConnectionManager.addConnectionInstance(connection, client)