@operato/scene-manufacturing 1.3.19 → 1.3.21

package/logs/connections-2024-07-12-19.log

@@ -0,0 +1,94 @@
+2024-07-12T19:47:56+09:00 info: Initializing ConnectionManager...
+2024-07-12T19:47:56+09:00 info: Connector 'echo-back-server' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'echo-back' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'http-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'graphql-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'sqlite-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'postgresql-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'mqtt-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'mssql-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'oracle-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'mysql-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'socket-server' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'operato-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'email-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'influxdb-connector' started to ready
+2024-07-12T19:47:56+09:00 info: Connector 'msgraph-connector' started to ready
+2024-07-12T19:47:56+09:00 info: echo-back-servers are ready
+2024-07-12T19:47:56+09:00 info: echo-back connections are ready
+2024-07-12T19:47:56+09:00 info: http-connector connections are ready
+2024-07-12T19:47:56+09:00 info: graphql-connector connections are ready
+2024-07-12T19:47:56+09:00 info: sqlite-connector connections are ready
+2024-07-12T19:47:56+09:00 info: postgresql-connector connections are ready
+2024-07-12T19:47:56+09:00 info: mqtt-connector connections are ready
+2024-07-12T19:47:56+09:00 info: mssql-connector connections are ready
+2024-07-12T19:47:56+09:00 info: oracle-connector connections are ready
+2024-07-12T19:47:56+09:00 info: mysql-connector connections are ready
+2024-07-12T19:47:56+09:00 info: socket servers are ready
+2024-07-12T19:47:56+09:00 info: graphql-connector connections are ready
+2024-07-12T19:47:56+09:00 info: email connections are ready
+2024-07-12T19:47:56+09:00 info: influxdb connections are ready
+2024-07-12T19:47:56+09:00 info: msgraph-connector connections are ready
+2024-07-12T19:47:56+09:00 info: All connector for 'echo-back-server' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'echo-back' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'http-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'graphql-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'sqlite-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'postgresql-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'mqtt-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'mssql-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'oracle-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'mysql-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'socket-server' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'operato-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'email-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'influxdb-connector' ready
+2024-07-12T19:47:56+09:00 info: All connector for 'msgraph-connector' ready
+2024-07-12T19:47:56+09:00 info: ConnectionManager initialization done:
+2024-07-12T19:53:56+09:00 info: Initializing ConnectionManager...
+2024-07-12T19:53:56+09:00 info: Connector 'echo-back-server' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'echo-back' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'http-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'graphql-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'sqlite-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'postgresql-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'mqtt-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'mssql-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'oracle-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'mysql-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'socket-server' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'operato-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'email-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'influxdb-connector' started to ready
+2024-07-12T19:53:56+09:00 info: Connector 'msgraph-connector' started to ready
+2024-07-12T19:53:56+09:00 info: echo-back-servers are ready
+2024-07-12T19:53:56+09:00 info: echo-back connections are ready
+2024-07-12T19:53:56+09:00 info: http-connector connections are ready
+2024-07-12T19:53:56+09:00 info: graphql-connector connections are ready
+2024-07-12T19:53:56+09:00 info: sqlite-connector connections are ready
+2024-07-12T19:53:56+09:00 info: postgresql-connector connections are ready
+2024-07-12T19:53:56+09:00 info: mqtt-connector connections are ready
+2024-07-12T19:53:56+09:00 info: mssql-connector connections are ready
+2024-07-12T19:53:56+09:00 info: oracle-connector connections are ready
+2024-07-12T19:53:56+09:00 info: mysql-connector connections are ready
+2024-07-12T19:53:56+09:00 info: socket servers are ready
+2024-07-12T19:53:56+09:00 info: graphql-connector connections are ready
+2024-07-12T19:53:56+09:00 info: email connections are ready
+2024-07-12T19:53:56+09:00 info: influxdb connections are ready
+2024-07-12T19:53:56+09:00 info: msgraph-connector connections are ready
+2024-07-12T19:53:56+09:00 info: All connector for 'echo-back-server' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'echo-back' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'http-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'graphql-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'sqlite-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'postgresql-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'mqtt-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'mssql-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'oracle-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'mysql-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'socket-server' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'operato-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'email-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'influxdb-connector' ready
+2024-07-12T19:53:56+09:00 info: All connector for 'msgraph-connector' ready
+2024-07-12T19:53:56+09:00 info: ConnectionManager initialization done:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@operato/scene-manufacturing",
   "description": "Things scene components for manufacturing industry",
-  "version": "1.3.19",
+  "version": "1.3.21",
   "license": "MIT",
   "things-scene": true,
   "author": "heartyoh",
@@ -57,5 +57,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "52166269cdb9bd5e72e395ea139f4036506f97b9"
+  "gitHead": "fbfab855bf9e584beddd330bbf171cfceccd3367"
 }

package/{icons/tact-timer-mask.svg → src/tact-timer-mask.ts}

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+export const MASK: string = `
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 95 23">
   <defs>
     <style>
@@ -11,7 +11,7 @@
       }
 
       .cls-2 {
-        fill: #000;
+        fill: {{fillColor}};
       }
     </style>
     <linearGradient id="linear-gradient" x1="47.4" y1="85.6" x2="47.4" y2="95" gradientTransform="translate(0 -74)" gradientUnits="userSpaceOnUse">
@@ -30,4 +30,5 @@
   <path class="cls-2" d="M75.6,3.1c0-.6.7-.6.7-.6v-.7h-2.5v.7s.7,0,.7.6v16.7s0,.7-.7.8v.6h2.5v-.6c-.7-.1-.7-.8-.7-.8V3.1Z"/>
   <path class="cls-2" d="M66.4,3.1c0-.6.7-.6.7-.6v-.7h-2.5v.7s.7,0,.7.6v16.7s0,.7-.7.8v.6h2.5v-.6c-.7-.1-.7-.8-.7-.8V3.1Z"/>
   <path class="cls-2" d="M57.2,3.1c0-.6.7-.6.7-.6v-.7h-2.5v.7s.7,0,.7.6v16.7s0,.7-.7.8v.6h2.5v-.6c-.7-.1-.7-.8-.7-.8V3.1Z"/>
-</svg>
+</svg>
+`

package/src/tact-timer.ts

@@ -1,7 +1,6 @@
 import { Component, ComponentNature, Properties, RectPath, Shape } from '@hatiolab/things-scene'
 import format from './libs/format'
-
-const mask = new URL('../icons/tact-timer-mask.svg', import.meta.url).href
+import { MASK } from './tact-timer-mask'
 
 const NATURE: ComponentNature = {
   mutable: false,
@@ -36,23 +35,28 @@ const NATURE: ComponentNature = {
     },
     {
       type: 'color',
-      label: 'increase-progress-color',
-      name: 'increaseProgressColor'
+      label: 'tact-timer-mask-color',
+      name: 'maskColor'
     },
     {
       type: 'color',
-      label: 'decrease-progress-color',
-      name: 'decreaseProgressColor'
+      label: 'before-due-progress-color',
+      name: 'beforeDueProgressColor'
     },
     {
       type: 'color',
-      label: 'increase-font-color',
-      name: 'increaseFontColor'
+      label: 'over-due-progress-color',
+      name: 'overDueProgressColor'
     },
     {
       type: 'color',
-      label: 'decrese-font-color',
-      name: 'decreaseFontColor'
+      label: 'before-due-font-color',
+      name: 'beforeDueFontColor'
+    },
+    {
+      type: 'color',
+      label: 'over-due-font-color',
+      name: 'overDueFontColor'
     },
     {
       type: 'color',
@@ -90,19 +94,9 @@ const NATURE: ComponentNature = {
 }
 
 export default class TactTimer extends RectPath(Shape) {
-  static MASK: HTMLImageElement
-
-  static get mask() {
-    if (!TactTimer.MASK) {
-      TactTimer.MASK = new Image()
-      TactTimer.MASK.src = mask
-    }
-
-    return TactTimer.MASK
-  }
-
   private _start: number = 0
   private _due: number = 0
+  private imageElement?: HTMLImageElement
 
   get nature() {
     return NATURE
@@ -121,11 +115,11 @@ export default class TactTimer extends RectPath(Shape) {
   }
 
   start() {
-    const { startTime, endTime } = this.state
+    const { startTime, endTime, hidden } = this.state
     const start = this.parseTime(startTime)
     const end = this.parseTime(endTime)
 
-    if (start && end) {
+    if (start && end && !hidden) {
       this._due = end.getTime()
       this._start = start.getTime()
       this.counting()
@@ -133,20 +127,39 @@ export default class TactTimer extends RectPath(Shape) {
   }
 
   onchange(after: Properties) {
-    if ('startTime' in after || 'endTime' in after) {
+    if ('startTime' in after || 'endTime' in after || 'hidden' in after) {
       this.start()
     }
+
+    if ('maskColor' in after) {
+      delete this.imageElement
+    }
+  }
+
+  getImageElement(): HTMLImageElement | undefined {
+    if (!this.imageElement) {
+      const { maskColor = 'black' } = this.state
+
+      this.imageElement = new Image()
+      this.imageElement.src =
+        'data:image/svg+xml;charset=UTF-8;base64,' + btoa(MASK.replace(/{{fillColor}}/g, maskColor))
+    }
+
+    return this.imageElement
   }
 
   counting() {
-    if (this.disposed) {
+    const { hidden } = this.state
+    if (this.disposed || hidden) {
       return
     }
 
     requestAnimationFrame(() => {
-      const { showTimer } = this.state
+      const { showTimer, beforeDueFontColor, overDueFontColor, fontColor } = this.state
       const countdown = this.countdown
 
+      this.setState('fontColor', (this.countdown > 0 ? beforeDueFontColor : overDueFontColor) || fontColor)
+
       if (showTimer) {
         const text = format(Math.abs(countdown), this.getState('format'))
         this.text = text
@@ -170,15 +183,15 @@ export default class TactTimer extends RectPath(Shape) {
       width,
       round = 0,
       fontColor,
-      increaseFontColor,
-      decreaseFontColor,
-      increaseProgressColor = 'transparent',
-      decreaseProgressColor = 'transparent',
+      maskColor,
+      beforeDueFontColor,
+      overDueFontColor,
+      beforeDueProgressColor = 'transparent',
+      overDueProgressColor = 'transparent',
       underThresholdColor = 'transparent',
       progressDirection = 'increase',
       progressThreshold = 0,
-      showProgress,
-      showTimer
+      showProgress
     } = this.state
 
     const increase = this.countdown > 0
@@ -213,17 +226,19 @@ export default class TactTimer extends RectPath(Shape) {
       context.fillStyle = increase
         ? underThreshold
           ? underThresholdColor
-          : increaseProgressColor
-        : decreaseProgressColor
+          : beforeDueProgressColor
+        : overDueProgressColor
       context.fill()
 
       context.beginPath()
     }
 
-    this.drawImage(context, TactTimer.mask, left, top, width, height)
+    const image = this.getImageElement()
+    this.drawImage(context, image!, left - 2, top - 2, width + 4, height + 4)
+
     context.roundRect(left, top, width, height, round)
 
-    this.setState('fontColor', (increase ? increaseFontColor : decreaseFontColor) || fontColor)
+    this.setState('fontColor', (increase ? beforeDueFontColor : overDueFontColor) || fontColor)
   }
 
   postrender(context: CanvasRenderingContext2D) {

package/translations/en.json

@@ -1,15 +1,17 @@
 {
-  "label.decrease-progress-color": "Decrease Progress Color",
-  "label.decrese-font-color": "Decrease Font Color",
-  "label.format": "Format",
-  "label.increase-font-color": "Increase Font Color",
-  "label.increase-progress-color": "Increase Progress Color",
-  "label.progress-direction": "Progress Direction",
-  "label.progress-threshold": "Progress Threshold",
-  "label.tact-time": "Tact Time",
-  "label.under-threshold-color": "Under Threshold Color",
-  "label.show-progress": "show progress",
+  "component.tact-timer": "tact timer",
+  "label.before-due-progress-color": "before due progress color",
+  "label.before-due-font-color": "before due font color",
+  "label.over-due-progress-color": "over due progress color",
+  "label.over-due-font-color": "over due font color",
+  "label.format": "format",
+  "label.progress-direction": "progress direction",
+  "label.progress-threshold": "progress threshold",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "under threshold color",
+  "label.show-progress": "show progress color",
   "label.show-timer": "show timer",
   "label.start-time": "start time",
-  "label.end-time": "end time"
+  "label.end-time": "end time",
+  "label.tact-timer-mask-color": "mask color"
 }

package/translations/ja.json

@@ -1,15 +1,17 @@
 {
-  "label.decrease-progress-color": "進行色の減少",
-  "label.decrese-font-color": "フォント色の減少",
+  "component.tact-timer": "工程標準時間タイマー",
+  "label.before-due-progress-color": "期限前進行色",
+  "label.before-due-font-color": "期限前フォント色",
+  "label.over-due-progress-color": "期限後進行色",
+  "label.over-due-font-color": "期限後フォント色",
   "label.format": "フォーマット",
-  "label.increase-font-color": "フォント色の増加",
-  "label.increase-progress-color": "進行色の増加",
   "label.progress-direction": "進行方向",
-  "label.progress-threshold": "進行閾値",
-  "label.tact-time": "標準所要時間",
-  "label.under-threshold-color": "閾値以下の色",
-  "label.show-progress": "進捗を表示",
+  "label.progress-threshold": "進行しきい値",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "しきい値以下の色",
+  "label.show-progress": "進行色を表示",
   "label.show-timer": "タイマーを表示",
   "label.start-time": "開始時間",
-  "label.end-time": "終了時間"
+  "label.end-time": "終了時間",
+  "label.tact-timer-mask-color": "マスク色"
 }

package/translations/ko.json

@@ -1,9 +1,10 @@
 {
-  "label.decrease-progress-color": "감소 진행색상",
-  "label.decrese-font-color": "감소 폰트색상",
+  "component.tact-timer": "공정표준시간 타이머",
+  "label.before-due-progress-color": "만기이전 진행색상",
+  "label.before-due-font-color": "만기이전 폰트색상",
+  "label.over-due-progress-color": "만기이후 진행색상",
+  "label.over-due-font-color": "만기이후 폰트색상",
   "label.format": "포맷",
-  "label.increase-font-color": "증가 폰트색상",
-  "label.increase-progress-color": "증가 진행색상",
   "label.progress-direction": "진행 방향",
   "label.progress-threshold": "진행 임계값",
   "label.tact-time": "tact time",
@@ -11,5 +12,6 @@
   "label.show-progress": "진행색상 보이기",
   "label.show-timer": "타이머 보이기",
   "label.start-time": "시작 시간",
-  "label.end-time": "완료 시간"
+  "label.end-time": "완료 시간",
+  "label.tact-timer-mask-color": "마스크 색상"
 }

package/translations/ms.json

@@ -1,15 +1,17 @@
 {
-  "label.decrease-progress-color": "warna kemajuan menurun",
-  "label.decrese-font-color": "warna fon menurun",
+  "component.tact-timer": "pemasa masa standard proses",
+  "label.before-due-progress-color": "warna kemajuan sebelum tarikh akhir",
+  "label.before-due-font-color": "warna fon sebelum tarikh akhir",
+  "label.over-due-progress-color": "warna kemajuan selepas tarikh akhir",
+  "label.over-due-font-color": "warna fon selepas tarikh akhir",
   "label.format": "format",
-  "label.increase-font-color": "warna fon meningkat",
-  "label.increase-progress-color": "warna kemajuan meningkat",
   "label.progress-direction": "arah kemajuan",
   "label.progress-threshold": "ambang kemajuan",
-  "label.tact-time": "masa standard",
-  "label.under-threshold-color": "warna bawah ambang",
-  "label.show-progress": "tunjuk kemajuan",
-  "label.show-timer": "tunjuk pemasa",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "warna di bawah ambang",
+  "label.show-progress": "tunjukkan warna kemajuan",
+  "label.show-timer": "tunjukkan pemasa",
   "label.start-time": "masa mula",
-  "label.end-time": "masa tamat"
+  "label.end-time": "masa tamat",
+  "label.tact-timer-mask-color": "warna topeng"
 }

package/translations/zh.json

@@ -1,15 +1,17 @@
 {
-  "label.decrease-progress-color": "减少进度颜色",
-  "label.decrese-font-color": "减少字体颜色",
+  "component.tact-timer": "工艺标准时间计时器",
+  "label.before-due-progress-color": "到期前进度颜色",
+  "label.before-due-font-color": "到期前字体颜色",
+  "label.over-due-progress-color": "到期后进度颜色",
+  "label.over-due-font-color": "到期后字体颜色",
   "label.format": "格式",
-  "label.increase-font-color": "增加字体颜色",
-  "label.increase-progress-color": "增加进度颜色",
   "label.progress-direction": "进度方向",
   "label.progress-threshold": "进度阈值",
-  "label.tact-time": "标准耗时",
+  "label.tact-time": "tact time",
   "label.under-threshold-color": "低于阈值颜色",
-  "label.show-progress": "显示进度",
+  "label.show-progress": "显示进度颜色",
   "label.show-timer": "显示计时器",
   "label.start-time": "开始时间",
-  "label.end-time": "完成时间"
+  "label.end-time": "结束时间",
+  "label.tact-timer-mask-color": "掩码颜色"
 }