@tuya-sat/micro-script 3.2.9 → 3.2.10

package/dist/module/bundleServer.js

@@ -31,6 +31,7 @@ const paths_1 = __importDefault(require("../config/paths"));
 const webpack_config_1 = __importDefault(require("../config/webpack.config"));
 const options_1 = __importDefault(require("./options"));
 const onceFactory_1 = require("../utils/onceFactory");
+const promiser_1 = require("../utils/promiser");
 function createServerCompiler() {
     const config = Object.assign(Object.assign({}, (0, webpack_config_1.default)()), { 
         //下面所有配置都是为了精简terminal输出
@@ -43,6 +44,7 @@ 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 { waiting, resolve } = (0, promiser_1.promiser)();
         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: {
@@ -63,11 +65,13 @@ function runBundleServer({ port, compiler, internalDevConfig = {}, }) {
         });
         compiler.hooks.done.tap('MyPlugin', ({ endTime, startTime }) => {
             spinner.isSpinning && spinner.succeed();
+            resolve();
             console.log(`compiled time ~${endTime - startTime}ms`);
         });
         //临时提示
         compiler.hooks.done.tap('once-tip', (0, onceFactory_1.onceFactory)(() => { }));
         yield server.start();
+        yield waiting;
         console.log('\n The local application server has started');
     });
 }

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

@@ -3,5 +3,5 @@ import { AppProxy } from '@tuya-sat/micro-dev-proxy';
 interface IApp extends Express {
     __appProxy__?: AppProxy;
 }
-export default function mockSaasInfo(app: IApp, microPort: number): void;
+export default function mockSaasInfo(app: IApp, microPort: number): Promise<IApp>;
 export {};

package/dist/module/main/fakeSaasInfo.js

@@ -44,78 +44,40 @@ const path = __importStar(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const utils_1 = require("../../utils");
 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) ||
-            fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps'));
-        dirs === null || dirs === void 0 ? void 0 : dirs.forEach((dir) => {
-            idsMap.set(dir, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
-        });
-        app.get('/api/saas-info', (req, res) => {
-            const lang = 'zh';
-            const result = {
-                apps: [],
-                entry_info: { entries: [], entry_mode: 'normal' },
-                permissions: {},
-                saas_id_info_list: [],
-            };
-            dirs.forEach((dir) => {
-                const entry_id = idsMap.get(dir).entry_id;
-                const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'apps', dir, 'manifest.json'), 'utf-8');
-                const oem_micro_app_id = idsMap.get(dir).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 appConfig = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'node_modules', '.micro', 'app.config.json'));
-                const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, appConfig[dir]);
-                const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, `apps/${dir}`);
-                const permission = (manifest === null || manifest === void 0 ? void 0 : manifest.privileges.map((item) => {
-                    return { permission_group: item.code };
-                })) || [];
-                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,
+    return __awaiter(this, void 0, void 0, function* () {
+        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) ||
+                fs_extra_1.default.readdirSync(path.join(process.cwd(), 'apps'));
+            dirs === null || dirs === void 0 ? void 0 : dirs.forEach((dir) => {
+                idsMap.set(dir, { entry_id: (0, uuid_1.v4)(), oem_micro_app_id: (0, uid_1.uid)(16) });
             });
-        });
-    }
-    if (!isMainApp) {
-        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) => __awaiter(this, void 0, void 0, function* () {
-            const lang = parseCookie(req.headers['cookie'], 'main-i18next');
-            if ((0, utils_1.isMonorepo)() || (multiApps && multiApps.length > 0)) {
+            return app.get('/api/saas-info', (req, res) => {
+                const lang = 'zh';
                 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 dir = (0, utils_1.isMonorepo)() ? `apps/${app.name}` : `${app.dir}`;
-                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), dir, 'manifest.json'), 'utf-8');
-                    const oem_micro_app_id = idsMap.get(app.name).oem_micro_app_id;
+                dirs.forEach((dir) => {
+                    const entry_id = idsMap.get(dir).entry_id;
+                    const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'apps', dir, 'manifest.json'), 'utf-8');
+                    const oem_micro_app_id = idsMap.get(dir).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, dir);
-                    const permission = consturctPermissions();
+                    const appConfig = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 'node_modules', '.micro', 'app.config.json'));
+                    const micoApp = consturctApp(manifest, oem_micro_app_id, baseUrl, lang, appConfig[dir]);
+                    const entryInfo = consturctEntry(manifest, oem_micro_app_id, entry_id, baseUrl, lang, `apps/${dir}`);
+                    const permission = (manifest === null || manifest === void 0 ? void 0 : manifest.privileges.map((item) => {
+                        return { permission_group: item.code };
+                    })) || [];
                     result.apps.push(micoApp);
                     result.entry_info.entries.push(entryInfo);
                     result.permissions[oem_micro_app_id] = permission;
@@ -127,46 +89,86 @@ function mockSaasInfo(app, microPort) {
                     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 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({
-                    code: null,
-                    errorMsg: null,
-                    msg: null,
-                    result: {
-                        apps: saasApps,
-                        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,
-                });
-            }
-        }));
-    }
+            });
+        }
+        if (!isMainApp) {
+            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) });
+            });
+            return 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 = {
+                        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 dir = (0, utils_1.isMonorepo)() ? `apps/${app.name}` : `${app.dir}`;
+                        const manifest = fs_extra_1.default.readJSONSync(path.join(process.cwd(), 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, 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,
+                    });
+                }
+                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 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({
+                        code: null,
+                        errorMsg: null,
+                        msg: null,
+                        result: {
+                            apps: saasApps,
+                            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/mainServer.js

@@ -93,7 +93,7 @@ function runMain({ port, microPort, }) {
         (0, socket_1.bootStrap)(io);
         mainServer && mainServer.before && mainServer.before(app);
         yield (0, staticMain_1.default)(app, debuggerConfig, microPort);
-        (0, fakeSaasInfo_1.default)(app, microPort);
+        yield (0, fakeSaasInfo_1.default)(app, microPort);
         (0, mock_1.default)(app);
         (0, proxy_1.default)(app);
         mainServer && mainServer.after && mainServer.after(app);

package/dist/scripts/start.js

@@ -24,7 +24,7 @@ const template_1 = __importDefault(require("../template"));
     //检测端口占用情况
     if (process.env.PROT) {
         const compiler = (0, bundleServer_1.createServerCompiler)();
-        (0, bundleServer_1.runBundleServer)({
+        yield (0, bundleServer_1.runBundleServer)({
             port: Number(process.env.PROT),
             compiler,
             internalDevConfig: {
@@ -43,7 +43,7 @@ const template_1 = __importDefault(require("../template"));
             stopPort: defaultPort + 100,
         });
         const compiler = (0, bundleServer_1.createServerCompiler)();
-        (0, bundleServer_1.runBundleServer)({
+        yield (0, bundleServer_1.runBundleServer)({
             port,
             compiler,
             internalDevConfig: {

package/package.json

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