@things-factory/integration-base 6.2.70 → 6.2.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.2.70",
+  "version": "6.2.75",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "99c274f281e62be08a952c10cb3b8fdecba24a65"
+  "gitHead": "55d7ca9bf5591461d28cca4640941a3f6df93bc0"
 }

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

@@ -1,7 +1,7 @@
 import uniq from 'lodash/uniq'
 
 import { Domain, getRepository } from '@things-factory/shell'
-import { Scenario } from '../../service/scenario/scenario-type'
+import { Scenario } from '../../service/scenario/scenario'
 import { Connection } from '../../service/connection/connection-type'
 
 export async function analyzeIntegration(domain: Domain) {

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

@@ -7,15 +7,16 @@ import { setContext } from '@apollo/client/link/context'
 import WebSocket from 'ws'
 import { createClient } from 'graphql-ws'
 import { GraphQLWsLink } from '@apollo/client/link/subscriptions'
-import { Observable, getMainDefinition } from '@apollo/client/utilities'
+import { getMainDefinition } from '@apollo/client/utilities'
 import gql from 'graphql-tag'
 
 import { ConnectionManager } from '../connection-manager'
 import { Connector } from '../types'
-import { Scenario, ScenarioInstance } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
+import { ScenarioInstance } from '../../service/scenario-instance/scenario-instance-type'
 
 import { getRepository, GraphqlLocalClient, Domain } from '@things-factory/shell'
-import { PrivilegeObject, User, checkPermission } from '@things-factory/auth-base'
+import { User, checkPermission } from '@things-factory/auth-base'
 
 const debug = require('debug')('things-factory:integration-base:operato-connector-subscription')
 

package/server/engine/scenario-engine.ts

@@ -1,6 +1,8 @@
 import { getRepository, GraphqlLocalClient, pubsub } from '@things-factory/shell'
 
-import { Scenario, ScenarioInstance } from '../service'
+import { Scenario } from '../service/scenario/scenario'
+import { ScenarioInstance } from '../service/scenario-instance/scenario-instance-type'
+
 import { PendingQueue } from './pending-queue'
 
 const debug = require('debug')('things-factory:integration-base:scenario-engine')

package/server/engine/task/pick-pending-scenario.ts

@@ -1,7 +1,7 @@
 import { getRepository } from '@things-factory/shell'
 import { sleep } from '@things-factory/utils'
 
-import { Scenario } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
 import { ScenarioEngine } from '../scenario-engine'
 import { TaskRegistry } from '../task-registry'
 

package/server/engine/task/stop-scenario.ts

@@ -1,6 +1,6 @@
 import { getRepository } from '@things-factory/shell'
 
-import { Scenario } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
 import { ScenarioEngine } from '../../engine'
 import { TaskRegistry } from '../task-registry'
 

package/server/engine/task/sub-scenario.ts

@@ -1,7 +1,7 @@
 import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
 
-import { Scenario } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
 import { TaskRegistry } from '../task-registry'
 
 async function SubScenario(step, context) {

package/server/engine/task/switch-range-scenario.ts

@@ -1,7 +1,7 @@
 import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
 
-import { Scenario } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
 import { TaskRegistry } from '../task-registry'
 
 async function SwitchRangeScenario(step, context) {

package/server/engine/task/switch-scenario.ts

@@ -1,7 +1,7 @@
 import { getRepository } from '@things-factory/shell'
 import { access, deepClone } from '@things-factory/utils'
 
-import { Scenario } from '../../service'
+import { Scenario } from '../../service/scenario/scenario'
 import { TaskRegistry } from '../task-registry'
 
 async function SwitchScenario(step, context) {

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

@@ -4,7 +4,7 @@ import { getRepository } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { ScheduleRegisterRequest } from '@things-factory/scheduler-client'
 
-import { Scenario } from '../service/scenario/scenario-type'
+import { Scenario } from '../service/scenario/scenario'
 import { ScenarioEngine } from '../engine/scenario-engine'
 
 export const scenarioScheduleCallbackRouter = new Router()

package/server/routers/scenario-view-router.ts

@@ -2,7 +2,8 @@ import Router from 'koa-router'
 
 import { getRepository } from '@things-factory/shell'
 
-import { Scenario, Step } from '../service'
+import { Scenario } from '../service/scenario/scenario'
+import { Step } from '../service/step/step-type'
 
 export const scenarioViewRouter = new Router()
 

package/server/service/index.ts

@@ -13,7 +13,7 @@ export * from './property-spec'
 export * from './task-type/task-type-type'
 export * from './connector/connector-type'
 export * from './connection/connection-type'
-export * from './scenario/scenario-type'
+export * from './scenario/scenario'
 export * from './scenario-instance/scenario-instance-type'
 export * from './scenario-queue/scenario-queue-type'
 export * from './step/step-type'

package/server/service/scenario/index.ts

@@ -1,4 +1,4 @@
-import { Scenario } from './scenario-type'
+import { Scenario } from './scenario'
 import { ScenarioQuery } from './scenario-query'
 import { ScenarioMutation } from './scenario-mutation'
 

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

@@ -1,7 +1,6 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In } from 'typeorm'
+import { In } from 'typeorm'
 
-import { Domain } from '@things-factory/shell'
 import {
   Application,
   getCallbackBaseWithDomainContext,
@@ -10,12 +9,11 @@ import {
 } from '@things-factory/scheduler-client'
 
 import { Step } from '../step/step-type'
-import { NewScenario, Scenario, ScenarioPatch } from './scenario-type'
+import { Scenario } from './scenario'
+import { NewScenario, ScenarioPatch } from './scenario-type'
 
 const crypto = require('crypto')
 
-const debug = require('debug')('things-factory:integration-base:scenario-mutation')
-
 @Resolver(Scenario)
 export class ScenarioMutation {
   @Directive('@transaction')

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

@@ -7,7 +7,8 @@ import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from
 import { ScenarioEngine } from '../../engine'
 import { ScenarioInstance, ScenarioInstanceStatus } from '../scenario-instance/scenario-instance-type'
 import { Step } from '../step/step-type'
-import { Scenario, ScenarioList } from './scenario-type'
+import { Scenario } from './scenario'
+import { ScenarioList } from './scenario-type'
 import { Connection } from '../connection/connection-type'
 
 @Resolver(Scenario)

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

@@ -1,112 +1,9 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
-
-import { PrivilegeObject, PrivilegeInput, User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-
-import { ScenarioEngine } from '../../engine'
-import { Step, StepPatch } from '../step/step-type'
-
-@Entity()
-@Index('ix_scenario_0', (scenario: Scenario) => [scenario.domain, scenario.name], { unique: true })
-@ObjectType()
-export class Scenario {
-  @PrimaryGeneratedColumn('uuid')
-  @Field(type => ID)
-  id?: string
-
-  @ManyToOne(type => Domain)
-  @Field({ nullable: true })
-  domain?: Domain
-
-  @RelationId((scenario: Scenario) => scenario.domain)
-  domainId?: string
-
-  @Column()
-  @Field()
-  name?: string
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  description?: string
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  type?: string
 
-  @Column({ nullable: true })
-  @Field({ nullable: true, description: 'accessible and executable system-wide' })
-  public?: boolean
+import { PrivilegeInput } from '@things-factory/auth-base'
 
-  @Column({ nullable: true })
-  @Field({ nullable: true, description: '[will be deprecated] automatically be started when this server start' })
-  active?: boolean
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  schedule?: string
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  scheduleId?: string
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  timezone?: string
-
-  @OneToMany(type => Step, step => step.scenario)
-  @Field(type => [Step], { nullable: true })
-  steps?: Step[]
-
-  @Column({ type: 'simple-json', nullable: true })
-  @Field(type => PrivilegeObject, { nullable: true })
-  privilege?: PrivilegeObject
-
-  @CreateDateColumn()
-  @Field({ nullable: true })
-  createdAt?: Date
-
-  @UpdateDateColumn()
-  @Field({ nullable: true })
-  updatedAt?: Date
-
-  @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
-  creator?: User
-
-  @RelationId((scenario: Scenario) => scenario.creator)
-  creatorId?: string
-
-  @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
-  updater?: User
-
-  @RelationId((scenario: Scenario) => scenario.updater)
-  updaterId?: string
-
-  async start(instanceName, variables?: any) {
-    try {
-      await ScenarioEngine.load(instanceName || this.name, this, { domain: this.domain, user: this.updater, variables })
-    } catch (ex) {}
-  }
-
-  async stop(instanceName?) {
-    try {
-      await ScenarioEngine.unload(this.domain, instanceName || this.name)
-    } finally {
-    }
-  }
-}
+import { Scenario } from './scenario'
+import { StepPatch } from '../step/step-type'
 
 @InputType()
 export class NewScenario {

package/server/service/scenario/scenario.ts

@@ -0,0 +1,109 @@
+import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { PrivilegeObject, PrivilegeInput, User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { ScenarioEngine } from '../../engine'
+import { Step } from '../step/step-type'
+
+@Entity()
+@Index('ix_scenario_0', (scenario: Scenario) => [scenario.domain, scenario.name], { unique: true })
+@ObjectType()
+export class Scenario {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  id?: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((scenario: Scenario) => scenario.domain)
+  domainId?: string
+
+  @Column()
+  @Field()
+  name?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  description?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  type?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'accessible and executable system-wide' })
+  public?: boolean
+
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: '[will be deprecated] automatically be started when this server start' })
+  active?: boolean
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  schedule?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  scheduleId?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  timezone?: string
+
+  @OneToMany(type => Step, step => step.scenario)
+  @Field(type => [Step], { nullable: true })
+  steps?: Step[]
+
+  @Column({ type: 'simple-json', nullable: true })
+  @Field(type => PrivilegeObject, { nullable: true })
+  privilege?: PrivilegeObject
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((scenario: Scenario) => scenario.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((scenario: Scenario) => scenario.updater)
+  updaterId?: string
+
+  async start(instanceName, variables?: any) {
+    try {
+      await ScenarioEngine.load(instanceName || this.name, this, { domain: this.domain, user: this.updater, variables })
+    } catch (ex) {}
+  }
+
+  async stop(instanceName?) {
+    try {
+      await ScenarioEngine.unload(this.domain, instanceName || this.name)
+    } finally {
+    }
+  }
+}

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

@@ -3,7 +3,7 @@ import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
 import { getRepository, Domain, GraphqlLocalClient, ScalarObject } from '@things-factory/shell'
 
 import { ScenarioEngine } from '../../engine'
-import { Scenario } from '../scenario/scenario-type'
+import { Scenario } from '../scenario/scenario'
 import { ScenarioInstance } from './scenario-instance-type'
 import { PrivilegeObject, User, checkPermission } from '@things-factory/auth-base'
 import { Step } from '../step/step-type'

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

@@ -1,7 +1,7 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
 
-import { Scenario } from '../scenario/scenario-type'
+import { Scenario } from '../scenario/scenario'
 import { Step, StepPatch } from './step-type'
 
 @Resolver(Step)

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

@@ -3,7 +3,7 @@ import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graph
 import { User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
-import { Scenario } from '../scenario/scenario-type'
+import { Scenario } from '../scenario/scenario'
 import { Step, StepList } from './step-type'
 
 @Resolver(Step)

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

@@ -13,7 +13,7 @@ import {
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
-import { Scenario } from '../scenario/scenario-type'
+import { Scenario } from '../scenario/scenario'
 
 @Entity()
 @Index('ix_step_0', (step: Step) => [step.scenario, step.sequence], { unique: true })