@tuya-sat/micro-script 1.0.4 → 1.1.0

package/dist/bin/cli.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
 declare const PORXY_SIGN = "--proxy";
+declare const IS_MAIN = "--main";
 declare const params: string[];
 declare const action: string, rest: string[];

package/dist/bin/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 const PORXY_SIGN = "--proxy";
+const IS_MAIN = "--main";
 const params = process.argv.slice(2);
 const [action, ...rest] = params;
 if (rest.includes(PORXY_SIGN)) {
@@ -8,7 +9,13 @@ if (rest.includes(PORXY_SIGN)) {
 }
 if (action === "start") {
     process.env.NODE_ENV = "development";
-    require("../scripts/start");
+    if (rest.includes(IS_MAIN)) {
+        process.env.START_IN_MAIN = "true";
+        require("../scripts/startInMain");
+    }
+    else {
+        require("../scripts/start");
+    }
 }
 else {
     process.env.NODE_ENV = "production";

package/dist/framework/react.config.js

@@ -52,7 +52,8 @@ const reactConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                         },
                     ],
                 },
-                isDev && {
+                isDev &&
+                    process.env.START_IN_MAIN !== "true" && {
                     test: isTs ? paths_1.default.ReactTsEntryFile : paths_1.default.ReactJsEntryFile,
                     include: paths_1.default.appSrc,
                     use: [

package/dist/framework/vue.config.js

@@ -50,7 +50,8 @@ const vueConfig = ({ isDev, isBuild, currentFramework, isTs, }) => {
                         },
                     ],
                 },
-                isDev && {
+                isDev &&
+                    process.env.START_IN_MAIN !== "true" && {
                     test: isTs ? paths_js_1.default.vueTsEntryFile : paths_js_1.default.vueJsEntryFile,
                     include: paths_js_1.default.appSrc,
                     use: [

package/dist/module/bundleServer.d.ts

@@ -0,0 +1,8 @@
+import webpack, { Compiler } from "webpack";
+import { Configuration } from "webpack-dev-server";
+export declare function createServerCompiler(): webpack.Compiler;
+export declare function runBundleServer({ port, compiler, internalDevConfig, }: {
+    port: number;
+    compiler: Compiler;
+    internalDevConfig?: Pick<Configuration, "open" | "setupMiddlewares">;
+}): Promise<void>;

package/dist/module/bundleServer.js

@@ -0,0 +1,70 @@
+"use strict";
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBundleServer = exports.createServerCompiler = void 0;
+const webpack_1 = __importDefault(require("webpack"));
+const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
+const ora_1 = __importDefault(require("ora"));
+const paths_1 = __importDefault(require("../config/paths"));
+const webpack_config_1 = __importDefault(require("../config/webpack.config"));
+const options_1 = __importDefault(require("./options"));
+function createServerCompiler() {
+    const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
+        //下面所有配置都是为了精简terminal输出
+        infrastructureLogging: {
+            level: "warn",
+        }, stats: "errors-warnings" });
+    return (0, webpack_1.default)(config);
+}
+exports.createServerCompiler = createServerCompiler;
+function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const spinner = (0, ora_1.default)(`starting dev server in ${port} port`).start();
+        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": "*",
+            }, historyApiFallback: true, setupMiddlewares(middleware, devServer) {
+                //可能会有问题
+                middleware.push(options_1.default);
+                return startDevSetupMiddlewares
+                    ? startDevSetupMiddlewares(middleware, devServer)
+                    : middleware;
+            } }, restServerConfig)), compiler);
+        compiler.hooks.watchRun.tap("MyPlugin", () => {
+            spinner.isSpinning && spinner.succeed();
+            spinner.color = "yellow";
+            spinner.text = "webpack compiling";
+            spinner.start();
+        });
+        compiler.hooks.done.tap("MyPlugin", ({ endTime, startTime }) => {
+            spinner.isSpinning && spinner.succeed();
+            console.log(`compiled time ~${endTime - startTime}ms`);
+        });
+        server.start();
+    });
+}
+exports.runBundleServer = runBundleServer;

package/dist/module/mainServer.d.ts

@@ -0,0 +1,4 @@
+export default function runMain({ port, microPort, }: {
+    port: number;
+    microPort: number;
+}): Promise<void>;

package/dist/module/mainServer.js

@@ -0,0 +1,138 @@
+"use strict";
+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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const ora_1 = __importDefault(require("ora"));
+const http_proxy_middleware_1 = require("http-proxy-middleware");
+const micro_utils_1 = require("@tuya-sat/micro-utils");
+//@ts-ignore
+const uuid_1 = require("uuid");
+const promiser_1 = require("../utils/promiser");
+const mock_1 = __importDefault(require("../module/mock"));
+const paths_1 = __importDefault(require("../config/paths"));
+const oem_micro_app_id = (0, uuid_1.v4)();
+const entry_id = (0, uuid_1.v4)();
+function runMain({ port, microPort, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { debuggerConfig: { target }, } = require(paths_1.default.microConfig);
+        const app = (0, express_1.default)();
+        //use mock
+        (0, mock_1.default)(app);
+        app.use([
+            //html
+            "/",
+            "/apps/:appId",
+            "/login",
+            "/apps/:appId/*",
+            "/application",
+            "/application/*",
+            //api
+            "/open-api/*",
+            "/custom-api/*",
+            "/api/*",
+        ], (0, http_proxy_middleware_1.createProxyMiddleware)({
+            target,
+            changeOrigin: true,
+            selfHandleResponse: true,
+            onProxyReq(proxyReq, req) {
+                if (req.url === "/api/saas-info") {
+                    //该死的，会有缓存
+                    proxyReq.setHeader("if-none-match", "");
+                }
+            },
+            onProxyRes: (0, http_proxy_middleware_1.responseInterceptor)((responseBuffer, proxyRes, req, res) => __awaiter(this, void 0, void 0, function* () {
+                if (req.url !== "/api/saas-info" || res.statusCode !== 200) {
+                    return responseBuffer;
+                }
+                let response = responseBuffer;
+                try {
+                    const lang = req.headers["accept-language"];
+                    const data = JSON.parse(response.toString("utf8"));
+                    response = JSON.stringify(processSaasInfo(data, lang, microPort));
+                }
+                catch (err) {
+                    console.log(`----json 解析错误----`, err);
+                }
+                return response;
+            })),
+        }));
+        const { pp, resolve } = (0, promiser_1.promiser)();
+        app.listen(port, () => {
+            (0, ora_1.default)(`main server in ${port} port`).succeed();
+            resolve();
+        });
+        yield pp;
+    });
+}
+exports.default = runMain;
+function processSaasInfo(data, lang, port) {
+    if (data === null || data === void 0 ? void 0 : data.success) {
+        const { result: { entry_info, apps, permissions }, } = data;
+        const baseUrl = `/apps/${oem_micro_app_id}`;
+        const manifest = (0, micro_utils_1.parseManifest)();
+        const entry = consturctEntry(manifest, oem_micro_app_id, baseUrl, lang);
+        const app = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port);
+        if (entry_info.entry_mode === "group") {
+            entry_info.entries[0].sub_entry_list.unshift(entry);
+        }
+        else {
+            entry_info.entries.unshift(entry);
+        }
+        delete require.cache[paths_1.default.microConfig];
+        const { mockPermissions = [] } = require(paths_1.default.microConfig).debuggerConfig || {};
+        permissions[oem_micro_app_id] = mockPermissions;
+        apps.unshift(app);
+    }
+    return data;
+}
+function consturctEntry(manifest, oem_micro_app_id, baseUrl, lang) {
+    const fakeMenu = (0, micro_utils_1.getFakeMenu)(manifest);
+    let stack = [fakeMenu];
+    while (stack.length) {
+        const menu = stack.shift();
+        //@ts-ignore
+        menu.oem_micro_app_id = oem_micro_app_id;
+        //@ts-ignore
+        menu.entry_id = entry_id;
+        //@ts-ignore
+        menu.entry_name = pickText(menu.entry_name, lang);
+        //@ts-ignore
+        menu.micro_app_name = pickText(menu.micro_app_name, lang);
+        //@ts-ignore
+        menu.path = `${baseUrl}${menu.path}`;
+        if (menu.sub_entry_list.length) {
+            stack.push(...menu.sub_entry_list);
+        }
+    }
+    return fakeMenu;
+}
+function consturctApp(manifest, oem_micro_app_id, baseUrl, lang, port) {
+    const packageInfo = (0, micro_utils_1.getPackage)();
+    return {
+        active_rule: baseUrl,
+        dependencies: [""],
+        ext_info: null,
+        micro_app_code: `${packageInfo.name}`,
+        micro_app_name: `${pickText((0, micro_utils_1.nameProcesser2)("name"), lang)}-dev`,
+        micro_app_version: "0.0.0-x",
+        oem_micro_app_id,
+        resource: `http://localhost:${port}`,
+        schema: null,
+        universal_id: manifest.universalId,
+        isAuth: true,
+    };
+}
+function pickText(texts, lang) {
+    return lang === "en-US" ? texts[1] : texts[0];
+}

package/dist/scripts/start.js

@@ -11,27 +11,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = __importDefault(require("webpack"));
-const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
-const ora_1 = __importDefault(require("ora"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const portfinder_1 = __importDefault(require("portfinder"));
 const micro_dev_loader_1 = require("@tuya-sat/micro-dev-loader");
+const micro_utils_1 = require("@tuya-sat/micro-utils");
 const paths_1 = __importDefault(require("../config/paths"));
-const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const mock_1 = __importDefault(require("../module/mock"));
-const options_1 = __importDefault(require("../module/options"));
-const isMobile = ((_a = fs_extra_1.default.readJSONSync(paths_1.default.manifest).supportedPlatform) === null || _a === void 0 ? void 0 : _a[0]) === "MOBILE";
-const { debuggerConfig, devServerConfig = (value) => value, needMainLayout = !isMobile, } = require(paths_1.default.microConfig);
-const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
-    //下面所有配置都是为了精简terminal输出
-    infrastructureLogging: {
-        level: "warn",
-    }, stats: "errors-warnings" });
-const compiler = (0, webpack_1.default)(config);
-needMainLayout && new micro_dev_loader_1.LayoutMockPlugin().apply(compiler);
+const bundleServer_1 = require("../module/bundleServer");
+const needLayout = !(0, micro_utils_1.isMobile)();
+const internalDevConfig = {
+    open: true,
+    setupMiddlewares(middleware, { app }) {
+        needLayout && micro_dev_loader_1.LayoutMockPlugin.useLayoutStatic(app);
+        (0, mock_1.default)(app);
+        const isProxy = process.env.MICRO_DEBUGGER === "true";
+        if (isProxy) {
+            const createProxy = require("@tuya-sat/micro-dev-proxy").default;
+            const { debuggerConfig } = require(paths_1.default.microConfig);
+            createProxy(debuggerConfig)(app);
+        }
+        return middleware;
+    },
+};
 (() => __awaiter(void 0, void 0, void 0, function* () {
     let defaultPort = 9000;
     //检测端口占用情况
@@ -39,40 +40,13 @@ needMainLayout && new micro_dev_loader_1.LayoutMockPlugin().apply(compiler);
         port: defaultPort,
         stopPort: defaultPort + 100,
     });
-    const spinner = (0, ora_1.default)(`starting dev server in ${port} port`).start();
-    const server = new webpack_dev_server_1.default(devServerConfig({
-        static: paths_1.default.dist,
-        hot: true,
-        liveReload: false,
-        open: true,
+    const compiler = (0, bundleServer_1.createServerCompiler)();
+    needLayout && new micro_dev_loader_1.LayoutMockPlugin().apply(compiler);
+    (0, bundleServer_1.runBundleServer)({
         port,
-        headers: {
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Headers": "*",
-        },
-        historyApiFallback: true,
-        setupMiddlewares(middlewares, { app }) {
-            needMainLayout && micro_dev_loader_1.LayoutMockPlugin.useLayoutStatic(app);
-            middlewares.push(options_1.default);
-            (0, mock_1.default)(app);
-            if (process.env.MICRO_DEBUGGER === "true") {
-                const createProxy = require("@tuya-sat/micro-dev-proxy").default;
-                createProxy(debuggerConfig)(app);
-            }
-            return middlewares;
-        },
-    }), compiler);
-    compiler.hooks.watchRun.tap("MyPlugin", () => {
-        spinner.isSpinning && spinner.succeed();
-        spinner.color = "yellow";
-        spinner.text = "webpack compiling";
-        spinner.start();
-    });
-    compiler.hooks.done.tap("MyPlugin", ({ endTime, startTime }) => {
-        spinner.isSpinning && spinner.succeed();
-        console.log(`compiled time ~${endTime - startTime}ms`);
+        compiler,
+        internalDevConfig,
     });
-    server.start();
 }))().catch((err) => {
     console.log(err);
 });

package/dist/scripts/startInMain.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/startInMain.js

@@ -0,0 +1,63 @@
+"use strict";
+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 };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfinder_1 = __importDefault(require("portfinder"));
+const open_1 = __importDefault(require("open"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const mainServer_1 = __importDefault(require("../module/mainServer"));
+const micro_utils_1 = require("@tuya-sat/micro-utils");
+const bundleServer_1 = require("../module/bundleServer");
+function onceFactory(fn, count = 1) {
+    let executeCount = 0;
+    return () => {
+        if (executeCount >= count) {
+            return;
+        }
+        executeCount++;
+        return fn();
+    };
+}
+(() => __awaiter(void 0, void 0, void 0, function* () {
+    let defaultPort = 9000;
+    //检测端口占用情况
+    const bundledServerPort = yield portfinder_1.default.getPortPromise({
+        port: defaultPort,
+        stopPort: defaultPort + 100,
+    });
+    const mainServerPort = yield portfinder_1.default.getPortPromise({
+        port: bundledServerPort + 1,
+        stopPort: bundledServerPort + 100,
+    });
+    const compiler = (0, bundleServer_1.createServerCompiler)();
+    yield (0, mainServer_1.default)({
+        port: mainServerPort,
+        microPort: bundledServerPort,
+    });
+    const packagePath = path_1.default.resolve(__dirname, "../../package.json");
+    const { name, version } = fs_extra_1.default.readJSONSync(packagePath);
+    (0, micro_utils_1.isNewVersions)(name, version);
+    (0, open_1.default)(`http://localhost:${mainServerPort}`);
+    (0, bundleServer_1.runBundleServer)({
+        port: bundledServerPort,
+        compiler,
+    });
+    //临时提示
+    compiler.hooks.done.tap("once-tip", onceFactory(() => {
+        console.log(chalk_1.default.yellow(`Tip: 如果HMR失效且保存文件时造成多次compile，请考虑调高aggregateTimeout参数(可以尝试100)`));
+    }));
+}))().catch((err) => {
+    console.log(err);
+});

package/dist/utils/filterLoaderInRule.d.ts

@@ -0,0 +1,7 @@
+import { ModuleOptions } from "webpack";
+/**
+ *
+ * @param loaderName loader的名字
+ * @param ruleConfig webpack内的rule项的config
+ */
+export declare function filterRulesWithLoader(loaderName: string, ruleConfig: ModuleOptions["rules"]): (import("webpack").RuleSetRule | "...")[];

package/dist/utils/filterLoaderInRule.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterRulesWithLoader = void 0;
+/**
+ *
+ * @param loaderName loader的名字
+ * @param ruleConfig webpack内的rule项的config
+ */
+function filterRulesWithLoader(loaderName, ruleConfig) {
+    return ruleConfig.filter((rule) => {
+        if (rule !== "..." && rule.use instanceof Array) {
+            for (const useItem of rule.use) {
+                if (typeof useItem === "object" && useItem.loader === loaderName) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    });
+}
+exports.filterRulesWithLoader = filterRulesWithLoader;

package/dist/utils/promiser.d.ts

@@ -0,0 +1,5 @@
+export declare const promiser: () => {
+    pp: Promise<unknown>;
+    resolve: undefined;
+    reject: undefined;
+};

package/dist/utils/promiser.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiser = void 0;
+const promiser = () => {
+    let resolve;
+    let reject;
+    let pp = new Promise((resolve$, reject$) => {
+        resolve = resolve$;
+        reject = reject$;
+    });
+    return {
+        pp,
+        resolve,
+        reject,
+    };
+};
+exports.promiser = promiser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-sat/micro-script",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "bin": "./dist/bin/cli.js",
   "type": "commonjs",
   "license": "MIT",
@@ -15,19 +15,23 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
-    "@tuya-sat/micro-dev-loader": "1.0.4",
-    "@tuya-sat/micro-dev-proxy": "1.0.4",
+    "@tuya-sat/micro-dev-loader": "1.1.0",
+    "@tuya-sat/micro-dev-proxy": "1.1.0",
+    "@tuya-sat/micro-utils": "1.1.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-import": "^1.13.3",
     "chalk": "4.1.2",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.4.0",
     "css-minimizer-webpack-plugin": "^3.2.0",
+    "express": "^4.17.2",
     "fork-ts-checker-webpack-plugin": "^6.4.0",
     "html-webpack-plugin": "^5.3.2",
+    "http-proxy-middleware": "^2.0.1",
     "less": "^4.1.2",
     "less-loader": "^10.1.0",
     "mini-css-extract-plugin": "^2.4.2",
+    "open": "^8.4.0",
     "ora": "5.4.1",
     "path-to-regexp": "^6.2.0",
     "portfinder": "^1.0.28",
@@ -42,12 +46,15 @@
     "svg-url-loader": "^7.1.1",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
     "url-loader": "^4.1.1",
+    "uuid": "^8.3.2",
     "vue-loader": "16.8.2",
     "webpack": "^5.58.1",
     "webpack-dev-server": "^4.3.1",
     "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
+    "@types/express": "^4.17.13",
+    "@types/webpack-dev-server": "^4.5.0",
     "typescript": "^4.4.4"
   },
   "keywords": [