@cloudbase/cli 2.5.1-alpha.4 → 2.5.1-alpha.5

package/lib/commands/common.js

@@ -42,7 +42,9 @@ const events_1 = require("events");
 const commander_1 = require("commander");
 const yargs_parser_1 = __importDefault(require("yargs-parser"));
 const error_1 = require("../error");
+const toolbox_1 = require("@cloudbase/toolbox");
 const utils_1 = require("../utils");
+const auth_1 = require("../auth");
 const registrableCommands = [];
 const cmdMap = new Map();
 const defaultCmdDecoratorOpts = {
@@ -162,8 +164,11 @@ class Command extends events_1.EventEmitter {
             }
             if (!withoutAuth && !loginState) {
                 if (autoRunLogin) {
-                    console.log(chalk_1.default.bold.yellowBright('无有效身份信息，将自动为您打开授权页面。授权成功后请再重新执行命令'));
-                    yield commander_1.program.parseAsync(['node', 'tcb', 'login']);
+                    console.log(chalk_1.default.bold.yellowBright('无有效身份信息，将自动为您打开授权页面。'));
+                    yield (0, toolbox_1.execWithLoading)(() => (0, auth_1.login)(), {
+                        startTip: '请在浏览器中打开的授权页面进行授权...',
+                        successTip: '授权登录成功！'
+                    });
                 }
                 else {
                     throw new error_1.CloudBaseError('无有效身份信息，请使用 cloudbase login 登录');

package/lib/commands/lowcode/app.js

@@ -70,6 +70,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const dts_1 = require("../../utils/dts");
+const cals_1 = require("@cloudbase/cals");
 let lowcodeCli;
 if (process.argv.includes('lowcode')) {
     (0, utils_1.getLowcodeCli)().then((_) => (lowcodeCli = _));
@@ -401,84 +402,239 @@ let TemplateSync = class TemplateSync extends common_1.Command {
             childCmd: 'sync',
             options: [
                 {
-                    flags: '--envId <envId>',
-                    desc: '环境 ID'
+                    flags: '--source <source>',
+                    desc: '来源: 1-野鹤 2-自建模板'
                 }
             ],
             desc: '同步官方模板应用内容',
-            requiredEnvId: true
+            requiredEnvId: false
         };
     }
     execute(ctx, log, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             log.info('同步中...');
+            const SourceType = {
+                YEHE: '1',
+                CUSTOM_MODULE: '2'
+            };
+            const source = Object.values(SourceType).includes(options.source)
+                ? options.source
+                : SourceType.YEHE;
             const envId = 'lowcode-5g5llxbq5bc9299e';
+            const cloudService = yield getCloudServiceInstance(ctx);
+            const files = [];
+            const limit = 50;
+            let count = 1;
             const fileDir = path_1.default.resolve(os_1.default.tmpdir(), 'templates');
             yield fs_extra_1.default.ensureDir(fileDir);
             yield fs_extra_1.default.rmdir(fileDir, { recursive: true });
             yield fs_extra_1.default.ensureDir(fileDir);
-            const cloudService = yield getCloudServiceInstance(ctx);
-            let total = Infinity;
-            let currentTotal = 0;
-            const limit = 50;
-            const files = [];
-            let count = 1;
-            while (currentTotal < total) {
-                const solutionListResult = yield cloudService.lowcode.request('DescribeSolutionList', {
-                    Limit: limit,
-                    Offset: currentTotal,
-                    KeyWords: '',
-                    EnvId: envId,
-                    TypeList: ['SELFBUILD', 'TPLEXPORT']
-                });
-                const solutionList = solutionListResult.SolutionInfoList;
-                const handledSolutionList = yield Promise.all(solutionList.map((item) => __awaiter(this, void 0, void 0, function* () {
-                    const solution = yield cloudService.lowcode.request('DescribeSolution', {
+            if (source === SourceType.YEHE) {
+                const templates = yield fs_extra_1.default.readJSON('data.json', 'utf8');
+                console.log('模板总数：', templates.length);
+                while (templates.length > 0) {
+                    const handledSolutionList = yield Promise.all(templates.splice(0, limit).map((item) => __awaiter(this, void 0, void 0, function* () {
+                        if (item.appIds.length > 0) {
+                            const apps = yield getAppsContent(item.appIds);
+                            return {
+                                name: item.templateName,
+                                templateId: item.templateId,
+                                status: item.status,
+                                apps
+                            };
+                        }
+                        else {
+                            return null;
+                        }
+                    })));
+                    const filePath = path_1.default.resolve(fileDir, `templates_${count}.json`);
+                    yield fs_extra_1.default.writeFile(filePath, JSON.stringify(handledSolutionList, null, 2), 'utf8');
+                    files.push(filePath);
+                    count += 1;
+                }
+            }
+            else if (source === SourceType.CUSTOM_MODULE) {
+                let total = Infinity;
+                let currentTotal = 0;
+                while (currentTotal < total) {
+                    const solutionListResult = yield cloudService.lowcode.request('DescribeSolutionList', {
+                        Limit: limit,
+                        Offset: currentTotal,
+                        KeyWords: '',
                         EnvId: envId,
-                        SolutionId: item.SolutionId
+                        TypeList: ['SELFBUILD', 'TPLEXPORT']
                     });
-                    if (solution.SolutionAppInfos.length > 0) {
-                        const appIds = solution.SolutionAppInfos.map((item) => item.AppId);
-                        const apps = yield Promise.all(appIds.map((appId) => __awaiter(this, void 0, void 0, function* () {
-                            var _a, _b, _c, _d, _e;
-                            try {
-                                let result = yield cloudService.lowcode.request('DescribeHistoryListByAppId', {
-                                    WeAppId: appId,
-                                    PageNum: 1,
-                                    PageSize: 1
-                                });
-                                result = yield cloudService.lowcode.request('DescribeAppHistoryPreSignUrl', {
-                                    HisIds: [(_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.Data) === null || _a === void 0 ? void 0 : _a.List) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.Id],
-                                    HttpMethod: 'get',
-                                    WeAppsId: appId
-                                });
-                                result = yield (0, toolbox_1.fetch)((_e = (_d = result === null || result === void 0 ? void 0 : result.Data) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.UploadUrl);
-                                return { appId, content: result };
-                            }
-                            catch (e) {
-                                return { appId, error: e.message };
-                            }
-                        })));
-                        return {
-                            name: item.Name,
-                            solutionId: item.SolutionId,
-                            version: item.Version,
-                            apps
-                        };
+                    const solutionList = solutionListResult.SolutionInfoList;
+                    const handledSolutionList = yield Promise.all(solutionList.map((item) => __awaiter(this, void 0, void 0, function* () {
+                        const solution = yield cloudService.lowcode.request('DescribeSolution', {
+                            EnvId: envId,
+                            SolutionId: item.SolutionId
+                        });
+                        if (solution.SolutionAppInfos.length > 0) {
+                            const appIds = solution.SolutionAppInfos.map((item) => item.AppId);
+                            const apps = yield getAppsContent(appIds);
+                            return {
+                                name: item.Name,
+                                solutionId: item.SolutionId,
+                                version: item.Version,
+                                apps
+                            };
+                        }
+                        else {
+                            return null;
+                        }
+                    })));
+                    const filePath = path_1.default.resolve(fileDir, `templates_${count}.json`);
+                    yield fs_extra_1.default.writeFile(filePath, JSON.stringify(handledSolutionList, null, 2), 'utf8');
+                    files.push(filePath);
+                    total = solutionListResult.TotalCount;
+                    currentTotal += limit;
+                    count += 1;
+                }
+            }
+            log.success(`同步官方模板应用内容已完成. 文件路径:`);
+            log.success(files.join('\n'));
+            const appIdNameMap = {};
+            const appsPath = path_1.default.resolve(process.cwd(), 'apps');
+            try {
+                const items = yield fs_extra_1.default.readdir(appsPath);
+                const directories = [];
+                for (const item of items) {
+                    const itemPath = path_1.default.join(appsPath, item);
+                    const stats = yield fs_extra_1.default.stat(itemPath);
+                    if (stats.isDirectory()) {
+                        directories.push(item);
+                        const appConfig = yield fs_extra_1.default.readJSON(path_1.default.resolve(itemPath, 'src', 'app-config.json'));
+                        const appId = appConfig.id;
+                        appIdNameMap[appId] = item;
+                    }
+                }
+            }
+            catch (error) {
+                console.error('Error reading directory:', error);
+            }
+            for (let fileUrl of files) {
+                const items = yield fs_extra_1.default.readJSON(fileUrl);
+                for (let item of items) {
+                    if (!item)
+                        continue;
+                    let done = false;
+                    if (((_a = item === null || item === void 0 ? void 0 : item.apps) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                        try {
+                            yield Promise.all(item === null || item === void 0 ? void 0 : item.apps.map((app) => __awaiter(this, void 0, void 0, function* () {
+                                var _b, _c;
+                                if (app === null || app === void 0 ? void 0 : app.error) {
+                                    return null;
+                                }
+                                else {
+                                    if (appIdNameMap[app.appId]) {
+                                        app.name = appIdNameMap[app.appId];
+                                    }
+                                    else {
+                                        const result = yield (0, toolbox_1.fetch)('http://localhost:1234/v1/chat/completions', {
+                                            method: 'POST',
+                                            headers: {
+                                                'Content-Type': 'application/json'
+                                            },
+                                            body: JSON.stringify({
+                                                model: 'TheBloke/Mistral-7B-Instruct-v0.2-GGUF',
+                                                messages: [
+                                                    {
+                                                        role: 'system',
+                                                        content: '你是一个目录命名专家。目录名只包括小写字母，数字和下划线, 不能包含其它符号。\n正确的示例: community_deals_platform\n错误的示例: restaurant_company_website'
+                                                    },
+                                                    {
+                                                        role: 'user',
+                                                        content: `请为“${(_b = app === null || app === void 0 ? void 0 : app.content) === null || _b === void 0 ? void 0 : _b.label}”起一个目录名。请始终只返回一个目录名，其它不用返回`
+                                                    }
+                                                ],
+                                                temperature: 1,
+                                                stream: false
+                                            }),
+                                            timeout: 30 * 60 * 1000
+                                        });
+                                        app.name = result.choices[0].message.content
+                                            .replace(/[\s\\]+/g, '')
+                                            .replace(/-/g, '_');
+                                    }
+                                    if (app.content) {
+                                        const calsAppData = app.content;
+                                        calsAppData.id = app.appId;
+                                        const { clientId, originHistoryId, mpAppId, uin } = app.extra;
+                                        calsAppData.extra.clientId = clientId;
+                                        calsAppData.extra.originHistoryId = `${originHistoryId}`;
+                                        calsAppData.extra.mpAppId = mpAppId;
+                                        calsAppData.extra.envId = envId;
+                                        calsAppData.extra.uin = uin;
+                                        calsAppData.extra.domain =
+                                            'lowcode-5g5llxbq5bc9299e-1300677802.tcloudbaseapp.com';
+                                        calsAppData.extra.resourceAppId = '';
+                                        calsAppData.extra.endpointType = '';
+                                        const codeItems = (0, cals_1.calsToCode)(app.content, 'v0');
+                                        yield Promise.all(codeItems.map((codeItem) => __awaiter(this, void 0, void 0, function* () {
+                                            const codePath = path_1.default.resolve(appsPath, app.name, codeItem.path);
+                                            yield fs_extra_1.default.ensureFile(codePath);
+                                            yield fs_extra_1.default.writeFile(codePath, codeItem.code || '', 'utf8');
+                                        })));
+                                        console.log('写入成功:', app.appId, (_c = app === null || app === void 0 ? void 0 : app.content) === null || _c === void 0 ? void 0 : _c.label, app.name);
+                                    }
+                                    else {
+                                        console.error('写入异常:', app.appId, app.error);
+                                    }
+                                }
+                            })));
+                        }
+                        catch (e) {
+                            console.error('异常:', item.templateId, e.message);
+                        }
+                        done = true;
                     }
                     else {
-                        return null;
+                        done = true;
+                    }
+                    if (done) {
+                        if (source === SourceType.YEHE) {
+                            let templates = yield fs_extra_1.default.readJSON('data.json', 'utf8');
+                            templates = templates.filter((tItem) => tItem.templateId !== item.templateId);
+                            yield fs_extra_1.default.writeFile('data.json', JSON.stringify(templates, null, 2), 'utf8');
+                        }
                     }
-                })));
-                const filePath = path_1.default.resolve(fileDir, `templates_${count}.json`);
-                yield fs_extra_1.default.writeFile(filePath, JSON.stringify(handledSolutionList, null, 2), 'utf8');
-                files.push(filePath);
-                total = solutionListResult.TotalCount;
-                currentTotal += limit;
-                count += 1;
+                }
+                yield fs_extra_1.default.writeFile(fileUrl, JSON.stringify(items, null, 2), 'utf8');
+            }
+            function getAppsContent(appIds) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return yield Promise.all(appIds.map((appId) => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b, _c;
+                        try {
+                            let result = yield cloudService.lowcode.request('DescribeAppDetail', {
+                                WeAppId: appId
+                            });
+                            const { Title, LatestHistory, OwnerInfo, MpAppId, ClientId } = result.Data;
+                            const label = Title;
+                            const historyId = (_a = JSON.parse(LatestHistory)) === null || _a === void 0 ? void 0 : _a.id;
+                            const extra = {
+                                originHistoryId: historyId,
+                                uin: OwnerInfo.Uin,
+                                mpAppId: MpAppId,
+                                clientId: ClientId
+                            };
+                            result = yield cloudService.lowcode.request('DescribeAppHistoryPreSignUrl', {
+                                HisIds: [historyId],
+                                HttpMethod: 'get',
+                                WeAppsId: appId
+                            });
+                            result = yield (0, toolbox_1.fetch)((_c = (_b = result === null || result === void 0 ? void 0 : result.Data) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.UploadUrl);
+                            result.label = label;
+                            return { appId, content: result, extra };
+                        }
+                        catch (e) {
+                            return { appId, error: e.message };
+                        }
+                    })));
+                });
             }
-            log.success(`同步官方模板应用内容已完成. 文件路径:`);
-            log.success(files.join('\n'));
         });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.5.1-alpha.4",
+    "version": "2.5.1-alpha.5",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {