@tuya-miniapp/ark-extension-virtual-device 1.7.3-beta-2 → 1.7.3-beta-4

package/dist/worker/index.js

@@ -42423,68 +42423,108 @@ var require_crypto_js = __commonJS({
   }
 });
 
-// node_modules/crc32/lib/crc32.js
-var require_crc32 = __commonJS({
-  "node_modules/crc32/lib/crc32.js"(exports, module2) {
+// node_modules/js-crc/src/crc.js
+var require_crc = __commonJS({
+  "node_modules/js-crc/src/crc.js"(exports, module2) {
     (function() {
       "use strict";
-      var table = [], poly = 3988292384;
-      function makeTable() {
-        var c2, n2, k2;
-        for (n2 = 0; n2 < 256; n2 += 1) {
-          c2 = n2;
-          for (k2 = 0; k2 < 8; k2 += 1) {
-            if (c2 & 1) {
-              c2 = poly ^ c2 >>> 1;
-            } else {
-              c2 = c2 >>> 1;
-            }
+      var root = typeof window === "object" ? window : {};
+      var NODE_JS = !root.JS_CRC_NO_NODE_JS && typeof process === "object" && process.versions && process.versions.node;
+      if (NODE_JS) {
+        root = global;
+      }
+      var COMMON_JS = !root.JS_CRC_NO_COMMON_JS && typeof module2 === "object" && module2.exports;
+      var AMD = typeof define === "function" && define.amd;
+      var ARRAY_BUFFER = !root.JS_CRC_NO_ARRAY_BUFFER && typeof ArrayBuffer !== "undefined";
+      var HEX_CHARS = "0123456789abcdef".split("");
+      var Modules = [
+        {
+          name: "crc32",
+          polynom: 3988292384,
+          initValue: -1,
+          bytes: 4
+        },
+        {
+          name: "crc16",
+          polynom: 40961,
+          initValue: 0,
+          bytes: 2
+        }
+      ];
+      var i2, j2, k2, b2;
+      for (i2 = 0; i2 < Modules.length; ++i2) {
+        var m2 = Modules[i2];
+        m2.method = function(m3) {
+          return function(message) {
+            return crc(message, m3);
+          };
+        }(m2);
+        m2.table = [];
+        for (j2 = 0; j2 < 256; ++j2) {
+          b2 = j2;
+          for (k2 = 0; k2 < 8; ++k2) {
+            b2 = b2 & 1 ? m2.polynom ^ b2 >>> 1 : b2 >>> 1;
           }
-          table[n2] = c2 >>> 0;
+          m2.table[j2] = b2 >>> 0;
         }
       }
-      function strToArr(str) {
-        return Array.prototype.map.call(str, function(c2) {
-          return c2.charCodeAt(0);
-        });
-      }
-      function crcDirect(arr) {
-        var crc = -1, i2, j2, l2, temp;
-        for (i2 = 0, l2 = arr.length; i2 < l2; i2 += 1) {
-          temp = (crc ^ arr[i2]) & 255;
-          for (j2 = 0; j2 < 8; j2 += 1) {
-            if ((temp & 1) === 1) {
-              temp = temp >>> 1 ^ poly;
+      var crc = function(message, module3) {
+        var notString = typeof message !== "string";
+        if (notString && ARRAY_BUFFER && message instanceof ArrayBuffer) {
+          message = new Uint8Array(message);
+        }
+        var crc2 = module3.initValue, code, i3, length = message.length, table = module3.table;
+        if (notString) {
+          for (i3 = 0; i3 < length; ++i3) {
+            crc2 = table[(crc2 ^ message[i3]) & 255] ^ crc2 >>> 8;
+          }
+        } else {
+          for (i3 = 0; i3 < length; ++i3) {
+            code = message.charCodeAt(i3);
+            if (code < 128) {
+              crc2 = table[(crc2 ^ code) & 255] ^ crc2 >>> 8;
+            } else if (code < 2048) {
+              crc2 = table[(crc2 ^ (192 | code >> 6)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code & 63)) & 255] ^ crc2 >>> 8;
+            } else if (code < 55296 || code >= 57344) {
+              crc2 = table[(crc2 ^ (224 | code >> 12)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code >> 6 & 63)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code & 63)) & 255] ^ crc2 >>> 8;
             } else {
-              temp = temp >>> 1;
+              code = 65536 + ((code & 1023) << 10 | message.charCodeAt(++i3) & 1023);
+              crc2 = table[(crc2 ^ (240 | code >> 18)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code >> 12 & 63)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code >> 6 & 63)) & 255] ^ crc2 >>> 8;
+              crc2 = table[(crc2 ^ (128 | code & 63)) & 255] ^ crc2 >>> 8;
             }
           }
-          crc = crc >>> 8 ^ temp;
         }
-        return crc ^ -1;
+        crc2 ^= module3.initValue;
+        var hex = "";
+        if (module3.bytes > 2) {
+          hex += HEX_CHARS[crc2 >> 28 & 15] + HEX_CHARS[crc2 >> 24 & 15] + HEX_CHARS[crc2 >> 20 & 15] + HEX_CHARS[crc2 >> 16 & 15];
+        }
+        hex += HEX_CHARS[crc2 >> 12 & 15] + HEX_CHARS[crc2 >> 8 & 15] + HEX_CHARS[crc2 >> 4 & 15] + HEX_CHARS[crc2 & 15];
+        return hex;
+      };
+      var exports2 = {};
+      for (i2 = 0; i2 < Modules.length; ++i2) {
+        var m2 = Modules[i2];
+        exports2[m2.name] = m2.method;
       }
-      function crcTable(arr, append2) {
-        var crc, i2, l2;
-        if (typeof crcTable.crc === "undefined" || !append2 || !arr) {
-          crcTable.crc = 0 ^ -1;
-          if (!arr) {
-            return;
-          }
+      if (COMMON_JS) {
+        module2.exports = exports2;
+      } else {
+        for (i2 = 0; i2 < Modules.length; ++i2) {
+          var m2 = Modules[i2];
+          root[m2.name] = m2.method;
         }
-        crc = crcTable.crc;
-        for (i2 = 0, l2 = arr.length; i2 < l2; i2 += 1) {
-          crc = crc >>> 8 ^ table[(crc ^ arr[i2]) & 255];
+        if (AMD) {
+          define(function() {
+            return exports2;
+          });
         }
-        crcTable.crc = crc;
-        return crc ^ -1;
       }
-      makeTable();
-      module2.exports = function(val, direct) {
-        var val = typeof val === "string" ? strToArr(val) : val, ret = direct ? crcDirect(val) : crcTable(val);
-        return (ret >>> 0).toString(16);
-      };
-      module2.exports.direct = crcDirect;
-      module2.exports.table = crcTable;
     })();
   }
 });
@@ -220712,7 +220752,7 @@ var require_package2 = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "@tuya-miniapp/ark-extension-virtual-device",
-      version: "1.7.3-beta-1",
+      version: "1.7.3-beta-4",
       license: "MIT",
       files: [
         "manifest.json",
@@ -220795,6 +220835,7 @@ var require_package2 = __commonJS({
         fs: "^0.0.1-security",
         "fs-extra": "*",
         glob: "^10.3.4",
+        "js-crc": "^0.2.0",
         json5: "^2.2.1",
         "lz-string": "^1.4.4",
         matt: "^0.0.5",
@@ -262740,6 +262781,8 @@ var getDeviceInfo = async (body) => {
           devId: body?.deviceId
         }
       });
+      console.log("devInfo>>>>>", JSON.stringify(devInfo));
+      console.log("devINfo2>>>", JSON.stringify(devInfo32));
       if (!devInfo.success && !devInfo.result) {
         return null;
       }
@@ -262761,6 +262804,7 @@ var getDeviceInfo = async (body) => {
         });
         const pro = pInfo?.result[0];
         devInfo.result.bizAttribute = pro?.bizAttribute;
+        console.log("productInfo>>>>", JSON.stringify(pInfo));
       } catch (error) {
         console.log("-----error tuya.m.product.ext.prop.batch.get", error);
       }
@@ -262980,7 +263024,7 @@ var import_crypto3 = require("crypto");
 var import_crypto = require("crypto");
 var CryptoJS = require_crypto_js();
 var crypto = require("crypto");
-var crc32 = require_crc32();
+var crc32 = require_crc().crc32;
 var md5 = require_md5();
 function Decrypt(serect, config) {
   try {
@@ -263015,19 +263059,14 @@ function Decrypt20(secret, localKey) {
 }
 function Encrypt20(message, localKey, gwId) {
   try {
-    const data = Buffer.from(JSON.stringify(message.data), "utf8");
-    const keyData = Buffer.from(localKey, "utf8");
-    const t2 = `${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10);
-    console.log("messageData", data.toString("hex"));
-    console.log("$localKeyData", keyData.toString("hex"));
+    const t2 = Number(`${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10));
     const cipher = CryptoJS.AES.encrypt(JSON.stringify(message.data), CryptoJS.enc.Utf8.parse(localKey), {
       mode: CryptoJS.mode.ECB,
       padding: CryptoJS.pad.Pkcs7,
       iv: ""
     });
     const encryptData = cipher.ciphertext.toString(CryptoJS.enc.Hex);
-    console.log("encryptData", encryptData);
-    const d2 = `${encryptData}||gwId=${gwId}||protocol=${message.protocol || 5}||pv=2.0||t=${t2}||${localKey}`;
+    const d2 = `data=${encryptData}||gwId=${gwId}||protocol=${message.protocol || 5}||pv=2.0||t=${t2}||${localKey}`;
     const signData = md5(d2);
     const p2 = {
       pv: "2.0",
@@ -263037,11 +263076,7 @@ function Encrypt20(message, localKey, gwId) {
       gwId,
       t: t2
     };
-    console.log("signData", signData);
-    console.log("p", p2);
     const buffer = Buffer.from(JSON.stringify(p2), "utf8");
-    const de2 = Decrypt20(encryptData, localKey);
-    console.log("----de", de2);
     return buffer;
   } catch (e2) {
     console.log("Encrypt is error", e2);
@@ -263092,7 +263127,7 @@ function Encrypt22(data, key) {
       msg += cipher.final("hex");
       const encryptData = msg;
       const crc32Data = sData + rData + encryptData;
-      const signData = crc32(crc32Data).toString("hex");
+      const signData = crc32(strToHexArr(crc32Data)).toString(16);
       console.log("------signData", signData);
       const result = `${version}${signData}${sData}${rData}${encryptData}`;
       const decr = Decrypt22(Buffer.from(result, "hex"), key);
@@ -263187,6 +263222,20 @@ var numberToHex = (str, len = str.length) => {
   }
   return val;
 };
+function strToHexArr(str) {
+  const hexArr = [];
+  if (!str) {
+    return hexArr;
+  }
+  if (!str.match(/^[0-9a-fA-F]+$/)) {
+    throw new Error("Input is not a hex string.");
+  }
+  const len = str.length;
+  for (let t2 = 0; t2 < len; t2 += 2) {
+    hexArr.push(parseInt(str.substr(t2, 2), 16));
+  }
+  return hexArr;
+}
 function generateRandomHash(length) {
   const bytes = crypto.randomBytes(length);
   const hex = bytes.toString("hex");
@@ -265906,21 +265955,10 @@ var getVirtualBindInfo = async (params) => {
 };
 
 // worker/api/services/queryDps.ts
-var queryDps = async ({ deviceId, dpIds }) => {
-  const deviceInfo2 = await getDeviceInfo({ "deviceId": deviceId });
-  const dps = deviceInfo2?.result?.dps || {};
-  const schema = JSON.parse(deviceInfo2?.result?.schema || "[]");
-  JSON.parse(schema).map((item) => {
-    const { id, code, property, type: oType } = item;
-    const { type } = property || {};
-    if (type === "raw" || oType === "raw") {
-      const b2 = Buffer.from(dps[id], "base64");
-      dps[id] = b2.toString("hex");
-    }
-  });
+var queryDps = ({ deviceId, dpIds }) => {
   const result = {};
   for (const dpId of dpIds) {
-    result[dpId] = dps[dpId];
+    result[dpId] = null;
   }
   return result;
 };
@@ -266154,7 +266192,7 @@ var parseI18nCheckResult = async () => {
       const langCheck = i18nMap[key] ?? {};
       for (const lang of langs) {
         langCheck[lang] = key in result[lang];
-        if (!langCheck[lang]) {
+        if (!langCheck[lang] && ["zh", "en"].includes(lang)) {
           errorKeys.push(key);
         }
       }
@@ -279762,6 +279800,7 @@ async function getDeviceInfo2(params) {
     const { id, code } = item;
     objSchema[code] = dps[id];
   });
+  console.log("--------objSchema", dev);
   const d2 = {
     ...devInfo,
     attributeString: parseInt(productInfo.attribute, 10).toString(2),
@@ -279830,7 +279869,7 @@ async function getDeviceInfo2(params) {
   };
 }
 async function publishDps2(params) {
-  const { deviceId, dps } = params;
+  const { deviceId, dps, showPublish = true } = params;
   try {
     let dev = cachedDevices2[deviceId];
     if (!dev) {
@@ -279838,6 +279877,7 @@ async function publishDps2(params) {
       dev = cachedDevices2[deviceId];
     }
     let _dps = { ...dps };
+    let _atopDps = { ...dps };
     if (dev) {
       const { schema } = dev;
       const idCodes = {};
@@ -279848,6 +279888,7 @@ async function publishDps2(params) {
       });
       const publish = {};
       const pudp = {};
+      const s2 = typeof schema === "string" ? JSON.parse(schema) : schema;
       Object.keys(dps).map((key) => {
         if (isNumeric(key)) {
           const code2 = idCodes[key];
@@ -279857,12 +279898,28 @@ async function publishDps2(params) {
           pudp[codeIds[key]] = dps[key];
         }
       });
-      ark.runtime.sendMessage(
+      showPublish && ark.runtime.sendMessage(
         JSON.stringify({ type: "publishDps", value: publish, protocol: 5 })
       );
       if (Object.keys(pudp).length > 0) {
         _dps = pudp;
+        _atopDps = { ...pudp };
+        console.log("--------pudp", pudp);
       }
+      s2.map((item) => {
+        const { id, code: code2, property, type: oType } = item;
+        const { type } = property || {};
+        if (Object.keys(_dps).includes(`${id}`) && (type === "raw" || oType === "raw") && isHexString(_dps[id])) {
+          const b2 = Buffer.from(_dps[id], "hex");
+          _dps[id] = b2.toString("base64");
+        }
+        if (Object.keys(_dps).includes(`${id}`) && (type === "raw" || oType === "raw") && !_dps[id]) {
+          delete _dps[id];
+        }
+        if (Object.keys(_dps).includes(`${id}`) && (type === "value" || oType === "value") && !isInteger(_dps[id])) {
+          viewLog("@i18n(number_publish_error)");
+        }
+      });
     }
     console.log("--------result publishDpsWithMqtt", deviceId, _dps);
     let reason;
@@ -279877,15 +279934,29 @@ async function publishDps2(params) {
       }
     };
     const topic = `smart/mb/out/${deviceId}`;
-    const { pv } = dev;
+    const { pv = "2.2" } = dev;
     let data = null;
     console.log("--------pv", pv);
     switch (pv) {
+      case "2.0":
+        data = crypto_default.Encrypt20(message, dev.localKey, dev.gwId || dev.devId);
+        console.log("---------data", data);
+        break;
+      case "2.2":
+        if (dev.localKey) {
+          data = crypto_default.Encrypt22(message, dev.localKey);
+        } else {
+          result = await publishDps({ deviceId, dps: _dps }, (err) => {
+            reason = err;
+            console.log("--------error", err);
+          });
+        }
+        break;
       case "2.3":
         data = crypto_default.Encrypt23(message, dev.localKey);
         break;
       default:
-        result = await publishDps({ deviceId, dps: _dps }, (err) => {
+        result = await publishDps({ deviceId, dps: _atopDps }, (err) => {
           reason = err;
           console.log("--------error", err);
         });
@@ -279990,11 +280061,58 @@ async function getProductInfo2(params) {
 }
 async function queryDps2(params) {
   try {
-    const dps = await queryDps(params);
+    const { deviceId, dpIds } = params;
+    const dev = cachedDevices2[deviceId];
+    console.log("--------queryDps", dpIds);
+    const message = {
+      protocol: 31,
+      t: Number(`${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10)),
+      data: {
+        dpId: dpIds.map(Number)
+      }
+    };
+    const topic = `smart/mb/out/${deviceId}`;
+    const { pv = "2.2" } = dev;
+    let data = null;
+    switch (pv) {
+      case "2.0":
+        data = crypto_default.Encrypt20(message, dev.localKey, dev.gwId || dev.devId);
+        break;
+      case "2.2":
+        data = crypto_default.Encrypt22(message, dev.localKey);
+        break;
+      case "2.3":
+        data = crypto_default.Encrypt23(message, dev.localKey);
+        break;
+      default:
+        break;
+    }
+    if (data) {
+      initMqttClient_default._client.publish(
+        topic,
+        data,
+        { qos: 1, retain: true },
+        (error, pocket) => {
+          console.log("------publish", error, pocket, data);
+        }
+      );
+    }
+    const q2 = dpIds.reduce((a2, c2) => {
+      a2[c2] = null;
+      return a2;
+    }, {});
+    publishDps2({
+      deviceId,
+      dps: q2,
+      mode: 2,
+      pipelines: [1, 2, 3, 4, 5, 6],
+      options: {},
+      showPublish: false
+    });
     return {
-      data: dps,
-      errorCode: !!dps ? 0 : import_TYUniCode3.TYUniPluginError.DEVICEKIT_QUERY_DPS_ERROR.code,
-      errorMsg: !!dps ? import_TYUniCode3.TYUniPluginError.SUCCESS.des : import_TYUniCode3.TYUniPluginError.DEVICEKIT_QUERY_DPS_ERROR.des
+      data: true,
+      errorCode: 0,
+      errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
     };
   } catch (e2) {
     return {
@@ -280350,7 +280468,9 @@ function dpTranslateAdvancedCapability(params) {
       targetStatusValue = leftDisplayValue;
     } else {
       let showValuePerStep = (rightDisplayValue - leftDisplayValue) / (rightOriginalValue - leftOriginalValue);
-      targetStatusValue = Math.floor((statusValue - leftOriginalValue) * showValuePerStep + leftDisplayValue);
+      targetStatusValue = Math.floor(
+        (statusValue - leftOriginalValue) * showValuePerStep + leftDisplayValue
+      );
     }
     return {
       dpCode,
@@ -281529,6 +281649,22 @@ async function addTimer(params) {
       };
     }
   }
+  let isDpId = true;
+  const keys = Object.keys(dps);
+  for (const key of keys) {
+    if (!isNumeric(key)) {
+      isDpId = false;
+      break;
+    }
+  }
+  if (!isDpId) {
+    return {
+      errorCode: import_TYUniCode11.TYUniPluginError.DEVICEKIT_DEVICE_NETWORK_ERROR.code,
+      errorMsg: import_TYUniCode11.TYUniPluginError.DEVICEKIT_DEVICE_NETWORK_ERROR.des,
+      ext: { errorCode: "1501", errorMsg: "dpId is not a number" },
+      data: null
+    };
+  }
   try {
     const data = await apiRequestByAtop({
       api: "tuya.m.clock.dps.add",
@@ -281578,6 +281714,22 @@ async function updateTimer(params) {
       };
     }
   }
+  let isDpId = true;
+  const keys = Object.keys(dps);
+  for (const key of keys) {
+    if (!isNumeric(key)) {
+      isDpId = false;
+      break;
+    }
+  }
+  if (!isDpId) {
+    return {
+      errorCode: import_TYUniCode11.TYUniPluginError.DEVICEKIT_DEVICE_NETWORK_ERROR.code,
+      errorMsg: import_TYUniCode11.TYUniPluginError.DEVICEKIT_DEVICE_NETWORK_ERROR.des,
+      ext: { errorCode: "1501", errorMsg: "dpId is not a number" },
+      data: null
+    };
+  }
   try {
     const data = await apiRequestByAtop({
       api: "tuya.m.clock.dps.update",
@@ -282031,12 +282183,17 @@ async function getRemoteRebootTimers(params) {
     const data = crypto_default.Encrypt23(message, device.localKey);
     console.log("------publish data", data);
     const topic = `smart/mb/out/${deviceId}`;
-    initMqttClient_default._client.publish(topic, data, {
-      qos: 1,
-      retain: true
-    }, (error, pocket) => {
-      console.log("------publish", error, pocket);
-    });
+    initMqttClient_default._client.publish(
+      topic,
+      data,
+      {
+        qos: 1,
+        retain: true
+      },
+      (error, pocket) => {
+        console.log("------publish", error, pocket);
+      }
+    );
   } catch (e2) {
     console.log("============fail", e2);
   }
@@ -282161,7 +282318,7 @@ async function publishThingModelMessage(params) {
     "0": `tylink/${devId}/thing/property/set`,
     "1": `tylink/${devId}/thing/action/execute`
   };
-  initMqttClient_default._client.publish(topics[type], JSON.stringify(payload));
+  initMqttClient_default._client.publish(topics[type], JSON.stringify({ data: payload, time: Number(`${Date.now()}`.substring(0, 10)) }));
   return {
     data: true,
     errorCode: 0,
@@ -282500,6 +282657,17 @@ crypto-js/mode-ctr-gladman.js:
    * Jan Hruby jhruby.web@gmail.com
    *)
 
+js-crc/src/crc.js:
+  (**
+   * [js-crc]{@link https://github.com/emn178/js-crc}
+   *
+   * @namespace crc
+   * @version 0.2.0
+   * @author Chen, Yi-Cyuan [emn178@gmail.com]
+   * @copyright Chen, Yi-Cyuan 2015-2017
+   * @license MIT
+   *)
+
 typescript/lib/typescript.js:
   (*! *****************************************************************************
   Copyright (c) Microsoft Corporation. All rights reserved.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/ark-extension-virtual-device",
-  "version": "1.7.3-beta-2",
+  "version": "1.7.3-beta-4",
   "license": "MIT",
   "files": [
     "manifest.json",
@@ -83,6 +83,7 @@
     "fs": "^0.0.1-security",
     "fs-extra": "*",
     "glob": "^10.3.4",
+    "js-crc": "^0.2.0",
     "json5": "^2.2.1",
     "lz-string": "^1.4.4",
     "matt": "^0.0.5",