@tuya-miniapp/ark-extension-virtual-device 1.8.2-beta-3 → 1.8.2-beta-5

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-2",
+      version: "1.8.2-beta-4",
       license: "MIT",
       files: [
         "manifest.json",
@@ -262819,6 +262819,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;
       }
@@ -262861,8 +262862,8 @@ var getDeviceInfo = async (body) => {
         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") {
+          const { id, type, property } = item;
+          if (Object.keys(oDps).includes(`${id}`) && (type === "raw" || type === "obj" && property?.type === "string")) {
             if (!isHexString(oDps[id])) {
               const b2 = Buffer.from(oDps[id], "base64");
               oDps[id] = b2.toString("hex");
@@ -263750,7 +263751,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")) {
+          if (Object.keys(result.data.dps).includes(`${id}`) && (oType === "raw" || type === "raw" || oType === "obj" && type === "string")) {
             const b2 = Buffer.from(result.data.dps[id], "base64");
             result.data.dps[id] = b2.toString("hex");
           }
@@ -279821,125 +279822,133 @@ async function getDeviceInfo2(params) {
   }
   if (cachedDevices2[deviceId]) {
     deviceInfo = cachedDevices2[deviceId];
-    const result2 = { ...cachedDevices2[deviceId] };
-    delete result2["accessType"];
-    delete result2["appRnVersion"];
-    delete result2["rnFind"];
-    delete result2["runtimeEnv"];
-    delete result2["supportGroup"];
-    delete result2["time"];
-    delete result2["ui"];
-    delete result2["uiConfig"];
-    delete result2["uiPhase"];
-    delete result2["uiType"];
-    delete result2["verSw"];
-    delete result2["isActive"];
-    delete result2["lat"];
-    delete result2["lon"];
-    delete result2["gwType"];
-    delete result2["dpMaxTime"];
-    delete result2["i18nTime"];
+    const result = { ...cachedDevices2[deviceId] };
+    delete result["accessType"];
+    delete result["appRnVersion"];
+    delete result["rnFind"];
+    delete result["runtimeEnv"];
+    delete result["supportGroup"];
+    delete result["time"];
+    delete result["ui"];
+    delete result["uiConfig"];
+    delete result["uiPhase"];
+    delete result["uiType"];
+    delete result["verSw"];
+    delete result["isActive"];
+    delete result["lat"];
+    delete result["lon"];
+    delete result["gwType"];
+    delete result["dpMaxTime"];
+    delete result["i18nTime"];
     return {
-      data: result2,
+      data: result,
       errorCode: 0,
       errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
     };
   }
-  const response = await getDeviceInfo({ deviceId });
-  const { result: devInfo } = response || {};
-  if (!devInfo) {
+  try {
+    const response = await getDeviceInfo({ deviceId });
+    const { result: devInfo } = response || {};
+    if (!devInfo) {
+      return {
+        data: null,
+        errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.code,
+        errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.des
+      };
+    }
+    let product = {};
+    let dev = {};
+    const presponse = await getProductInfo2({
+      productId: devInfo.productId,
+      getDevices: true
+    });
+    const { data: productInfo, devices } = presponse || {};
+    product = productInfo || {};
+    if (devices) {
+      const a2 = devices.filter((item) => item.devId === deviceId).pop();
+      dev = a2 || {};
+    }
+    const { dps, schema } = devInfo;
+    const objSchema = {};
+    const oDps = { ...dps };
+    JSON.parse(schema).map((item) => {
+      const { id, code } = item;
+      objSchema[code] = dps[id];
+    });
+    console.log("--------objSchema", dev);
+    const d2 = {
+      ...devInfo,
+      attributeString: parseInt(productInfo.attribute, 10).toString(2),
+      dpCodes: objSchema,
+      // deviceOnline: devInfo.isOnline,
+      // icon: devInfo.iconUrl,
+      schema: JSON.parse(devInfo.schema),
+      // @ts-ignore
+      capability: product.capability,
+      category: product.category,
+      attribute: product.attribute,
+      devAttribute: devInfo.devAttribute,
+      // devTimezoneId: dev.timezoneId,
+      isCloudOnline: devInfo.cloudOnline,
+      isOnline: devInfo.isOnline || dev.cloudOnline || devInfo.cloudOnline,
+      latitude: devInfo.lat,
+      longitude: devInfo.lon,
+      ...devInfo.dataPointInfo,
+      isVirtualDevice: devInfo.virtual,
+      panelConfig: product.panelConfig,
+      // isVDevice: dev.virtual,
+      dps,
+      connectionStatus: devInfo.communication?.connectionStatus,
+      baseAttribute: devInfo.baseAttribute,
+      isSupportGroup: devInfo.supportGroup,
+      isSupportOTA: devInfo.otaInfo?.support,
+      hasWifi: !!dev.moduleMap?.wifi,
+      cadv: dev.moduleMap?.wifi?.cadv || "",
+      protocolAttribute: dev.protocolAttribute || 0,
+      isGW: dev.protocolAttribute !== 0 && !!dev.protocolAttribute,
+      isLocalOnline: false,
+      isTripartiteMatter: devInfo.accessType == 1,
+      isSupportLink: devInfo.accessType == 2,
+      pcc: product.meshCategory,
+      isMatter: !!getBitValue(devInfo.baseAttribute, 7)
+      // bizAttribute: dev.bizAttribute
+    };
+    const result = { ...d2 };
+    if (projectDeviceId === d2.devId) {
+      deviceInfo = d2;
+    }
+    cachedDevices2[deviceId] = { ...d2 };
+    delete result["accessType"];
+    delete result["appRnVersion"];
+    delete result["rnFind"];
+    delete result["runtimeEnv"];
+    delete result["supportGroup"];
+    delete result["time"];
+    delete result["ui"];
+    delete result["uiConfig"];
+    delete result["uiPhase"];
+    delete result["uiType"];
+    delete result["verSw"];
+    delete result["isActive"];
+    delete result["lat"];
+    delete result["lon"];
+    delete result["gwType"];
+    delete result["dpMaxTime"];
+    delete result["i18nTime"];
+    const returnData = { ...result };
+    delete returnData["localKey"];
+    return {
+      data: returnData,
+      errorCode: 0,
+      errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
     return {
       data: null,
-      errorCode: import_TYUniCode3.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.code,
-      errorMsg: import_TYUniCode3.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.des
+      errorCode: import_TYUniCode3.TYUniPluginError.INTERNAL_ERROR.code,
+      errorMsg: import_TYUniCode3.TYUniPluginError.INTERNAL_ERROR.des
     };
   }
-  let product = {};
-  let dev = {};
-  const presponse = await getProductInfo2({
-    productId: devInfo.productId,
-    getDevices: true
-  });
-  const { data: productInfo, devices } = presponse || {};
-  product = productInfo || {};
-  if (devices) {
-    const a2 = devices.filter((item) => item.devId === deviceId).pop();
-    dev = a2 || {};
-  }
-  const { dps, schema } = devInfo;
-  const objSchema = {};
-  const oDps = { ...dps };
-  JSON.parse(schema).map((item) => {
-    const { id, code } = item;
-    objSchema[code] = dps[id];
-  });
-  console.log("--------objSchema", dev);
-  const d2 = {
-    ...devInfo,
-    attributeString: parseInt(productInfo.attribute, 10).toString(2),
-    dpCodes: objSchema,
-    // deviceOnline: devInfo.isOnline,
-    // icon: devInfo.iconUrl,
-    schema: JSON.parse(devInfo.schema),
-    // @ts-ignore
-    capability: product.capability,
-    category: product.category,
-    attribute: product.attribute,
-    devAttribute: devInfo.devAttribute,
-    // devTimezoneId: dev.timezoneId,
-    isCloudOnline: devInfo.cloudOnline,
-    isOnline: devInfo.isOnline || dev.cloudOnline || devInfo.cloudOnline,
-    latitude: devInfo.lat,
-    longitude: devInfo.lon,
-    ...devInfo.dataPointInfo,
-    isVirtualDevice: devInfo.virtual,
-    panelConfig: product.panelConfig,
-    // isVDevice: dev.virtual,
-    dps,
-    connectionStatus: devInfo.communication?.connectionStatus,
-    baseAttribute: devInfo.baseAttribute,
-    isSupportGroup: devInfo.supportGroup,
-    isSupportOTA: devInfo.otaInfo?.support,
-    hasWifi: !!dev.moduleMap?.wifi,
-    cadv: dev.moduleMap?.wifi?.cadv || "",
-    protocolAttribute: dev.protocolAttribute || 0,
-    isGW: dev.protocolAttribute !== 0 && !!dev.protocolAttribute,
-    isLocalOnline: false,
-    isTripartiteMatter: devInfo.accessType == 1,
-    isSupportLink: devInfo.accessType == 2,
-    pcc: product.meshCategory,
-    isMatter: !!getBitValue(devInfo.baseAttribute, 7)
-    // bizAttribute: dev.bizAttribute
-  };
-  const result = { ...d2 };
-  if (projectDeviceId === d2.devId) {
-    deviceInfo = d2;
-  }
-  cachedDevices2[deviceId] = { ...d2 };
-  delete result["accessType"];
-  delete result["appRnVersion"];
-  delete result["rnFind"];
-  delete result["runtimeEnv"];
-  delete result["supportGroup"];
-  delete result["time"];
-  delete result["ui"];
-  delete result["uiConfig"];
-  delete result["uiPhase"];
-  delete result["uiType"];
-  delete result["verSw"];
-  delete result["isActive"];
-  delete result["lat"];
-  delete result["lon"];
-  delete result["gwType"];
-  delete result["dpMaxTime"];
-  delete result["i18nTime"];
-  const returnData = { ...result };
-  delete returnData["localKey"];
-  return {
-    data: returnData,
-    errorCode: 0,
-    errorMsg: import_TYUniCode3.TYUniPluginError.SUCCESS.des
-  };
 }
 async function publishDps2(params) {
   const { deviceId, dps, showPublish = true } = params;

package/package.json

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