@things-factory/integration-base 8.0.37 → 8.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.37",
+  "version": "8.0.39",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,13 +27,13 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^8.0.0",
-    "@things-factory/api": "^8.0.37",
-    "@things-factory/auth-base": "^8.0.37",
-    "@things-factory/cache-service": "^8.0.37",
+    "@things-factory/api": "^8.0.38",
+    "@things-factory/auth-base": "^8.0.38",
+    "@things-factory/cache-service": "^8.0.38",
     "@things-factory/env": "^8.0.37",
-    "@things-factory/oauth2-client": "^8.0.37",
-    "@things-factory/scheduler-client": "^8.0.37",
-    "@things-factory/shell": "^8.0.37",
+    "@things-factory/oauth2-client": "^8.0.38",
+    "@things-factory/scheduler-client": "^8.0.38",
+    "@things-factory/shell": "^8.0.38",
     "@things-factory/utils": "^8.0.37",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -44,5 +44,5 @@
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "a3a78656259d6c5d3719ba0864d6bdde87bcba7d"
+  "gitHead": "f5e1a4c04bceec2d731a46f1ef88976839d04dac"
 }

package/server/engine/analyzer/analyze-integration.ts

@@ -76,7 +76,7 @@ export async function analyzeIntegration(domain: Domain) {
     const tags = uniq(
       scenario.steps
         .filter(step => !step.connection && step.task == 'publish')
-        .map(step => JSON.parse(step.params)?.tag)
+        .map(step => step.params?.tag)
         .filter(Boolean)
     )
 

package/server/engine/connection-manager.ts

@@ -61,16 +61,9 @@ export class ConnectionManager {
         relations: ['domain', 'edge', 'creator', 'updater']
       })
     ).map(connection => {
-      var params = {}
-      try {
-        params = JSON.parse(connection.params || '{}')
-      } catch (ex) {
-        ConnectionManager.logger.error(`connection '${connection.name}' params should be JSON format`, ex)
-      }
-
       return {
         ...connection,
-        params
+        params: connection.params || {}
       }
     })
 

package/server/service/connection/connection-type.ts

@@ -11,12 +11,15 @@ import {
 } from 'typeorm'
 
 import { User, Appliance } from '@things-factory/auth-base'
-import { logger } from '@things-factory/env'
-import { Domain, ObjectRef } from '@things-factory/shell'
+import { config } from '@things-factory/env'
+import { Domain, ObjectRef, ScalarObject } from '@things-factory/shell'
 
 import { ConnectionManager } from '../../engine'
 import { ProxyConnector } from '../../engine/connector/proxy-connector'
 
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
 export enum ConnectionStatus {
   CONNECTED = 'CONNECTED',
   DISCONNECTED = 'DISCONNECTED'
@@ -109,10 +112,31 @@ export class Connection {
 
   /**
    * Additional parameters for the connection, stored as a JSON string.
+   *
+   * [Caution]
+   * 이 컬럼타입은 postgres 데이터베이스에서는 varchar 타입을 유지한다.
+   * 이는 데이터베이스 타입을 변경하면 기존 데이터가 손실될 수 있기 때문이다.
+   * 'simple-json' 타입으로 변경 전에 postgres 데이타베이스에 이미 varchar 타입으로 사용한 사례가 많기 때문이다.
    */
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  params: string
+  @Column({
+    type: DATABASE_TYPE == 'postgres' ? 'varchar' : 'simple-json',
+    nullable: true,
+    transformer:
+      DATABASE_TYPE == 'postgres'
+        ? {
+            to: (value: any) => JSON.stringify(value),
+            from: (value: string) => {
+              try {
+                return JSON.parse(value)
+              } catch (error) {
+                return null
+              }
+            }
+          }
+        : undefined
+  })
+  @Field(type => ScalarObject, { nullable: true })
+  params: { [key: string]: any }
 
   /**
    * The date and time when the connection was created.
@@ -163,17 +187,10 @@ export class Connection {
   async connect() {
     const { type, edge } = this
     const connector = edge ? ProxyConnector.instance : ConnectionManager.getConnector(type)
-    var params = {}
-
-    try {
-      params = JSON.parse(this.params || '{}')
-    } catch (ex) {
-      logger.error(`connection '${this.name}' params should be JSON format`, ex)
-    }
 
     await connector.connect({
       ...this,
-      params
+      params: this.params || {}
     })
   }
 
@@ -244,8 +261,8 @@ export class NewConnection {
   @Field({ nullable: true })
   endpoint?: string
 
-  @Field({ nullable: true })
-  params?: string
+  @Field(type => ScalarObject, { nullable: true })
+  params?: { [key: string]: any }
 }
 
 @InputType()
@@ -271,8 +288,8 @@ export class ConnectionPatch {
   @Field({ nullable: true })
   active?: boolean
 
-  @Field({ nullable: true })
-  params?: string
+  @Field(type => ScalarObject, { nullable: true })
+  params?: { [key: string]: any }
 
   @Field({ nullable: true })
   cuFlag?: string

package/server/service/scenario/scenario-query.ts

@@ -84,7 +84,7 @@ export class ScenarioQuery {
       where: { domain: { id: domain.id }, scenario: { id: scenario.id }, task: 'publish' }
     })
 
-    return steps.map(step => JSON.parse(step.params)?.tag).filter(Boolean)
+    return steps.map(step => step.params?.tag).filter(Boolean)
   }
 
   @FieldResolver(type => String, { nullable: true })

package/server/service/scenario-instance/scenario-instance-type.ts

@@ -519,15 +519,9 @@ export class ScenarioInstance {
     this.context.logger.info(`Step '${step.name}'(${step.id}) started.`)
 
     step = {
-      ...step
-    } // copy step
-
-    try {
-      step.params = JSON.parse(step.params)
-    } catch (ex) {
-      this.context.logger.error(`params(${step.params}) parsing error. params must be a JSON.`, ex)
+      ...step,
+      params: step.params || {}
     }
-    step.params = step.params || {}
 
     const connection =
       step.connection && ConnectionManager.getConnectionInstanceEntityByName(this.domain, step.connection)

package/server/service/step/step-type.ts

@@ -11,10 +11,14 @@ import {
 } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarObject } from '@things-factory/shell'
+import { config } from '@things-factory/env'
 
 import { Scenario } from '../scenario/scenario'
 
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
+
 @Entity()
 @Index('ix_step_0', (step: Step) => [step.scenario, step.sequence], { unique: true })
 @ObjectType()
@@ -103,10 +107,31 @@ export class Step {
 
   /**
    * The parameters for the step.
-   */
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  params?: string
+   *
+   * [Caution]
+   * 이 컬럼타입은 postgres 데이터베이스에서는 varchar 타입을 유지한다.
+   * 이는 데이터베이스 타입을 변경하면 기존 데이터가 손실될 수 있기 때문이다.
+   * 'simple-json' 타입으로 변경 전에 postgres 데이타베이스에 이미 varchar 타입으로 사용한 사례가 많기 때문이다.
+   */
+  @Column({
+    type: DATABASE_TYPE == 'postgres' ? 'varchar' : 'simple-json',
+    nullable: true,
+    transformer:
+      DATABASE_TYPE == 'postgres'
+        ? {
+            to: (value: any) => JSON.stringify(value),
+            from: (value: string) => {
+              try {
+                return JSON.parse(value)
+              } catch (error) {
+                return null
+              }
+            }
+          }
+        : undefined
+  })
+  @Field(type => ScalarObject, { nullable: true })
+  params?: { [key: string]: any }
 
   /**
    * A boolean attribute indicating the inclusion status of an element in the result.
@@ -186,8 +211,8 @@ export class StepPatch {
   @Field({ nullable: true })
   connection?: string
 
-  @Field({ nullable: true })
-  params?: string
+  @Field(type => ScalarObject, { nullable: true })
+  params?: { [key: string]: any }
 
   @Field({ nullable: true })
   result?: boolean
@@ -201,9 +226,7 @@ export class StepPatch {
  * 추후, 타입 일치를 통해서 제거할 예정임.
  *
  */
-export interface InputStep extends Step {
-  params: any
-}
+export interface InputStep extends Step {}
 
 @ObjectType()
 export class StepList {