@things-factory/integration-base 7.0.1-beta.8 → 7.0.1-beta.9

package/helps/integration/connector/mssql-connector.ja.md

@@ -11,13 +11,13 @@
 MSSqlエンジンのホスト名とサービスポート
 
 - ホスト名：データベースサーバーホスト
-- サービスポート：データベースサービスポート（デフォルト - 5432）
+- サービスポート：データベースサービスポート（デフォルト - 1433）
 - フォーマット
   - {ホスト名}[:{ポート}]
   - 例
-    - "localhost:5432"
+    - "localhost:1433"
     - "localhost"
-    - "192.168.0.1:5432"
+    - "192.168.0.1:1433"
 
 ## パラメーター
 

package/helps/integration/connector/mssql-connector.ko.md

@@ -11,13 +11,13 @@
 mssql 엔진 호스트 이름과 서비스 포트
 
 - 호스트 이름 : 데이터베이스 서버 호스트
-- 서비스 포트 : 데이터베이스 서비스 포트 (기본값 - 5432)
+- 서비스 포트 : 데이터베이스 서비스 포트 (기본값 - 1433)
 - 형식
   - {호스트 이름}[:{포트}]
   - 예시
-    - "localhost:5432"
+    - "localhost:1433"
     - "localhost"
-    - "192.168.0.1:5432"
+    - "192.168.0.1:1433"
 
 ## 매개변수
 

package/helps/integration/connector/mssql-connector.md

@@ -11,13 +11,13 @@
 MSSql engine hostname and service port
 
 - hostname : database server host
-- service port : database service port (default - 5432)
+- service port : database service port (default - 1433)
 - format
   - {hostname}[:{port}]
   - eg.
-    - "localhost:5432"
+    - "localhost:1433"
     - "localhost"
-    - "192.168.0.1:5432"
+    - "192.168.0.1:1433"
 
 ## Parameters
 

package/helps/integration/connector/mssql-connector.ms.md

@@ -11,13 +11,13 @@
 Nama hos dan port perkhidmatan enjin MSSql
 
 - nama hos : hos pelayan pangkalan data
-- port perkhidmatan : port perkhidmatan pangkalan data (lalai - 5432)
+- port perkhidmatan : port perkhidmatan pangkalan data (lalai - 1433)
 - format
   - {nama hos}[:{port}]
   - contoh
-    - "localhost:5432"
+    - "localhost:1433"
     - "localhost"
-    - "192.168.0.1:5432"
+    - "192.168.0.1:1433"
 
 ## Parameter
 

package/helps/integration/connector/mssql-connector.zh.md

@@ -11,13 +11,13 @@
 MSSql引擎主机名和服务端口
 
 - 主机名：数据库服务器主机
-- 服务端口：数据库服务端口（默认 - 5432）
+- 服务端口：数据库服务端口（默认 - 1433）
 - 格式
   - {主机名}[:{端口}]
   - 例如
-    - "localhost:5432"
+    - "localhost:1433"
     - "localhost"
-    - "192.168.0.1:5432"
+    - "192.168.0.1:1433"
 
 ## 参数
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "7.0.1-beta.8",
+  "version": "7.0.1-beta.9",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,11 +27,11 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^2.0.0-beta.0",
-    "@things-factory/api": "^7.0.1-beta.8",
-    "@things-factory/auth-base": "^7.0.1-beta.8",
+    "@things-factory/api": "^7.0.1-beta.9",
+    "@things-factory/auth-base": "^7.0.1-beta.9",
     "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/oauth2-client": "^7.0.1-beta.8",
-    "@things-factory/scheduler-client": "^7.0.1-beta.8",
+    "@things-factory/oauth2-client": "^7.0.1-beta.9",
+    "@things-factory/scheduler-client": "^7.0.1-beta.9",
     "@things-factory/shell": "^7.0.1-beta.8",
     "@things-factory/utils": "^7.0.1-beta.6",
     "async-mqtt": "^2.5.0",
@@ -43,5 +43,5 @@
     "readline": "^1.3.0",
     "vm2": "^3.9.11"
   },
-  "gitHead": "d2ca60f7fca6feb2b7cb86b4f825378573fcc335"
+  "gitHead": "b2fb4923e2763b4d831f934905dd6ae0019446a4"
 }

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

@@ -20,7 +20,7 @@ export class MssqlConnector implements Connector {
   async connect(connection: InputConnection) {
     const {
       endpoint,
-      params: { user, password, database, encrypt = 'Y' }
+      params: { user, password, database, encrypt = 'Y', trustServerCertificate }
     } = connection
 
     const [host, port = 1433] = endpoint.split(':')
@@ -33,9 +33,17 @@ export class MssqlConnector implements Connector {
       // client is pool
       user,
       password,
-      server: `${host}`,
-      database: `${database}`,
-      encrypt: `${encrypt === 'Y'}`
+      server: host,
+      database,
+      pool: {
+        max: 10,
+        min: 0,
+        idleTimeoutMillis: 30000
+      },
+      options: {
+        encrypt: encrypt === 'Y',
+        trustServerCertificate: trustServerCertificate === 'Y'
+      }
     })
 
     ConnectionManager.addConnectionInstance(connection, {
@@ -88,6 +96,14 @@ export class MssqlConnector implements Connector {
         property: {
           options: ['Y', 'N']
         }
+      },
+      {
+        type: 'select',
+        name: 'trustServerCertificate',
+        label: 'trust-server-certificate',
+        property: {
+          options: ['Y', 'N']
+        }
       }
     ]
   }

package/translations/en.json

@@ -6,5 +6,6 @@
   "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.subscription-handlers": "subscription handlers"
+  "label.subscription-handlers": "subscription handlers",
+  "label.trust-server-certificate": "trust server certificate"
 }

package/translations/ja.json

@@ -6,5 +6,6 @@
   "error.timezone is not set": "スケジュールとして登録するためにはシナリオ'{scenario}'にタイム ゾーン情報が設定される必要があります.",
   "error.scenario instance not found": "シナリオ インスタンス'{instance}'が見つかりません. 既に終了している可能性があります.",
   "label.auth-key": "認証キー",
-  "label.subscription-handlers": "サブスクリプションハンドラー"
+  "label.subscription-handlers": "サブスクリプションハンドラー",
+  "label.trust-server-certificate": "サーバー証明書を信頼する"
 }

package/translations/ko.json

@@ -6,5 +6,6 @@
   "error.timezone is not set": "스케쥴로 등록하기 위해서는 시나리오 '{scenario}'에 타임존 정보가 설정되어야 합니다.",
   "error.scenario instance not found": "시나리오 인스턴스 '{instance}'를 찾을 수 없습니다. 이미 종료되었을 수 있습니다.",
   "label.auth-key": "인증 키",
-  "label.subscription-handlers": "구독 핸들러"
+  "label.subscription-handlers": "구독 핸들러",
+  "label.trust-server-certificate": "서버 인증서 신뢰"
 }

package/translations/ms.json

@@ -6,5 +6,6 @@
   "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.subscription-handlers": "pengendali langganan"
+  "label.subscription-handlers": "pengendali langganan",
+  "label.trust-server-certificate": "percaya sijil pelayan"
 }

package/translations/zh.json

@@ -6,5 +6,6 @@
   "error.timezone is not set": "要注册为计划，场景 '{scenario}' 需要设置时区信息。",
   "error.scenario instance not found": "无法找到场景实例 '{instance}'。它可能已经结束。",
   "label.auth-key": "认证密钥",
-  "label.subscription-handlers": "订阅处理程序"
+  "label.subscription-handlers": "订阅处理程序",
+  "label.trust-server-certificate": "信任服务器证书"
 }