@operato/scene-integration 1.0.0-alpha.6 → 1.0.0

package/logs/connections-2022-07-17-18.log

@@ -0,0 +1,70 @@
+2022-07-17T18:23:56+09:00 info: Initializing ConnectionManager...
+2022-07-17T18:23:56+09:00 info: Connector 'echo-back-server' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'echo-back' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'http-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'graphql-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'sqlite-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'postgresql-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'mqtt-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'mssql-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'oracle-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'mysql-connector' started to ready
+2022-07-17T18:23:56+09:00 info: Connector 'socket-server' started to ready
+2022-07-17T18:23:56+09:00 info: echo-back-servers are ready
+2022-07-17T18:23:56+09:00 info: echo-back connections are ready
+2022-07-17T18:23:56+09:00 info: http-connector connections are ready
+2022-07-17T18:23:56+09:00 info: graphql-connector connections are ready
+2022-07-17T18:23:56+09:00 info: sqlite-connector connections are ready
+2022-07-17T18:23:56+09:00 info: postgresql-connector connections are ready
+2022-07-17T18:23:56+09:00 info: mqtt-connector connections are ready
+2022-07-17T18:23:56+09:00 info: mssql-connector connections are ready
+2022-07-17T18:23:56+09:00 info: oracle-connector connections are ready
+2022-07-17T18:23:56+09:00 info: mysql-connector connections are ready
+2022-07-17T18:23:56+09:00 info: socket servers are ready
+2022-07-17T18:23:56+09:00 info: All connector for 'echo-back-server' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'echo-back' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'http-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'graphql-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'sqlite-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'postgresql-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'mqtt-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'mssql-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'oracle-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'mysql-connector' ready
+2022-07-17T18:23:56+09:00 info: All connector for 'socket-server' ready
+2022-07-17T18:23:56+09:00 info: ConnectionManager initialization done:
+2022-07-17T18:50:06+09:00 info: Initializing ConnectionManager...
+2022-07-17T18:50:06+09:00 info: Connector 'echo-back-server' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'echo-back' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'http-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'graphql-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'sqlite-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'postgresql-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'mqtt-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'mssql-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'oracle-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'mysql-connector' started to ready
+2022-07-17T18:50:06+09:00 info: Connector 'socket-server' started to ready
+2022-07-17T18:50:06+09:00 info: echo-back-servers are ready
+2022-07-17T18:50:06+09:00 info: echo-back connections are ready
+2022-07-17T18:50:06+09:00 info: http-connector connections are ready
+2022-07-17T18:50:06+09:00 info: graphql-connector connections are ready
+2022-07-17T18:50:06+09:00 info: sqlite-connector connections are ready
+2022-07-17T18:50:06+09:00 info: postgresql-connector connections are ready
+2022-07-17T18:50:06+09:00 info: mqtt-connector connections are ready
+2022-07-17T18:50:06+09:00 info: mssql-connector connections are ready
+2022-07-17T18:50:06+09:00 info: oracle-connector connections are ready
+2022-07-17T18:50:06+09:00 info: mysql-connector connections are ready
+2022-07-17T18:50:06+09:00 info: socket servers are ready
+2022-07-17T18:50:06+09:00 info: All connector for 'echo-back-server' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'echo-back' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'http-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'graphql-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'sqlite-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'postgresql-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'mqtt-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'mssql-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'oracle-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'mysql-connector' ready
+2022-07-17T18:50:06+09:00 info: All connector for 'socket-server' ready
+2022-07-17T18:50:06+09:00 info: ConnectionManager initialization done:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@operato/scene-integration",
   "description": "Things factory integration component for things-scene",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0",
   "license": "MIT",
   "author": "heartyoh",
   "main": "dist/index.js",
@@ -26,16 +26,14 @@
     "migration": "things-factory-migration"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.6",
-    "@hatiolab/things-scene": "^2.7.34",
-    "graphql-tag": "^2.12.6",
-    "subscriptions-transport-ws": "^0.11.0"
+    "@hatiolab/things-scene": "^3.0.19",
+    "@operato/graphql": "^1.0.0",
+    "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
     "@hatiolab/prettier-config": "^1.0.0",
-    "@operato/board": "^1.0.0-alpha.51",
-    "@things-factory/builder": "^5.0.0-alpha.28",
-    "@things-factory/operato-board": "^5.0.0-alpha.28",
+    "@things-factory/builder": "^5.0.0-zeta.28",
+    "@things-factory/operato-board": "^5.0.0-zeta.28",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "@web/dev-server": "^0.1.28",
@@ -60,5 +58,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "3807e89728ce6cd472cfd732f4da9676c7b21541"
+  "gitHead": "41d54d5fd010844be20b670f46119e4c06d6850e"
 }

package/src/client-api.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
-import { getClient } from './origin-client'
+import { client } from '@operato/graphql'
 
 export const scenarios = async () => {
-  var response = await getClient().query({
+  var response = await client.query({
     query: gql`
       query {
         scenarios {

package/src/connection-control.ts

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, RectPath, Shape } from '@hatiolab/things-scene'
-
-import { getClient } from './origin-client'
+import { client } from '@operato/graphql'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -15,7 +14,7 @@ const NATURE: ComponentNature = {
       name: 'connectionName',
       property: {
         options: async () => {
-          var response = await getClient().query({
+          var response = await client.query({
             query: gql`
               query {
                 connections {
@@ -71,46 +70,16 @@ export default class ConnectionControl extends RectPath(Shape) {
     return ConnectionControl._image
   }
 
-  private _client: any
-
   render(context: CanvasRenderingContext2D) {
     var { left, top, width, height } = this.bounds
     context.beginPath()
     this.drawImage(context, ConnectionControl.image, left, top, width, height)
   }
 
-  ready() {
-    super.ready()
-    this._init()
-  }
-
-  _init() {
-    if (!this.app.isViewMode) return
-
-    this._client = getClient()
-  }
-
-  dispose() {
-    super.dispose()
-
-    try {
-      if (this._client) {
-        this._client.stop()
-      }
-    } catch (e) {
-      console.error(e)
-    }
-    delete this._client
-  }
-
   get nature() {
     return NATURE
   }
 
-  get client() {
-    return this._client
-  }
-
   get controlType() {
     return this.getState('controlType')
   }
@@ -135,7 +104,6 @@ export default class ConnectionControl extends RectPath(Shape) {
         controlType = 'disconnect'
     }
 
-    var client = this._client
     var query = ''
 
     query = `mutation{

package/src/connection-state-subscription.ts

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, RectPath, Shape } from '@hatiolab/things-scene'
-
-import { getClient, subscribe } from './origin-client'
+import { client, subscribe } from '@operato/graphql'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -15,7 +14,7 @@ const NATURE: ComponentNature = {
       name: 'connectionName',
       property: {
         options: async () => {
-          var response = await getClient().query({
+          var response = await client.query({
             query: gql`
               query {
                 connections {

package/src/data-subscription.ts

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, RectPath, Shape } from '@hatiolab/things-scene'
-
-import { subscribe } from './origin-client'
+import { subscribe } from '@operato/graphql'
 
 const NATURE: ComponentNature = {
   mutable: false,

package/src/scenario-control.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, Properties, RectPath, Shape } from '@hatiolab/things-scene'
+import { client } from '@operato/graphql'
 
 import { scenarios } from './client-api'
-import { getClient } from './origin-client'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -55,8 +55,6 @@ export default class ScenarioControl extends DataSource(RectPath(Shape)) {
     return ScenarioControl._image
   }
 
-  private _client: any
-
   render(context: CanvasRenderingContext2D) {
     var { left, top, width, height } = this.bounds
     context.beginPath()
@@ -65,27 +63,10 @@ export default class ScenarioControl extends DataSource(RectPath(Shape)) {
 
   ready() {
     super.ready()
-    this._initScenario()
-  }
 
-  _initScenario() {
-    if (!this.app.isViewMode) return
-
-    this._client = getClient()
-    this.requestData()
-  }
-
-  dispose() {
-    super.dispose()
-
-    try {
-      if (this._client) {
-        this._client.stop()
-      }
-    } catch (e) {
-      console.error(e)
+    if (this.app.isViewMode) {
+      this.requestData()
     }
-    delete this._client
   }
 
   get nature() {
@@ -98,10 +79,6 @@ export default class ScenarioControl extends DataSource(RectPath(Shape)) {
     }
   }
 
-  get client() {
-    return this._client
-  }
-
   get controlType() {
     return this.getState('controlType')
   }
@@ -112,8 +89,10 @@ export default class ScenarioControl extends DataSource(RectPath(Shape)) {
 
   async requestData() {
     let { controlType, scenarioName } = this.state
-    if (!controlType || !scenarioName || !this.app.isViewMode) return
-    var client = this._client
+    if (!controlType || !scenarioName || !this.app.isViewMode) {
+      return
+    }
+
     var query = ''
     if (controlType == 'start') {
       query = `mutation{
@@ -129,15 +108,13 @@ export default class ScenarioControl extends DataSource(RectPath(Shape)) {
       }`
     }
 
-    if (client) {
-      var response = await client.query({
-        query: gql`
-          ${query}
-        `
-      })
+    var response = await client.query({
+      query: gql`
+        ${query}
+      `
+    })
 
-      this.data = response
-    }
+    this.data = response
   }
 }
 

package/src/scenario-instance-subscription.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, RectPath, Shape } from '@hatiolab/things-scene'
+import { subscribe } from '@operato/graphql'
 
 import { scenarios } from './client-api'
-import { subscribe } from './origin-client'
 
 const NATURE: ComponentNature = {
   mutable: false,

package/src/scenario-queue-subscription.ts

@@ -1,8 +1,7 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, RectPath, Shape } from '@hatiolab/things-scene'
-
-import { subscribe } from './origin-client'
+import { subscribe } from '@operato/graphql'
 
 const NATURE: ComponentNature = {
   mutable: false,

package/src/scenario-run.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, Properties, RectPath, Shape } from '@hatiolab/things-scene'
+import { client } from '@operato/graphql'
 
 import { scenarios } from './client-api'
-import { getClient } from './origin-client'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -44,8 +44,6 @@ export default class ScenarioRun extends DataSource(RectPath(Shape)) {
     return ScenarioRun._image
   }
 
-  private _client: any
-
   render(context: CanvasRenderingContext2D) {
     var { left, top, width, height } = this.bounds
     context.beginPath()
@@ -54,30 +52,12 @@ export default class ScenarioRun extends DataSource(RectPath(Shape)) {
 
   ready() {
     super.ready()
-    this._initScenario()
-  }
-
-  _initScenario() {
-    if (!this.app.isViewMode) {
-      return
-    }
-    this._client = getClient()
-    if (this.state.runOnStart) {
-      this.requestData()
-    }
-  }
 
-  dispose() {
-    super.dispose()
-
-    try {
-      if (this._client) {
-        this._client.stop()
+    if (this.app.isViewMode) {
+      if (this.state.runOnStart) {
+        this.requestData()
       }
-    } catch (e) {
-      console.error(e)
     }
-    delete this._client
   }
 
   get nature() {
@@ -98,15 +78,12 @@ export default class ScenarioRun extends DataSource(RectPath(Shape)) {
     this.setState('variables', variables)
   }
 
-  get client() {
-    return this._client
-  }
-
   async requestData() {
     let { scenarioName, variables } = this.state
-    if (!scenarioName || !this.app.isViewMode) return
+    if (!scenarioName || !this.app.isViewMode) {
+      return
+    }
 
-    var client = this._client
     try {
       variables = typeof variables == 'string' ? JSON.parse(variables) : variables
     } catch (e) {

package/src/scenario-start.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, Properties, RectPath, Shape } from '@hatiolab/things-scene'
+import { client } from '@operato/graphql'
 
 import { scenarios } from './client-api'
-import { getClient } from './origin-client'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -44,39 +44,12 @@ export default class ScenarioStart extends DataSource(RectPath(Shape)) {
     return ScenarioStart._image
   }
 
-  private _client: any
-
   render(context: CanvasRenderingContext2D) {
     var { left, top, width, height } = this.bounds
     context.beginPath()
     this.drawImage(context, ScenarioStart.image, left, top, width, height)
   }
 
-  ready() {
-    super.ready()
-    this._initScenario()
-  }
-
-  _initScenario() {
-    if (!this.app.isViewMode) {
-      return
-    }
-    this._client = getClient()
-  }
-
-  dispose() {
-    super.dispose()
-
-    try {
-      if (this._client) {
-        this._client.stop()
-      }
-    } catch (e) {
-      console.error(e)
-    }
-    delete this._client
-  }
-
   get nature() {
     return NATURE
   }
@@ -95,15 +68,10 @@ export default class ScenarioStart extends DataSource(RectPath(Shape)) {
     this.setState('variables', variables)
   }
 
-  get client() {
-    return this._client
-  }
-
   async requestData() {
     let { instanceName, scenarioName, variables } = this.state
     if (!scenarioName || !this.app.isViewMode) return
 
-    var client = this._client
     try {
       variables = typeof variables == 'string' ? JSON.parse(variables) : variables
     } catch (e) {

package/src/scenario-stop.ts

@@ -1,9 +1,9 @@
 import gql from 'graphql-tag'
 
 import { Component, ComponentNature, DataSource, Properties, RectPath, Shape } from '@hatiolab/things-scene'
+import { client } from '@operato/graphql'
 
 import { scenarios } from './client-api'
-import { getClient } from './origin-client'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -39,39 +39,12 @@ export default class ScenarioStop extends DataSource(RectPath(Shape)) {
     return ScenarioStop._image
   }
 
-  private _client: any
-
   render(context: CanvasRenderingContext2D) {
     var { left, top, width, height } = this.bounds
     context.beginPath()
     this.drawImage(context, ScenarioStop.image, left, top, width, height)
   }
 
-  ready() {
-    super.ready()
-    this._initScenario()
-  }
-
-  _initScenario() {
-    if (!this.app.isViewMode) {
-      return
-    }
-    this._client = getClient()
-  }
-
-  dispose() {
-    super.dispose()
-
-    try {
-      if (this._client) {
-        this._client.stop()
-      }
-    } catch (e) {
-      console.error(e)
-    }
-    delete this._client
-  }
-
   get nature() {
     return NATURE
   }
@@ -90,16 +63,11 @@ export default class ScenarioStop extends DataSource(RectPath(Shape)) {
     this.setState('nothing', nothing)
   }
 
-  get client() {
-    return this._client
-  }
-
   async requestData() {
     let { instanceName, scenarioName } = this.state
     instanceName = instanceName || scenarioName
     if (!instanceName || !this.app.isViewMode) return
 
-    var client = this._client
     if (client) {
       var response = await client.query({
         query: gql`