@things-factory/operato-edge 8.0.0-beta.1 → 8.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-edge",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.2",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -41,24 +41,24 @@
     "docker:push": "docker image push hatiolab/operato-edge:latest && docker image push hatiolab/operato-edge:$npm_package_version"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^8.0.0-beta.1",
-    "@things-factory/auth-ui": "^8.0.0-beta.1",
-    "@things-factory/context-ui": "^8.0.0-beta.1",
-    "@things-factory/edge": "^8.0.0-beta.1",
-    "@things-factory/evaluation": "^8.0.0-beta.1",
-    "@things-factory/i18n-base": "^8.0.0-beta.1",
-    "@things-factory/integration-influxdb": "^8.0.0-beta.1",
-    "@things-factory/integration-melsec": "^8.0.0-beta.1",
-    "@things-factory/integration-modbus": "^8.0.0-beta.1",
-    "@things-factory/integration-opc": "^8.0.0-beta.1",
-    "@things-factory/integration-ui": "^8.0.0-beta.1",
-    "@things-factory/lite-menu": "^8.0.0-beta.1",
-    "@things-factory/more-ui": "^8.0.0-beta.1",
-    "@things-factory/shell": "^8.0.0-beta.1",
-    "@things-factory/system": "^8.0.0-beta.1"
+    "@things-factory/apptool-ui": "^8.0.0-beta.2",
+    "@things-factory/auth-ui": "^8.0.0-beta.2",
+    "@things-factory/context-ui": "^8.0.0-beta.2",
+    "@things-factory/edge": "^8.0.0-beta.2",
+    "@things-factory/evaluation": "^8.0.0-beta.2",
+    "@things-factory/i18n-base": "^8.0.0-beta.2",
+    "@things-factory/integration-influxdb": "^8.0.0-beta.2",
+    "@things-factory/integration-melsec": "^8.0.0-beta.2",
+    "@things-factory/integration-modbus": "^8.0.0-beta.2",
+    "@things-factory/integration-opc": "^8.0.0-beta.2",
+    "@things-factory/integration-ui": "^8.0.0-beta.2",
+    "@things-factory/lite-menu": "^8.0.0-beta.2",
+    "@things-factory/more-ui": "^8.0.0-beta.2",
+    "@things-factory/shell": "^8.0.0-beta.2",
+    "@things-factory/system": "^8.0.0-beta.2"
   },
   "devDependencies": {
-    "@things-factory/builder": "^8.0.0-beta.1"
+    "@things-factory/builder": "^8.0.0-beta.2"
   },
-  "gitHead": "36c494e587640c1490318ef7b95adab02606e0c2"
+  "gitHead": "f03431a09435511b2595515658f9cb8f78ba4ebb"
 }

package/installer/config.production.js

@@ -1,62 +0,0 @@
-module.exports = {
-  subdomain: 'system',
-  SECRET: '0xD59F835B69C217A76BB1FA4a70a1D0d4D79dAC66', // temporary...
-  accessTokenCookieKey: 'access_token.edge',
-  email: {
-    host: 'smtp.office365.com', // your sender-email smtp host
-    port: 587, // smtp server port
-    secure: false, // true for 465, false for other ports
-    auth: {
-      user: 'your sender-email',
-      pass: 'your sender-email password' // generated ethereal password
-    },
-    secureConnection: false,
-    tls: {
-      ciphers: 'SSLv3'
-    }
-  },
-  logger: {
-    file: {
-      filename: 'logs/application-%DATE%.log',
-      datePattern: 'YYYY-MM-DD-HH',
-      zippedArchive: false,
-      maxSize: '20m',
-      maxFiles: '2d',
-      level: 'info'
-    },
-    console: {
-      level: 'silly'
-    }
-  },
-  //   ormconfig: {
-  //     name: 'default',
-  //     type: 'sqlite',
-  //     database: 'db.sqlite',
-  //     synchronize: false,
-  //     logging: true,
-  //     logger: 'debug'
-  //   },
-  ormconfig: {
-    name: 'default',
-    type: 'postgres',
-    host: 'postgres',
-    port: 5432,
-    database: 'postgres',
-    username: 'postgres',
-    password: 'abcd1234',
-    synchronize: true,
-    logging: true
-  },
-  scheduler: {
-    /* Name to be used for setting client's "application" properties when registering a schedule */
-    application: 'operato-edge',
-    /* Base endpoint to be used for setting "callback" properties when registering a schedule */
-    callbackBase: 'http://app:3000',
-    /* 
-        Scheduler service endpoint
-        caution) endpoint for "localhost" has some problem. 
-        https://github.com/node-fetch/node-fetch/issues/1624
-      */
-    endpoint: 'http://scheduler:9902'
-  }
-}

package/installer/config.yaml

@@ -1,4 +0,0 @@
----
-queue: local
-
-local: /app/evt_queue

package/installer/docker-compose.yml

@@ -1,54 +0,0 @@
-version: '3'
-services:
-  nginx:
-    image: hatiolab/operato-nginx:latest
-    ports:
-      - ${HostPort}:80
-    depends_on:
-      - app
-  app:
-    container_name: operato-edge
-    image: hatiolab/operato-edge:latest
-    privileged: true
-    volumes:
-      - ./logs:/app/logs
-      - ./config.production.js:/app/config.production.js
-    ports:
-      - 4000:3000
-    depends_on:
-      - postgres
-      - mosquitto
-      - scheduler
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '100m'
-        max-file: '3'
-  postgres:
-    image: postgres:13.2
-    container_name: db-operato-edge
-    environment:
-      POSTGRES_PASSWORD: abcd1234
-      POSTGRES_USER: postgres
-      PGDATA: /var/lib/postgresql/data/pgdata
-    volumes:
-      - ./postgres_data:/var/lib/postgresql/data/pgdata
-    ports:
-      - '55432:5432'
-  mosquitto:
-    image: eclipse-mosquitto:1.6.12
-    ports:
-      - 1883:1883
-      - 9001:9001
-  scheduler:
-    image: hatiolab/schevt-mgr:latest
-    container_name: scheduler
-    volumes:
-      - ./config.yaml:/app/config.yaml
-    ports:
-      - '9902:9902'
-    logging:
-      driver: 'json-file'
-      options:
-        max-size: '100m'
-        max-file: '3'

package/installer/install.sh

@@ -1,54 +0,0 @@
-if [ -f "config.production.js" ] ; then
-  echo "config.production.js exist"
-else
-  echo "config.production.js create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/config.production.js
-fi
-
-if [ -f "start.sh" ] ; then
-  echo "start.sh exist"
-else
-  echo "start.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/start.sh
-fi
-
-if [ -f "stop.sh" ] ; then
-  echo "stop.sh exist"
-else
-  echo "stop.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/stop.sh
-fi
-
-if [ -f "upgrade.sh" ] ; then
-  echo "upgrade.sh exist"
-else
-  echo "upgrade.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/upgrade.sh
-fi
-
-if [ -f "migrate.sh" ] ; then
-  echo "migrate.sh exist"
-else
-  echo "migrate.sh create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/migrate.sh
-fi
-
-if [ -f "docker-compose.yml" ] ; then
-  echo "docker-compose.yml exist"
-else
-  echo "docker-compose.yml create"
-  curl -O https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/docker-compose.yml
-fi
-
-chmod u+x start.sh
-chmod u+x stop.sh
-chmod u+x upgrade.sh
-chmod u+x migrate.sh
-
-echo "HostPort=3000" > .env
-
-docker pull hatiolab/operato-edge:latest
-
-docker pull hatiolab/operato-nginx:latest
-
-docker-compose create

package/installer/migrate.sh

@@ -1 +0,0 @@
-docker exec -it operato-edge npm run migration -- --mode=production

package/installer/start.sh

@@ -1,18 +0,0 @@
-HOST_PORT=3000
-
-if [ $# -eq 0 ] ; then
-  echo "Warning: default port 3000"
-else
-  HOST_PORT=$1
-fi
-
-
-echo "HOST_PORT : ${HOST_PORT}"
-
-echo "HostPort="$HOST_PORT > .env
-
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    xhost +"local:docker@"
-fi
-
-docker-compose up -d

package/installer/stop.sh

@@ -1 +0,0 @@
-docker-compose stop

package/installer/upgrade.sh

@@ -1 +0,0 @@
-curl -fsSL https://raw.githubusercontent.com/things-factory/things-factory/master/packages/operato-edge/installer/install.sh | bash -s