@things-factory/integration-base 8.0.5 → 9.0.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "8.0.5",
+  "version": "9.0.0-beta.12",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,23 +26,24 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@operato/moment-timezone-es": "^8.0.0",
-    "@things-factory/api": "^8.0.5",
-    "@things-factory/auth-base": "^8.0.5",
-    "@things-factory/cache-service": "^8.0.5",
-    "@things-factory/env": "^8.0.2",
-    "@things-factory/oauth2-client": "^8.0.5",
-    "@things-factory/scheduler-client": "^8.0.5",
-    "@things-factory/shell": "^8.0.2",
-    "@things-factory/utils": "^8.0.0",
+    "@operato/moment-timezone-es": "^9.0.0-beta",
+    "@things-factory/api": "^9.0.0-beta.12",
+    "@things-factory/auth-base": "^9.0.0-beta.12",
+    "@things-factory/cache-service": "^9.0.0-beta.12",
+    "@things-factory/env": "^9.0.0-beta.5",
+    "@things-factory/oauth2-client": "^9.0.0-beta.12",
+    "@things-factory/scheduler-client": "^9.0.0-beta.12",
+    "@things-factory/shell": "^9.0.0-beta.12",
+    "@things-factory/utils": "^9.0.0-beta.0",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
     "ieee754": "^1.2.1",
     "node-fetch": "^2.6.0",
     "promise-socket": "^7.0.0",
+    "puppeteer": "^23.0.0",
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "9ab6fca18eeb58b9d2f3411661508a39d0ab6aee"
+  "gitHead": "5e9ade1c2d4b4c96b89396e36c3afa1caaf18ef0"
 }

package/translations/en.json

@@ -1,14 +1,22 @@
 {
+  "error.scenario instance not found": "scenario instance '{instance}' not found.",
   "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.",
   "label.auth-key": "authentication key",
+  "label.connectionTimeoutMillis": "Connection Timeout (milliseconds)",
+  "label.idleTimeoutMillis": "Idle Timeout (milliseconds)",
+  "label.login-api-url": "login API URL",
+  "label.login-page-path": "login page path",
+  "label.maxPoolConnection": "Max Pool Connection",
+  "label.maximum-retries": "maximum retry count",
+  "label.password-selector": "password selector",
+  "label.shadow-dom-selectors": "Shadow-DOM selector",
+  "label.submit-selector": "submit selector",
   "label.subscription-handlers": "subscription handlers",
+  "label.success-selector": "success selector",
   "label.trust-server-certificate": "trust server certificate",
-  "label.maxPoolConnection": "Max Pool Connection",
-  "label.idleTimeoutMillis": "Idle Timeout (milliseconds)",
-  "label.connectionTimeoutMillis": "Connection Timeout (milliseconds)"
+  "label.username-selector": "username selector"
 }

package/translations/ja.json

@@ -1,14 +1,22 @@
 {
+  "error.scenario instance not found": "シナリオ インスタンス'{instance}'が見つかりません. 既に終了している可能性があります.",
   "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}'が見つかりません. 既に終了している可能性があります.",
   "label.auth-key": "認証キー",
+  "label.connectionTimeoutMillis": "接続タイムアウト（ミリ秒）",
+  "label.idleTimeoutMillis": "アイドルタイムアウト（ミリ秒）",
+  "label.login-api-url": "ログインAPI URL",
+  "label.login-page-path": "ログインページパス",
+  "label.maxPoolConnection": "最大プール接続数",
+  "label.maximum-retries": "最大リトライ回数",
+  "label.password-selector": "パスワードセレクター",
+  "label.shadow-dom-selectors": "Shadow-DOMセレクター",
+  "label.submit-selector": "送信セレクター",
   "label.subscription-handlers": "サブスクリプションハンドラー",
+  "label.success-selector": "成功セレクター",
   "label.trust-server-certificate": "サーバー証明書を信頼する",
-  "label.maxPoolConnection": "最大プール接続数",
-  "label.idleTimeoutMillis": "アイドルタイムアウト（ミリ秒）",
-  "label.connectionTimeoutMillis": "接続タイムアウト（ミリ秒）"
+  "label.username-selector": "ユーザー名セレクター"
 }

package/translations/ko.json

@@ -1,14 +1,22 @@
 {
+  "error.scenario instance not found": "시나리오 인스턴스 '{instance}'를 찾을 수 없습니다. 이미 종료되었을 수 있습니다.",
   "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}'를 찾을 수 없습니다. 이미 종료되었을 수 있습니다.",
   "label.auth-key": "인증 키",
+  "label.connectionTimeoutMillis": "연결 시간 제한 (밀리초)",
+  "label.idleTimeoutMillis": "유휴 시간 제한 (밀리초)",
+  "label.login-api-url": "로그인 API URL",
+  "label.login-page-path": "로그인 페이지 경로",
+  "label.maxPoolConnection": "최대 풀 연결 수",
+  "label.maximum-retries": "최대 재시도 횟수",
+  "label.password-selector": "비밀번호 선택자",
+  "label.shadow-dom-selectors": "Shadow-DOM 선택자",
+  "label.submit-selector": "제출 선택자",
   "label.subscription-handlers": "구독 핸들러",
+  "label.success-selector": "성공 선택자",
   "label.trust-server-certificate": "서버 인증서 신뢰",
-  "label.maxPoolConnection": "최대 풀 연결 수",
-  "label.idleTimeoutMillis": "유휴 시간 제한 (밀리초)",
-  "label.connectionTimeoutMillis": "연결 시간 제한 (밀리초)"
+  "label.username-selector": "사용자 이름 선택자"
 }

package/translations/ms.json

@@ -1,14 +1,22 @@
 {
+  "error.scenario instance not found": "Tidak dapat mencari instans senario '{instance}'. Mungkin telah berakhir.",
   "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.",
   "label.auth-key": "Kunci pengesahan",
+  "label.connectionTimeoutMillis": "Had Masa Sambungan (milisaat)",
+  "label.idleTimeoutMillis": "Had Masa Tanpa Aktiviti (milisaat)",
+  "label.login-api-url": "URL API log masuk",
+  "label.login-page-path": "laluan halaman log masuk",
+  "label.maxPoolConnection": "Sambungan Pool Maksimum",
+  "label.maximum-retries": "bilangan cubaan semula maksimum",
+  "label.password-selector": "pemilih kata laluan",
+  "label.shadow-dom-selectors": "pemilih Shadow-DOM",
+  "label.submit-selector": "pemilih serah",
   "label.subscription-handlers": "pengendali langganan",
+  "label.success-selector": "pemilih kejayaan",
   "label.trust-server-certificate": "percaya sijil pelayan",
-  "label.maxPoolConnection": "Sambungan Pool Maksimum",
-  "label.idleTimeoutMillis": "Had Masa Tanpa Aktiviti (milisaat)",
-  "label.connectionTimeoutMillis": "Had Masa Sambungan (milisaat)"
+  "label.username-selector": "pemilih nama pengguna"
 }

package/translations/zh.json

@@ -1,14 +1,22 @@
 {
+  "error.scenario instance not found": "无法找到场景实例 '{instance}'。它可能已经结束。",
   "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}'。它可能已经结束。",
   "label.auth-key": "认证密钥",
+  "label.connectionTimeoutMillis": "连接超时时间（毫秒）",
+  "label.idleTimeoutMillis": "空闲超时时间（毫秒）",
+  "label.login-api-url": "登录API URL",
+  "label.login-page-path": "登录页面路径",
+  "label.maxPoolConnection": "最大连接池连接数",
+  "label.maximum-retries": "最大重试次数",
+  "label.password-selector": "密码选择器",
+  "label.shadow-dom-selectors": "Shadow-DOM选择器",
+  "label.submit-selector": "提交选择器",
   "label.subscription-handlers": "订阅处理程序",
+  "label.success-selector": "成功选择器",
   "label.trust-server-certificate": "信任服务器证书",
-  "label.maxPoolConnection": "最大连接池连接数",
-  "label.idleTimeoutMillis": "空闲超时时间（毫秒）",
-  "label.connectionTimeoutMillis": "连接超时时间（毫秒）"
+  "label.username-selector": "用户名选择器"
 }

package/server/controllers/index.ts

@@ -1,2 +0,0 @@
-export * from './scenario-controller'
-export * from './publish-data'

package/server/controllers/publish-data.ts

@@ -1,29 +0,0 @@
-import { Domain, getRepository, pubsub } from '@things-factory/shell'
-import { User } from '@things-factory/auth-base'
-
-import { StateRegister } from '../service/state-register/state-register'
-
-export async function publishData(tag: string, data: any, { domain, user }: { domain: Domain; user: User }) {
-  const repository = getRepository(StateRegister)
-
-  const stateRegister = await repository.findOne({
-    where: { domain: { id: domain?.id }, name: tag }
-  })
-
-  if (stateRegister) {
-    await repository.save({
-      ...stateRegister,
-      state: data,
-      writer: user,
-      wroteAt: new Date()
-    })
-  }
-
-  pubsub.publish('data', {
-    data: {
-      domain,
-      tag,
-      data
-    }
-  })
-}

package/server/controllers/scenario-controller.ts

@@ -1,154 +0,0 @@
-import { getRepository, Domain, GraphqlLocalClient } from '@things-factory/shell'
-import { checkUserHasRole } 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, ScenarioInstanceRunResult } 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<{
-  id: string
-  ttl: number
-  name: string
-  steps: Step[]
-  domain: Domain
-}> {
-  var repository = getRepository(Scenario)
-
-  var scenario = await repository.findOne({
-    where: { domain: { id: domain.id }, name: scenarioName },
-    relations: ['domain', 'steps', 'role', 'creator', 'updater']
-  })
-
-  if (!scenario && domain.parentId) {
-    scenario = await repository.findOne({
-      where: { domain: { id: domain.parentId }, name: scenarioName },
-      relations: ['domain', 'steps', 'role', 'creator', 'updater']
-    })
-  }
-
-  return scenario as any
-}
-
-export async function checkHasRole(scenario: Partial<Scenario>, context: ResolverContext): Promise<void> {
-  const { domain, user } = context.state
-  if (!(await checkUserHasRole(scenario.roleId, domain, user))) {
-    throw new Error(
-      context.t('error.scenario run unauthorized', {
-        scenario: scenario.name
-      })
-    )
-  }
-}
-
-export async function runScenario(
-  instanceName: string,
-  scenarioName: string,
-  variables: any,
-  context: ResolverContext
-): Promise<ScenarioInstanceRunResult> {
-  const { domain, user, lng } = context.state
-
-  debug('runScenario', scenarioName, instanceName, variables)
-
-  var scenario = await findScenario(scenarioName, domain)
-
-  if (!scenario) {
-    throw new Error(
-      context.t('error.scenario not found', {
-        scenario: scenarioName
-      })
-    )
-  }
-
-  await checkHasRole(scenario, context)
-
-  if (scenario.ttl > 0) {
-    const cachedValue = await cacheService.getFromCache(scenario.id, { domain: domain.id, variables: variables || {} })
-    if (cachedValue) {
-      return cachedValue.value
-    }
-  }
-
-  /* 시나리오 인스턴스를 생성한다. */
-  instanceName = instanceName || scenarioName + '-' + String(Date.now())
-  var instance = new ScenarioInstance(instanceName, scenario, {
-    domain,
-    user,
-    lng,
-    variables,
-    client: GraphqlLocalClient.client
-  })
-
-  try {
-    return await instance.run()
-  } catch (err) {
-    console.error(err)
-
-    throw new Error(
-      context.t('error.scenario run error', {
-        scenario: scenarioName
-      })
-    )
-  }
-}
-
-export async function startScenario(
-  instanceName: string,
-  scenarioName: string,
-  variables: any,
-  context: ResolverContext
-): Promise<ScenarioInstance> {
-  const { domain, user, lng } = context.state
-
-  debug('startScenario', instanceName, scenarioName, variables)
-
-  var scenario = await findScenario(scenarioName, domain)
-
-  if (!scenario) {
-    throw new Error(
-      context.t('error.scenario not found', {
-        scenario: scenarioName
-      })
-    )
-  }
-
-  await checkHasRole(scenario, context)
-
-  instanceName = instanceName || scenarioName
-  return await ScenarioEngine.load(instanceName, scenario, { domain, user, lng, variables })
-}
-
-export async function stopScenario(
-  instanceName: string,
-  context: ResolverContext
-): Promise<ScenarioInstance | undefined> {
-  const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
-
-  debug('stopScenario', instanceName)
-
-  var scenarioInstance = ScenarioEngine.getScenarioInstance(domain, instanceName)
-
-  if (!scenarioInstance) {
-    debug('stopScenario', `ScenarioInstance(${instanceName}) Not Found.`)
-    throw new Error(
-      context.t('error.scenario instance not found', {
-        instance: instanceName
-      })
-    )
-  }
-
-  var scenario = await findScenario(scenarioInstance.scenarioName, domain)
-
-  await checkHasRole(scenario, context)
-
-  await ScenarioEngine.unload(domain, instanceName)
-
-  return scenarioInstance
-}

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

@@ -1,115 +0,0 @@
-import uniq from 'lodash/uniq'
-
-import { Domain, getRepository } from '@things-factory/shell'
-import { Scenario } from '../../service/scenario/scenario'
-import { Connection } from '../../service/connection/connection-type'
-
-export async function analyzeIntegration(domain: Domain) {
-  const tagNames = []
-
-  const model = {
-    nodes: [],
-    relationships: []
-  }
-
-  var id = 0
-
-  const scenarios = await getRepository(Scenario).find({
-    where: { domain: { id: domain.id } },
-    relations: ['steps']
-  })
-
-  const connections = await getRepository(Connection).find({
-    where: { domain: { id: domain.id } }
-  })
-
-  model.nodes = model.nodes.concat(
-    scenarios.map(scenario => {
-      return {
-        id: scenario.id,
-        labels: ['Scenario'],
-        text: scenario.name,
-        icon: 'settings',
-        properties: {
-          name: scenario.name,
-          description: scenario.description
-        }
-      }
-    })
-  )
-
-  model.nodes = model.nodes.concat(
-    connections.map(connection => {
-      return {
-        id: connection.id,
-        labels: ['Connection'],
-        text: connection.name,
-        icon: 'link',
-        properties: {
-          name: connection.name,
-          description: connection.description
-        }
-      }
-    })
-  )
-
-  scenarios.forEach(scenario => {
-    const connectionNames = uniq(scenario.steps.map(step => step.connection).filter(Boolean))
-    const connectionList = connectionNames
-      .map(connectionName => connections.find(connection => connection.name == connectionName))
-      .filter(Boolean)
-
-    const relationships = connectionList.map(connection => {
-      return {
-        id: ++id,
-        type: 'using',
-        startNode: scenario.id,
-        endNode: connection.id,
-        properties: {}
-      }
-    })
-
-    model.relationships = model.relationships.concat(relationships)
-  })
-
-  scenarios.forEach(scenario => {
-    const tags = uniq(
-      scenario.steps
-        .filter(step => !step.connection && step.task == 'publish')
-        .map(step => JSON.parse(step.params)?.tag)
-        .filter(Boolean)
-    )
-
-    for (const tag of tags) {
-      if (tagNames.includes(tag)) {
-        continue
-      }
-
-      model.nodes.push({
-        id: `tag-${tag}`,
-        labels: ['Tag'],
-        text: tag,
-        icon: 'label',
-        properties: {
-          tag
-        }
-      })
-
-      tagNames.push(tag)
-    }
-
-    const relationships = tags.map(tag => {
-      return {
-        id: ++id,
-        type: 'publish',
-        startNode: scenario.id,
-        endNode: `tag-${tag}`,
-        properties: {}
-      }
-    })
-
-    model.relationships = model.relationships.concat(relationships)
-  })
-
-  return model
-}