@things-factory/integration-base 7.0.1-beta.9 → 7.0.1-rc.1

package/helps/integration/connector/mssql-connector.ja.md

@@ -1,14 +1,14 @@
-# MSSqlコネクタ
+# MS-SQLコネクタ
 
-## MSSqlとは
+## MS-SQLとは
 
-[MSSql](https://www.microsoft.com/sql-server)はMicrosoft SQL Serverです。
+[MS-SQL](https://www.microsoft.com/sql-server)はMicrosoft SQL Serverです。
 
 ## 設定
 
 ### エンドポイント
 
-MSSqlエンジンのホスト名とサービスポート
+MS-SQLエンジンのホスト名とサービスポート
 
 - ホスト名：データベースサーバーホスト
 - サービスポート：データベースサービスポート（デフォルト - 1433）
@@ -23,11 +23,11 @@ MSSqlエンジンのホスト名とサービスポート
 
 ### ユーザー
 
-- MSSqlデータベースのユーザーID
+- MS-SQLデータベースのユーザーID
 
 ### パスワード
 
-- MSSqlデータベースのユーザーパスワード
+- MS-SQLデータベースのユーザーパスワード
 
 ### データベース
 
@@ -36,3 +36,7 @@ MSSqlエンジンのホスト名とサービスポート
 ### 暗号化
 
 - 暗号化された接続
+
+### サーバー証明書の信頼性
+
+- MS-SQL サーバーにインストールされた SSL/TLS 証明書が自己署名証明書であっても信頼できるかどうか

package/helps/integration/connector/mssql-connector.ko.md

@@ -1,14 +1,14 @@
-# mssql 커넥터
+# MS-SQL 커넥터
 
-## mssql
+## MS-SQL
 
-[mssql](https://www.microsoft.com/sql-server)은 Microsoft SQL Server입니다.
+[MS-SQL](https://www.microsoft.com/sql-server)은 Microsoft SQL Server입니다.
 
 ## 설정
 
 ### 엔드포인트
 
-mssql 엔진 호스트 이름과 서비스 포트
+MS-SQL 엔진 호스트 이름과 서비스 포트
 
 - 호스트 이름 : 데이터베이스 서버 호스트
 - 서비스 포트 : 데이터베이스 서비스 포트 (기본값 - 1433)
@@ -23,11 +23,11 @@ mssql 엔진 호스트 이름과 서비스 포트
 
 ### 사용자
 
-- mssql 데이터베이스의 사용자 ID
+- MS-SQL 데이터베이스의 사용자 ID
 
 ### 비밀번호
 
-- mssql 데이터베이스의 사용자 비밀번호
+- MS-SQL 데이터베이스의 사용자 비밀번호
 
 ### 데이터베이스
 
@@ -36,3 +36,7 @@ mssql 엔진 호스트 이름과 서비스 포트
 ### 암호화
 
 - 암호화된 연결
+
+### 서버 인증서 신뢰
+
+- MS-SQL 서버에 설치된 SSL/TLS 인증서가 self-signed certificate 이더라도 신뢰할 지 여부

package/helps/integration/connector/mssql-connector.md

@@ -1,14 +1,14 @@
-# MSSql connector
+# MS-SQL connector
 
-## MSSql is
+## MS-SQL is
 
-[MSSql](https://www.microsoft.com/sql-server) is Microsoft SQL Server
+[MS-SQL](https://www.microsoft.com/sql-server) is Microsoft SQL Server
 
 ## Setting
 
 ### endpoint
 
-MSSql engine hostname and service port
+MS-SQL engine hostname and service port
 
 - hostname : database server host
 - service port : database service port (default - 1433)
@@ -23,11 +23,11 @@ MSSql engine hostname and service port
 
 ### user
 
-- user id for MSSql database
+- user id for MS-SQL database
 
 ### password
 
-- user password for MSSql database
+- user password for MS-SQL database
 
 ### database
 
@@ -36,3 +36,7 @@ MSSql engine hostname and service port
 ### encrypt
 
 - encrypted connection
+
+### trust server certificate
+
+- whether the SSL/TLS certificate installed on the MS-SQL server is trustworthy, even if it is a self-signed certificate

package/helps/integration/connector/mssql-connector.ms.md

@@ -1,14 +1,14 @@
-# Penyambung MSSql
+# Penyambung MS-SQL
 
-## MSSql adalah
+## MS-SQL adalah
 
-[MSSql](https://www.microsoft.com/sql-server) adalah Microsoft SQL Server
+[MS-SQL](https://www.microsoft.com/sql-server) adalah Microsoft SQL Server
 
 ## Tetapan
 
 ### titik akhir
 
-Nama hos dan port perkhidmatan enjin MSSql
+Nama hos dan port perkhidmatan enjin MS-SQL
 
 - nama hos : hos pelayan pangkalan data
 - port perkhidmatan : port perkhidmatan pangkalan data (lalai - 1433)
@@ -23,11 +23,11 @@ Nama hos dan port perkhidmatan enjin MSSql
 
 ### pengguna
 
-- ID pengguna untuk pangkalan data MSSql
+- ID pengguna untuk pangkalan data MS-SQL
 
 ### kata laluan
 
-- Kata laluan pengguna untuk pangkalan data MSSql
+- Kata laluan pengguna untuk pangkalan data MS-SQL
 
 ### pangkalan data
 
@@ -36,3 +36,7 @@ Nama hos dan port perkhidmatan enjin MSSql
 ### enkripsi
 
 - Sambungan terenkripsi
+
+### kepercayaan sijil pelayan
+
+- adakah sijil SSL/TLS yang dipasang di pelayan MS-SQL boleh dipercayai walaupun ia sijil yang ditandatangani sendiri

package/helps/integration/connector/mssql-connector.zh.md

@@ -1,14 +1,14 @@
-# MSSql连接器
+# MS-SQL连接器
 
-## MSSql是什么
+## MS-SQL是什么
 
-[MSSql](https://www.microsoft.com/sql-server)是Microsoft SQL Server
+[MS-SQL](https://www.microsoft.com/sql-server)是Microsoft SQL Server
 
 ## 设置
 
 ### 终端点
 
-MSSql引擎主机名和服务端口
+MS-SQL引擎主机名和服务端口
 
 - 主机名：数据库服务器主机
 - 服务端口：数据库服务端口（默认 - 1433）
@@ -23,11 +23,11 @@ MSSql引擎主机名和服务端口
 
 ### 用户
 
-- MSSql数据库的用户ID
+- MS-SQL数据库的用户ID
 
 ### 密码
 
-- MSSql数据库的用户密码
+- MS-SQL数据库的用户密码
 
 ### 数据库
 
@@ -36,3 +36,7 @@ MSSql引擎主机名和服务端口
 ### 加密
 
 - 加密连接
+
+### 服务器证书信任
+
+- MS-SQL 服务器安装的 SSL/TLS 证书是否值得信赖，即使是自签名证书

package/helps/integration/connector/operato-connector.ja.md

@@ -25,13 +25,10 @@ GraphQLサーバーエンドポイントを指定します。
 
 - 対象サーバーで動作させたいドメインを指定する必要があります。
 
-
 ### タグ
 
 - ターゲットサーバーで pubsub ベースのデータを購読する際に使用されるタグ名を指定します。
 
-
 ### 场景
 
 - タグが設定されている場合、購読されたメッセージを処理するシナリオを指定します。
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-beta.9",
+  "version": "7.0.1-rc.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,14 +26,15 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@operato/moment-timezone-es": "^2.0.0-beta.0",
-    "@things-factory/api": "^7.0.1-beta.9",
-    "@things-factory/auth-base": "^7.0.1-beta.9",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/oauth2-client": "^7.0.1-beta.9",
-    "@things-factory/scheduler-client": "^7.0.1-beta.9",
-    "@things-factory/shell": "^7.0.1-beta.8",
-    "@things-factory/utils": "^7.0.1-beta.6",
+    "@operato/moment-timezone-es": "^7.0.0-rc",
+    "@things-factory/api": "^7.0.1-rc.1",
+    "@things-factory/auth-base": "^7.0.1-rc.1",
+    "@things-factory/cache-service": "^7.0.1-rc.1",
+    "@things-factory/env": "^7.0.1-rc.0",
+    "@things-factory/oauth2-client": "^7.0.1-rc.1",
+    "@things-factory/scheduler-client": "^7.0.1-rc.1",
+    "@things-factory/shell": "^7.0.1-rc.1",
+    "@things-factory/utils": "^7.0.1-rc.0",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -43,5 +44,5 @@
     "readline": "^1.3.0",
     "vm2": "^3.9.11"
   },
-  "gitHead": "b2fb4923e2763b4d831f934905dd6ae0019446a4"
+  "gitHead": "fa52d291483c4aa913a9c6a9a4463a73058b1b0d"
 }

package/server/controllers/scenario-controller.ts

@@ -1,14 +1,22 @@
 import { getRepository, Domain, GraphqlLocalClient } from '@things-factory/shell'
-import { PrivilegeObject, checkPermission } from '@things-factory/auth-base'
+import { PrivilegeObject, User, checkPermission } from '@things-factory/auth-base'
+import { cacheService } from '@things-factory/cache-service'
 
 import { ScenarioEngine } from '../engine/scenario-engine'
 import { Scenario } from '../service/scenario/scenario'
-import { ScenarioInstance } from '../service/scenario-instance/scenario-instance-type'
+import {
+  ScenarioInstance,
+  ScenarioInstanceRunResult,
+  ScenarioInstanceStatus
+} from '../service/scenario-instance/scenario-instance-type'
 import { Step } from '../service/step/step-type'
 
 const debug = require('debug')('things-factory:integration-base:controller:run-scenario')
 
-async function findScenario(scenarioName: string, domain: Domain): Promise<{ name: string; steps: Step[]; domain: Domain; privilege?: PrivilegeObject }> {
+async function findScenario(
+  scenarioName: string,
+  domain: Domain
+): Promise<{ id: string; name: string; steps: Step[]; domain: Domain; privilege?: PrivilegeObject; ttl?: number }> {
   var repository = getRepository(Scenario)
 
   var scenario = await repository.findOne({
@@ -26,7 +34,12 @@ async function findScenario(scenarioName: string, domain: Domain): Promise<{ nam
   return scenario as any
 }
 
-export async function runScenario(instanceName: string, scenarioName: string, variables: any, context: ResolverContext): Promise<ScenarioInstance> {
+export async function runScenario(
+  instanceName: string,
+  scenarioName: string,
+  variables: any,
+  context: ResolverContext
+): Promise<ScenarioInstanceRunResult> {
   const { domain, user, lng, unsafeIP, prohibitedPrivileges } = context.state
 
   debug('runScenario', scenarioName, instanceName, variables)
@@ -44,11 +57,22 @@ export async function runScenario(instanceName: string, scenarioName: string, va
   if (!(await checkPermission(scenario.privilege, user, domain, unsafeIP, prohibitedPrivileges))) {
     const { category, privilege } = scenario.privilege || {}
 
-    console.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
+      })
+    )
+  }
 
-    throw new Error(context.t('error.scenario run unauthorized', {
-      scenario: scenarioName
-    }))
+  if (scenario.ttl > 0) {
+    const cachedValue = await cacheService.getFromCache(scenario.id, { domain: domain.id, variables: variables || {} })
+    if (cachedValue) {
+      return cachedValue.value
+    }
   }
 
   /* 시나리오 인스턴스를 생성한다. */
@@ -62,19 +86,24 @@ export async function runScenario(instanceName: string, scenarioName: string, va
   })
 
   try {
-    await instance.run()
-  } catch(err) {
+    return await instance.run()
+  } catch (err) {
     console.error(err)
 
-    throw new Error(context.t('error.scenario run error', {
-      scenario: scenarioName
-    }))
+    throw new Error(
+      context.t('error.scenario run error', {
+        scenario: scenarioName
+      })
+    )
   }
-
-  return instance
 }
 
-export async function startScenario(instanceName: string, scenarioName: string, variables: any, context: ResolverContext): Promise<ScenarioInstance> {
+export async function startScenario(
+  instanceName: string,
+  scenarioName: string,
+  variables: any,
+  context: ResolverContext
+): Promise<ScenarioInstance> {
   const { domain, user, lng, unsafeIP, prohibitedPrivileges } = context.state
 
   debug('startScenario', instanceName, scenarioName, variables)
@@ -91,14 +120,19 @@ export async function startScenario(instanceName: string, scenarioName: string,
 
   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`)
+    throw new Error(
+      `Unauthorized! ${category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'} required`
+    )
   }
 
   instanceName = instanceName || scenarioName
   return await ScenarioEngine.load(instanceName, scenario, { domain, user, lng, variables })
 }
 
-export async function stopScenario(instanceName: string, context: ResolverContext): Promise<ScenarioInstance | undefined> {
+export async function stopScenario(
+  instanceName: string,
+  context: ResolverContext
+): Promise<ScenarioInstance | undefined> {
   const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
 
   debug('stopScenario', instanceName)
@@ -120,7 +154,9 @@ export async function stopScenario(instanceName: string, context: ResolverContex
 
   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`)
+    throw new Error(
+      `Unauthorized! ${category && privilege ? category + ':' + privilege + ' privilege' : 'ownership granted'} required`
+    )
   }
 
   await ScenarioEngine.unload(domain, instanceName)

package/server/engine/index.ts

@@ -7,4 +7,4 @@ export * from './task-registry'
 export * from './analyzer/analyze-integration'
 export * from './edge-client'
 
-export { Connector } from './types'
+export { Connector, Context, TaskHandler } from './types'

package/server/engine/types.ts

@@ -1,4 +1,4 @@
-import { Connection, PropertySpec, ScenarioInstanceStatus, Step } from '../service'
+import { Connection, PropertySpec, ScenarioInstance, ScenarioInstanceStatus, Step } from '../service'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 
@@ -76,7 +76,7 @@ export type Context = {
   /**
    * Root object, can be used for various purposes.
    */
-  root: Object
+  root?: ScenarioInstance
 
   /**
    * Array of function closures.

package/server/restful/unstable/run-scenario.ts

@@ -21,7 +21,6 @@ router.post('/unstable/run-scenario/:scenarioName', async (context, next) => {
         runScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {
           instanceName
           scenarioName
-          state
           data
           result
           message

package/server/routers/scenario-schedule-callback-router.ts

@@ -61,8 +61,8 @@ scenarioScheduleCallbackRouter.post('/callback-schedule-for-scenario', async (co
 
   ScenarioEngine.load(scenario.name, scenario, {
     domain,
-    user,
-    variables: client.task?.data
+    user
+    /* variables: schedule 등록시 variables 는 설정할 방법이 없음. */
   })
 
   context.status = 200

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

@@ -19,12 +19,17 @@ export class ConnectionQuery {
 
     return {
       ...connection,
-      state: ConnectionManager.getConnectionInstance(connection) ? ConnectionStatus.CONNECTED : ConnectionStatus.DISCONNECTED
+      state: ConnectionManager.getConnectionInstance(connection)
+        ? ConnectionStatus.CONNECTED
+        : ConnectionStatus.DISCONNECTED
     } as Connection
   }
 
   @Query(returns => ConnectionList, { description: 'To fetch multiple connections' })
-  async connections(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ConnectionList> {
+  async connections(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ConnectionList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -38,7 +43,9 @@ export class ConnectionQuery {
     const [items, total] = await queryBuilder.leftJoinAndSelect('connection.domain', 'domain').getManyAndCount()
 
     items.forEach(connection => {
-      connection['state'] = ConnectionManager.getConnectionInstance(connection) ? ConnectionStatus.CONNECTED : ConnectionStatus.DISCONNECTED
+      connection['state'] = ConnectionManager.getConnectionInstance(connection)
+        ? ConnectionStatus.CONNECTED
+        : ConnectionStatus.DISCONNECTED
     })
 
     return { items, total }
@@ -63,7 +70,9 @@ export class ConnectionQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() connection: Connection) {
-    return connection.domain || (connection.domainId && (await getRepository(Domain).findOneBy({ id: connection.domainId })))
+    return (
+      connection.domain || (connection.domainId && (await getRepository(Domain).findOneBy({ id: connection.domainId })))
+    )
   }
 
   @FieldResolver(type => User)

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

@@ -18,7 +18,10 @@ export class PayloadLogQuery {
   }
 
   @Query(returns => PayloadLogList, { description: 'To fetch multiple PayloadLogs' })
-  async payloadLogs(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<PayloadLogList> {
+  async payloadLogs(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<PayloadLogList> {
     const { domain } = context.state
 
     const convertedParams = convertListParams(params, {

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

@@ -81,14 +81,14 @@ export class PayloadLog {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((payloadLog: PayloadLog) => payloadLog.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((payloadLog: PayloadLog) => payloadLog.updater)

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

@@ -26,7 +26,7 @@ export class ScenarioQuery {
 
   @Directive('@privilege(category: "scenario", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ScenarioList, { description: 'To fetch multiple scenarios' })
-  async scenarios(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ScenarioList> {
+  async scenarios(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<ScenarioList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -22,6 +22,9 @@ export class NewScenario {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  ttl?: number
+
   @Field({ nullable: true })
   active?: boolean
 
@@ -49,6 +52,9 @@ export class ScenarioPatch {
   @Field({ nullable: true })
   timezone?: string
 
+  @Field({ nullable: true })
+  ttl?: number
+
   @Field({ nullable: true })
   active?: boolean
 

package/server/service/scenario/scenario.ts

@@ -64,6 +64,10 @@ export class Scenario {
   @Field({ nullable: true })
   timezone?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  ttl?: number
+
   @OneToMany(type => Step, step => step.scenario)
   @Field(type => [Step], { nullable: true })
   steps?: Step[]
@@ -81,14 +85,14 @@ export class Scenario {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((scenario: Scenario) => scenario.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((scenario: Scenario) => scenario.updater)

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

@@ -2,7 +2,7 @@ import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
 
 import { ScalarObject } from '@things-factory/shell'
 
-import { ScenarioInstance } from './scenario-instance-type'
+import { ScenarioInstance, ScenarioInstanceRunResult } from './scenario-instance-type'
 
 import {
   runScenario as controllerRunScenario,
@@ -12,7 +12,7 @@ import {
 
 @Resolver(ScenarioInstance)
 export class ScenarioInstanceMutation {
-  @Mutation(returns => ScenarioInstance, {
+  @Mutation(returns => ScenarioInstanceRunResult, {
     description: 'To run new scenario instance and will return the result after the scenario stop.'
   })
   async runScenario(
@@ -20,7 +20,7 @@ export class ScenarioInstanceMutation {
     @Arg('scenarioName') scenarioName: string,
     @Arg('variables', type => ScalarObject, { nullable: true }) variables: any,
     @Ctx() context: ResolverContext
-  ): Promise<ScenarioInstance> {
+  ): Promise<ScenarioInstanceRunResult> {
     return await controllerRunScenario(instanceName, scenarioName, variables, context)
   }
 
@@ -35,7 +35,10 @@ export class ScenarioInstanceMutation {
   }
 
   @Mutation(returns => ScenarioInstance, { nullable: true, description: 'To start new scenario instance' })
-  async stopScenario(@Arg('instanceName', { nullable: true }) instanceName: string, @Ctx() context: ResolverContext): Promise<ScenarioInstance | undefined> {
+  async stopScenario(
+    @Arg('instanceName', { nullable: true }) instanceName: string,
+    @Ctx() context: ResolverContext
+  ): Promise<ScenarioInstance | undefined> {
     return await controllerStopScenario(instanceName, context)
   }
 }

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

@@ -23,7 +23,10 @@ export class ScenarioInstanceQuery {
   }
 
   @Query(returns => ScenarioInstanceList, { description: 'To fetch multiple scenario instances' })
-  async scenarioInstances(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ScenarioInstanceList> {
+  async scenarioInstances(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ScenarioInstanceList> {
     const { domain } = context.state
 
     var scenarioInstances = ScenarioEngine.getScenarioInstances(domain)
@@ -36,33 +39,4 @@ export class ScenarioInstanceQuery {
       total: items.length
     }
   }
-
-  @FieldResolver(type => ScenarioInstance)
-  async root(@Root() scenarioInstance: ScenarioInstance): Promise<ScenarioInstance> {
-    return scenarioInstance.context?.root as ScenarioInstance
-  }
-
-  @FieldResolver(type => ScenarioInstanceStatus)
-  async state(@Root() scenarioInstance: ScenarioInstance): Promise<ScenarioInstanceStatus> {
-    return scenarioInstance.context?.state
-  }
-
-  @FieldResolver(type => ScenarioInstanceProgress)
-  progress(@Root() scenarioInstance: ScenarioInstance): ScenarioInstanceProgress {
-    return scenarioInstance.calcProgress()
-  }
-  @FieldResolver(type => ScalarObject)
-  async variables(@Root() scenarioInstance: ScenarioInstance): Promise<Object> {
-    return scenarioInstance.context?.variables
-  }
-
-  @FieldResolver(type => ScalarObject)
-  async data(@Root() scenarioInstance: ScenarioInstance): Promise<Object> {
-    return scenarioInstance.context?.data
-  }
-
-  @FieldResolver()
-  async timestamp(@Root() scenarioInstance: ScenarioInstance): Promise<Date> {
-    return new Date()
-  }
 }