@tuya-miniapp/ark-extension-virtual-device 1.1.27 → 1.1.28-beta-2

package/dist/worker/index.js

@@ -173003,7 +173003,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@tuya-miniapp/ark-extension-virtual-device",
-      version: "1.1.27-beta-3",
+      version: "1.1.28-beta-1",
       files: [
         "manifest.json",
         "package.json",
@@ -239211,6 +239211,7 @@ var getProjectProductId = async () => {
       productId = debugParams.productId;
     }
   }
+  console.log("----------------------9999999999--------------------", mode, params, debugParams);
   if (mode === "real") {
     const realDevId = await getRealDevId();
     if (!!debugParams.deviceId || !!realDevId) {
@@ -239219,6 +239220,7 @@ var getProjectProductId = async () => {
         setCompilationParams({ deviceId: "" });
         return "";
       }
+      console.log("----------------------deviceId--------------------", deviceId);
       const devInfo = await getDeviceInfo2({ deviceId });
       if (!devInfo.data) {
         ark.runtime.sendMessage("device_not_exist");
@@ -239244,8 +239246,11 @@ var getProjectProductId = async () => {
 };
 var getProjectDeviceId = async () => {
   const mode = await getDebugMode();
+  console.log("----------------getDebugMode-----------------", mode);
   const { page, params } = await ark.project.getCompilationParams() || {};
+  console.log("----------------getCompilationParams-----------------", page, params);
   const productId = await getProjectProductId();
+  console.log("----------------getProjectProductId-----------------", productId);
   let deviceId = "";
   let debugParams = parseSearchParams(params);
   if (productId) {
@@ -239402,6 +239407,14 @@ var getDeviceInfo = async (body) => {
         devId: body?.deviceId
       }
     });
+    const devInfo32 = await apiRequestByAtop({
+      api: "tuya.m.device.get",
+      version: "3.2",
+      params: {
+        devId: body?.deviceId
+      }
+    });
+    devInfo.result.moduleMap = devInfo32.result?.moduleMap;
     try {
       const { schema, dps } = devInfo.result;
       const oDps = { ...dps };
@@ -239473,10 +239486,11 @@ async function getDeviceInfo2(params) {
     const { id, code } = item;
     objSchema[code] = dps[id];
   });
+  console.log("--------->>>>>>>devInfo", devInfo);
+  console.log("--------->>>>>>>dev", dev, JSON.stringify(dev.otaInfo.otaModuleMap));
   const d = {
     ...devInfo,
     dpCodes: objSchema,
-    icon: devInfo.iconUrl,
     schema: JSON.parse(devInfo.schema),
     capability: product.capability,
     category: product.category,
@@ -239488,9 +239502,16 @@ async function getDeviceInfo2(params) {
     longitude: devInfo.lon,
     ...dev.dataPointInfo,
     isVirtualDevice: dev.virtual,
+    mac: dev.mac,
     panelConfig: product.panelConfig,
-    isVDevice: deviceId.indexOf("vdev") === 0,
-    dps
+    dps,
+    connectionStatus: dev.communication?.connectionStatus,
+    baseAttribute: dev.baseAttribute,
+    isSupportGroup: devInfo.supportGroup,
+    isSupportOTA: dev.otaInfo?.support,
+    hasWifi: !!devInfo.moduleMap?.wifi,
+    cadv: devInfo.moduleMap?.wifi?.cadv || "",
+    protocolAttribute: dev.protocolAttribute || 0
   };
   const result = { ...d };
   if (global.__deviceId === d.devId) {
@@ -239507,12 +239528,12 @@ async function getDeviceInfo2(params) {
   delete result["uiPhase"];
   delete result["uiType"];
   delete result["verSw"];
-  delete result["iconUrl"];
   delete result["isActive"];
   delete result["lat"];
   delete result["lon"];
   delete result["gwType"];
   delete result["dpMaxTime"];
+  delete result["i18nTime"];
   chchedDevices[deviceId] = result;
   return {
     data: result,
@@ -239975,8 +239996,132 @@ ark.miniapp.addPluginMethod("TYUniOpenPageManager", "registerChannel", registerC
 ark.miniapp.addPluginMethod("TUNIOpenPageManager", "unRegisterChannel", unRegisterChannel);
 ark.miniapp.addPluginMethod("TYUniOpenPageManager", "unRegisterChannel", unRegisterChannel);
 
-// worker/api/Bridge.ts
+// worker/api/TUNIHomeDataManager.ts
 var import_TYUniCode9 = __toESM(require_dist());
+async function getCurrentHomeInfo() {
+  const u = await ark.auth.getCustomerUserInfo();
+  const userInfo = typeof u === "string" ? JSON.parse(u) : u;
+  const {
+    extras: { homeId }
+  } = userInfo;
+  const data = await ark.http.atop({
+    api: "tuya.m.location.get",
+    version: "3.1",
+    params: { gid: homeId }
+  });
+  if (data) {
+    const homeInfo = {
+      address: data.data?.result?.geoName,
+      homeName: data.data?.result?.name,
+      homeId,
+      latitude: data.data?.result?.lat,
+      longitude: data.data?.result?.lon
+    };
+    return {
+      data: homeInfo,
+      errorCode: 0,
+      errorMsg: import_TYUniCode9.TYUniPluginError.SUCCESS.des
+    };
+  } else {
+    return {
+      data: null,
+      devices: [],
+      errorCode: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.code,
+      errorMsg: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
+    };
+  }
+}
+async function getRoomList(params) {
+  const data = await ark.http.atop({
+    api: "tuya.m.security.web.home.room.list.get",
+    version: "1.0",
+    params: { homeId: params.ownerId }
+  });
+  if (data.data?.result) {
+    const result = data.data?.result;
+    const list = [];
+    result.map((item) => {
+      if (item.roomId !== "ALL_DEVICE") {
+        const room = {
+          name: item.roomName,
+          roomId: item.roomId,
+          deviceIds: item.deviceList.map((dev) => dev.deviceId)
+        };
+        list.push(room);
+      }
+    });
+    return {
+      data: { roomDatas: list },
+      errorCode: 0,
+      errorMsg: import_TYUniCode9.TYUniPluginError.SUCCESS.des
+    };
+  } else {
+    return {
+      data: null,
+      devices: [],
+      errorCode: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.code,
+      errorMsg: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
+    };
+  }
+}
+async function getDeviceIdList(params) {
+  const data = await ark.http.atop({
+    api: "tuya.m.security.web.home.room.list.get",
+    version: "1.0",
+    params: { homeId: params.ownerId }
+  });
+  if (data.data?.result) {
+    const result = data.data?.result;
+    const devices = result.find((item) => item.roomId === "ALL_DEVICE");
+    return {
+      data: { devIds: devices?.deviceList?.map((item) => item.deviceId) },
+      errorCode: 0,
+      errorMsg: import_TYUniCode9.TYUniPluginError.SUCCESS.des
+    };
+  } else {
+    return {
+      data: null,
+      devices: [],
+      errorCode: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.code,
+      errorMsg: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
+    };
+  }
+}
+async function updateHomeInfoData(params) {
+  const data = await ark.http.atop({
+    api: "tuya.m.location.update",
+    version: "2.0",
+    params: {
+      gid: params.homeId,
+      name: params.homeName,
+      lon: params.longitude,
+      lat: params.latitude,
+      geoName: params.address
+    }
+  });
+  if (data.data?.result) {
+    const result = data.data?.result;
+    return {
+      data: result,
+      errorCode: 0,
+      errorMsg: import_TYUniCode9.TYUniPluginError.SUCCESS.des
+    };
+  } else {
+    return {
+      data: null,
+      devices: [],
+      errorCode: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.code,
+      errorMsg: import_TYUniCode9.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
+    };
+  }
+}
+ark.miniapp.addPluginMethod("TUNIHomeDataManager", "getCurrentHomeInfo", getCurrentHomeInfo);
+ark.miniapp.addPluginMethod("TUNIHomeDataManager", "updateHomeInfoData", updateHomeInfoData);
+ark.miniapp.addPluginMethod("TUNIHomeDeviceListManager", "getRoomList", getRoomList);
+ark.miniapp.addPluginMethod("TUNIHomeDeviceListManager", "getDeviceIdList", getDeviceIdList);
+
+// worker/api/Bridge.ts
+var import_TYUniCode10 = __toESM(require_dist());
 var bridgeWall = {
   send(event, payload) {
     const data = { event, payload };
@@ -239996,7 +240141,7 @@ async function handle(params) {
     return {
       data: { status: 0 },
       errorCode: 0,
-      errorMsg: import_TYUniCode9.TYUniPluginError.SUCCESS.des
+      errorMsg: import_TYUniCode10.TYUniPluginError.SUCCESS.des
     };
   } else {
     return checkOTAUpgradeStatus(params);
@@ -240038,14 +240183,13 @@ async function initMqtt() {
   const productId = await services_default.getProjectProductId();
   if (!productId)
     return;
-  await startMQTT({
-    productId
-  });
+  await startMQTT();
 }
 async function initLaunchParams() {
   const status = await ark.auth.checkStatus();
   if (status !== "authorized")
     return;
+  console.log("to getProjectDeviceId");
   let deviceId = await services_default.getProjectDeviceId();
   if (deviceId) {
     await getLangContent({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/ark-extension-virtual-device",
-  "version": "1.1.27",
+  "version": "1.1.28-beta-2",
   "files": [
     "manifest.json",
     "package.json",