@things-factory/integration-base 8.0.88 → 8.0.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.88",
+  "version": "8.0.90",
   "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": "e69eac3309063291d4249333288b98e23bd7a293"
+  "gitHead": "196118cd2941406d5927e6fe3558a9a8b0623df0"
 }

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/echo-send-hex.ts

@@ -0,0 +1,32 @@
+import { TaskRegistry } from '../task-registry'
+import { ConnectionManager } from '../connection-manager'
+import { InputStep } from '../../service/step/step-type'
+import { Context } from '../types'
+
+async function EchoSendHex(step: InputStep, { logger, domain }: Context) {
+  var {
+    connection: connectionName,
+    params: { message }
+  } = step
+
+  var connection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
+  if (!connection) {
+    throw Error(`connection is not found : ${connectionName}`)
+  }
+
+  var data = await connection.write(Buffer.from(message, 'hex'))
+
+  return {
+    data
+  }
+}
+
+EchoSendHex.parameterSpec = [
+  {
+    type: 'string',
+    name: 'message',
+    label: 'message (hex)'
+  }
+]
+
+TaskRegistry.registerTaskHandler('echo-send-hex', EchoSendHex)

package/server/engine/task/index.ts

@@ -1,4 +1,5 @@
 import './echo-send'
+import './echo-send-hex'
 import './echo-receive'
 import './sleep'
 import './log'

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'
         }
       ]
     }