@tuya-sat/micro-script 3.1.4 → 3.1.6

package/dist/module/main/fakeSaas.js

@@ -57,7 +57,7 @@ function parse__MAIN_APP_PUBLIC_PATH(html) {
 }
 const grabSaasPage = (target) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        return axios_1.default.get(target);
+        return yield axios_1.default.get(target);
     }
     catch (e) {
         return axios_1.default.get(new URL('/login?disable_third_login=true', target).href);

package/dist/module/main/fakeSaasInfo.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,8 +42,9 @@ const uid_1 = require("uid");
 const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("../../utils");
+const axios_1 = __importDefault(require("axios"));
 function mockSaasInfo(app, microPort) {
-    let { multiApps, microApps, debuggerConfig: { isMainApp }, } = require(paths_1.default.microConfig);
+    let { multiApps, microApps, debuggerConfig: { isMainApp, target }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
     multiApps = (0, utils_1.processMultiApps)(multiApps);
     if (isMainApp && fs_extra_1.default.existsSync(path.join(process.cwd(), 'apps'))) {
@@ -122,7 +132,15 @@ function mockSaasInfo(app, microPort) {
                 const entry_id = (0, uuid_1.v4)();
                 const oem_micro_app_id = manifest.universalId;
                 const baseUrl = `/apps/${oem_micro_app_id}`;
-                const app = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort);
+                const localApps = refactorConstructApp(target, [
+                    {
+                        manifest,
+                        oem_micro_app_id,
+                        baseUrl,
+                        lang,
+                        port: microPort
+                    }
+                ]);
                 const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, '');
                 const permission = consturctPermissions();
                 res.send({
@@ -130,7 +148,7 @@ function mockSaasInfo(app, microPort) {
                     errorMsg: null,
                     msg: null,
                     result: {
-                        apps: [app],
+                        apps: localApps,
                         entry_info: { entries: [entryInfo], entry_mode: 'normal' },
                         permissions: { [oem_micro_app_id]: permission },
                         saas_id_info_list: [
@@ -178,6 +196,27 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir
     }
     return fakeMenu;
 }
+function refactorConstructApp(saasUrl, localApps) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const saasAppsMap = {};
+        try {
+            const res = yield axios_1.default.get(new URL('/api/saas-info', saasUrl).href);
+            (_a = res.data.result.apps) === null || _a === void 0 ? void 0 : _a.forEach((app) => {
+                saasAppsMap[app.universal_id] = app;
+            });
+        }
+        catch (e) {
+            console.error('获取 SaaS 信息失败，尝试使用假数据模拟 APP 信息');
+        }
+        const packageInfo = (0, micro_utils_1.getPackage)();
+        return localApps.map((app) => {
+            const uuid = app.manifest.universalId;
+            const code = app.code || `${packageInfo.name}`;
+            return Object.assign(Object.assign({}, saasAppsMap[app.oem_micro_app_id]), { active_rule: app.baseUrl, micro_app_code: code, micro_app_name: code ? `${code}-dev` : `${packageInfo.name}-dev`, micro_app_version: '0.0.0-x', oem_micro_app_id: app.oem_micro_app_id, resource: `http://localhost:${app.port}/${code || 'index'}.html`, universal_id: uuid, isAuth: true, schema: null });
+        });
+    });
+}
 function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port, code) {
     const packageInfo = (0, micro_utils_1.getPackage)();
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -23,9 +23,9 @@
     "@babel/preset-typescript": "7.16.7",
     "@babel/traverse": "^7.20.13",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
-    "@tuya-sat/micro-dev-loader": "3.1.4",
-    "@tuya-sat/micro-dev-proxy": "3.1.4",
-    "@tuya-sat/micro-utils": "3.1.4",
+    "@tuya-sat/micro-dev-loader": "3.1.6",
+    "@tuya-sat/micro-dev-proxy": "3.1.6",
+    "@tuya-sat/micro-utils": "3.1.6",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",