esa-cli 0.0.2-beta.8 → 0.0.5

package/dist/commands/commit/index.js

@@ -9,13 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getProjectConfig, readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
 import { checkDirectory, checkIsLoginSuccess } from '../utils.js';
-import { displaySelectSpec } from '../deploy/index.js';
 import { descriptionInput } from '../../components/descriptionInput.js';
 import { ApiService } from '../../libs/apiService.js';
 import prodBuild from './prodBuild.js';
 import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
-import { exit } from 'process';
 const commit = {
     command: 'commit [entry]',
     describe: `📥 ${t('commit_describe').d('Commit your code, save as a new version')}`,
@@ -40,7 +38,6 @@ const commit = {
 export default commit;
 export function handleCommit(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
         if (!checkDirectory())
             return;
         const projectConfig = getProjectConfig();
@@ -53,19 +50,11 @@ export function handleCommit(argv) {
             const server = yield ApiService.getInstance();
             const req = { Name: projectConfig.name };
             const response = yield server.getRoutine(req, false);
-            let specName = (_a = response === null || response === void 0 ? void 0 : response.data.Envs[0].SpecName) !== null && _a !== void 0 ? _a : '50ms';
             let action = 'Creating';
             let description;
             if (!response) {
                 logger.log(`🙅 ${t('commit_er_not_exist').d('No routine found, creating a new one')}`);
                 description = yield descriptionInput(`🖊️ ${t('commit_er_description').d('Enter a description for the routine')}:`, false);
-                const specList = ((_c = (_b = (yield server.ListRoutineOptionalSpecs())) === null || _b === void 0 ? void 0 : _b.data.Specs) !== null && _c !== void 0 ? _c : []).reduce((acc, item) => {
-                    if (item.IsAvailable) {
-                        acc.push(item.SpecName);
-                    }
-                    return acc;
-                }, []);
-                specName = yield displaySelectSpec(specList);
             }
             else {
                 logger.log(`🔄 ${t('commit_er_exist').d('Routine exists, updating the code')}`);
@@ -76,8 +65,7 @@ export function handleCommit(argv) {
             const edgeRoutine = {
                 name: projectConfig.name,
                 code,
-                description,
-                specName
+                description
             };
             if (action === 'Creating') {
                 yield createEdgeRoutine(edgeRoutine);
@@ -87,7 +75,6 @@ export function handleCommit(argv) {
                     return;
                 yield releaseOfficialVersion(edgeRoutine);
             }
-            exit(0);
         }
         catch (error) {
             logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
@@ -126,6 +113,7 @@ export function uploadEdgeRoutineCode(edgeRoutine) {
             return true;
         }
         catch (error) {
+            logger.error('123');
             logger.error(`${t('common_error_occurred').d('An error occurred:')} ${error}`);
             process.exit(0);
         }

package/dist/commands/common/constant.js

@@ -1,23 +1,4 @@
 import t from '../../i18n/index.js';
-export const SUMMARIES_LIST = [
-    {
-        title: t('summery_cd').d('Enter your routine project folder'),
-        command: '💡 cd [Your Routine Name]'
-    },
-    {
-        title: t('summery_dev').d('Start a local development server for your project'),
-        command: '💡 esa dev'
-    },
-    {
-        title: t('summery_commit').d('Save a new version of code'),
-        command: '💡 esa commit'
-    },
-    // Use Deploy or Release?
-    {
-        title: t('summery_deploy').d('Deploy your project to different environments'),
-        command: '💡 esa deploy'
-    }
-];
 export const getSummary = (routineName) => {
     return [
         {

package/dist/commands/deploy/helper.js

@@ -13,7 +13,6 @@ import { PublishType } from '../../libs/interface.js';
 import { ApiService } from '../../libs/apiService.js';
 import { descriptionInput } from '../../components/descriptionInput.js';
 import { readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
-import { displaySelectSpec } from './index.js';
 import { createEdgeRoutine, releaseOfficialVersion, uploadEdgeRoutineCode } from '../commit/index.js';
 import logger from '../../libs/logger.js';
 import t from '../../i18n/index.js';
@@ -33,11 +32,14 @@ export function yesNoPromptAndExecute(message, execute) {
 }
 export function promptSelectVersion(versionList) {
     const items = versionList
-        .filter((version) => version.CodeVersion !== 'unstable')
-        .map((version, index) => ({
-        label: version.CodeVersion,
-        value: String(index)
-    }));
+        .filter((version) => version.codeVersion !== 'unstable')
+        .map((version, index) => {
+        var _a;
+        return ({
+            label: (_a = version.codeVersion) !== null && _a !== void 0 ? _a : '',
+            value: String(index)
+        });
+    });
     return new Promise((resolve) => {
         const handleSelection = (item) => __awaiter(this, void 0, void 0, function* () {
             resolve(item.label);
@@ -64,7 +66,6 @@ export function displaySelectDeployType() {
 }
 export function createAndDeployVersion(projectConfig_1) {
     return __awaiter(this, arguments, void 0, function* (projectConfig, createUnstable = false, customEntry) {
-        var _a, _b, _c, _d;
         try {
             const server = yield ApiService.getInstance();
             const description = yield descriptionInput(createUnstable
@@ -72,26 +73,10 @@ export function createAndDeployVersion(projectConfig_1) {
                 : `🖊️ ${t('deploy_description_version').d('Enter the description of the code version')}:`, false);
             yield prodBuild(false, customEntry);
             const code = readEdgeRoutineFile();
-            const specList = ((_b = (_a = (yield server.ListRoutineOptionalSpecs())) === null || _a === void 0 ? void 0 : _a.data.Specs) !== null && _b !== void 0 ? _b : []).reduce((acc, item) => {
-                if (item.IsAvailable) {
-                    acc.push(item.SpecName);
-                }
-                return acc;
-            }, []);
-            let specName;
-            if (createUnstable) {
-                specName = yield displaySelectSpec(specList);
-            }
-            else {
-                const req = { Name: (_c = projectConfig.name) !== null && _c !== void 0 ? _c : '' };
-                const response = yield server.getRoutine(req);
-                specName = (_d = response === null || response === void 0 ? void 0 : response.data.Envs[0].SpecName) !== null && _d !== void 0 ? _d : '50ms';
-            }
             const edgeRoutine = {
                 name: projectConfig.name,
                 code: code || '',
-                description: description,
-                specName: specName
+                description: description
             };
             if (createUnstable) {
                 return yield createEdgeRoutine(edgeRoutine);

package/dist/commands/deploy/index.js

@@ -9,12 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import chalk from 'chalk';
 import { getProjectConfig, readEdgeRoutineFile } from '../../utils/fileUtils/index.js';
-import SelectItems from '../../components/selectInput.js';
 import { Environment, PublishType } from '../../libs/interface.js';
 import logger from '../../libs/logger.js';
 import { checkDirectory, checkIsLoginSuccess, getRoutineVersionList } from '../utils.js';
 import { displayMultiSelectTable } from '../../components/mutiSelectTable.js';
-import { Base64 } from 'js-base64';
 import { ApiService } from '../../libs/apiService.js';
 import { createAndDeployVersion, displaySelectDeployType, promptSelectVersion, yesNoPromptAndExecute } from './helper.js';
 import t from '../../i18n/index.js';
@@ -59,13 +57,13 @@ export function quickDeploy(entry, projectConfig) {
         }
         else {
             logger.error(t('quick_deploy_failed').d('Quick deploy failed'));
-            process.exit(0);
+            throw Error(t('quick_deploy_failed').d('Quick deploy failed'));
         }
     });
 }
 export function handleDeploy(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         if (!checkDirectory()) {
             return;
         }
@@ -80,10 +78,10 @@ export function handleDeploy(argv) {
         yield checkRoutineExist(projectConfig.name, entry);
         const req = { Name: projectConfig.name };
         const routineDetail = yield server.getRoutine(req, false);
-        const versionList = ((_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.CodeVersions) || [];
+        const versionList = yield getRoutineVersionList(projectConfig.name);
         const customEntry = argv.entry;
-        const stagingVersion = (_c = (_b = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _b === void 0 ? void 0 : _b.Envs[1]) === null || _c === void 0 ? void 0 : _c.CodeVersion;
-        const productionVersion = (_e = (_d = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _d === void 0 ? void 0 : _d.Envs[0]) === null || _e === void 0 ? void 0 : _e.CodeVersion;
+        const stagingVersion = (_b = (_a = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _a === void 0 ? void 0 : _a.Envs[1]) === null || _b === void 0 ? void 0 : _b.CodeVersion;
+        const productionVersion = (_d = (_c = routineDetail === null || routineDetail === void 0 ? void 0 : routineDetail.data) === null || _c === void 0 ? void 0 : _c.Envs[0]) === null || _d === void 0 ? void 0 : _d.CodeVersion;
         if (argv.quick) {
             yield quickDeploy(customEntry, projectConfig);
             exit(0);
@@ -101,20 +99,6 @@ export function handleDeploy(argv) {
         }
     });
 }
-export function displaySelectSpec(specList) {
-    return __awaiter(this, void 0, void 0, function* () {
-        logger.log(`📃 ${t('deploy_spec_select').d('Please select the spec of the routine you want to create')}`);
-        const selectItems = specList.map((spec) => {
-            return { label: spec, value: spec };
-        });
-        return new Promise((resolve) => {
-            const handleSelection = (item) => __awaiter(this, void 0, void 0, function* () {
-                resolve(item.value);
-            });
-            SelectItems({ items: selectItems, handleSelect: handleSelection });
-        });
-    });
-}
 function handleNoVersionsFound(projectConfig, customEntry) {
     return __awaiter(this, void 0, void 0, function* () {
         logger.log(`😄 ${t('deploy_first_time').d("This is first time to deploy. Let's create a version first!")}`);
@@ -194,6 +178,7 @@ export function deploySelectedCodeVersion(name, selectedType, version) {
 }
 export function displayVersionList(versionList_1) {
     return __awaiter(this, arguments, void 0, function* (versionList, stagingVersion = 'unstable', productionVersion = 'unstable') {
+        var _a;
         logger.log(`${chalk.bgYellow('Active')} ${t('deploy_env_staging').d('Staging')}`);
         logger.log(`${chalk.bgGreen('Active')} ${t('deploy_env_production').d('Production')}`);
         const data = [];
@@ -201,13 +186,13 @@ export function displayVersionList(versionList_1) {
             const version = versionList[i];
             const createTime = moment(version.CreateTime).format('YYYY/MM/DD HH:mm:ss');
             const tags = [
-                version.CodeVersion === stagingVersion ? chalk.bgYellow('Active') : '',
-                version.CodeVersion === productionVersion ? chalk.bgGreen('Active') : ''
+                version.codeVersion === stagingVersion ? chalk.bgYellow('Active') : '',
+                version.codeVersion === productionVersion ? chalk.bgGreen('Active') : ''
             ];
             data.push([
-                `${version.CodeVersion} ${tags.join(' ')}`,
+                `${version.codeVersion} ${tags.join(' ')}`,
                 createTime,
-                Base64.decode(version.CodeDescription)
+                (_a = version.codeDescription) !== null && _a !== void 0 ? _a : ''
             ]);
         }
         logger.table([

package/dist/commands/deployments/list.js

@@ -62,11 +62,8 @@ function displayListPrompt(routineDetail) {
         const coloredStagingIpList = stagingIpList.map((ip) => {
             return chalk.green(ip);
         });
-        const showEnvTable = (version, spec, region) => {
-            const data = [
-                { Version: version },
-                { Specification: spec }
-            ];
+        const showEnvTable = (version, region) => {
+            const data = [{ Version: version }];
             if (region) {
                 data.push({ Region: region });
             }
@@ -76,13 +73,13 @@ function displayListPrompt(routineDetail) {
         if (stagingIpList.length > 0) {
             logger.log(`Staging IP: ${coloredStagingIpList.join(', ')}`);
         }
-        showEnvTable(stagingEnv.CodeVersion, stagingEnv.SpecName);
+        showEnvTable(stagingEnv.CodeVersion);
         logger.block();
         logger.log(`${chalk.bold(`${t('deploy_env_production').d('Production')} ${!isCanary ? chalk.green('●') : ''}`)}`);
-        showEnvTable(canaryEnv.CodeVersion, canaryEnv.SpecName);
+        showEnvTable(canaryEnv.CodeVersion);
         logger.block();
         logger.log(`${chalk.bold(`${t('deploy_env_canary').d('Canary')} ${isCanary ? chalk.green('●') : ''}`)}`);
-        showEnvTable((_d = canaryEnv.CanaryCodeVersion) !== null && _d !== void 0 ? _d : '', canaryEnv.SpecName, (_e = canaryEnv.CanaryAreaList) === null || _e === void 0 ? void 0 : _e.join(', '));
+        showEnvTable((_d = canaryEnv.CanaryCodeVersion) !== null && _d !== void 0 ? _d : '', (_e = canaryEnv.CanaryAreaList) === null || _e === void 0 ? void 0 : _e.join(', '));
         logger.log(`${t('show_default_url').d(`You can visit:`)} ${chalk.yellowBright(routineDetail.data.DefaultRelatedRecord)}`);
         logger.info(routineDetail.data.DefaultRelatedRecord);
         logger.block();

package/dist/commands/dev/ew2/server.js

@@ -128,7 +128,6 @@ class Ew2Server {
     }
     createServer() {
         this.server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 const host = req.headers.host;
                 const url = req.url;
@@ -148,18 +147,20 @@ class Ew2Server {
                 // 解决 gzip 兼容性问题，防止net::ERR_CONTENT_DECODING_FAILED
                 workerHeaders['content-encoding'] = 'identity';
                 if (workerRes.body) {
-                    if ((_a = workerRes.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('text/')) {
-                        const text = yield workerRes.text();
-                        // 出现换行符之类会导致 content-length 不一致
-                        workerHeaders['content-length'] =
-                            Buffer.byteLength(text).toString();
-                        res.writeHead(workerRes.status, workerHeaders);
-                        res.end(text);
-                    }
-                    else {
-                        res.writeHead(workerRes.status, workerHeaders);
-                        workerRes.body.pipe(res);
-                    }
+                    // if (workerRes.headers.get('content-type')?.includes('text/')) {
+                    //   const text = await workerRes.text();
+                    //   // 出现换行符之类会导致 content-length 不一致
+                    //   workerHeaders['content-length'] =
+                    //     Buffer.byteLength(text).toString();
+                    //     console.log(workerHeaders['content-length']);
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   res.end(text);
+                    // } else {
+                    //   res.writeHead(workerRes.status, workerHeaders);
+                    //   workerRes.body.pipe(res);
+                    // }
+                    res.writeHead(workerRes.status, workerHeaders);
+                    workerRes.body.pipe(res);
                     logger.log(`[ESA Dev] ${req.method} ${url} ${getColorForStatusCode(workerRes.status, workerRes.statusText)}`);
                 }
                 else {

package/dist/commands/domain/delete.js

@@ -31,7 +31,7 @@ const deleteDomain = {
 export default deleteDomain;
 export function handleDeleteDomain(argv) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!checkDirectory()) {
             return;
         }
@@ -44,10 +44,10 @@ export function handleDeleteDomain(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name || '' };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const listRoutineRelatedRecordRes = yield server.listRoutineRelatedRecords(req);
+        if (!listRoutineRelatedRecordRes)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = ((_a = listRoutineRelatedRecordRes.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) || [];
         const relatedDomain = argv.domain;
         const matchedSite = relatedRecords.find((item) => {
             return String(item.RecordName) === relatedDomain;

package/dist/commands/domain/list.js

@@ -36,10 +36,10 @@ export function handleListDomains(argv) {
         yield validRoutine(projectConfig.name);
         const server = yield ApiService.getInstance();
         const req = { Name: projectConfig.name };
-        const routineDetail = yield server.getRoutine(req);
-        if (!routineDetail)
+        const res = yield server.listRoutineRelatedRecords(req);
+        if (!res)
             return;
-        const relatedRecords = (_b = (_a = routineDetail.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
+        const relatedRecords = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.RelatedRecords) !== null && _b !== void 0 ? _b : [];
         if (relatedRecords.length === 0) {
             logger.log(`🙅 ${t('domain_list_empty').d('No related domains found')}`);
             return;

package/dist/commands/init/helper.js

@@ -0,0 +1,118 @@
+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());
+    });
+};
+import fs from 'fs-extra';
+import path from 'path';
+import Template from '../../libs/templates/index.js';
+import { getProjectConfig } from '../../utils/fileUtils/index.js';
+import logger from '../../libs/logger.js';
+import { execSync } from 'child_process';
+import t from '../../i18n/index.js';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { getDirName } from '../../utils/fileUtils/base.js';
+export const getTemplateInstances = (templateHubPath) => {
+    return fs
+        .readdirSync(templateHubPath)
+        .filter((item) => {
+        const itemPath = path.join(templateHubPath, item);
+        return (fs.statSync(itemPath).isDirectory() &&
+            !['.git', 'node_modules', 'lib'].includes(item));
+    })
+        .map((item) => {
+        var _a;
+        const projectPath = path.join(templateHubPath, item);
+        const projectConfig = getProjectConfig(projectPath);
+        const templateName = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.name) !== null && _a !== void 0 ? _a : '';
+        return new Template(projectPath, templateName);
+    });
+};
+export const transferTemplatesToSelectItem = (configs, templateInstanceList, lang) => {
+    if (!configs)
+        return [];
+    return configs.map((config) => {
+        var _a, _b;
+        const title = config.Title_EN;
+        const value = (_b = (_a = templateInstanceList.find((template) => {
+            return title === template.title;
+        })) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '';
+        const children = transferTemplatesToSelectItem(config.children, templateInstanceList, lang);
+        return {
+            label: lang === 'en' ? config.Title_EN : config.Title_ZH,
+            value: value,
+            children
+        };
+    });
+};
+export const preInstallDependencies = (targetPath) => __awaiter(void 0, void 0, void 0, function* () {
+    const packageJsonPath = path.join(targetPath, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        logger.log(t('init_install_dependence').d('⌛️ Installing dependencies...'));
+        execSync('npm install', { stdio: 'inherit', cwd: targetPath });
+        logger.success(t('init_install_dependencies_success').d('Dependencies installed successfully.'));
+        // Read and parse package.json to check for build script
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+        if (packageJson.scripts && packageJson.scripts.build) {
+            logger.log(t('init_build_project').d('⌛️ Building project...'));
+            execSync('npm run build', { stdio: 'inherit', cwd: targetPath });
+            logger.success(t('init_build_project_success').d('Project built successfully.'));
+        }
+        else {
+            logger.log(t('no_build_script').d('No build script found in package.json, skipping build step.'));
+        }
+    }
+});
+export function checkAndUpdatePackage(packageName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // 获取当前安装的版本
+            const __dirname = getDirName(import.meta.url);
+            console.log(__dirname);
+            const packageJsonPath = path.join(__dirname, '../../../');
+            const versionInfo = execSync(`npm list ${packageName}`, {
+                cwd: packageJsonPath
+            }).toString();
+            const match = versionInfo.match(new RegExp(`(${packageName})@([0-9.]+)`));
+            const currentVersion = match ? match[2] : '';
+            // 获取最新版本
+            const latestVersion = execSync(`npm view ${packageName} version`, {
+                cwd: packageJsonPath
+            })
+                .toString()
+                .trim();
+            if (currentVersion !== latestVersion) {
+                logger.log(t('display_current_esa_template_version').d(`Current esa-template version:`) +
+                    chalk.green(currentVersion) +
+                    '    ' +
+                    t('display_latest_esa_template_version').d(`Latest esa-template version:`) +
+                    chalk.green(latestVersion));
+                const { isUpdate } = yield inquirer.prompt({
+                    type: 'confirm',
+                    name: 'isUpdate',
+                    message: t('is_update_to_latest_version').d('Do you want to update templates to latest version?')
+                });
+                if (isUpdate) {
+                    execSync(`rm -rf node_modules/${packageName} &&rm -rf package-lock.json &&npm install ${packageName}@latest`, {
+                        cwd: packageJsonPath
+                    });
+                    logger.log(t('updated_esa_template_to_latest_version', { packageName }).d(`${packageName} updated successfully`));
+                }
+            }
+            else {
+                logger.log(t('esa_template_is_latest_version', { packageName }).d(`${packageName} is latest.`));
+            }
+        }
+        catch (error) {
+            console.log(error);
+            if (error instanceof Error) {
+                logger.error('检测和更新包时发生错误，跳过更新模版');
+            }
+        }
+    });
+}