@tuya-miniapp/ark-extension-virtual-device 1.6.2-beta-1 → 1.6.2-beta-3

package/dist/worker/index.js

@@ -220712,7 +220712,7 @@ var require_package2 = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "@tuya-miniapp/ark-extension-virtual-device",
-      version: "1.6.1",
+      version: "1.6.2-beta-2",
       license: "MIT",
       files: [
         "manifest.json",
@@ -264074,6 +264074,7 @@ var MqttClientManager = class _MqttClientManager {
 async function initMqttClient() {
   console.log("---------------initClient");
   const client = await MqttClientManager.init();
+  console.log("---------------initClient success");
   return client;
 }
 var initMqttClient_default = MqttClientManager;
@@ -279661,15 +279662,6 @@ async function publishDps2(params) {
     let data = null;
     console.log("--------pv", pv);
     switch (pv) {
-      case "2.0":
-        result = await publishDps({ deviceId, dps: _dps }, (err) => {
-          reason = err;
-          console.log("--------error", err);
-        });
-        break;
-      case "2.2":
-        data = crypto_default.Encrypt22(message, dev.localKey);
-        break;
       case "2.3":
         data = crypto_default.Encrypt23(message, dev.localKey);
         break;
@@ -281981,39 +281973,48 @@ var getInstalledExtList2 = () => {
 var getDebugExt = () => {
   return new Promise((resolve) => {
     ark.storage.get(DEBUG_EXT_STORAGE_KEY).then((value) => {
-      let list = null;
-      if (value) {
-        list = JSON.parse(value);
+      try {
+        let list = null;
+        if (value) {
+          list = JSON.parse(value);
+        }
+        resolve(list);
+      } catch (error) {
+        console.log("getDebugExt error", error);
       }
-      resolve(list);
     }).catch((err) => {
       resolve(null);
     });
   });
 };
 async function initPlugin() {
-  const installedExt = await getInstalledExtList2();
-  const plugins = [...installedExt];
-  const debugExt = await getDebugExt();
-  if (debugExt) {
-    plugins.push(debugExt);
-  }
-  return Promise.all(
-    plugins.map(async (item) => {
-      try {
-        const p2 = `${item.baseDir}/${item.worker.entry}`;
-        if (!!item.worker.initFunc) {
-          import(p2);
-        } else {
-          import(p2);
+  try {
+    const installedExt = await getInstalledExtList2();
+    const plugins = [...installedExt];
+    const debugExt = await getDebugExt();
+    if (debugExt) {
+      plugins.push(debugExt);
+    }
+    return Promise.all(
+      plugins.map(async (item) => {
+        try {
+          const p2 = `${item.baseDir}/${item.worker.entry}`;
+          if (!!item.worker.initFunc) {
+            import(p2);
+          } else {
+            import(p2);
+          }
+        } catch (error) {
+          console.log("\u63D2\u4EF6\u52A0\u8F7D\u5931\u8D25", item, error);
         }
-      } catch (error) {
-        console.log("\u63D2\u4EF6\u52A0\u8F7D\u5931\u8D25", item, error);
-      }
-    })
-  ).catch((e2) => {
-    console.log("------promise fail", e2);
-  });
+      })
+    ).catch((e2) => {
+      console.log("------promise fail", e2);
+      return Promise.reject(e2);
+    });
+  } catch (error) {
+    return Promise.reject(error);
+  }
 }
 
 // worker/utils/debugExtension.ts
@@ -282136,180 +282137,43 @@ function saveDebugExtension({ service, params: { path: path5 }, eventId }) {
 
 // worker/index.ts
 var isInstanceMode7 = process.env.PROJECT_MODE === "instant";
-initPlugin();
-ark.runtime.onMessage(async (event) => {
-  try {
-    const message = event.message;
-    console.log("\u540E\u7AEF\u6536\u5230\u6D88\u606F", message);
-    if (isJSON(message)) {
-      const data = JSON.parse(message);
-      if (data["__bridge__"]) {
-        const { event: event2, payload } = data["__bridge__"];
-        bridgeWall.send(event2, payload);
-        console.log("[bridgeWall.send]", data["__bridge__"]);
-      }
-      const service = data.service;
-      const params = data.params;
-      console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u662F\u5426\u5B9E\u73B0:`, service in services_default);
-      if (service in services_default) {
-        try {
-          const res = await services_default[service](params);
-          ark.runtime.sendMessage(
-            JSON.stringify({
-              ...data,
-              result: res
-            })
-          );
-        } catch (error) {
-          console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u6267\u884C\u5931\u8D25`, error);
-          ark.runtime.sendMessage(
-            JSON.stringify({
-              ...data,
-              result: null
-            })
-          );
-        }
-      } else {
-        if (service === "initLaunchParams") {
-          const { deviceId, productId, groupId, __debugMode } = params;
-          if (!!productId) {
-            await setProductId(productId);
-          } else {
-            await setProductId("");
-          }
-          if (!!deviceId) {
-            await setDeviceId(deviceId);
-          } else {
-            await setDeviceId("");
-          }
-          if (!!groupId) {
-            await setGroupId(groupId);
-          } else {
-            await setGroupId("");
-          }
-          initMqttClient_default.removeAllSubscribe();
-          await setDebugMode({ mode: __debugMode });
-          initLaunchParams();
-          ark.runtime.sendMessage(JSON.stringify({ ...data }));
-        } else if (service === "startMQTT") {
-          initMqttClient_default.reconnectAll();
-        } else if (service === "set_debug_extension_path") {
-          saveDebugExtension(data);
-        }
-      }
-    }
-  } catch (error) {
-    console.log("---------------error", error);
-  }
-});
-async function initLaunchParams() {
-  try {
-    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 });
-      groupInfo2 = gd?.data;
-      deviceId = groupId;
-    }
-    if (deviceId && deviceId !== groupId) {
-      await getLangContent({});
-      await getDeviceInfo2({ deviceId });
-      deviceInfo2 = getCachedDevice()[deviceId];
-    }
-    console.log("to startMQTT", deviceId, groupId);
-    if (mode === "group") {
-      initMqttClient_default.addGroupListener(groupInfo2);
-    } else {
-      console.log("------------------- \u53BB\u76D1\u542C");
-      initMqttClient_default.addDeviceListener(deviceInfo2);
-    }
-    ark.utils.reload();
-    initUpdateMessage();
-  } catch (error) {
-    console.log("---------update", error);
-  }
-}
-isInstanceMode7 && ark.project.setCompilationParams({ params: `deviceId=123` });
-ark.auth.onAuthed(async (env) => {
-  try {
-    await setProductId("");
-    await setDeviceId("");
-    await setGroupId("");
-    await setHomeId("");
-    const info = await services_default.getTuyaProjectInfo();
-    const { productId: pid } = info || {};
-    const productId = await services_default.getProductId();
-    if (pid !== productId) {
-      await services_default.setCompilationParams({ deviceId: "" });
-    }
-    initMqttClient_default._client && initMqttClient_default._client.end();
-    initMqttClient_default._client = null;
-    await initMqttClient();
-    await initLaunchParams();
-    ark.utils.reload();
-  } catch (error) {
-    console.error("---error", error);
-  }
-});
-ark.miniapp.onUploadedPackage(async () => {
-  const res = await services_default.getI18nNoUseStrings();
-  console.log("[onUploadedPackage]", "getI18nNoUseStrings:", res);
-  if (res.count > 0) {
-    const keys = getArray(res.result).reduce(
-      (acc, cur) => acc.concat(cur.noUseKeys),
-      []
-    );
-    ark.utils.message({
-      content: `\u68C0\u6D4B\u5230\u5197\u4F59\u591A\u8BED\u8A00\u5B57\u6BB5\uFF1A${keys.join(",")}`,
-      type: "error"
-    });
-  }
-});
-var onUpdateListener = null;
-var initUpdateMessage = () => {
-  onUpdateListener = ark.project.onUpdate(async () => {
-    const { page, params } = await ark.project.getCompilationParams() || {};
-    await getHomeDeviceList();
+try {
+  initPlugin();
+  ark.runtime.onMessage(async (event) => {
     try {
-      let debugParams = parseSearchParams(params);
-      const allDeviceIds2 = getAllDeviceIds();
-      const allGroupIds2 = getAllGroupIds();
-      console.log(typeof allDeviceIds2, typeof allGroupIds2);
-      const { deviceId, groupId } = debugParams;
-      if (allDeviceIds2.length || allGroupIds2.length) {
-        console.log("-----deviceId", deviceId, groupId, typeof deviceId);
-        if (!!deviceId && allDeviceIds2.indexOf(deviceId) > -1 || !!groupId && allGroupIds2.indexOf(groupId) > -1) {
-          if (groupId) {
-            const groupInfo2 = await getGroupInfo({ groupId });
-            const { productId } = groupInfo2.data;
-            if (!!groupId) {
-              await setGroupId(groupId);
-            } else {
-              await setGroupId("");
-            }
-            if (!!productId) {
-              await setProductId(productId);
-            } else {
-              await setProductId("");
-            }
-            await setDebugMode({
-              mode: "group"
-            });
-            await initLaunchParams();
-          } else {
-            const device = await getDeviceInfo2({ deviceId });
-            const { productId } = device.data;
+      const message = event.message;
+      console.log("\u540E\u7AEF\u6536\u5230\u6D88\u606F", message);
+      if (isJSON(message)) {
+        const data = JSON.parse(message);
+        if (data["__bridge__"]) {
+          const { event: event2, payload } = data["__bridge__"];
+          bridgeWall.send(event2, payload);
+          console.log("[bridgeWall.send]", data["__bridge__"]);
+        }
+        const service = data.service;
+        const params = data.params;
+        console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u662F\u5426\u5B9E\u73B0:`, service in services_default);
+        if (service in services_default) {
+          try {
+            const res = await services_default[service](params);
+            ark.runtime.sendMessage(
+              JSON.stringify({
+                ...data,
+                result: res
+              })
+            );
+          } catch (error) {
+            console.log(`\u540E\u7AEF\u65B9\u6CD5[${service}]\u6267\u884C\u5931\u8D25`, error);
+            ark.runtime.sendMessage(
+              JSON.stringify({
+                ...data,
+                result: null
+              })
+            );
+          }
+        } else {
+          if (service === "initLaunchParams") {
+            const { deviceId, productId, groupId, __debugMode } = params;
             if (!!productId) {
               await setProductId(productId);
             } else {
@@ -282320,25 +282184,166 @@ var initUpdateMessage = () => {
             } else {
               await setDeviceId("");
             }
-            await setDebugMode({
-              mode: deviceId.startsWith("vdev") ? "virtual" : "real"
-            });
-            await initLaunchParams();
+            if (!!groupId) {
+              await setGroupId(groupId);
+            } else {
+              await setGroupId("");
+            }
+            initMqttClient_default.removeAllSubscribe();
+            await setDebugMode({ mode: __debugMode });
+            initLaunchParams();
+            ark.runtime.sendMessage(JSON.stringify({ ...data }));
+          } else if (service === "startMQTT") {
+            initMqttClient_default.reconnectAll();
+          } else if (service === "set_debug_extension_path") {
+            saveDebugExtension(data);
           }
-        } else {
-          console.log("\u4E0D\u884C\u554A\uFF0C \u8FD9ID\u627E\u4E0D\u5230");
-          ark.utils.message({
-            type: "error",
-            content: "\u8BF7\u5728\u9996\u9875\u9009\u62E9\u6216\u626B\u7801\u6DFB\u52A0\u8BBE\u5907"
-          });
         }
       }
     } catch (error) {
-      console.log(error);
+      console.log("---------------error", error);
     }
   });
-};
-initMqttClient();
+  const initLaunchParams = async () => {
+    try {
+      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 });
+        groupInfo2 = gd?.data;
+        deviceId = groupId;
+      }
+      if (deviceId && deviceId !== groupId) {
+        await getLangContent({});
+        await getDeviceInfo2({ deviceId });
+        deviceInfo2 = getCachedDevice()[deviceId];
+      }
+      console.log("to startMQTT", deviceId, groupId);
+      if (mode === "group") {
+        initMqttClient_default.addGroupListener(groupInfo2);
+      } else {
+        console.log("------------------- \u53BB\u76D1\u542C");
+        initMqttClient_default.addDeviceListener(deviceInfo2);
+      }
+      ark.utils.reload();
+      initUpdateMessage();
+    } catch (error) {
+      console.log("---------update", error);
+    }
+  };
+  isInstanceMode7 && ark.project.setCompilationParams({ params: `deviceId=123` });
+  ark.auth.onAuthed(async (env) => {
+    try {
+      await setProductId("");
+      await setDeviceId("");
+      await setGroupId("");
+      await setHomeId("");
+      const info = await services_default.getTuyaProjectInfo();
+      const { productId: pid } = info || {};
+      const productId = await services_default.getProductId();
+      if (pid !== productId) {
+        await services_default.setCompilationParams({ deviceId: "" });
+      }
+      initMqttClient_default._client && initMqttClient_default._client.end();
+      initMqttClient_default._client = null;
+      await initMqttClient();
+      await initLaunchParams();
+      ark.utils.reload();
+    } catch (error) {
+      console.error("---error", error);
+    }
+  });
+  ark.miniapp.onUploadedPackage(async () => {
+    const res = await services_default.getI18nNoUseStrings();
+    console.log("[onUploadedPackage]", "getI18nNoUseStrings:", res);
+    if (res.count > 0) {
+      const keys = getArray(res.result).reduce(
+        (acc, cur) => acc.concat(cur.noUseKeys),
+        []
+      );
+      ark.utils.message({
+        content: `\u68C0\u6D4B\u5230\u5197\u4F59\u591A\u8BED\u8A00\u5B57\u6BB5\uFF1A${keys.join(",")}`,
+        type: "error"
+      });
+    }
+  });
+  let onUpdateListener = null;
+  const initUpdateMessage = () => {
+    onUpdateListener = ark.project.onUpdate(async () => {
+      const { page, params } = await ark.project.getCompilationParams() || {};
+      await getHomeDeviceList();
+      try {
+        let debugParams = parseSearchParams(params);
+        const allDeviceIds2 = getAllDeviceIds();
+        const allGroupIds2 = getAllGroupIds();
+        console.log(typeof allDeviceIds2, typeof allGroupIds2);
+        const { deviceId, groupId } = debugParams;
+        if (allDeviceIds2.length || allGroupIds2.length) {
+          console.log("-----deviceId", deviceId, groupId, typeof deviceId);
+          if (!!deviceId && allDeviceIds2.indexOf(deviceId) > -1 || !!groupId && allGroupIds2.indexOf(groupId) > -1) {
+            if (groupId) {
+              const groupInfo2 = await getGroupInfo({ groupId });
+              const { productId } = groupInfo2.data;
+              if (!!groupId) {
+                await setGroupId(groupId);
+              } else {
+                await setGroupId("");
+              }
+              if (!!productId) {
+                await setProductId(productId);
+              } else {
+                await setProductId("");
+              }
+              await setDebugMode({
+                mode: "group"
+              });
+              await initLaunchParams();
+            } else {
+              const device = await getDeviceInfo2({ deviceId });
+              const { productId } = device.data;
+              if (!!productId) {
+                await setProductId(productId);
+              } else {
+                await setProductId("");
+              }
+              if (!!deviceId) {
+                await setDeviceId(deviceId);
+              } else {
+                await setDeviceId("");
+              }
+              await setDebugMode({
+                mode: deviceId.startsWith("vdev") ? "virtual" : "real"
+              });
+              await initLaunchParams();
+            }
+          } else {
+            console.log("\u4E0D\u884C\u554A\uFF0C \u8FD9ID\u627E\u4E0D\u5230");
+            ark.utils.message({
+              type: "error",
+              content: "\u8BF7\u5728\u9996\u9875\u9009\u62E9\u6216\u626B\u7801\u6DFB\u52A0\u8BBE\u5907"
+            });
+          }
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    });
+  };
+  initMqttClient();
+} catch (error) {
+  console.log("-------------------worker \u6302\u4E86", error);
+}
 /*! Bundled license information:
 
 lodash/lodash.js:

package/package.json

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