@tuya-miniapp/ark-extension-virtual-device 1.8.2-beta-4 → 1.8.2-beta-6

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.2-beta-3",
+      version: "1.8.2-beta-5",
       license: "MIT",
       files: [
         "manifest.json",
@@ -262807,8 +262807,6 @@ 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;
       }
@@ -262819,6 +262817,7 @@ var getDeviceInfo = async (body) => {
       devInfo.result.accessType = devInfo32.result?.accessType;
       devInfo.result.parentId = devInfo32.result?.deviceTopo.parentDevId;
       devInfo.result.nodeId = devInfo32.result?.deviceTopo.nodeId;
+      devInfo.result.devAttribute = devInfo32.result?.devAttribute;
       if (Object.hasOwn(devInfo32.result, "cloudOnline")) {
         devInfo.result.cloudOnline = devInfo32.result?.cloudOnline;
       }
@@ -262862,7 +262861,7 @@ var getDeviceInfo = async (body) => {
         const oDps = { ...dps };
         JSON.parse(schema).map((item) => {
           const { id, type, property } = item;
-          if (Object.keys(oDps).includes(`${id}`) && (type === "raw" || type === "obj" && property?.type === "string")) {
+          if (Object.keys(oDps).includes(`${id}`) && type === "raw") {
             if (!isHexString(oDps[id])) {
               const b2 = Buffer.from(oDps[id], "base64");
               oDps[id] = b2.toString("hex");
@@ -263750,7 +263749,7 @@ function parseRawMessage(result, devInfo) {
         schema.map((item) => {
           const { id, property, type: oType } = item;
           const { type } = property || {};
-          if (Object.keys(result.data.dps).includes(`${id}`) && (oType === "raw" || type === "raw" || oType === "obj" && type === "string")) {
+          if (Object.keys(result.data.dps).includes(`${id}`) && (oType === "raw" || type === "raw")) {
             const b2 = Buffer.from(result.data.dps[id], "base64");
             result.data.dps[id] = b2.toString("hex");
           }
@@ -280389,13 +280388,73 @@ async function setDeviceProperty(params) {
 }
 async function getDeviceListByDevIds(params) {
   const { deviceIds } = params;
-  const promises = deviceIds.map((devId) => {
+  const homeId = await getHomeId();
+  const homeAllDeviceResponse = await apiRequestByAtop({
+    api: "tuya.m.my.group.device.list",
+    version: "2.1",
+    params: {
+      gid: homeId
+    },
+    meta: {
+      gid: homeId
+    }
+  });
+  const { result: allDevices = [] } = homeAllDeviceResponse || {};
+  const productIds = [];
+  allDevices.map((item) => {
+    if (!productIds.includes(item.productId)) {
+      productIds.push(item.productId);
+    }
+  });
+  const { result: productInfos } = await apiRequestByAtop({
+    api: "tuya.m.device.ref.info.list",
+    version: "3.0",
+    params: {
+      productIds
+    }
+  });
+  const tempList = allDevices.filter((item) => deviceIds.includes(item.devId));
+  const resetList = [];
+  deviceIds.map((devId) => {
+    const d2 = tempList.find((item) => item.devId === devId);
+    if (!d2) {
+      resetList.push(devId);
+    }
+  });
+  const promises = resetList.map((devId) => {
     return getDeviceInfo2({ deviceId: devId });
   });
   const list = await Promise.all(promises);
-  const result = list.map((item) => {
+  const restList = list.map((item) => {
     return item.data;
-  }).filter((item) => !!item);
+  });
+  const devices = [...tempList, ...restList].filter((item) => !!item);
+  const result = devices.map((item) => {
+    const { productId, dataPointInfo, iconUrl } = item;
+    const productInfo = productInfos.find((product) => product.id === productId);
+    const {
+      schemaInfo: { schema },
+      attribute,
+      capability,
+      category,
+      supportGroup,
+      otaInfo
+    } = productInfo;
+    if (productInfo) {
+      item.productInfo = productInfo;
+    }
+    return {
+      ...item,
+      schema: JSON.parse(schema),
+      ...dataPointInfo,
+      icon: iconUrl,
+      isSupportGroup: supportGroup,
+      attribute,
+      capability,
+      category,
+      isSupportOTA: !!otaInfo
+    };
+  });
   return {
     data: { deviceInfos: result },
     errorCode: 0,
@@ -282490,9 +282549,16 @@ ark.miniapp.addPluginMethod(
 var import_TYUniCode12 = __toESM(require_dist());
 async function getDeviceThingModelInfo(params) {
   const { devId } = params;
-  await getDeviceInfo2({ deviceId: devId });
-  const dev = cachedDeviceList.find((d2) => d2.devId === devId);
-  const { productVer, productId } = dev;
+  const devInfo = await getDeviceInfo2({ deviceId: devId });
+  const dev = devInfo.data;
+  if (!dev) {
+    return {
+      data: null,
+      errorCode: 1,
+      errorMsg: "device not found"
+    };
+  }
+  const { productVer = "1.0.0", productId } = dev;
   const thing = await apiRequestByAtop({
     api: "tuya.m.product.thing.model",
     version: "1.0",

package/package.json

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