@tuya-sat/micro-script 3.1.7 → 3.2.0

package/dist/module/main/fakeSaasInfo.d.ts

@@ -1,2 +1,7 @@
 import { Express } from 'express';
-export default function mockSaasInfo(app: Express, microPort: number): void;
+import AppProxy from "@tuya-sat/micro-dev-proxy/dist/appProxy";
+interface IApp extends Express {
+    __appProxy__?: AppProxy;
+}
+export default function mockSaasInfo(app: IApp, microPort: number): void;
+export {};

package/dist/module/main/fakeSaasInfo.js

@@ -46,6 +46,7 @@ const axios_1 = __importDefault(require("axios"));
 function mockSaasInfo(app, microPort) {
     let { multiApps, microApps, debuggerConfig: { isMainApp, target }, } = require(paths_1.default.microConfig);
     const idsMap = new Map();
+    const expressApp = app;
     multiApps = (0, utils_1.processMultiApps)(multiApps);
     if (isMainApp && fs_extra_1.default.existsSync(path.join(process.cwd(), 'apps'))) {
         const dirs = ((microApps === null || microApps === void 0 ? void 0 : microApps.length) > 0 && microApps) ||
@@ -93,7 +94,7 @@ function mockSaasInfo(app, microPort) {
         multiApps === null || multiApps === void 0 ? void 0 : multiApps.forEach((app) => {
             idsMap.set(app.name, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
         });
-        app.get('/api/saas-info', (req, res) => {
+        app.get('/api/saas-info', (req, res) => __awaiter(this, void 0, void 0, function* () {
             const lang = parseCookie(req.headers['cookie'], 'main-i18next');
             if ((0, utils_1.isMonorepo)() || (multiApps && multiApps.length > 0)) {
                 const result = {
@@ -132,7 +133,21 @@ 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 saasApps = yield refactorConstructApp({
+                    url: target,
+                    headers: {
+                        cookie: expressApp.__appProxy__.getCookie(''),
+                        csrf: expressApp.__appProxy__.csrfValue.value,
+                    }
+                }, [
+                    {
+                        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({
@@ -140,7 +155,7 @@ function mockSaasInfo(app, microPort) {
                     errorMsg: null,
                     msg: null,
                     result: {
-                        apps: [app],
+                        apps: saasApps,
                         entry_info: { entries: [entryInfo], entry_mode: 'normal' },
                         permissions: { [oem_micro_app_id]: permission },
                         saas_id_info_list: [
@@ -150,7 +165,7 @@ function mockSaasInfo(app, microPort) {
                     success: true,
                 });
             }
-        });
+        }));
     }
 }
 exports.default = mockSaasInfo;
@@ -188,24 +203,40 @@ function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir
     }
     return fakeMenu;
 }
-function refactorConstructApp(saasUrl, localApps) {
+function refactorConstructApp(config, 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);
+            const res = yield axios_1.default.get(new URL('/api/saas-info', config.url).href, {
+                headers: config.headers,
+            });
             (_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 信息');
+            console.error('\n获取 SaaS 信息失败，尝试使用假数据模拟 APP 信息\n');
         }
         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 });
+            const appInfo = saasAppsMap[app.oem_micro_app_id];
+            return {
+                ext_info: appInfo === null || appInfo === void 0 ? void 0 : appInfo.ext_info,
+                micro_app_config: appInfo.micro_app_config,
+                lang_package_biz_id: appInfo.lang_package_biz_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,
+            };
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "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.7",
-    "@tuya-sat/micro-dev-proxy": "3.1.7",
-    "@tuya-sat/micro-utils": "3.1.7",
+    "@tuya-sat/micro-dev-loader": "3.2.0",
+    "@tuya-sat/micro-dev-proxy": "3.2.0",
+    "@tuya-sat/micro-utils": "3.2.0",
     "@types/kill-port": "^2.0.0",
     "babel-loader": "8.2.4",
     "babel-plugin-import": "1.13.3",