@things-factory/integration-base 8.0.89 → 8.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.89",
+  "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": "984bd30a606d1e24a66a0685c41bff369c54b779"
+  "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)

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

@@ -16,23 +16,37 @@ export class SocketServer implements Connector {
   async connect(config: InputConnection): Promise<void> {
     var em = new EventEmitter()
     var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':')
+    var clientIPs = new Set<string>()
     return new Promise((resolve, reject) => {
       var server = net.createServer(tcp => {
+        const remoteIP = `${tcp.remoteAddress}:${tcp.remotePort}`
+        clientIPs.add(remoteIP)
         ConnectionManager.logger.info('Client connection: ')
         ConnectionManager.logger.info('   local = %s:%s', tcp.localAddress, tcp.localPort)
         ConnectionManager.logger.info('   remote = %s:%s', tcp.remoteAddress, tcp.remotePort)
+        console.log(
+          `[socket-server] ${config.name} clients: ${clientIPs.size}\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\n')}`
+        )
         tcp.on('data', (data: any) => {
           em['__tcp__'] = tcp
           var message = data.toString()
           message = message.replace('SB#', '')
           message = message.replace(/(\r\n|\n|\r)/gm, '')
-          em.emit('socket-message-arrive', message)
+          // IP 정보를 함께 전달한다
+          em.emit('socket-message-arrive', message, tcp.remoteAddress)
           ConnectionManager.logger.info(`socket ${message}`)
           tcp.write('ok')
         })
 
-        tcp.on('end', () => {
+        tcp.on('close', hadError => {
           ConnectionManager.logger.info('Client disconnected')
+          if (hadError) {
+            ConnectionManager.logger.info('Client disconnected with error: ' + hadError)
+          }
+          clientIPs.delete(remoteIP)
+          console.log(
+            `[socket-server] ${config.name} clients: ${clientIPs.size}\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\n')}`
+          )
         })
 
         tcp.on('error', ex => {

package/server/engine/task/socket-listener.ts

@@ -4,18 +4,29 @@ import { ConnectionManager } from '../connection-manager'
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
 
-function convertDataFormat(data, format) {
+const WITH_IP_FORMATS = ['string-with-ip', 'json-with-ip']
+
+function convertDataFormat(data: string, format: string, ip?: string) {
+  let converted: any
   try {
-    if (format == 'json') {
-      return JSON.parse(data)
-    } else if (format == 'csv') {
-      return data.split(',')
+    const baseFormat = format.replace('-with-ip', '')
+    if (baseFormat == 'json') {
+      converted = JSON.parse(data)
+    } else if (baseFormat == 'csv') {
+      converted = data.split(',')
+    } else {
+      converted = data
     }
   } catch (e) {
-    return data.toString()
+    converted = data.toString()
+  }
+
+  // IP 포함 포맷이면 { data, ip } 형태로 반환한다
+  if (WITH_IP_FORMATS.includes(format) && ip) {
+    return { data: converted, ip }
   }
 
-  return data
+  return converted
 }
 
 async function SocketListener(step: InputStep, context: Context) {
@@ -54,9 +65,9 @@ async function SocketListener(step: InputStep, context: Context) {
         }
       }
 
-      await connection.addListener('socket-message-arrive', async message => {
+      await connection.addListener('socket-message-arrive', async (message: string, ip: string) => {
         logger.info(message.toString())
-        MESSAGES.push(convertDataFormat(message.toString(), dataFormat))
+        MESSAGES.push(convertDataFormat(message.toString(), dataFormat, ip))
       })
     } catch (e) {
       logger.error(e)
@@ -88,6 +99,14 @@ SocketListener.parameterSpec = [
         {
           display: 'String',
           value: 'string'
+        },
+        {
+          display: 'String with IP',
+          value: 'string-with-ip'
+        },
+        {
+          display: 'JSON with IP',
+          value: 'json-with-ip'
         }
       ]
     }