@things-factory/integration-base 6.1.96 → 6.1.98

package/helps/integration/concept/template-literal.ja.md

@@ -0,0 +1,13 @@
+## テンプレートリテラル（Template Literals）
+
+テンプレートリテラルは、ES6（ECMAScript 2015）で導入された文字列の記法の拡張で、バッククオート（``）で文字列を囲むことができます。
+
+### 文字列内挿（String Interpolation）
+
+テンプレートリテラルを使用すると、`${変数}`の構文を使って変数を文字列に挿入することができます。
+
+```javascript
+const name = 'Alice'
+const greeting = `Hello, ${name}!`
+console.log(greeting) // 出力: Hello, Alice!
+```

package/helps/integration/concept/template-literal.ko.md

@@ -0,0 +1,13 @@
+## 템플릿 리터럴 (Template Literals)
+
+ES6에서 도입된 문자열 표기법의 확장으로, 백틱 (`)으로 문자열을 감싸서 사용합니다.
+
+### 변수 삽입 (String Interpolation)
+
+템플릿 리터럴을 사용하면 `${변수}` 형식으로 변수를 문자열에 삽입할 수 있습니다.
+
+```javascript
+const name = 'Alice'
+const greeting = `Hello, ${name}!`
+console.log(greeting) // 출력: Hello, Alice!
+```

package/helps/integration/concept/template-literal.md

@@ -0,0 +1,13 @@
+## Template Literals
+
+Template literals are an extension of string notation introduced in ES6 (ECMAScript 2015) that allows strings to be enclosed in backticks (`).
+
+### String Interpolation
+
+With template literals, you can insert variables into strings using the `${variable}` syntax.
+
+```javascript
+const name = 'Alice'
+const greeting = `Hello, ${name}!`
+console.log(greeting) // Output: Hello, Alice!
+```

package/helps/integration/concept/template-literal.zh.md

@@ -0,0 +1,13 @@
+## 模板字面量（Template Literals）
+
+模板字面量是在 ES6（ECMAScript 2015）中引入的一种扩展字符串表示法，允许字符串用反引号（``）括起来。
+
+### 字符串插值（String Interpolation）
+
+使用模板字面量，您可以使用`${变量}`语法将变量插入字符串中。
+
+```javascript
+const name = 'Alice'
+const greeting = `你好，${name}！`
+console.log(greeting) // 输出：你好，Alice！
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.96",
+  "version": "6.1.98",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.96",
-    "@things-factory/auth-base": "^6.1.96",
-    "@things-factory/env": "^6.1.96",
-    "@things-factory/oauth2-client": "^6.1.96",
-    "@things-factory/scheduler-client": "^6.1.96",
-    "@things-factory/shell": "^6.1.96",
+    "@things-factory/api": "^6.1.97",
+    "@things-factory/auth-base": "^6.1.97",
+    "@things-factory/env": "^6.1.97",
+    "@things-factory/oauth2-client": "^6.1.97",
+    "@things-factory/scheduler-client": "^6.1.97",
+    "@things-factory/shell": "^6.1.97",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "535ca1d403d6c2d6e25314ece79f4b77d877c75b"
+  "gitHead": "d4f1c879015daa09cb3b9aa5ea7316de61021d4d"
 }

package/server/engine/task/http-get.ts

@@ -27,6 +27,20 @@ async function HttpGet(step, { logger, data, domain, variables }) {
 
   path = vm.run('`' + path + '`')
 
+  requestHeaders =
+    requestHeaders &&
+    Object.entries(requestHeaders as { [key: string]: string }).reduce((sum, [key, value]) => {
+      sum[key] = vm.run('`' + value + '`')
+      return sum
+    }, {})
+
+  searchParams =
+    searchParams &&
+    Object.entries(searchParams as { [key: string]: string }).reduce((sum, [key, value]) => {
+      sum[key] = vm.run('`' + value + '`')
+      return sum
+    }, {})
+
   var url = new URL(path, endpoint)
   if (searchParams) {
     Object.keys(searchParams).forEach(key => {

package/server/engine/task/http-post.ts

@@ -1,11 +1,12 @@
 import fetch from 'node-fetch'
 import { URL } from 'url'
+import { VM } from 'vm2'
 import { access } from '@things-factory/utils'
 import { TaskRegistry } from '../task-registry'
 import { ConnectionManager } from '../connection-manager'
 import https from 'https'
 
-async function HttpPost(step, { logger, data, domain }) {
+async function HttpPost(step, { logger, data, domain, variables }) {
   var { connection: connectionName, params: stepOptions } = step
   var { headers: requestHeaders, contentType, path, accessor } = stepOptions || {}
 
@@ -17,8 +18,23 @@ async function HttpPost(step, { logger, data, domain }) {
 
   var { endpoint, params: connectionParams, authHeaders = {} } = connection
 
-  var url = new URL(path, endpoint)
+  const vm = new VM({
+    sandbox: {
+      domain,
+      data,
+      variables
+    }
+  })
 
+  path = vm.run('`' + path + '`')
+  requestHeaders =
+    requestHeaders &&
+    Object.entries(requestHeaders as { [key: string]: string }).reduce((sum, [key, value]) => {
+      sum[key] = vm.run('`' + value + '`')
+      return sum
+    }, {})
+
+  var url = new URL(path, endpoint)
   var headers = {
     ...authHeaders,
     ...requestHeaders