@things-factory/integration-base 7.0.1-alpha.10 → 7.0.1-alpha.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-alpha.10",
+  "version": "7.0.1-alpha.102",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,22 +26,22 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^7.0.1-alpha.10",
-    "@things-factory/auth-base": "^7.0.1-alpha.10",
-    "@things-factory/env": "^7.0.1-alpha.0",
-    "@things-factory/oauth2-client": "^7.0.1-alpha.10",
-    "@things-factory/scheduler-client": "^7.0.1-alpha.10",
-    "@things-factory/shell": "^7.0.1-alpha.10",
-    "@things-factory/utils": "^7.0.1-alpha.4",
+    "@operato/moment-timezone-es": "^2.0.0-alpha.0",
+    "@things-factory/api": "^7.0.1-alpha.102",
+    "@things-factory/auth-base": "^7.0.1-alpha.102",
+    "@things-factory/env": "^7.0.1-alpha.71",
+    "@things-factory/oauth2-client": "^7.0.1-alpha.102",
+    "@things-factory/scheduler-client": "^7.0.1-alpha.102",
+    "@things-factory/shell": "^7.0.1-alpha.102",
+    "@things-factory/utils": "^7.0.1-alpha.71",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
     "ieee754": "^1.2.1",
-    "moment-timezone": "^0.5.40",
     "node-fetch": "^2.6.0",
     "promise-socket": "^7.0.0",
     "readline": "^1.3.0",
     "vm2": "^3.9.11"
   },
-  "gitHead": "5adeb2a190f3c6eb5c5cbceac181a3d19fefda9b"
+  "gitHead": "2bce598261c2d7377ea008ee687358480a2869bc"
 }

package/server/controllers/scenario-controller.ts

@@ -43,7 +43,12 @@ export async function runScenario(instanceName: string, scenarioName: string, va
 
   if (!(await checkPermission(scenario.privilege, user, domain, unsafeIP, prohibitedPrivileges))) {
     const { category, privilege } = scenario.privilege || {}
-    throw new Error(`Unauthorized! ${category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'} required`)
+
+    console.error(`Unauthorized! ${category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'} required`)
+
+    throw new Error(context.t('error.scenario run unauthorized', {
+      scenario: scenarioName
+    }))
   }
 
   /* 시나리오 인스턴스를 생성한다. */
@@ -56,7 +61,15 @@ export async function runScenario(instanceName: string, scenarioName: string, va
     client: GraphqlLocalClient.client
   })
 
-  await instance.run()
+  try {
+    await instance.run()
+  } catch(err) {
+    console.error(err)
+
+    throw new Error(context.t('error.scenario run error', {
+      scenario: scenarioName
+    }))
+  }
 
   return instance
 }

package/server/engine/task/database-query.ts

@@ -37,7 +37,11 @@ DatabaseQuery.parameterSpec = [
     name: 'query',
     label: 'query',
     property: {
-      language: 'sql'
+      language: 'sql',
+      showLineNumbers: true
+    },
+    styles: {
+      flex: '1'
     }
   }
 ]

package/server/engine/task/graphql-mutate.ts

@@ -51,7 +51,13 @@ GraphqlMutate.parameterSpec = [
   {
     type: 'graphql',
     name: 'mutation',
-    label: 'mutation'
+    label: 'mutation',
+    property: {
+      showLineNumbers: true
+    },
+    styles: {
+      flex: 1
+    }
   },
   {
     type: 'key-values',

package/server/engine/task/graphql-query.ts

@@ -50,7 +50,13 @@ GraphqlQuery.parameterSpec = [
   {
     type: 'graphql',
     name: 'query',
-    label: 'query'
+    label: 'query',
+    property: {
+      showLineNumbers: true
+    },
+    styles: {
+      flex: 1
+    }
   },
   {
     type: 'key-values',

package/server/engine/task/jsonata.ts

@@ -30,7 +30,11 @@ JSonata.parameterSpec = [
     name: 'expression',
     label: 'jsonata-expression',
     property: {
-      language: 'javascript'
+      language: 'javascript',
+      showLineNumbers: true
+    },
+    styles: {
+      flex: '1'
     }
   }
 ]

package/server/engine/task/local-graphql-mutate.ts

@@ -9,8 +9,6 @@ import { TaskRegistry } from '../task-registry'
 import { InputStep } from '../../service/step/step-type'
 import { Context } from '../types'
 
-
-
 async function LocalGraphqlMutate(step: InputStep, context: Context) {
   var { params, updaterId } = step
   var { mutation, variables: variablesAccessorMap, headers } = params || {}
@@ -70,7 +68,13 @@ LocalGraphqlMutate.parameterSpec = [
   {
     type: 'graphql',
     name: 'mutation',
-    label: 'mutation'
+    label: 'mutation',
+    property: {
+      showLineNumbers: true
+    },
+    styles: {
+      flex: 1
+    }
   },
   {
     type: 'key-values',

package/server/engine/task/local-graphql-query.ts

@@ -68,7 +68,13 @@ LocalGraphqlQuery.parameterSpec = [
   {
     type: 'graphql',
     name: 'query',
-    label: 'query'
+    label: 'query',
+    property: {
+      showLineNumbers: true
+    },
+    styles: {
+      flex: 1
+    }
   },
   {
     type: 'key-values',

package/server/engine/task/script.ts

@@ -38,7 +38,11 @@ Script.parameterSpec = [
     name: 'script',
     label: 'script',
     property: {
-      language: 'javascript'
+      language: 'javascript',
+      showLineNumbers: true
+    },
+    styles: {
+      flex: '1'
     }
   }
 ]

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

@@ -1,5 +1,14 @@
 import { Field, ID, InputType, Int, ObjectType, registerEnumType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User, Appliance } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
@@ -33,7 +42,7 @@ export class Connection {
    * Many-to-One relationship with the Domain entity.
    */
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain, { nullable: true })
   domain: Domain
 
   /**
@@ -193,7 +202,7 @@ export interface InputConnection extends Connection {
 
 @ObjectType()
 export class ConnectionState {
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @Field({ nullable: true })

package/server/service/payload-log/payload-log.ts

@@ -32,7 +32,7 @@ export class PayloadLog {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((payloadLog: PayloadLog) => payloadLog.domain)
@@ -47,8 +47,8 @@ export class PayloadLog {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: PayloadType,
     default: PayloadType.EGESTION,
     nullable: true

package/server/service/property-spec.ts

@@ -18,4 +18,7 @@ export class PropertySpec {
 
   @Field(type => ScalarObject, { nullable: true })
   property?: { [key: string]: any }
+
+  @Field(type => ScalarObject, { nullable: true })
+  styles?: { [key: string]: any }
 }

package/server/service/scenario/scenario.ts

@@ -26,7 +26,7 @@ export class Scenario {
   id?: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((scenario: Scenario) => scenario.domain)

package/server/service/state-register/state-register.ts

@@ -26,7 +26,7 @@ export class StateRegister {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((stateRegister: StateRegister) => stateRegister.domain)

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

@@ -15,110 +15,112 @@ import { Domain } from '@things-factory/shell'
 
 import { Scenario } from '../scenario/scenario'
 
-
 @Entity()
 @Index('ix_step_0', (step: Step) => [step.scenario, step.sequence], { unique: true })
 @ObjectType()
 export class Step {
-  /** 
-    * The unique identifier for each step.
-    */
+  /**
+   * The unique identifier for each step.
+   */
   @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
   readonly id: string
 
-  /** 
-    * The domain to which this step belongs.
-    */
+  /**
+   * The domain to which this step belongs.
+   */
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain, { nullable: true })
   domain: Domain
 
-  /** 
-    * The ID of the domain associated with this step.
-    */
+  /**
+   * The ID of the domain associated with this step.
+   */
   @RelationId((step: Step) => step.domain)
   domainId: string
 
-  /** 
-    * The name of the step.
-    */
+  /**
+   * The name of the step.
+   */
   @Column({ nullable: true })
   @Field()
   name: string
 
-  /** 
-    * A description of what the step involves.
-    */
+  /**
+   * A description of what the step involves.
+   */
   @Column({ nullable: true })
   @Field({ nullable: true })
   description: string
 
-  /** 
-    * The scenario that includes this step.
-    */
+  /**
+   * The scenario that includes this step.
+   */
   @ManyToOne(type => Scenario, scenario => scenario.steps, { onDelete: 'CASCADE' })
   @Field(type => Scenario, { nullable: true })
   scenario: Scenario
 
-  /** 
-    * The ID of the scenario associated with this step.
-    */
+  /**
+   * The ID of the scenario associated with this step.
+   */
   @RelationId((step: Step) => step.scenario)
   scenarioId: string
 
-  /** 
-    * The sequence number of the step within its scenario.
-    */
+  /**
+   * The sequence number of the step within its scenario.
+   */
   @Column()
   @Field({ nullable: true })
   sequence: number
 
-  /** 
-    * The specific task associated with this step.
-    */
+  /**
+   * The specific task associated with this step.
+   */
   @Column()
   @Field({ nullable: true })
   task: string
 
-  /** 
-    * Boolean value to indicate if the step should be skipped.
-    */
+  /**
+   * Boolean value to indicate if the step should be skipped.
+   */
   @Column({ nullable: true })
   @Field({ nullable: true })
   skip: boolean
 
-  /** 
-    * Boolean value to indicate if the step should be logged.
-    */
+  /**
+   * Boolean value to indicate if the step should be logged.
+   */
   @Column({ nullable: true })
   @Field({ nullable: true })
   log: boolean
 
-  /** 
-    * The connection details associated with this step.
-    */
+  /**
+   * The connection details associated with this step.
+   */
   @Column({ nullable: true })
   @Field({ nullable: true })
   connection: string
 
-  /** 
-    * The parameters for the step.
-    */
+  /**
+   * The parameters for the step.
+   */
   @Column({ nullable: true })
   @Field({ nullable: true })
   params: string
 
-  /** 
-    * A boolean attribute indicating the inclusion status of an element in the result.
-    */
+  /**
+   * A boolean attribute indicating the inclusion status of an element in the result.
+   */
   @Column({ nullable: true, default: true })
-  @Field({ nullable: true, description: 'A boolean attribute indicating the inclusion status of an element in the result' })
+  @Field({
+    nullable: true,
+    description: 'A boolean attribute indicating the inclusion status of an element in the result'
+  })
   result: boolean = true
 
-  /** 
-    * The timestamp when the step was created.
-    */
+  /**
+   * The timestamp when the step was created.
+   */
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt: Date
@@ -132,28 +134,28 @@ export class Step {
   updatedAt: Date
 
   /**
-  * The user who created this step.
-  */
+   * The user who created this step.
+   */
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator: User
 
   /**
-  * The ID of the user who created this step.
-  */
+   * The ID of the user who created this step.
+   */
   @RelationId((step: Step) => step.creator)
   creatorId: string
 
   /**
-  * The user who last updated this step.
-  */
+   * The user who last updated this step.
+   */
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   updater: User
 
   /**
-  * The ID of the user who last updated this step.
-  */
+   * The ID of the user who last updated this step.
+   */
   @RelationId((step: Step) => step.updater)
   updaterId: string
 }
@@ -197,7 +199,7 @@ export class StepPatch {
 /**
  * Step의 params의 원 타입과 사용 시에 타입 불일치로 인해 임시적으로 생성한 타입으로
  * 추후, 타입 일치를 통해서 제거할 예정임.
- * 
+ *
  */
 export interface InputStep extends Step {
   params: any

package/translations/en.json

@@ -1,5 +1,7 @@
 {
   "error.scenario not found": "scenario '{scenario}' not found.",
+  "error.scenario run error": "an error occurred while processing the '{scenario}' request. please contact the administrator.",
+  "error.scenario run unauthorized": "you do not have permission to run the {scenario} scenario. please contact the administrator.",
   "error.schedule is not set": "schedule should be set for the scenario '{scenario}' in order to register as a schedule",
   "error.timezone is not set": "timezone should be set for the scenario '{scenario}' in order to register as a schedule",
   "error.scenario instance not found": "scenario instance '{instance}' not found.",

package/translations/ja.json

@@ -1,5 +1,7 @@
 {
   "error.scenario not found": "シナリオ'{scenario}'が見つかりません.",
+  "error.scenario run error": "シナリオ '{scenario}' のリクエストを処理中にエラーが発生しました。管理者に連絡してください。",
+  "error.scenario run unauthorized": "シナリオ {scenario} を実行する権限がありません。管理者に連絡してください。",
   "error.schedule is not set": "スケジュールとして登録するためにはシナリオ'{scenario}'にスケジュール情報が設定される必要があります.",
   "error.timezone is not set": "スケジュールとして登録するためにはシナリオ'{scenario}'にタイム ゾーン情報が設定される必要があります.",
   "error.scenario instance not found": "シナリオ インスタンス'{instance}'が見つかりません. 既に終了している可能性があります.",

package/translations/ko.json

@@ -1,5 +1,7 @@
 {
   "error.scenario not found": "시나리오 '{scenario}'를 찾을 수 없습니다.",
+  "error.scenario run error": "시나리오 '{scenario}' 요청을 처리하는 중 오류가 발생했습니다. 관리자에게 문의하십시오.",
+  "error.scenario run unauthorized": "시나리오 {scenario}를 실행할 권한이 없습니다. 관리자에게 문의하십히오.",
   "error.schedule is not set": "스케쥴로 등록하기 위해서는 시나리오 '{scenario}'에 스케쥴 정보가 설정되어야 합니다.",
   "error.timezone is not set": "스케쥴로 등록하기 위해서는 시나리오 '{scenario}'에 타임존 정보가 설정되어야 합니다.",
   "error.scenario instance not found": "시나리오 인스턴스 '{instance}'를 찾을 수 없습니다. 이미 종료되었을 수 있습니다.",

package/translations/ms.json

@@ -1,5 +1,7 @@
 {
   "error.scenario not found": "Tidak dapat mencari senario '{scenario}'.",
+  "error.scenario run error": "Ralat berlaku semasa memproses permintaan senario '{scenario}'. Sila hubungi pentadbir.",
+  "error.scenario run unauthorized": "Anda tidak mempunyai kebenaran untuk menjalankan senario {scenario}. Sila hubungi pentadbir.",
   "error.schedule is not set": "Untuk mendaftarkan sebagai jadual, maklumat jadual mesti diset dalam senario '{scenario}'.",
   "error.timezone is not set": "Untuk mendaftarkan sebagai jadual, maklumat zon masa mesti diset dalam senario '{scenario}'.",
   "error.scenario instance not found": "Tidak dapat mencari instans senario '{instance}'. Mungkin telah berakhir.",

package/translations/zh.json

@@ -1,5 +1,7 @@
 {
   "error.scenario not found": "无法找到场景 '{scenario}'。",
+  "error.scenario run error": "处理场景 '{scenario}' 请求时发生错误。请联系管理员。",
+  "error.scenario run unauthorized": "没有执行场景 {scenario} 的权限。请联系管理员。",
   "error.schedule is not set": "要注册为计划，场景 '{scenario}' 需要设置计划信息。",
   "error.timezone is not set": "要注册为计划，场景 '{scenario}' 需要设置时区信息。",
   "error.scenario instance not found": "无法找到场景实例 '{instance}'。它可能已经结束。",