@tuya-miniapp/ark-extension-virtual-device 1.8.5 → 1.8.6-beta-2

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.4",
+      version: "1.8.6-beta-1",
       license: "MIT",
       files: [
         "manifest.json",
@@ -262484,7 +262484,6 @@ var setDebugMode = async ({ mode }) => {
 };
 var setCompilationParams = async (p2) => {
   const { page, params } = await ark.project.getCompilationParams() || {};
-  const mode = await getDebugMode();
   let debugParams = parseSearchParams(params);
   const realParams = {};
   Object.keys(debugParams).map((key) => {
@@ -262833,6 +262832,8 @@ 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;
       }
@@ -262844,6 +262845,7 @@ var getDeviceInfo = async (body) => {
       devInfo.result.parentId = devInfo32.result?.deviceTopo.parentDevId;
       devInfo.result.nodeId = devInfo32.result?.deviceTopo.nodeId;
       devInfo.result.devAttribute = devInfo32.result?.devAttribute;
+      devInfo.result.extModuleType = -1;
       if (Object.hasOwn(devInfo32.result, "cloudOnline")) {
         devInfo.result.cloudOnline = devInfo32.result?.cloudOnline;
       }
@@ -263974,6 +263976,7 @@ var MqttClientManager = class _MqttClientManager {
         }
       });
     });
+    console.log("mqtt clientId", clientId);
     client.on("error", (err) => {
       console.log("\u8FDE\u63A5\u5931\u8D25", err.message);
       viewLog(`[MQTT] @i18n(connectFail) ${err.message}`);
@@ -281874,6 +281877,14 @@ ark.miniapp.addPluginMethod(
 // worker/api/TUNIDeviceDetailManager.ts
 var import_TYUniCode11 = __toESM(require_dist());
 var import_crypto7 = require("crypto");
+
+// worker/utils/getParams.ts
+async function getParams() {
+  const { params } = await ark.project.getCompilationParams() || {};
+  return parseSearchParams(params || "{}");
+}
+
+// worker/api/TUNIDeviceDetailManager.ts
 async function addTimer(params) {
   const {
     deviceId,
@@ -282444,6 +282455,55 @@ async function getRemoteRebootTimers(params) {
     errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
   };
 }
+async function dispatchDataResult(params) {
+  const { success, fail, complete, ...rest } = params;
+  ark.miniapp.emitPluginEvent({
+    name: "TUNIDeviceDetailManager.dispatchDataResult",
+    data: {
+      ...rest
+    }
+  });
+  return {
+    data: true,
+    errorCode: 0,
+    errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
+  };
+}
+async function getSubFunctionExtShowData(params) {
+  const { id, data } = params;
+  const { deviceId } = await getParams();
+  switch (id) {
+    case "connect_cloud_activation":
+      return {
+        data: {
+          data: {
+            extModuleType: -1,
+            deviceId
+          }
+        },
+        errorCode: 0,
+        errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
+      };
+    case "location_manage":
+      return {
+        data: {
+          data: {
+            deviceLocation: 0,
+            deviceId
+          }
+        },
+        errorCode: 0,
+        errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
+      };
+  }
+  return {
+    data: {
+      data: {}
+    },
+    errorCode: 0,
+    errorMsg: import_TYUniCode11.TYUniPluginError.SUCCESS.des
+  };
+}
 ark.miniapp.addPluginMethod(
   "TUNIDeviceDetailManager",
   "removeShareDevice",
@@ -282510,6 +282570,16 @@ ark.miniapp.addPluginMethod(
   "getRemoteRebootTimers1",
   getRemoteRebootTimers
 );
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "dispatchDataResult",
+  dispatchDataResult
+);
+ark.miniapp.addPluginMethod(
+  "TUNIDeviceDetailManager",
+  "getSubFunctionExtShowData",
+  getSubFunctionExtShowData
+);
 
 // worker/api/TUNIThingControlManager.ts
 var import_TYUniCode12 = __toESM(require_dist());
@@ -282615,8 +282685,595 @@ ark.miniapp.addPluginMethod(
   updateDeviceThingModelInfo
 );
 
-// worker/api/Bridge.ts
+// worker/api/TUNIAppInfoManager.ts
 var import_TYUniCode13 = __toESM(require_dist());
+
+// worker/utils/ngConfig.ts
+var defaultVersion = "6.0.0";
+var ngConfig_default = (appVersion = defaultVersion) => [
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:activator:EZBleFirstEnable",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:activator:EZBleFirstEnable",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:deviceBiz:group",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:LoginSDK:ChangeBindSwitch",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:Location:Frequency",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:OSApp:ABTestConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:Location:UpdateReduce",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:deviceBiz:deviceDetail",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:hybrid:config",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:miniApp:basicRule",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:cubeBiz:config",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:iap:iosDisable",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:voiceBiz:thirdPartAuth",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:tangram:tracker",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:oem:config",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:mqtt",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:bleconfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:control",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:pskIOS",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:apmQueueRequest",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:functionConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:deviceNameMap",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:dpReportConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:BLEMultiConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:neutralDomainSet",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:network",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:bleConnectConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:miniApp:ReleaseRule",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:miniApp:redirectMatch",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:tangram:config",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:supportPlugplay",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:ble",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:OSHome:openDeviceListMajorization",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:bleCache",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:advCache",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:DeviceBiz:DeviceDetail",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:mqttConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:OSApp:appRightAuthType",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:network:monitor",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:deviceInfoBindConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:activatorConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:plugPlayConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:shouldUseNewUIPanelModel",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:miniApp:preInfos",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:sdk:ipcConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  },
+  {
+    lastGmtModified: 0,
+    lastVersion: 0,
+    module: "tuyaclient:OSApp:DynamicUpdateCustomConfig",
+    type: "ios",
+    appVersion,
+    lastId: ""
+  }
+];
+
+// worker/utils/getNgConfig.ts
+async function requestNgConfig(uid) {
+  try {
+    const { appId = 168 } = await getParams();
+    const res = await apiRequestByAtop({
+      api: "tuya.m.pull.config.data.for.app",
+      version: "1.0",
+      params: {
+        input: JSON.stringify(ngConfig_default())
+      },
+      meta: {
+        appId
+      }
+    });
+    if (res.success) {
+      ark.storage.set(`ng_config_${uid}`, JSON.stringify(res));
+    }
+    return res;
+  } catch (error) {
+    return {};
+  }
+}
+async function getCacheNGConfig() {
+  const authInfo = await ark.auth.getCustomerUserInfo();
+  const uid = authInfo?.uid || "unlogin";
+  try {
+    const config = await ark.storage.get(`ng_config_${uid}`);
+    if (config) {
+      return JSON.parse(config);
+    }
+    return requestNgConfig(uid);
+  } catch (error) {
+    console.log("getCacheNGConfig error", error);
+  }
+  return {};
+}
+async function getAppInfo() {
+  const { appId = 168 } = await getParams();
+  const homeId = await getHomeId();
+  const res = await apiRequestByAtop({
+    api: "s.open.app.info",
+    version: "2.0",
+    params: {
+      appId
+    },
+    meta: {
+      appId,
+      gid: homeId
+    }
+  });
+  return res;
+}
+
+// worker/api/TUNIAppInfoManager.ts
+async function getFunctionList(keys) {
+  try {
+    const res = await getCacheNGConfig();
+    if (res.success) {
+      const data = res.result?.output || [];
+      const config = data.find((item) => item.module === "tuyaclient:oem:config");
+      const obj = JSON.parse(config?.data || "{}");
+      const result = {};
+      keys.forEach((key) => {
+        result[key] = typeof obj[key] !== "undefined" ? obj[key] : true;
+      });
+      console.log("getFunctionList result", result);
+      return result;
+    }
+    return {};
+  } catch (error) {
+    console.log("getFunctionList error", error);
+    return {};
+  }
+}
+async function getConfigList(keys) {
+  try {
+    const res = await getCacheNGConfig();
+    if (res.success) {
+      const result = {};
+      keys.forEach((key) => {
+        const ks = key.split(":");
+        if (ks && ks.length > 1) {
+          const module2 = "tuyaclient:" + ks[0] + ":" + ks[1];
+          const config = res.result?.output.find((item) => item.module === module2);
+          if (ks.length === 2) {
+            result[key] = config?.data || "";
+          } else if (ks.length === 3) {
+            const obj = JSON.parse(config?.data || "{}");
+            try {
+              result[key] = JSON.parse(obj[ks[2]]) || void 0;
+            } catch (error) {
+              result[key] = obj[ks[2]] || void 0;
+            }
+          } else {
+            try {
+              let tmp = JSON.parse(config?.data || "{}");
+              for (let i2 = 2; i2 < ks.length; i2++) {
+                const ki = tmp[ks[i2]];
+                try {
+                  tmp = JSON.parse(ki) || void 0;
+                  console.log("==================", tmp);
+                } catch (error) {
+                  tmp = ki || void 0;
+                }
+              }
+              result[key] = tmp || void 0;
+            } catch (e2) {
+              console.log("getConfigList error", e2);
+              result[key] = "";
+            }
+          }
+        }
+      });
+      for (const key in result) {
+        if (typeof result[key] === "undefined") {
+          delete result[key];
+        }
+      }
+      console.log("getFunctionList result", result);
+      return result;
+    }
+    return {};
+  } catch (error) {
+    console.log("getFunctionList error", error);
+    return {};
+  }
+}
+async function getNGConfigByKeys(params) {
+  try {
+    const res = await getFunctionList(params.keys);
+    return {
+      data: { config: res },
+      errorCode: 0,
+      errorMsg: import_TYUniCode13.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    console.log("getNGConfigByKeys error>>>>", error);
+    return {
+      data: {},
+      errorCode: 0,
+      errorMsg: import_TYUniCode13.TYUniPluginError.SUCCESS.des
+    };
+  }
+}
+async function getConfigByKeys(params) {
+  try {
+    const res = await getConfigList(params.keys);
+    return {
+      data: { config: res },
+      errorCode: 0,
+      errorMsg: import_TYUniCode13.TYUniPluginError.SUCCESS.des
+    };
+  } catch (error) {
+    console.log("getNGConfigByKeys error>>>>", error);
+    return {
+      data: {},
+      errorCode: 0,
+      errorMsg: import_TYUniCode13.TYUniPluginError.SUCCESS.des
+    };
+  }
+}
+ark.miniapp.addPluginMethod(
+  "TUNIAppInfoManager",
+  "getNGConfigByKeys",
+  getNGConfigByKeys
+);
+ark.miniapp.addPluginMethod(
+  "TUNIAppInfoManager",
+  "getConfigByKeys",
+  getConfigByKeys
+);
+
+// worker/api/TUNINGManager.ts
+async function getFunction(key) {
+  try {
+    const res = await getCacheNGConfig();
+    if (res.success) {
+      const data = res.result?.output || [];
+      const config = data.find((item) => item.module === "tuyaclient:oem:config");
+      const obj = JSON.parse(config?.data || "{}");
+      console.log("getFunction result", obj[key]);
+      return obj[key];
+    }
+    return {};
+  } catch (error) {
+    console.log("getFunctionList error", error);
+    return {};
+  }
+}
+async function getNgRawData(params) {
+  const { rawKey } = params;
+  if (rawKey === "appType") {
+    const res = await getAppInfo();
+    const { appType = "0" } = await getParams();
+    console.log("---------res", res);
+    return {
+      data: { rawData: appType },
+      errorCode: 0,
+      errorMsg: "success"
+    };
+  } else {
+    const result = await getFunction(rawKey);
+    return {
+      data: { rawData: result },
+      errorCode: 0,
+      errorMsg: "success"
+    };
+  }
+}
+ark.miniapp.addPluginMethod("TUNINGManager", "getNgRawData", getNgRawData);
+
+// worker/api/Bridge.ts
+var import_TYUniCode14 = __toESM(require_dist());
 var bridgeWall = {
   // 向小程序发送消息
   send(event, payload) {
@@ -282639,7 +283296,7 @@ async function handle(params) {
     return {
       data: { status: 0 },
       errorCode: 0,
-      errorMsg: import_TYUniCode13.TYUniPluginError.SUCCESS.des
+      errorMsg: import_TYUniCode14.TYUniPluginError.SUCCESS.des
     };
   } else {
     return checkOTAUpgradeStatus(params);

package/package.json

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