@tuya-miniapp/ark-extension-virtual-device 1.5.0 → 1.6.0-beta-1

package/dist/worker/index.js

@@ -213424,7 +213424,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "@tuya-miniapp/ark-extension-virtual-device",
-      version: "1.5.0-beta-8",
+      version: "1.5.0",
       license: "MIT",
       files: [
         "manifest.json",
@@ -254815,6 +254815,12 @@ var cachedDevices = {};
 function getCachedDevice() {
   return cachedDevices;
 }
+function shouldDispatchSubDeviceEvent(devId, should = void 0) {
+  if (typeof should !== "undefined") {
+    cachedDevices[`sub_${devId}_should`] = should;
+  }
+  return !!cachedDevices[`sub_${devId}_should`];
+}
 var isBase64 = (str) => {
   try {
     return btoa(atob(str)) == str;
@@ -254829,146 +254835,152 @@ function isInteger(num) {
   return /^-?\d+$/.test(num);
 }
 var getDeviceInfo = async (body) => {
-  const mode = await getDebugMode();
-  if (isInstanceMode2) {
-    let fileContent = await readFile("src/devices/schema.ts");
-    let schemaFile = fileContent.replace(" as const", "").split("export const defaultSchema = ")[1];
-    let parseJson = new Function(`return ${schemaFile}`);
-    const formatDps = (dpSchema) => {
-      let res = {};
-      dpSchema.forEach((item) => {
-        let type = item?.property?.type;
-        if (type === "bool") {
-          res[item.id] = true;
-        } else if (type === "string") {
-          res[item.id] = "";
-        } else if (type === "value") {
-          res[item.id] = item.property.min;
-        } else if (type === "enum") {
-          res[item.id] = item.property?.range[0] || "";
-        }
-      });
-      return res;
-    };
-    return new Promise((resolve) => {
-      resolve({
-        result: {
-          schema: JSON.stringify(parseJson()),
-          isOnline: true,
-          isActive: true,
-          uuid: "123",
-          iconUrl: "https://images.tuyacn.com/smart/icon/non-session-user/159049664009d883358de.png",
-          dps: formatDps(parseJson()),
-          name: "\u9762\u677F\u6A21\u677F"
-        },
-        t: 1676878538884,
-        success: true,
-        status: "ok"
-      });
-    });
-  } else if (mode === "group" && isNumeric(body.deviceId)) {
-    if (groupInfoList[body?.deviceId]) {
-      return groupInfoList[body?.deviceId];
-    }
-    const response = await apiRequestByAtop({
-      api: "tuya.m.device.group.get",
-      version: "2.0",
-      params: {
-        id: body?.deviceId
-      }
-    });
-    const { productId } = response?.result || {};
-    if (productId) {
-      const productResponse = await getProductInfo({ productIds: [productId] });
-      if (productResponse.result instanceof Array && productResponse.result.length > 0) {
-        const product = productResponse.result[0];
-        console.log("product>>", product);
-        groupInfoList[body?.deviceId] = {
-          result: {
-            ...response?.result,
-            panelConfig: product.panelConfig,
-            categoryCode: product.categoryCode,
-            meshCategory: product.meshCategory,
-            supportGroup: product.supportGroup,
-            schema: product.schemaInfo?.schema,
-            capability: product.capability,
-            supportSGroup: product.supportSGroup,
-            attribute: product.attribute,
-            category: product.category
+  try {
+    const mode = await getDebugMode();
+    if (isInstanceMode2) {
+      let fileContent = await readFile("src/devices/schema.ts");
+      let schemaFile = fileContent.replace(" as const", "").split("export const defaultSchema = ")[1];
+      let parseJson = new Function(`return ${schemaFile}`);
+      const formatDps = (dpSchema) => {
+        let res = {};
+        dpSchema.forEach((item) => {
+          let type = item?.property?.type;
+          if (type === "bool") {
+            res[item.id] = true;
+          } else if (type === "string") {
+            res[item.id] = "";
+          } else if (type === "value") {
+            res[item.id] = item.property.min;
+          } else if (type === "enum") {
+            res[item.id] = item.property?.range[0] || "";
           }
-        };
+        });
+        return res;
+      };
+      return new Promise((resolve) => {
+        resolve({
+          result: {
+            schema: JSON.stringify(parseJson()),
+            isOnline: true,
+            isActive: true,
+            uuid: "123",
+            iconUrl: "https://images.tuyacn.com/smart/icon/non-session-user/159049664009d883358de.png",
+            dps: formatDps(parseJson()),
+            name: "\u9762\u677F\u6A21\u677F"
+          },
+          t: 1676878538884,
+          success: true,
+          status: "ok"
+        });
+      });
+    } else if (mode === "group" && isNumeric(body.deviceId)) {
+      if (groupInfoList[body?.deviceId]) {
         return groupInfoList[body?.deviceId];
       }
-      return null;
-    }
-    return null;
-  } else {
-    const devInfo = await apiRequestByAtop({
-      api: "tuya.m.device.get",
-      version: "1.0",
-      params: {
-        devId: body?.deviceId
-      }
-    });
-    const devInfo32 = await apiRequestByAtop({
-      api: "tuya.m.device.get",
-      version: "4.1",
-      params: {
-        devId: body?.deviceId
+      const response = await apiRequestByAtop({
+        api: "tuya.m.device.group.get",
+        version: "2.0",
+        params: {
+          id: body?.deviceId
+        }
+      });
+      const { productId } = response?.result || {};
+      if (productId) {
+        const productResponse = await getProductInfo({
+          productIds: [productId]
+        });
+        if (productResponse.result instanceof Array && productResponse.result.length > 0) {
+          const product = productResponse.result[0];
+          console.log("product>>", product);
+          groupInfoList[body?.deviceId] = {
+            result: {
+              ...response?.result,
+              panelConfig: product.panelConfig,
+              categoryCode: product.categoryCode,
+              meshCategory: product.meshCategory,
+              supportGroup: product.supportGroup,
+              schema: product.schemaInfo?.schema,
+              capability: product.capability,
+              supportSGroup: product.supportSGroup,
+              attribute: product.attribute,
+              category: product.category
+            }
+          };
+          return groupInfoList[body?.deviceId];
+        }
+        return null;
       }
-    });
-    if (!devInfo.success && !devInfo.result) {
       return null;
-    }
-    devInfo.result.moduleMap = devInfo32.result?.moduleMap;
-    devInfo.result.baseAttribute = devInfo32.result?.baseAttribute;
-    devInfo.result.dataPointInfo = devInfo32.result?.dataPointInfo;
-    devInfo.result.meta = devInfo32.result?.meta;
-    if (Object.hasOwn(devInfo32.result, "cloudOnline")) {
-      devInfo.result.cloudOnline = devInfo32.result?.cloudOnline;
-    }
-    try {
-      const pInfo = await apiRequestByAtop({
-        api: "tuya.m.product.ext.prop.batch.get",
+    } else {
+      const devInfo = await apiRequestByAtop({
+        api: "tuya.m.device.get",
         version: "1.0",
         params: {
-          pids: [devInfo.result?.productId]
+          devId: body?.deviceId
         }
       });
-      const pro = pInfo?.result[0];
-      devInfo.result.bizAttribute = pro?.bizAttribute;
-    } catch (error) {
-      console.log("-----error tuya.m.product.ext.prop.batch.get", error);
-    }
-    try {
-      const bleInfo = await apiRequestByAtop({
-        api: "smartlife.m.device.ext.prop.batch.get",
-        version: "1.1",
-        params: { devIds: [body?.deviceId] }
-      });
-      const ble = bleInfo?.result[0];
-      devInfo.result.zigbeeInstallCode = ble?.zigbeeInstallCode;
-      devInfo.result.bluetoothCapability = ble?.bluetoothCapability;
-    } catch (error) {
-      console.log("-----error smartlife.m.device.ext.prop.batch.get", error);
-    }
-    try {
-      const { schema, dps } = devInfo.result;
-      const oDps = { ...dps };
-      JSON.parse(schema).map((item) => {
-        const { id, type } = item;
-        if (Object.keys(oDps).includes(`${id}`) && type === "raw") {
-          if (!isHexString(oDps[id])) {
-            const b2 = Buffer.from(oDps[id], "base64");
-            oDps[id] = b2.toString("hex");
-          }
+      const devInfo32 = await apiRequestByAtop({
+        api: "tuya.m.device.get",
+        version: "4.1",
+        params: {
+          devId: body?.deviceId
         }
       });
-      devInfo.result.dps = oDps;
-    } catch (error) {
-      console.log(error);
+      if (!devInfo.success && !devInfo.result) {
+        return null;
+      }
+      devInfo.result.moduleMap = devInfo32.result?.moduleMap;
+      devInfo.result.baseAttribute = devInfo32.result?.baseAttribute;
+      devInfo.result.dataPointInfo = devInfo32.result?.dataPointInfo;
+      devInfo.result.meta = devInfo32.result?.meta;
+      if (Object.hasOwn(devInfo32.result, "cloudOnline")) {
+        devInfo.result.cloudOnline = devInfo32.result?.cloudOnline;
+      }
+      try {
+        const pInfo = await apiRequestByAtop({
+          api: "tuya.m.product.ext.prop.batch.get",
+          version: "1.0",
+          params: {
+            pids: [devInfo.result?.productId]
+          }
+        });
+        const pro = pInfo?.result[0];
+        devInfo.result.bizAttribute = pro?.bizAttribute;
+      } catch (error) {
+        console.log("-----error tuya.m.product.ext.prop.batch.get", error);
+      }
+      try {
+        const bleInfo = await apiRequestByAtop({
+          api: "smartlife.m.device.ext.prop.batch.get",
+          version: "1.1",
+          params: { devIds: [body?.deviceId] }
+        });
+        const ble = bleInfo?.result[0];
+        devInfo.result.zigbeeInstallCode = ble?.zigbeeInstallCode;
+        devInfo.result.bluetoothCapability = ble?.bluetoothCapability;
+      } catch (error) {
+        console.log("-----error smartlife.m.device.ext.prop.batch.get", error);
+      }
+      try {
+        const { schema, dps } = devInfo.result;
+        const oDps = { ...dps };
+        JSON.parse(schema).map((item) => {
+          const { id, type } = item;
+          if (Object.keys(oDps).includes(`${id}`) && type === "raw") {
+            if (!isHexString(oDps[id])) {
+              const b2 = Buffer.from(oDps[id], "base64");
+              oDps[id] = b2.toString("hex");
+            }
+          }
+        });
+        devInfo.result.dps = oDps;
+      } catch (error) {
+        console.log(error);
+      }
+      return devInfo;
     }
-    return devInfo;
+  } catch (error) {
+    console.log("-------------88888", error);
   }
 };
 var getHomeDeviceList = async () => {
@@ -255329,6 +255341,7 @@ var MqttListener = (topic, message) => {
   }, 50);
 };
 async function dispatchMessageToTTT(result, devOrGroupId, dps) {
+  console.log("dispatchMessageToTTT>>", result);
   switch (result?.protocol) {
     case 1:
       if (typeof result.data?.online === "boolean") {
@@ -255366,20 +255379,35 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps) {
       break;
     case 4:
     case 5:
-      ark.miniapp.emitPluginEvent({
-        name: "TYUniDeviceControlManager.onDpDataChange",
-        data: {
-          deviceId: devOrGroupId,
-          dps
-        }
-      });
-      ark.miniapp.emitPluginEvent({
-        name: "TUNIDeviceControlManager.onDpDataChange",
-        data: {
-          deviceId: devOrGroupId,
-          dps
+      {
+        ark.miniapp.emitPluginEvent({
+          name: "TYUniDeviceControlManager.onDpDataChange",
+          data: {
+            deviceId: devOrGroupId,
+            dps
+          }
+        });
+        ark.miniapp.emitPluginEvent({
+          name: "TUNIDeviceControlManager.onDpDataChange",
+          data: {
+            deviceId: devOrGroupId,
+            dps
+          }
+        });
+        if (result.data?.cid) {
+          const { data: devList2 } = await getSubDeviceInfoList({
+            meshId: devOrGroupId
+          });
+          const dev = devList2.find((item) => item.deviceTopo?.nodeId === result.data?.cid);
+          ark.miniapp.emitPluginEvent({
+            name: "TUNIDeviceControlManager.onSubDeviceDpUpdate",
+            data: {
+              deviceId: dev?.devId,
+              dps
+            }
+          });
         }
-      });
+      }
       break;
     case 32:
       ark.miniapp.emitPluginEvent({
@@ -255400,24 +255428,44 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps) {
       });
       delete cachedDeviceList[devOrGroupId];
       break;
+    case 33:
+      {
+        console.log("---------\u5B50\u8BBE\u5907\u53D8\u52A8", result);
+        const {
+          type: type2,
+          s: s2,
+          t: t2,
+          data: { devId: opDevId }
+        } = result;
+        const pluginName = {
+          delete: "onSubDeviceRemoved",
+          add: "onSubDeviceAdded"
+        };
+        if (shouldDispatchSubDeviceEvent(devOrGroupId)) {
+          ark.miniapp.emitPluginEvent({
+            name: `TUNIDeviceControlManager.${pluginName[type2]}`,
+            data: {
+              deviceId: opDevId
+            }
+          });
+        }
+      }
+      break;
     case 34:
+      const { data: { devId }, type } = result;
       ark.miniapp.emitPluginEvent({
-        name: "TYUniDeviceControlManager.onDeviceInfoUpdated",
+        name: "TYUniDeviceControlManager.onSubDeviceInfoUpdate",
         data: {
-          ...result?.data,
-          deviceId: devOrGroupId,
-          dps: {}
+          deviceId: devId
         }
       });
       ark.miniapp.emitPluginEvent({
-        name: "TUNIDeviceControlManager.onDeviceInfoUpdated",
+        name: "TUNIDeviceControlManager.onSubDeviceInfoUpdate",
         data: {
-          ...result?.data,
-          deviceId: devOrGroupId,
-          dps: {}
+          deviceId: devId
         }
       });
-      removeCachedDevice(devOrGroupId);
+      removeCachedDevice(devId);
       break;
     case 47:
       ark.miniapp.emitPluginEvent({
@@ -255467,6 +255515,20 @@ async function dispatchMessageToTTT(result, devOrGroupId, dps) {
         console.log("-error", error);
       }
       break;
+    case 113:
+      {
+        const {
+          data: { devId: devId2 }
+        } = result;
+        ark.miniapp.emitPluginEvent({
+          name: "TUNIOTAManager.onOtaCompleted",
+          data: {
+            deviceId: devId2,
+            result: 0
+          }
+        });
+      }
+      break;
   }
 }
 function parseRawMessage(result, devInfo) {
@@ -255693,42 +255755,52 @@ var MqttClientManager = class _MqttClientManager {
     _MqttClientManager._client = null;
   }
   static async addDeviceListener(deviceInfo2) {
-    if (!deviceInfo2)
-      return;
-    if (!this._client) {
-      await initMqttClient();
-    }
     try {
-      const topic = `smart/mb/in/${deviceInfo2.devId}`;
-      if (MqttDevManager.deviceList.find((item) => item.devId === deviceInfo2.devId)) {
-        console.log("-------\u5DF2\u7ECF\u6CE8\u518C\u8FC7\u76D1\u542C\u4E86", topic);
+      if (!deviceInfo2)
         return;
-      } else {
-        MqttDevManager.deviceList.push(deviceInfo2);
+      if (!this._client) {
+        await initMqttClient();
       }
-      console.log("------device to subscribe", topic);
-      this._client.subscribe(topic, { qos: 2 }, (err, grant) => {
-        console.log("MQTT -->>>> error: ", err, "granted : ", grant);
-        if (!err) {
-          viewLog(`[MQTT] @i18n(subscribeSuccess) ${deviceInfo2.devId}`);
+      try {
+        const topic = `smart/mb/in/${deviceInfo2.devId}`;
+        if (MqttDevManager.deviceList.find(
+          (item) => item.devId === deviceInfo2.devId
+        )) {
+          console.log("-------\u5DF2\u7ECF\u6CE8\u518C\u8FC7\u76D1\u542C\u4E86", topic);
+          return;
         } else {
-          viewLog(`[MQTT] @i18n(subscribeFailed) ${deviceInfo2.devId} ${err}`);
+          MqttDevManager.deviceList.push(deviceInfo2);
         }
-      });
+        console.log("------device to subscribe", topic);
+        this._client.subscribe(topic, { qos: 2 }, (err, grant) => {
+          console.log("MQTT -->>>> error: ", err, "granted : ", grant);
+          if (!err) {
+            viewLog(`[MQTT] @i18n(subscribeSuccess) ${deviceInfo2.devId}`);
+          } else {
+            viewLog(`[MQTT] @i18n(subscribeFailed) ${deviceInfo2.devId} ${err}`);
+          }
+        });
+      } catch (error) {
+        console.log("=======\u6709\u5730\u65B9\u51FA\u4E86\u95EE\u9898", error);
+      }
     } catch (error) {
       console.log("=======\u6709\u5730\u65B9\u51FA\u4E86\u95EE\u9898", error);
     }
   }
   static removeDeviceListener(devId) {
-    const topic = `smart/mb/in/${devId}`;
-    const index = MqttDevManager.deviceList.findIndex(
-      (item) => item.devId === devId
-    );
-    console.log("-------------toRemove", devId);
-    if (index > -1) {
-      MqttDevManager.deviceList.splice(index, 1);
+    try {
+      const topic = `smart/mb/in/${devId}`;
+      const index = MqttDevManager.deviceList.findIndex(
+        (item) => item.devId === devId
+      );
+      console.log("-------------toRemove", devId);
+      if (index > -1) {
+        MqttDevManager.deviceList.splice(index, 1);
+      }
+      return this._client.unsubscribeAsync(topic);
+    } catch (error) {
+      console.log("-----------error", error);
     }
-    return this._client.unsubscribeAsync(topic);
   }
   static async addGroupListener(groupInfo2) {
     if (!groupInfo2)
@@ -255881,57 +255953,67 @@ function unRegisterGroupChange(params) {
 }
 async function getGroupInfo(params) {
   const { groupId } = params;
-  const response = await apiRequestByAtop({
-    api: "tuya.m.device.group.get",
-    version: "2.0",
-    params: {
-      id: groupId
-    }
-  });
-  groupInfo = response?.result;
-  const result = { ...groupInfo };
-  if (!!groupInfo) {
-    const { productId } = groupInfo;
-    result.groupId = String(result.id);
-    result.pv = Number(result.pv);
-    try {
-      const productInfo = await getProductInfo({
-        productIds: [productId],
-        version: "1.0"
-      });
-      const { schemaInfo } = productInfo?.result[0];
-      const schemaString = schemaInfo?.schema;
-      result.schema = JSON.parse(schemaString);
-      result.productInfo = productInfo?.result[0] || {};
-      result.productInfo.productVer = result["productVer"];
-      delete result.productInfo["panelConfig"];
-      delete result.productInfo["i18nTime"];
-      groupInfo = {
-        ...groupInfo,
-        ...result
-      };
-    } catch (error) {
-      console.log(error);
-    }
-    const { data } = await getGroupDeviceList({ groupId });
-    if (data) {
-      const { deviceList = [] } = data;
-      result.deviceList = deviceList;
-    }
+  try {
+    const response = await apiRequestByAtop({
+      api: "tuya.m.device.group.get",
+      version: "2.0",
+      params: {
+        id: groupId
+      }
+    });
+    groupInfo = response?.result;
+    const result = { ...groupInfo };
+    if (!!groupInfo) {
+      const { productId } = groupInfo;
+      result.groupId = String(result.id);
+      result.pv = Number(result.pv);
+      try {
+        const productInfo = await getProductInfo({
+          productIds: [productId],
+          version: "1.0"
+        });
+        const { schemaInfo } = productInfo?.result[0];
+        const schemaString = schemaInfo?.schema;
+        result.schema = JSON.parse(schemaString);
+        result.productInfo = productInfo?.result[0] || {};
+        result.productInfo.productVer = result["productVer"];
+        delete result.productInfo["panelConfig"];
+        delete result.productInfo["i18nTime"];
+        groupInfo = {
+          ...groupInfo,
+          ...result
+        };
+      } catch (error) {
+        console.log(error);
+      }
+      const { data } = await getGroupDeviceList({ groupId });
+      if (data) {
+        const { deviceList = [] } = data;
+        result.deviceList = deviceList;
+      }
+    }
+    delete result["devId"];
+    delete result["category"];
+    delete result["homeDisplayOrder"];
+    delete result["id"];
+    delete result["productVer"];
+    delete result["standard"];
+    delete result["uid"];
+    cachedGroups[groupId] = { ...result };
+    console.log("--------\u83B7\u53D6 Group \u5931\u8D25", result);
+    return {
+      errorCode: 0,
+      errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des,
+      data: Object.keys(result).length > 0 ? result : null
+    };
+  } catch (error) {
+    console.log("--------\u83B7\u53D6\u4FE1\u606F\u5931\u8D25", error);
+    return {
+      errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_MODEL_NULL.code,
+      errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_MODEL_NULL.des,
+      data: void 0
+    };
   }
-  delete result["devId"];
-  delete result["category"];
-  delete result["homeDisplayOrder"];
-  delete result["id"];
-  delete result["productVer"];
-  delete result["standard"];
-  delete result["uid"];
-  cachedGroups[groupId] = { ...result };
-  return {
-    errorCode: 0,
-    errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des,
-    data: result
-  };
 }
 async function publishGroupDps2(params) {
   const { groupId, dps, dpCodes } = params;
@@ -256301,6 +256383,7 @@ __export(services_exports, {
   setDeviceId: () => setDeviceId,
   setGroupId: () => setGroupId,
   setProductId: () => setProductId,
+  shouldDispatchSubDeviceEvent: () => shouldDispatchSubDeviceEvent,
   switchHome: () => switchHome,
   switchPluginVersion: () => switchPluginVersion,
   uninstallExtension: () => uninstallExtension,
@@ -271369,6 +271452,7 @@ async function publishDps2(params) {
       data: null
     };
   } catch (e2) {
+    console.log("--------ad", e2);
     return {
       errorCode: import_TYUniCode2.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.code,
       errorMsg: import_TYUniCode2.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.des,
@@ -271422,6 +271506,7 @@ async function getProductInfo2(params) {
       errorMsg: !!productInfo ? import_TYUniCode2.TYUniPluginError.SUCCESS.des : import_TYUniCode2.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
     };
   } catch (e2) {
+    console.log("--------getProductInfo", e2);
     return {
       data: null,
       devices: [],
@@ -271499,6 +271584,24 @@ function registerMQTTProtocolListener(params) {
     errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
   };
 }
+function registerGateWaySubDeviceListener(params) {
+  const { deviceId } = params;
+  shouldDispatchSubDeviceEvent(deviceId, true);
+  return {
+    data: null,
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+function unregisterGateWaySubDeviceListener(params) {
+  const { deviceId } = params;
+  shouldDispatchSubDeviceEvent(deviceId, false);
+  return {
+    data: null,
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
 function unregisterDeviceListListener(params) {
   devList.map((devId) => {
     initMqttClient_default.removeDeviceListener(devId);
@@ -271701,11 +271804,61 @@ function offDpDataChange() {
     errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
   };
 }
+async function getSubDeviceInfoList(params) {
+  const { meshId: deviceId } = params;
+  try {
+    const { result: list } = await apiRequestByAtop({
+      api: "tuya.m.device.sub.list",
+      version: "2.1",
+      params: {
+        meshId: deviceId
+      }
+    });
+    const promise = list.map((item) => {
+      return getDeviceInfo2({ deviceId: item.devId });
+    });
+    const all3 = await Promise.all(promise);
+    return {
+      data: all3.map((item) => {
+        const detail = list.find((i2) => i2.devId === item.data.devId);
+        return { ...detail, nodeId: detail.mac, ...item.data };
+      }),
+      errorCode: 0,
+      errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: [],
+      errorCode: import_TYUniCode2.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.code,
+      errorMsg: import_TYUniCode2.TYUniPluginError.DEVICEKIT_GW_ID_INVALID.des
+    };
+  }
+}
 ark.miniapp.addPluginMethod(
   "TUNIDeviceControlManager",
   "getDeviceInfo",
   getDeviceInfo2
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "getSubDeviceInfoList",
+  getSubDeviceInfoList
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "registerGateWaySubDeviceListener",
+  registerGateWaySubDeviceListener
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "registerZigbeeGateWaySubDeviceListener",
+  registerGateWaySubDeviceListener
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "unregisterGateWaySubDeviceListener",
+  unregisterGateWaySubDeviceListener
+);
 ark.miniapp.addPluginMethod(
   "TUNIDeviceDetailManager",
   "getShareDeviceInfo",
@@ -272041,8 +272194,38 @@ ark.miniapp.addPluginMethod("TYUniBluetoothManager", "bluetoothIsPowerOn", bluet
 // worker/api/TYUniOTAManager.ts
 var import_TYUniCode5 = __toESM(require_dist());
 async function checkOTAUpgradeStatus(params) {
+  const { deviceId } = params;
+  if (!deviceId) {
+    return {
+      errorCode: import_TYUniCode5.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode5.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  try {
+    const data = await apiRequestByAtop({
+      api: "m.thing.firmware.upgrade.info.get",
+      version: "1.0",
+      params: {
+        devId: deviceId
+      }
+    });
+    const update = data.result?.find((item) => {
+      const { upgradeStatus } = item;
+      return upgradeStatus !== 0;
+    });
+    return {
+      data: { status: update?.upgradeStatus || 0 },
+      errorCode: 0,
+      errorMsg: import_TYUniCode5.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    console.log("---------error", error);
+  }
+}
+async function registerOTACompleted() {
   return {
-    data: { status: 0 },
+    data: void 0,
     errorCode: 0,
     errorMsg: import_TYUniCode5.TYUniPluginError.SUCCESS.des
   };
@@ -272057,6 +272240,16 @@ ark.miniapp.addPluginMethod(
   "checkOTAUpgradeStatus",
   checkOTAUpgradeStatus
 );
+ark.miniapp.addPluginMethod(
+  "TUNIOTAManager",
+  "otaStatus",
+  checkOTAUpgradeStatus
+);
+ark.miniapp.addPluginMethod(
+  "TUNIOTAManager",
+  "registerOTACompleted",
+  registerOTACompleted
+);
 
 // worker/api/TYUniBluetoothManager.ts
 var import_TYUniCode6 = __toESM(require_dist());
@@ -272638,11 +272831,97 @@ async function syncTimerTask(params) {
     errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
   };
 }
+async function checkOTAUpdateInfo(params) {
+  const { deviceId } = params;
+  if (!deviceId) {
+    return {
+      errorCode: import_TYUniCode10.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode10.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  try {
+    const data = await apiRequestByAtop({
+      api: "m.thing.firmware.upgrade.info.get",
+      version: "1.0",
+      params: {
+        devId: deviceId
+      }
+    });
+    return {
+      data: data.result,
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: null,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
+async function getDeviceOfflineReminderState(params) {
+  const { deviceId } = params;
+  if (!deviceId) {
+    return {
+      errorCode: import_TYUniCode10.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode10.TYUniPluginError.DEVICEKIT_DEVICE_ID_AND_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  try {
+    const data = await apiRequestByAtop({
+      api: "tuya.m.linkage.dynamic.configuration",
+      version: "1.0",
+      params: {
+        entityType: 1,
+        entityId: deviceId
+      }
+    });
+    return {
+      data: { state: data.result?.offlineReminder || 0 },
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: null,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
+async function getDeviceOfflineReminderWarningText() {
+  try {
+    const data = await apiRequestByAtop({
+      api: "tuya.m.client.conf.get",
+      version: "1.0",
+      params: {}
+    });
+    return {
+      data: { warningText: data.result?.offlineSwitchRemind },
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: null,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
 ark.miniapp.addPluginMethod(
   "TUNIDeviceDetailManager",
   "syncTimerTask",
   syncTimerTask
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "checkOTAUpdateInfo",
+  checkOTAUpdateInfo
+);
 ark.miniapp.addPluginMethod("TUNIDeviceDetailManager", "addTimer", addTimer);
 ark.miniapp.addPluginMethod(
   "TUNIDeviceDetailManager",
@@ -272659,6 +272938,16 @@ ark.miniapp.addPluginMethod(
   "removeTimer",
   removeTimer
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "getDeviceOfflineReminderState",
+  getDeviceOfflineReminderState
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "getDeviceOfflineReminderWarningText",
+  getDeviceOfflineReminderWarningText
+);
 
 // worker/api/Bridge.ts
 var import_TYUniCode11 = __toESM(require_dist());
@@ -272884,100 +273173,108 @@ function saveDebugExtension({ service, params: { path: path6 }, eventId }) {
 var isInstanceMode7 = process.env.PROJECT_MODE === "instant";
 initPlugin();
 ark.runtime.onMessage(async (event) => {
-  const message = event.message;
-  console.log("\u540E\u7AEF\u6536\u5230\u6D88\u606F", message);
-  if (isJSON(message)) {
-    const data = JSON.parse(message);
-    if (data["__bridge__"]) {
-      const { event: event2, payload } = data["__bridge__"];
-      bridgeWall.send(event2, payload);
-      console.log("[bridgeWall.send]", data["__bridge__"]);
-    }
-    const service = data.service;
-    const params = data.params;
-    console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u662F\u5426\u5B9E\u73B0:`, service in services_default);
-    if (service in services_default) {
-      try {
-        const res = await services_default[service](params);
-        ark.runtime.sendMessage(
-          JSON.stringify({
-            ...data,
-            result: res
-          })
-        );
-      } catch (error) {
-        console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u6267\u884C\u5931\u8D25`, error);
-        ark.runtime.sendMessage(
-          JSON.stringify({
-            ...data,
-            result: null
-          })
-        );
-      }
-    } else {
-      if (service === "initLaunchParams") {
-        const { deviceId, productId, groupId, __debugMode } = params;
-        if (!!productId) {
-          await setProductId(productId);
-        } else {
-          await setProductId("");
-        }
-        if (!!deviceId) {
-          await setDeviceId(deviceId);
-        } else {
-          await setDeviceId("");
+  try {
+    const message = event.message;
+    console.log("\u540E\u7AEF\u6536\u5230\u6D88\u606F", message);
+    if (isJSON(message)) {
+      const data = JSON.parse(message);
+      if (data["__bridge__"]) {
+        const { event: event2, payload } = data["__bridge__"];
+        bridgeWall.send(event2, payload);
+        console.log("[bridgeWall.send]", data["__bridge__"]);
+      }
+      const service = data.service;
+      const params = data.params;
+      console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u662F\u5426\u5B9E\u73B0:`, service in services_default);
+      if (service in services_default) {
+        try {
+          const res = await services_default[service](params);
+          ark.runtime.sendMessage(
+            JSON.stringify({
+              ...data,
+              result: res
+            })
+          );
+        } catch (error) {
+          console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u6267\u884C\u5931\u8D25`, error);
+          ark.runtime.sendMessage(
+            JSON.stringify({
+              ...data,
+              result: null
+            })
+          );
         }
-        if (!!groupId) {
-          await setGroupId(groupId);
-        } else {
-          await setGroupId("");
+      } else {
+        if (service === "initLaunchParams") {
+          const { deviceId, productId, groupId, __debugMode } = params;
+          if (!!productId) {
+            await setProductId(productId);
+          } else {
+            await setProductId("");
+          }
+          if (!!deviceId) {
+            await setDeviceId(deviceId);
+          } else {
+            await setDeviceId("");
+          }
+          if (!!groupId) {
+            await setGroupId(groupId);
+          } else {
+            await setGroupId("");
+          }
+          initMqttClient_default.removeAllSubscribe();
+          await setDebugMode({ mode: __debugMode });
+          initLaunchParams();
+          ark.runtime.sendMessage(JSON.stringify({ ...data }));
+        } else if (service === "startMQTT") {
+          initMqttClient_default.reconnectAll();
+        } else if (service === "set_debug_extension_path") {
+          saveDebugExtension(data);
         }
-        initMqttClient_default.removeAllSubscribe();
-        await setDebugMode({ mode: __debugMode });
-        initLaunchParams();
-        ark.runtime.sendMessage(JSON.stringify({ ...data }));
-      } else if (service === "startMQTT") {
-        initMqttClient_default.reconnectAll();
-      } else if (service === "set_debug_extension_path") {
-        saveDebugExtension(data);
       }
     }
+  } catch (error) {
+    console.log("---------------error", error);
   }
 });
 async function initLaunchParams() {
-  onUpdateListener && onUpdateListener();
-  const status = await ark.auth.checkStatus();
-  console.log("authorized:", status);
-  if (status !== "authorized")
-    return;
-  console.log("to get device or group id");
-  let deviceId = await services_default.getDeviceId();
-  console.log(" got device id", deviceId);
-  const groupId = await services_default.getGroupId();
-  console.log(" got group id", groupId);
-  const mode = await services_default.getDebugMode();
-  console.log(" got dev mode", mode);
-  let deviceInfo2 = null, groupInfo2 = null;
-  if (groupId && mode === "group") {
-    const gd = await getGroupInfo({ groupId });
-    groupInfo2 = gd?.data;
-    deviceId = groupId;
-  }
-  if (deviceId && deviceId !== groupId) {
-    await getLangContent({});
-    await getDeviceInfo2({ deviceId });
-    deviceInfo2 = getCachedDevice()[deviceId];
-  }
-  console.log("to startMQTT", deviceId, groupId);
-  await initMqttClient();
-  if (mode === "group") {
-    initMqttClient_default.addGroupListener(groupInfo2);
-  } else {
-    console.log("------------------- \u53BB\u76D1\u542C");
-    initMqttClient_default.addDeviceListener(deviceInfo2);
+  try {
+    onUpdateListener && onUpdateListener();
+    const status = await ark.auth.checkStatus();
+    console.log("authorized:", status);
+    if (status !== "authorized")
+      return;
+    console.log("to get device or group id");
+    let deviceId = await services_default.getDeviceId();
+    console.log(" got device id", deviceId);
+    const groupId = await services_default.getGroupId();
+    console.log(" got group id", groupId);
+    const mode = await services_default.getDebugMode();
+    console.log(" got dev mode", mode);
+    let deviceInfo2 = null, groupInfo2 = null;
+    if (groupId && mode === "group") {
+      const gd = await getGroupInfo({ groupId });
+      groupInfo2 = gd?.data;
+      deviceId = groupId;
+    }
+    if (deviceId && deviceId !== groupId) {
+      await getLangContent({});
+      await getDeviceInfo2({ deviceId });
+      deviceInfo2 = getCachedDevice()[deviceId];
+    }
+    console.log("to startMQTT", deviceId, groupId);
+    await initMqttClient();
+    if (mode === "group") {
+      initMqttClient_default.addGroupListener(groupInfo2);
+    } else {
+      console.log("------------------- \u53BB\u76D1\u542C");
+      initMqttClient_default.addDeviceListener(deviceInfo2);
+    }
+    ark.utils.reload();
+    initUpdateMessage();
+  } catch (error) {
+    console.log("---------update", error);
   }
-  ark.utils.reload();
-  initUpdateMessage();
 }
 isInstanceMode7 && ark.project.setCompilationParams({ params: `deviceId=123` });
 ark.auth.onAuthed(async (env) => {

package/package.json

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