@tuya-sat/micro-script 3.0.0-beta.14 → 3.0.0-beta.16

package/dist/module/bundleServer.d.ts

@@ -1,9 +1,9 @@
-import webpack, { Compiler } from "webpack";
-import { Configuration } from "webpack-dev-server";
+import webpack, { Compiler } from 'webpack';
+import { Configuration } from 'webpack-dev-server';
 export declare type CustomDevServer = (value: Configuration) => typeof value;
 export declare function createServerCompiler(): webpack.Compiler;
 export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
     port: number;
     compiler: Compiler;
-    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares" | "allowedHosts">;
+    internalDevConfig?: Pick<Configuration, 'open' | 'setupMiddlewares' | 'allowedHosts'>;
 }): Promise<void>;

package/dist/module/bundleServer.js

@@ -36,8 +36,8 @@ function createServerCompiler() {
     const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
         //下面所有配置都是为了精简terminal输出
         infrastructureLogging: {
-            level: "warn",
-        }, stats: "errors-warnings" });
+            level: 'warn',
+        }, stats: 'errors-warnings' });
     return (0, webpack_1.default)(config);
 }
 exports.createServerCompiler = createServerCompiler;
@@ -47,8 +47,8 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
         const { devServer = (value) => value } = require(paths_1.default.microConfig);
         const { setupMiddlewares: startDevSetupMiddlewares } = internalDevConfig, restServerConfig = __rest(internalDevConfig, ["setupMiddlewares"]);
         const server = new webpack_dev_server_1.default(devServer(Object.assign({ hot: true, liveReload: false, port, headers: {
-                "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Headers": "*",
+                'Access-Control-Allow-Origin': '*',
+                'Access-Control-Allow-Headers': '*',
             }, historyApiFallback: true, setupMiddlewares(middleware, devServer) {
                 //可能会有问题
                 middleware.push(options_1.default);
@@ -56,21 +56,22 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
                     ? startDevSetupMiddlewares(middleware, devServer)
                     : middleware;
             } }, restServerConfig)), compiler);
-        compiler.hooks.watchRun.tap("MyPlugin", () => {
+        compiler.hooks.watchRun.tap('MyPlugin', () => {
             spinner.isSpinning && spinner.succeed();
-            spinner.color = "yellow";
-            spinner.text = "webpack compiling";
+            spinner.color = 'yellow';
+            spinner.text = 'webpack compiling';
             spinner.start();
         });
-        compiler.hooks.done.tap("MyPlugin", ({ endTime, startTime }) => {
+        compiler.hooks.done.tap('MyPlugin', ({ endTime, startTime }) => {
             spinner.isSpinning && spinner.succeed();
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
         //临时提示
-        compiler.hooks.done.tap("once-tip", (0, onceFactory_1.onceFactory)(() => {
+        compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => {
             console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
         }));
-        server.start();
+        yield server.start();
+        console.log('本地应用服务已启动');
     });
 }
 exports.runBundleServer = runBundleServer;

package/dist/module/main/fakeSaasInfo.js

@@ -33,68 +33,70 @@ const uid_1 = require("uid");
 const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 function mockSaasInfo(app, microPort) {
-    const { multiApps } = require(paths_1.default.microConfig);
+    const { multiApps, isMainApp } = require(paths_1.default.microConfig);
     const idsMap = new Map();
     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) => {
-        const lang = parseCookie(req.headers['cookie'], 'main-i18next');
-        if (multiApps && multiApps.length > 0) {
-            const result = {
-                apps: [],
-                entry_info: { entries: [], entry_mode: 'normal' },
-                permissions: {},
-                saas_id_info_list: [],
-            };
-            multiApps.forEach((app) => {
-                const entry_id = idsMap.get(app.name).entry_id;
-                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), `${app.dir}/manifest.json`), 'utf-8');
-                const oem_micro_app_id = idsMap.get(app.name).oem_micro_app_id;
-                const baseUrl = `/apps/${oem_micro_app_id}`;
-                result.saas_id_info_list.push({
-                    oem_micro_app_id: oem_micro_app_id,
-                    universal_id: '',
+    if (!isMainApp) {
+        app.get('/api/saas-info', (req, res) => {
+            const lang = parseCookie(req.headers['cookie'], 'main-i18next');
+            if (multiApps && multiApps.length > 0) {
+                const result = {
+                    apps: [],
+                    entry_info: { entries: [], entry_mode: 'normal' },
+                    permissions: {},
+                    saas_id_info_list: [],
+                };
+                multiApps.forEach((app) => {
+                    const entry_id = idsMap.get(app.name).entry_id;
+                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), `${app.dir}/manifest.json`), 'utf-8');
+                    const oem_micro_app_id = idsMap.get(app.name).oem_micro_app_id;
+                    const baseUrl = `/apps/${oem_micro_app_id}`;
+                    result.saas_id_info_list.push({
+                        oem_micro_app_id: oem_micro_app_id,
+                        universal_id: '',
+                    });
+                    const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort, app.name);
+                    const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, app.dir);
+                    const permission = consturctPermissions();
+                    result.apps.push(micoApp);
+                    result.entry_info.entries.push(entryInfo);
+                    result.permissions[oem_micro_app_id] = permission;
+                });
+                res.send({
+                    code: null,
+                    errorMsg: null,
+                    msg: null,
+                    result,
+                    success: true,
                 });
-                const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, microPort, app.name);
-                const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, app.dir);
+            }
+            else {
+                const manifest = (0, micro_utils_1.parseManifest)();
+                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 entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, '');
                 const permission = consturctPermissions();
-                result.apps.push(micoApp);
-                result.entry_info.entries.push(entryInfo);
-                result.permissions[oem_micro_app_id] = permission;
-            });
-            res.send({
-                code: null,
-                errorMsg: null,
-                msg: null,
-                result,
-                success: true,
-            });
-        }
-        else {
-            const manifest = (0, micro_utils_1.parseManifest)();
-            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 entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, '');
-            const permission = consturctPermissions();
-            res.send({
-                code: null,
-                errorMsg: null,
-                msg: null,
-                result: {
-                    apps: [app],
-                    entry_info: { entries: [entryInfo], entry_mode: 'normal' },
-                    permissions: { [oem_micro_app_id]: permission },
-                    saas_id_info_list: [
-                        { oem_micro_app_id: oem_micro_app_id, universal_id: '' },
-                    ],
-                },
-                success: true,
-            });
-        }
-    });
+                res.send({
+                    code: null,
+                    errorMsg: null,
+                    msg: null,
+                    result: {
+                        apps: [app],
+                        entry_info: { entries: [entryInfo], entry_mode: 'normal' },
+                        permissions: { [oem_micro_app_id]: permission },
+                        saas_id_info_list: [
+                            { oem_micro_app_id: oem_micro_app_id, universal_id: '' },
+                        ],
+                    },
+                    success: true,
+                });
+            }
+        });
+    }
 }
 exports.default = mockSaasInfo;
 function consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, dir) {

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

@@ -20,4 +20,4 @@ export declare type CustomConfig = {
 };
 export default function staticMain(app: Express & {
     _isLogin?: Promise<void>;
-}, debuggerConfig: DebuggerConfig): void;
+}, debuggerConfig: DebuggerConfig, microPort: number): void;

package/dist/module/main/staticMain.js

@@ -41,7 +41,7 @@ const fakeSaas_1 = __importStar(require("./fakeSaas"));
 const paths_1 = __importDefault(require("../../config/paths"));
 const webpack_common_1 = require("../../config/webpack.common");
 const defaultBase = 'https://static1.tuyacn.com/static/sdf-gw/v1.0.1.516/';
-function staticMain(app, debuggerConfig) {
+function staticMain(app, debuggerConfig, microPort) {
     app.get([
         '/',
         '/apps/:appId',
@@ -50,10 +50,13 @@ function staticMain(app, debuggerConfig) {
         '/application',
         '/application/*',
     ], (req, res) => __awaiter(this, void 0, void 0, function* () {
-        if (app._isLogin) {
+        if (!debuggerConfig.isMainApp && app._isLogin) {
             yield app._isLogin;
         }
-        const base = debuggerConfig.base || defaultBase;
+        let base = debuggerConfig.base || defaultBase;
+        if (debuggerConfig.isMainApp) {
+            base = `http://localhost:${microPort}`;
+        }
         const { data } = yield axios_1.default.get(new URL('index.html', base).href);
         const $ = cheerio_1.default.load(data);
         modifySrcAttr($, base);

package/dist/module/mainServer.js

@@ -27,7 +27,7 @@ function runMain({ port, microPort, }) {
         (0, validate_1.validateDebuggerConfig)(debuggerConfig);
         const app = (0, express_1.default)();
         mainServer && mainServer.before && mainServer.before(app);
-        (0, staticMain_1.default)(app, debuggerConfig);
+        (0, staticMain_1.default)(app, debuggerConfig, microPort);
         (0, fakeSaasInfo_1.default)(app, microPort);
         (0, mock_1.default)(app);
         (0, proxy_1.default)(app);
@@ -38,6 +38,7 @@ function runMain({ port, microPort, }) {
             resolve();
         });
         yield waiting;
+        console.log('代理服务已启动');
     });
 }
 exports.default = runMain;

package/dist/scripts/startInMain.js

@@ -29,18 +29,18 @@ const kill_port_1 = __importDefault(require("kill-port"));
         stopPort: bundledServerPort + 100,
     });
     const compiler = (0, bundleServer_1.createServerCompiler)();
-    yield (0, mainServer_1.default)({
-        port: mainServerPort,
-        microPort: bundledServerPort,
-    });
-    (0, open_1.default)(`http://localhost:${mainServerPort}`);
-    (0, bundleServer_1.runBundleServer)({
+    yield (0, bundleServer_1.runBundleServer)({
         port: bundledServerPort,
         compiler,
         internalDevConfig: {
             allowedHosts: 'all',
         },
     });
+    yield (0, mainServer_1.default)({
+        port: mainServerPort,
+        microPort: bundledServerPort,
+    });
+    (0, open_1.default)(`http://localhost:${mainServerPort}`);
     process.on('exit', () => {
         (0, kill_port_1.default)(bundledServerPort, 'tcp').then(console.log).catch(console.log);
     });

package/package.json

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