@tuya-miniapp/ark-extension-virtual-device 1.8.0 → 1.8.1-beta-2

package/dist/worker/index.js

@@ -220752,7 +220752,7 @@ var require_package2 = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "@tuya-miniapp/ark-extension-virtual-device",
-      version: "1.8.0-beta-7",
+      version: "1.8.1-beta-1",
       license: "MIT",
       files: [
         "manifest.json",
@@ -262807,9 +262807,21 @@ var getDeviceInfo = async (body) => {
       devInfo.result.dataPointInfo = devInfo32.result?.dataPointInfo;
       devInfo.result.meta = devInfo32.result?.meta;
       devInfo.result.accessType = devInfo32.result?.accessType;
+      devInfo.result.parentId = devInfo32.result?.deviceTopo.parentDevId;
+      devInfo.result.nodeId = devInfo32.result?.deviceTopo.nodeId;
       if (Object.hasOwn(devInfo32.result, "cloudOnline")) {
         devInfo.result.cloudOnline = devInfo32.result?.cloudOnline;
       }
+      if (devInfo32.parentId) {
+        const keys = await apiRequestByAtop({
+          api: "tuya.m.device.key.get",
+          version: "1.0",
+          params: {
+            gwId: devInfo32.parentId,
+            nodeIds: [devInfo32.nodeId]
+          }
+        });
+      }
       try {
         const pInfo = await apiRequestByAtop({
           api: "tuya.m.product.ext.prop.batch.get",
@@ -263361,7 +263373,7 @@ function trimEnd(str) {
   }
   return str;
 }
-var MqttListener = (topic, message) => {
+var MqttListener = async (topic, message) => {
   console.log("topic:", topic, message);
   if (topic.startsWith("tylink/")) {
     const devId = topic.split("/")[1];
@@ -263461,8 +263473,12 @@ var MqttListener = (topic, message) => {
   }
   dispatchMessageToTTT(result, devOrGroupId, dps, topic, message);
   if (result?.data?.cid) {
-    console.log("\u5B50\u8BBE\u5907\u6D88\u606F", result?.data?.cid, result?.data?.devId);
-    return;
+    const devId = await getDeviceId();
+    const currentDevice = getCachedDevice()[devId];
+    if (!currentDevice || currentDevice.nodeId !== result?.data?.cid) {
+      console.log("\u5B50\u8BBE\u5907\u6D88\u606F", result?.data?.cid, result?.data?.devId);
+      return;
+    }
   }
   console.log("\u8F6C\u53D1MQTT", result?.data?.dps, result?.protocol, result);
   ark.runtime.sendMessage(
@@ -263475,19 +263491,6 @@ var MqttListener = (topic, message) => {
 };
 async function dispatchMessageToTTT(result, devOrGroupId, dps, topic, message) {
   console.log("dispatchMessageToTTT>>", result);
-  ark.miniapp.emitPluginEvent({
-    name: "TUNIDeviceControlManager.onMqttMessageReceived",
-    data: {
-      deviceId: result?.data?.devId,
-      message: {
-        ...result?.data
-      },
-      protocol: result?.protocol,
-      messageData: {
-        ...result?.data
-      }
-    }
-  });
   switch (result?.protocol) {
     case 1:
       if (typeof result.data?.online === "boolean") {
@@ -263527,6 +263530,7 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps, topic, message) {
     case 5:
       {
         if (result.data?.cid) {
+          console.log("----->>>>>>>>>> gwId", devOrGroupId);
           const { data: devList2 } = await getSubDeviceInfoList({
             meshId: devOrGroupId
           });
@@ -263540,6 +263544,13 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps, topic, message) {
               dps
             }
           });
+          ark.miniapp.emitPluginEvent({
+            name: "TUNIDeviceControlManager.onDpDataChange",
+            data: {
+              deviceId: dev?.devId,
+              dps
+            }
+          });
         } else {
           ark.miniapp.emitPluginEvent({
             name: "TYUniDeviceControlManager.onDpDataChange",
@@ -263707,12 +263718,14 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps, topic, message) {
         ark.miniapp.emitPluginEvent({
           name: "TUNIDeviceControlManager.onMqttMessageReceived",
           data: {
-            deviceId: devId2,
-            type: result?.type,
-            topic,
-            message,
+            deviceId: result?.data?.devId || devOrGroupId,
+            message: {
+              ...result?.data
+            },
             protocol: result?.protocol,
-            messageData: {}
+            messageData: {
+              ...result?.data
+            }
           }
         });
       }
@@ -263967,6 +263980,18 @@ var MqttClientManager = class _MqttClientManager {
             viewLog(`[MQTT] @i18n(subscribeFailed) ${deviceInfo2.devId} ${err}`);
           }
         });
+        if (deviceInfo2.nodeId && deviceInfo2.parentId && deviceInfo2.parentId !== deviceInfo2.devId) {
+          if (MqttDevManager.deviceList.find(
+            (item) => item.devId === deviceInfo2.parentId
+          )) {
+            return;
+          }
+          getDeviceInfo({ deviceId: deviceInfo2.parentId }).then((gatewayInfo) => {
+            if (gatewayInfo.result) {
+              this.addDeviceListener(gatewayInfo.result);
+            }
+          });
+        }
       } catch (error) {
         console.log("=======\u6709\u5730\u65B9\u51FA\u4E86\u95EE\u9898", error);
       }
@@ -279401,6 +279426,7 @@ function downloadFromNpm(npmName, version) {
       headers: { "Content-Type": "application/json" }
     }).then((response) => {
       const { data, status } = response;
+      console.log("---------response", data, status);
       if (status === 200) {
         const { versions } = data;
         const lV = versions[version];
@@ -279418,7 +279444,7 @@ function downloadFromNpm(npmName, version) {
               const dist2 = import_path11.default.join(
                 __dirname,
                 "../../../ark.virtual-devices-extensions",
-                npmName.replace(/\//g, ":")
+                npmName
               );
               esm_default.request(tarball, {
                 streaming: true,
@@ -279426,6 +279452,7 @@ function downloadFromNpm(npmName, version) {
               }).then(
                 (result) => compressing2.tgz.uncompress(result.res, tempDir)
               ).then(() => {
+                console.log("---------uncompress success", `${tempDir}/package`, dist2, process.env);
                 setTimeout(async () => {
                   try {
                     fs10.removeSync(dist2);
@@ -279931,10 +279958,9 @@ async function publishDps2(params) {
         _atopDps = { ...pudp };
         console.log("--------pudp", pudp);
       }
-      for (let i2 = 0; i2 < s2.length; i2++) {
-        const item = s2[i2];
+      s2.map((item) => {
         const { id, code: code2, property, type: oType } = item;
-        const { type, range } = property || {};
+        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");
@@ -279943,40 +279969,30 @@ async function publishDps2(params) {
           delete _dps[id];
         }
         if (Object.keys(_dps).includes(`${id}`) && (type === "value" || oType === "value") && !isInteger(_dps[id])) {
-          viewLog("@i18n(number_publish_error)");
-          return {
-            errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_WITH_TYPE_ERROR.code,
-            errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_WITH_TYPE_ERROR.des,
-            data: null
-          };
-        }
-        if (Object.keys(_dps).includes(`${id}`) && type === "enum" && range.indexOf(_dps[id]) === -1) {
-          delete _dps[id];
-          viewLog("@i18n(enum_publish_error)");
-          return {
-            errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.code,
-            errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.des,
-            ext: {
-              errorCode: "3005",
-              errorMsg: "dp\u70B9\u6570\u636E\u7C7B\u578B\u9519\u8BEF"
-            }
-          };
+          showPublish && viewLog("@i18n(number_publish_error)");
         }
-        console.log("--------result publishDps", item, _dps);
-      }
+      });
     }
     console.log("--------result publishDpsWithMqtt", deviceId, _dps);
     let reason;
     let result = true;
-    if (Object.keys(_dps).length === 0) {
-      viewLog("@i18n(dps_is_empty)");
-      return {
-        errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.code,
-        errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.des,
-        data: null
-      };
+    const { parentId, nodeId } = dev;
+    const isSubDevice = parentId && nodeId;
+    if (isSubDevice) {
+      dev = cachedDevices2[parentId];
+      if (!dev) {
+        await getDeviceInfo2({ deviceId: parentId });
+        dev = cachedDevices2[parentId];
+      }
     }
-    const message = {
+    const message = isSubDevice ? {
+      t: `${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10),
+      protocol: 5,
+      data: {
+        cid: nodeId,
+        dps: _dps
+      }
+    } : {
       t: `${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10),
       protocol: 5,
       data: {
@@ -279985,47 +280001,57 @@ async function publishDps2(params) {
         gwId: deviceId
       }
     };
-    const topic = `smart/mb/out/${deviceId}`;
-    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: _atopDps }, (err) => {
-          reason = err;
-          console.log("--------error", err);
-        });
-        break;
-    }
-    if (data) {
-      initMqttClient_default._client.publish(
-        topic,
-        data,
-        {
-          qos: 1,
-          retain: true
-        },
-        (error, pocket) => {
-          console.log("------publish", error, pocket);
-        }
-      );
+    const topic = `smart/mb/out/${dev.devId}`;
+    const { pv = "2.2", localKey } = dev;
+    if (localKey) {
+      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: _atopDps },
+            (err) => {
+              reason = err;
+              console.log("--------error", err);
+            }
+          );
+          break;
+      }
+      if (data) {
+        initMqttClient_default._client.publish(
+          topic,
+          data,
+          {
+            qos: 1,
+            retain: true
+          },
+          (error, pocket) => {
+            console.log("------publish", error, pocket);
+          }
+        );
+      }
+    } else {
+      result = await publishDps({ deviceId, dps: _atopDps }, (err) => {
+        reason = err;
+        console.log("--------error", err);
+      });
     }
     let code = 0, msg = import_TYUniCode3.TYUniPluginError.SUCCESS.des;
     if (reason || !result) {
@@ -280115,17 +280141,33 @@ async function getProductInfo2(params) {
 async function queryDps2(params) {
   try {
     const { deviceId, dpIds } = params;
-    const dev = cachedDevices2[deviceId];
+    let dev = cachedDevices2[deviceId];
+    const { parentId, nodeId } = dev;
+    const isSubDevice = parentId && nodeId;
+    if (isSubDevice) {
+      dev = cachedDevices2[parentId];
+      if (!dev) {
+        await getDeviceInfo2({ deviceId: parentId });
+        dev = cachedDevices2[parentId];
+      }
+    }
     console.log("--------queryDps", dpIds);
-    const message = {
+    const message = isSubDevice ? {
+      protocol: 31,
+      t: Number(`${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10)),
+      data: {
+        cid: [nodeId],
+        dpId: dpIds.map(Number)
+      }
+    } : {
       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;
+    const topic = `smart/mb/out/${dev.devId}`;
+    let { pv = "2.2" } = dev;
     let data = null;
     switch (pv) {
       case "2.0":
@@ -280324,7 +280366,7 @@ async function getDeviceListByDevIds(params) {
   const list = await Promise.all(promises);
   const result = list.map((item) => {
     return item.data;
-  });
+  }).filter((item) => !!item);
   return {
     data: { deviceInfos: result },
     errorCode: 0,
@@ -280617,7 +280659,7 @@ async function removeDevice(params) {
       version: "3.0",
       params: {
         devId: deviceId,
-        resetFactory: "true"
+        resetFactory: "false"
       }
     });
     return {
@@ -280720,18 +280762,61 @@ async function unSubscribeDeviceRemoved(params) {
 }
 async function sendMqttMessage(params) {
   console.log("------------params", params);
-  try {
-    return {
-      data: null,
-      errorCode: 0,
-      errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
-    };
-  } catch (error) {
-    return {
-      data: false,
-      errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.code,
-      errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.des
-    };
+  const { protocol, message: data, deviceId } = params;
+  let dev = cachedDevices2[deviceId];
+  const { parentId, nodeId } = dev;
+  const message = {
+    t: `${(/* @__PURE__ */ new Date()).getTime()}`.substring(0, 10),
+    protocol,
+    data
+  };
+  const topic = `smart/mb/out/${dev.devId}`;
+  const { pv = "2.2", localKey } = dev;
+  if (localKey) {
+    let data2 = null;
+    console.log("--------pv", pv);
+    switch (pv) {
+      case "2.0":
+        data2 = crypto_default.Encrypt20(message, dev.localKey, dev.gwId || dev.devId);
+        console.log("---------data", data2);
+        break;
+      case "2.2":
+        if (dev.localKey) {
+          data2 = crypto_default.Encrypt22(message, dev.localKey);
+        }
+        break;
+      case "2.3":
+        data2 = crypto_default.Encrypt23(message, dev.localKey);
+        break;
+      default:
+        break;
+    }
+    if (data2) {
+      initMqttClient_default._client.publish(
+        topic,
+        data2,
+        {
+          qos: 1,
+          retain: true
+        },
+        (error, pocket) => {
+          console.log("------publish", error, pocket);
+        }
+      );
+    }
+    try {
+      return {
+        data: null,
+        errorCode: 0,
+        errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
+      };
+    } catch (error) {
+      return {
+        data: false,
+        errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.code,
+        errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.des
+      };
+    }
   }
 }
 async function syncDeviceInfo(params) {
@@ -280755,10 +280840,11 @@ async function syncDeviceInfo(params) {
 async function resetFactory(params) {
   const { deviceId } = params;
   const { result } = await apiRequestByAtop({
-    api: "tuya.device.factory.reset",
-    version: "1.0",
+    api: "tuya.m.device.reset",
+    version: "3.0",
     params: {
-      devId: deviceId
+      devId: deviceId,
+      resetFactory: "true"
     }
   });
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/ark-extension-virtual-device",
-  "version": "1.8.0",
+  "version": "1.8.1-beta-2",
   "license": "MIT",
   "files": [
     "manifest.json",