@tuya-miniapp/ark-extension-virtual-device 1.5.0-beta-2 → 1.5.0-beta-3

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-1",
+      version: "1.5.0-beta-2",
       license: "MIT",
       files: [
         "manifest.json",
@@ -253337,19 +253337,23 @@ var viewLog = (message) => {
 
 // worker/utils/home.ts
 var getHomeId = async () => {
-  let savedHomeId = await ark.storage.get("current_home_id");
-  const u2 = await ark.auth.getCustomerUserInfo();
-  if (!u2) {
-    console.log("\u7528\u6237\u4FE1\u606F\u83B7\u53D6\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u6388\u6743", u2);
-    viewLog(`[MQTT] @i18n(connectNoAccess)`);
+  try {
+    let savedHomeId = await ark.storage.get("current_home_id");
+    const u2 = await ark.auth.getCustomerUserInfo();
+    if (!u2) {
+      console.log("\u7528\u6237\u4FE1\u606F\u83B7\u53D6\u5931\u8D25\uFF0C\u8BF7\u91CD\u65B0\u6388\u6743", u2);
+      viewLog(`[MQTT] @i18n(connectNoAccess)`);
+      return null;
+    }
+    const userInfo = typeof u2 === "string" ? JSON.parse(u2) : u2;
+    const {
+      extras: { homeId }
+    } = userInfo;
+    return savedHomeId || homeId;
+  } catch (error) {
+    console.log("-------aaaaaa", error);
     return null;
   }
-  const userInfo = typeof u2 === "string" ? JSON.parse(u2) : u2;
-  const {
-    extras: { homeId }
-  } = userInfo;
-  console.log("-------getHomeId", homeId, savedHomeId);
-  return savedHomeId || homeId;
 };
 var setHomeId = async (homeId) => {
   console.log("-------setHomeId", homeId);
@@ -253363,6 +253367,10 @@ var allDeviceIds = [];
 var allGroupIds = [];
 var getAllDeviceIds = () => allDeviceIds;
 var getAllGroupIds = () => allGroupIds;
+var cachedDevices = {};
+function getCachedDevice() {
+  return cachedDevices;
+}
 var isBase64 = (str) => {
   try {
     return btoa(atob(str)) == str;
@@ -254357,6 +254365,9 @@ var initMqttClient_default = MqttClientManager;
 // worker/api/TYUniGroupControlManager.ts
 var groupInfo = null;
 var cachedGroups = {};
+function getCachedGroup(groupId) {
+  return cachedGroups[groupId];
+}
 var groupIds = [];
 var count = 0;
 function registerGroupChange(params) {
@@ -254417,7 +254428,6 @@ function unRegisterGroupChange(params) {
 }
 async function getGroupInfo(params) {
   const { groupId } = params;
-  const homeId = await getHomeId();
   const response = await apiRequestByAtop({
     api: "tuya.m.device.group.get",
     version: "2.0",
@@ -254450,36 +254460,10 @@ async function getGroupInfo(params) {
     } catch (error) {
       console.log(error);
     }
-    const devList2 = await apiRequestByAtop({
-      api: "s.m.dev.group.add.dev.list",
-      version: "1.0",
-      params: {
-        groupId,
-        productId: result.productId
-      },
-      meta: {
-        gid: homeId
-      }
-    });
-    const list = devList2?.result?.filter((item) => item.checked);
-    if (list && list.length > 0) {
-      try {
-        const homeAllDeviceResponse = await apiRequestByAtop({
-          api: "tuya.m.my.group.device.list",
-          version: "2.1",
-          params: {},
-          meta: {
-            gid: homeId
-          }
-        });
-        const devIds = list.map((item) => item.devId);
-        const l2 = homeAllDeviceResponse?.result?.filter(
-          (item) => devIds.indexOf(item.devId) > -1
-        );
-        result.deviceList = l2;
-      } catch (error) {
-        console.log(error);
-      }
+    const { data } = await getGroupDeviceList({ groupId });
+    if (data) {
+      const { deviceList = [] } = data;
+      result.deviceList = deviceList;
     }
   }
   delete result["devId"];
@@ -254496,28 +254480,59 @@ async function getGroupInfo(params) {
     data: result
   };
 }
-async function PublishGroupDps(params) {
-  const { groupId, dps } = params;
+async function publishGroupDps2(params) {
+  const { groupId, dps, dpCodes } = params;
   try {
-    if (cachedGroups[groupId]) {
-      const { schema } = cachedGroups[groupId];
-      const idCodes = {};
-      schema.map((item) => {
-        idCodes[item.id] = item.code;
+    if (!cachedGroups[groupId]) {
+      await getGroupInfo({ groupId });
+    }
+    if (!cachedGroups[groupId]) {
+      return {
+        errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_MODEL_NULL.code,
+        errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_MODEL_NULL.des,
+        data: null
+      };
+    }
+    const { schema, ownerId } = cachedGroups[groupId];
+    let pubDps = dps || {};
+    const idCodes = {};
+    const codeIds = {};
+    schema.map((item) => {
+      idCodes[item.id] = item.code;
+      codeIds[item.code] = item.id;
+    });
+    const publish = dpCodes ? dpCodes : {};
+    if (dpCodes) {
+      Object.keys(dpCodes).map((key) => {
+        const dpId = codeIds[key];
+        pubDps[dpId] = dpCodes[key];
       });
-      const publish = {};
+    } else {
       Object.keys(dps).map((key) => {
         const code2 = idCodes[key];
         publish[code2] = dps[key];
       });
-      ark.runtime.sendMessage(
-        JSON.stringify({ type: "publishDps", value: publish, protocol: 5 })
+    }
+    ark.runtime.sendMessage(
+      JSON.stringify({ type: "publishDps", value: publish, protocol: 5 })
+    );
+    let reason, result;
+    try {
+      result = await publishGroupDps(
+        { groupId, dps: pubDps, schema, ownerId },
+        (err) => {
+          reason = err;
+        }
       );
+    } catch (error) {
+      console.log("-------try", error);
     }
-    let reason;
-    const result = await publishGroupDps({ groupId, dps }, (err) => {
-      reason = err;
-    });
+    console.log(
+      "---------publish result ",
+      { groupId, dps: pubDps },
+      result,
+      reason
+    );
     let code = 0, msg = import_TYUniCode.TYUniPluginError.SUCCESS.des;
     if (reason || !result) {
       switch (reason) {
@@ -254547,6 +254562,170 @@ async function PublishGroupDps(params) {
     };
   }
 }
+async function publishGroupDpCodes(params) {
+  const { groupId } = params;
+  console.log(
+    "---------------TUNIGroupControlManager.publishGroupDpCodes",
+    params
+  );
+  if (!groupId) {
+    return {
+      errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.code,
+      errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_PUBLISH_DPS_ERROR.des,
+      data: null
+    };
+  }
+  if (!cachedGroups[groupId]) {
+    await getGroupInfo({ groupId });
+  }
+  return publishGroupDps2(params);
+}
+async function getGroupProperty(params) {
+  const { groupId, dps } = params;
+  const result = await apiRequestByAtop({
+    api: "s.m.dev.property.get",
+    version: "2.0",
+    params: {
+      devId: groupId,
+      bizType: "1"
+    }
+  });
+  return {
+    data: {
+      result: result.result
+    },
+    errorCode: 0,
+    errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des
+  };
+}
+async function setGroupProperty(params) {
+  const { groupId, code, value } = params;
+  const result = await apiRequestByAtop({
+    api: "s.m.dev.property.save",
+    version: "2.0",
+    params: {
+      devId: groupId,
+      bizType: "1",
+      code,
+      value
+    }
+  });
+  return {
+    data: result.result,
+    errorCode: 0,
+    errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des
+  };
+}
+async function getGroupDeviceList(params) {
+  const { groupId } = params;
+  if (!groupId) {
+    return {
+      errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  const homeId = await getHomeId();
+  let deviceList = [];
+  const devList2 = await apiRequestByAtop({
+    api: "s.m.dev.group.add.dev.list",
+    version: "4.0",
+    params: {
+      groupId
+    },
+    meta: {
+      gid: homeId
+    }
+  });
+  const list = devList2?.result?.filter((item) => item.checked);
+  if (list && list.length > 0) {
+    try {
+      const homeAllDeviceResponse = await apiRequestByAtop({
+        api: "tuya.m.my.group.device.list",
+        version: "2.1",
+        params: {},
+        meta: {
+          gid: homeId
+        }
+      });
+      const devIds = list.map((item) => item.devId);
+      const l2 = homeAllDeviceResponse?.result?.filter(
+        (item) => devIds.indexOf(item.devId) > -1
+      );
+      deviceList = l2;
+      return {
+        data: {
+          deviceList,
+          groupId
+        },
+        errorCode: 0,
+        errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des
+      };
+    } catch (error) {
+      console.log(error);
+      return {
+        data: null,
+        errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.code,
+        errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.des
+      };
+    }
+  }
+}
+async function getGroupDeviceNum(params) {
+  const { groupId } = params;
+  if (!groupId) {
+    return {
+      errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  await getGroupInfo({ groupId });
+  const group = cachedGroups[groupId];
+  return {
+    data: { devieNum: group.deviceNum },
+    errorCode: 0,
+    errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des
+  };
+}
+async function getDeviceNumWithDpCode(params) {
+  const { groupId, dpCode } = params;
+  console.log("--------getDeviceNumWithDpCode", groupId, dpCode);
+  if (!groupId) {
+    return {
+      errorCode: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.code,
+      errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_GROUP_ID_INVALID.des,
+      data: null
+    };
+  }
+  const homeId = await getHomeId();
+  const devList2 = await apiRequestByAtop({
+    api: "s.m.dev.group.add.dev.list",
+    version: "4.0",
+    params: {
+      groupId
+    },
+    meta: {
+      gid: homeId
+    }
+  });
+  const deviceList = devList2?.result?.filter((item) => item.checked);
+  const promises = deviceList.map((item) => {
+    return getDeviceInfo2({ deviceId: item.devId });
+  });
+  const l2 = await Promise.all(promises);
+  console.log("--------getDeviceNumWithDpCode", l2);
+  const result = deviceList.filter((item) => {
+    const { schema } = item;
+    return schema.find((s2) => s2.code === dpCode);
+  });
+  console.log("--------999999", result);
+  return {
+    data: { devieNum: result.length },
+    errorCode: 0,
+    errorMsg: import_TYUniCode.TYUniPluginError.SUCCESS.des
+  };
+}
 ark.miniapp.addPluginMethod(
   "TUNIGroupControlManager",
   "registerGroupChange",
@@ -254555,7 +254734,12 @@ ark.miniapp.addPluginMethod(
 ark.miniapp.addPluginMethod(
   "TUNIGroupControlManager",
   "publishGroupDps",
-  PublishGroupDps
+  publishGroupDps2
+);
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "publishGroupDpCodes",
+  publishGroupDpCodes
 );
 ark.miniapp.addPluginMethod(
   "TUNIGroupControlManager",
@@ -254582,6 +254766,31 @@ ark.miniapp.addPluginMethod(
   "getGroupInfo",
   getGroupInfo
 );
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "getGroupProperty",
+  getGroupProperty
+);
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "setGroupProperty",
+  setGroupProperty
+);
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "getGroupDeviceList",
+  getGroupDeviceList
+);
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "getGroupDeviceNum",
+  getGroupDeviceNum
+);
+ark.miniapp.addPluginMethod(
+  "TUNIGroupControlManager",
+  "getDeviceNumWithDpCode",
+  getDeviceNumWithDpCode
+);
 
 // worker/api/services/index.ts
 var services_exports = {};
@@ -254602,6 +254811,7 @@ __export(services_exports, {
   getAllDeviceIds: () => getAllDeviceIds,
   getAllGroupIds: () => getAllGroupIds,
   getAppId: () => getAppId,
+  getCachedDevice: () => getCachedDevice,
   getDebugMode: () => getDebugMode,
   getDeviceId: () => getDeviceId,
   getDeviceInfo: () => getDeviceInfo,
@@ -256093,6 +256303,12 @@ var isEqual2 = (a2, b2) => {
     return false;
   return keys.every((k2) => isEqual2(a2[k2], b2[k2]));
 };
+function isNumeric(str) {
+  if (typeof str != "string")
+    return false;
+  return !isNaN(str) && // use type coercion to parse the _entirety_ of the string (`parseFloat` alone does not do this)...
+  !isNaN(parseFloat(str));
+}
 
 // worker/api/services/parseI18nCheckResult.ts
 var import_lodash4 = __toESM(require_lodash());
@@ -269411,10 +269627,15 @@ var publishDps = async ({ deviceId, dps }, cb) => {
   }
   let error = false;
   if (devId) {
-    const devInfo = await getDeviceInfo({ deviceId: devId });
-    const { schema } = devInfo?.result || {};
+    let devInfo = getCachedDevice()[devId];
+    if (!devInfo) {
+      devInfo = await getDeviceInfo({ deviceId: devId });
+      devInfo = devInfo?.result;
+    }
+    const { schema } = devInfo || {};
     if (schema) {
-      JSON.parse(schema).map((item) => {
+      const s2 = typeof schema === "string" ? JSON.parse(schema) : schema;
+      s2.map((item) => {
         const { id, code, property, type: oType } = item;
         const { type } = property || {};
         if (Object.keys(dps).includes(`${id}`) && (type === "raw" || oType === "raw") && isHexString(dps[id])) {
@@ -269430,6 +269651,7 @@ var publishDps = async ({ deviceId, dps }, cb) => {
         }
       });
     }
+    console.log("00000000000000", dps);
     if (Object.keys(dps).length === 0 || error) {
       cb && cb(error ? "number_publish_error" : "dps_is_empty");
       return false;
@@ -269477,15 +269699,19 @@ var publishGroupDps = async (params, cb) => {
     });
     return;
   }
-  let groupId = await getGroupId();
-  if (!groupId)
-    groupId = gid;
+  let groupId = gid;
+  if (!groupId) {
+    groupId = await getGroupId();
+  }
   let error = false;
   if (groupId) {
-    const devInfo = await getGroupInfo({ groupId });
-    const { schema } = devInfo?.result || {};
+    if (!getCachedGroup(groupId)) {
+      await getGroupInfo({ groupId });
+    }
+    const groupInfo2 = getCachedGroup(groupId);
+    const { schema } = groupInfo2 || {};
     if (schema) {
-      JSON.parse(schema).map((item) => {
+      schema.map((item) => {
         const { id, code, property, type: oType } = item;
         const { type } = property || {};
         if (Object.keys(dps).includes(`${id}`) && (type === "raw" || oType === "raw") && isHexString(dps[id])) {
@@ -269515,10 +269741,10 @@ var publishGroupDps = async (params, cb) => {
       },
       meta: {
         bizType: "ide",
-        gid: devInfo.data?.ownerId
+        gid: groupInfo2.ownerId
       }
     });
-    console.log("publish", groupId, devInfo.data?.ownerId, dps, result);
+    console.log("publish", groupId, groupInfo2.ownerId, dps, result);
     if (result.result) {
       cb && cb(null);
       return true;
@@ -269536,13 +269762,10 @@ var publishGroupDps = async (params, cb) => {
 var import_lodash5 = __toESM(require_lodash());
 var deviceInfo = null;
 var cachedDeviceList = null;
-var cachedDevices = {};
-function getCachedDevice() {
-  return cachedDevices;
-}
+var cachedDevices2 = getCachedDevice();
 function updateCachedDevice(devId, dps) {
-  if (cachedDevices[devId]) {
-    const { schema } = cachedDevices[devId];
+  if (cachedDevices2[devId]) {
+    const { schema } = cachedDevices2[devId];
     const dpCodes = {};
     Object.keys(dps).map((dpId) => {
       const sch = schema.find((item) => item.id == dpId);
@@ -269550,18 +269773,18 @@ function updateCachedDevice(devId, dps) {
         dpCodes[sch.code] = dps[dpId];
       }
     });
-    cachedDevices[devId].dps = {
-      ...cachedDevices[devId].dps,
+    cachedDevices2[devId].dps = {
+      ...cachedDevices2[devId].dps,
       ...dps
     };
-    cachedDevices[devId].dpCodes = {
-      ...cachedDevices[devId].dpCodes,
+    cachedDevices2[devId].dpCodes = {
+      ...cachedDevices2[devId].dpCodes,
       ...dpCodes
     };
   }
 }
 function removeCachedDevice(devId) {
-  delete cachedDevices[devId];
+  delete cachedDevices2[devId];
 }
 async function getDeviceInfo2(params) {
   const { deviceId } = params;
@@ -269573,12 +269796,12 @@ async function getDeviceInfo2(params) {
       errorMsg: import_TYUniCode2.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.des
     };
   }
-  if (cachedDevices[deviceId]) {
-    if (projectDeviceId === cachedDevices[deviceId].devId) {
-      deviceInfo = cachedDevices[deviceId];
+  if (cachedDevices2[deviceId]) {
+    if (projectDeviceId === cachedDevices2[deviceId].devId) {
+      deviceInfo = cachedDevices2[deviceId];
     }
     return {
-      data: cachedDevices[deviceId],
+      data: cachedDevices2[deviceId],
       errorCode: 0,
       errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
     };
@@ -269667,7 +269890,7 @@ async function getDeviceInfo2(params) {
   delete result["gwType"];
   delete result["dpMaxTime"];
   delete result["i18nTime"];
-  cachedDevices[deviceId] = result;
+  cachedDevices2[deviceId] = result;
   const returnData = { ...result };
   delete returnData["localKey"];
   return {
@@ -269679,25 +269902,45 @@ async function getDeviceInfo2(params) {
 async function publishDps2(params) {
   const { deviceId, dps } = params;
   try {
-    if (cachedDevices[deviceId]) {
-      const { schema } = cachedDevices[deviceId];
+    let dev = cachedDevices2[deviceId];
+    if (!dev) {
+      await getDeviceInfo2({ deviceId });
+      dev = cachedDevices2[deviceId];
+    }
+    let _dps = { ...dps };
+    if (dev) {
+      const { schema } = dev;
       const idCodes = {};
+      const codeIds = {};
       schema.map((item) => {
         idCodes[item.id] = item.code;
+        codeIds[item.code] = item.id;
       });
       const publish = {};
+      const pudp = {};
       Object.keys(dps).map((key) => {
-        const code2 = idCodes[key];
-        publish[code2] = dps[key];
+        if (isNumeric(key)) {
+          const code2 = idCodes[key];
+          publish[code2] = dps[key];
+        } else {
+          publish[key] = dps[key];
+          pudp[codeIds[key]] = dps[key];
+        }
       });
       ark.runtime.sendMessage(
         JSON.stringify({ type: "publishDps", value: publish, protocol: 5 })
       );
+      if (Object.keys(pudp).length > 0) {
+        _dps = pudp;
+      }
     }
+    console.log("--------result publishDpsWithMqtt", deviceId, _dps);
     let reason;
-    const result = await publishDps({ deviceId, dps }, (err) => {
+    const result = await publishDps({ deviceId, dps: _dps }, (err) => {
       reason = err;
+      console.log("--------error", err);
     });
+    console.log("--------result", result, reason);
     let code = 0, msg = import_TYUniCode2.TYUniPluginError.SUCCESS.des;
     if (reason || !result) {
       switch (reason) {
@@ -269830,7 +270073,7 @@ function registerDeviceListListener(params) {
       console.log("------get success");
       list.map(({ data }) => {
         const { devId } = data;
-        initMqttClient_default.addDeviceListener(cachedDevices[devId]);
+        initMqttClient_default.addDeviceListener(cachedDevices2[devId]);
       });
     }).catch((err) => {
       console.log("---------registerDeviceListListener failed", err);
@@ -269927,21 +270170,166 @@ async function getDeviceListByDevIds(params) {
     errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
   };
 }
+async function getDeviceWifiActivatorStatus(params) {
+  const { deviceId } = params;
+  let devInfo = cachedDevices2[deviceId];
+  if (!devInfo) {
+    await getDeviceInfo2({ deviceId });
+    devInfo = cachedDevices2[deviceId];
+  }
+  return {
+    data: { wifiActivator: !(devInfo?.meta?.wifiEnable === false) },
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+async function getDeviceOnlineType(params) {
+  const { deviceId } = params;
+  let devInfo = cachedDevices2[deviceId];
+  if (!devInfo) {
+    await getDeviceInfo2({ deviceId });
+    devInfo = cachedDevices2[deviceId];
+  }
+  const { isLocalOnline, isCloudOnline, isOnline, capability } = devInfo;
+  const isBle = !!getBitValue(capability, 10);
+  const isBleMesh = !!getBitValue(capability, 11);
+  const isSigMesh = !!getBitValue(capability, 15);
+  const isBleBeacon = !!getBitValue(capability, 21);
+  let onlineType = 0;
+  if (isOnline || isLocalOnline) {
+    onlineType = onlineType | 1 << 0;
+  }
+  console.log(
+    "================ type",
+    onlineType,
+    capability,
+    isBle,
+    isBleMesh,
+    isSigMesh,
+    isBleBeacon
+  );
+  if (isBle && isLocalOnline) {
+    console.log("================ ble", onlineType, 1 < 2);
+    onlineType = onlineType | 1 << 2;
+  }
+  if ((isBleMesh || isSigMesh) && isLocalOnline) {
+    console.log("================ mesh", onlineType, 1 < 3);
+    onlineType = onlineType | 1 << 3;
+  }
+  if (isBleBeacon && isLocalOnline) {
+    console.log("================ beacon", onlineType, 1 < 4);
+    onlineType = onlineType | 1 << 4;
+  }
+  return {
+    data: { onlineType },
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+async function getShareDeviceInfo(params) {
+  const { deviceId } = params;
+  const result = await apiRequestByAtop({
+    api: "tuya.m.sharing.sharer.resowner.find",
+    version: "1.0",
+    params: {
+      resId: deviceId,
+      resType: "device"
+    }
+  });
+  console.log("----------6c089f69ce17af46bazi3v", deviceId, result);
+  const data = { ...result.result };
+  const r2 = {
+    name: void 0,
+    email: void 0,
+    mobile: void 0
+  };
+  if (Object.keys(data)) {
+    r2.name = data.name;
+    r2.email = data.email;
+    r2.mobile = data.phone;
+  }
+  return {
+    data: { ...r2 },
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+async function requestAdvancedCapability(params) {
+  const { bizId, bizType, vasCodes } = params;
+  const homeId = await getHomeId();
+  const result = await apiRequestByAtop({
+    api: "s.m.dev.property.get",
+    version: "1.0",
+    params: {
+      bizId,
+      bizType,
+      vasCodes,
+      gid: homeId
+    },
+    meta: {
+      gid: homeId
+    }
+  });
+  return {
+    data: result.result,
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+var dbDataChangeCb = null;
+function onDpDataChange(cb) {
+  dbDataChangeCb = cb;
+  console.log("-------------onDpDataChange", cb);
+  return {
+    data: null,
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
+function offDpDataChange() {
+  dbDataChangeCb = null;
+  return {
+    data: null,
+    errorCode: 0,
+    errorMsg: import_TYUniCode2.TYUniPluginError.SUCCESS.des
+  };
+}
 ark.miniapp.addPluginMethod(
   "TUNIDeviceControlManager",
   "getDeviceInfo",
   getDeviceInfo2
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "getShareDeviceInfo",
+  getShareDeviceInfo
+);
 ark.miniapp.addPluginMethod(
   "TUNIDeviceControlManager",
   "getProductInfo",
   getProductInfo2
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "onDpDataChange",
+  onDpDataChange
+);
+ark.miniapp.onPluginEvent("onDpDataChange", onDpDataChange);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "offDpDataChange",
+  offDpDataChange
+);
 ark.miniapp.addPluginMethod(
   "TUNIDeviceControlManager",
   "publishDps",
   publishDps2
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "publishDpsWithPipeType",
+  publishDps2
+);
 ark.miniapp.addPluginMethod(
   "TUNIThingControlManager",
   "getDeviceThingModelInfo",
@@ -269978,6 +270366,36 @@ ark.miniapp.addPluginMethod(
   "publishDps",
   publishDps2
 );
+ark.miniapp.addPluginMethod(
+  "TYUniDeviceControlManager",
+  "publishCommands",
+  publishDps2
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "publishCommands",
+  publishDps2
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceActivationManager",
+  "getDeviceWifiActivatorStatus",
+  getDeviceWifiActivatorStatus
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceActivationManager",
+  "getDeviceWifiActivatorStatus",
+  getDeviceWifiActivatorStatus
+);
+ark.miniapp.addPluginMethod(
+  "TYUniDeviceControlManager",
+  "getDeviceOnlineType",
+  getDeviceOnlineType
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "getDeviceOnlineType",
+  getDeviceOnlineType
+);
 ark.miniapp.addPluginMethod("TYUniDeviceControlManager", "queryDps", queryDps2);
 ark.miniapp.addPluginMethod(
   "TYUniDeviceControlManager",
@@ -270019,6 +270437,11 @@ ark.miniapp.addPluginMethod(
   "unregisterMQTTProtocolListener",
   registerMQTTProtocolListener
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceControlManager",
+  "requestAdvancedCapability",
+  requestAdvancedCapability
+);
 ark.miniapp.addPluginMethod(
   "TUNIOTAManager",
   "registerOTACompleted",
@@ -270558,8 +270981,280 @@ ark.miniapp.addPluginMethod(
   getDeviceIdList
 );
 
-// worker/api/Bridge.ts
+// worker/api/TUNIDeviceDetailManager.ts
 var import_TYUniCode10 = __toESM(require_dist());
+async function addTimer(params) {
+  const {
+    deviceId,
+    groupId,
+    category,
+    timer: { loops, time, dps, isAppPush, aliasName }
+  } = params;
+  if (!deviceId && !groupId) {
+    if (!groupId) {
+      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.clock.dps.add",
+      version: "1.0",
+      params: {
+        bizId: deviceId || groupId,
+        bizType: deviceId ? 0 : 1,
+        loops,
+        category,
+        status: 1,
+        actions: {
+          dps,
+          time
+        },
+        isAppPush,
+        aliasName
+      }
+    });
+    return {
+      data: {
+        timerId: 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 updateTimer(params) {
+  const {
+    deviceId,
+    groupId,
+    category,
+    timer: { loops, time, dps, isAppPush, aliasName, timerId }
+  } = params;
+  if (!deviceId && !groupId) {
+    if (!groupId) {
+      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.clock.dps.update",
+      version: "1.0",
+      params: {
+        bizId: deviceId || groupId,
+        bizType: deviceId ? 0 : 1,
+        id: timerId,
+        loops,
+        category,
+        status: 1,
+        actions: {
+          dps,
+          time
+        },
+        isAppPush,
+        aliasName
+      }
+    });
+    return {
+      data: void 0,
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: null,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
+async function updateTimerStatus(params) {
+  const { deviceId, groupId, timerId, status } = params;
+  if (!deviceId && !groupId) {
+    if (!groupId) {
+      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 {
+    await apiRequestByAtop({
+      api: "tuya.m.clock.batch.status.update",
+      version: "1.0",
+      params: {
+        bizId: deviceId || groupId,
+        bizType: deviceId ? 0 : 1,
+        ids: timerId,
+        status: status === true ? 1 : 0
+      }
+    });
+    ark.miniapp.emitPluginEvent({
+      name: "RCTNativeAppEventEmitter.linkageTimeUpdate",
+      data: null
+    });
+    ark.miniapp.emitPluginEvent({
+      name: "TUNIDeviceDetailManager.onTimerUpdate",
+      data: null
+    });
+    return {
+      data: void 0,
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: void 0,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
+async function removeTimer(params) {
+  const { deviceId, groupId, timerId } = params;
+  if (!deviceId && !groupId) {
+    if (!groupId) {
+      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 {
+    await apiRequestByAtop({
+      api: "tuya.m.clock.batch.status.update",
+      version: "1.0",
+      params: {
+        bizId: deviceId || groupId,
+        bizType: deviceId ? 0 : 1,
+        ids: timerId,
+        status: 2
+      }
+    });
+    ark.miniapp.emitPluginEvent({
+      name: "RCTNativeAppEventEmitter.linkageTimeUpdate",
+      data: null
+    });
+    ark.miniapp.emitPluginEvent({
+      name: "TUNIDeviceDetailManager.onTimerUpdate",
+      data: null
+    });
+    return {
+      data: void 0,
+      errorCode: 0,
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    return {
+      data: void 0,
+      errorCode: error.innerError.errorCode,
+      errorMsg: error.innerError.errorMsg
+    };
+  }
+}
+async function syncTimerTask(params) {
+  const { deviceId, groupId, category } = params;
+  if (!deviceId && !groupId) {
+    if (!groupId) {
+      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
+      };
+    }
+  }
+  const data = await apiRequestByAtop({
+    api: "tuya.m.clock.dps.list",
+    version: "2.0",
+    params: {
+      bizId: deviceId || groupId,
+      bizType: deviceId ? 0 : 1
+    }
+  });
+  const list = [];
+  const parseTimer = (item) => {
+    const {
+      aliasName,
+      date,
+      dps,
+      id,
+      isAppPush,
+      loops,
+      status,
+      time,
+      timezoneId,
+      groupOrder
+    } = item;
+    return {
+      aliasName,
+      date,
+      dps: JSON.parse(dps),
+      id: `${id}`,
+      isAppPush,
+      loops,
+      status: !!status,
+      time,
+      timeId: `${id}`,
+      timezoneId
+    };
+  };
+  if (!!category) {
+    data.result?.filter((l2) => l2.category === category).map((cate) => {
+      const { timers } = cate;
+      const t2 = timers.map(parseTimer);
+      list.push(...t2);
+    });
+  } else {
+    data.result?.map((cate) => {
+      const { timers } = cate;
+      const t2 = timers.map(parseTimer);
+      list.push(...t2);
+    });
+  }
+  return {
+    data: { timers: list },
+    errorCode: 0,
+    errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+  };
+}
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "syncTimerTask",
+  syncTimerTask
+);
+ark.miniapp.addPluginMethod("TUNIDeviceDetailManager", "addTimer", addTimer);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "updateTimer",
+  updateTimer
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "updateTimerStatus",
+  updateTimerStatus
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "removeTimer",
+  removeTimer
+);
+
+// worker/api/Bridge.ts
+var import_TYUniCode11 = __toESM(require_dist());
 var bridgeWall = {
   // 向小程序发送消息
   send(event, payload) {
@@ -270582,7 +271277,7 @@ async function handle(params) {
     return {
       data: { status: 0 },
       errorCode: 0,
-      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
+      errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
     };
   } else {
     return checkOTAUpgradeStatus(params);
@@ -270707,11 +271402,16 @@ ark.runtime.onMessage(async (event) => {
 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 });

package/package.json

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