esa-cli 0.0.5 → 1.0.1

package/dist/index.js

@@ -7,25 +7,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import chalk from 'chalk';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import chalk from 'chalk';
-import login from './commands/login/index.js';
+import commit from './commands/commit/index.js';
 import config from './commands/config.js';
-import dev from './commands/dev/index.js';
-import init from './commands/init/index.js';
-import routine from './commands/routine/index.js';
 import deploy from './commands/deploy/index.js';
-import commit from './commands/commit/index.js';
 import deployments from './commands/deployments/index.js';
+import dev from './commands/dev/index.js';
 import domainCommand from './commands/domain/index.js';
-import routeCommand from './commands/route/index.js';
-import logout from './commands/logout.js';
+import init from './commands/init/index.js';
 import lang from './commands/lang.js';
-import { getCliConfig } from './utils/fileUtils/index.js';
-import { handleCheckVersion } from './utils/checkVersion.js';
-import t from './i18n/index.js';
+import login from './commands/login/index.js';
+import logout from './commands/logout.js';
+import routeCommand from './commands/route/index.js';
+import routine from './commands/routine/index.js';
 import site from './commands/site/index.js';
+import t from './i18n/index.js';
+import { handleCheckVersion, checkCLIVersion } from './utils/checkVersion.js';
+import { getCliConfig } from './utils/fileUtils/index.js';
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     const argv = hideBin(process.argv);
     const cliConfig = getCliConfig();
@@ -34,11 +34,21 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
         .fail((msg, err) => {
         console.error(msg, err);
     })
-        .scriptName('esa')
+        .scriptName('esa-cli')
         .locale((cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.lang) || 'en')
         .version(false)
         .wrap(null)
-        .help(false)
+        .help()
+        .middleware((argv) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            // Pass current command (first positional) so version check can decide prompting behavior
+            yield checkCLIVersion((argv._ && argv._[0] ? String(argv._[0]) : ''));
+        }
+        catch (e) {
+            console.log(e);
+            console.log('error');
+        }
+    }))
         .epilogue(`${t('main_epilogue').d('For more information, visit ESA')}: ${chalk.underline.blue('https://www.aliyun.com/product/esa')}`)
         .options('version', {
         describe: t('main_version_describe').d('Show version'),
@@ -50,11 +60,16 @@ const main = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     esa.command('*', false, () => { }, (args) => {
         if (args._.length > 0) {
+            // Unknown command
+            console.error(t('common_sub_command_fail').d('Use esa-cli <command> -h to see help'));
         }
         else {
             if (args.v) {
                 handleCheckVersion();
             }
+            else if (args.h || args.help) {
+                esa.showHelp('log');
+            }
             else {
                 esa.showHelp('log');
             }

package/dist/libs/api.js

@@ -103,16 +103,13 @@ class Client {
     getMatchSite(params) {
         return this.callOpenApi('getMatchSite', params);
     }
-    listRoutineCanaryAreas() {
-        return this.callApi(this.client.listRoutineCanaryAreasWithOptions.bind(this.client));
-    }
-    getRoutineUserInfo() {
-        return this.callApi(this.client.getRoutineUserInfoWithOptions.bind(this.client));
-    }
     deleteRoutine(params) {
         const request = new $ESA.DeleteRoutineRequest(params);
         return this.callApi(this.client.deleteRoutineWithOptions.bind(this.client), request);
     }
+    listUserRoutines(params) {
+        return this.callApi(this.client.listUserRoutinesWithOptions.bind(this.client), new $ESA.ListUserRoutinesRequest(params));
+    }
     deleteRoutineCodeVersion(params) {
         const request = new $ESA.DeleteRoutineCodeVersionRequest(params);
         return this.callApi(this.client.deleteRoutineCodeVersionWithOptions.bind(this.client), request);

package/dist/libs/apiService.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as $OpenApi from '@alicloud/openapi-client';
 import FormData from 'form-data';
 import fetch from 'node-fetch';
-import { Environment } from './interface.js';
-import { getApiConfig } from '../utils/fileUtils/index.js';
 import t from '../i18n/index.js';
+import { getApiConfig } from '../utils/fileUtils/index.js';
+import { Environment } from './interface.js';
 export class ApiService {
     constructor(cliConfig) {
         var _a, _b;
@@ -48,7 +48,7 @@ export class ApiService {
      *   - message: (Optional) A string providing additional information in case of failure.
      */
     checkLogin() {
-        return __awaiter(this, arguments, void 0, function* (isShowError = true) {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
                     action: 'GetErService',
@@ -74,7 +74,15 @@ export class ApiService {
                 };
                 const response = yield this.client.callApi(params, request, runtime);
                 if (response.statusCode === 200) {
-                    return { success: true };
+                    if (response.body.Status === 'Running') {
+                        return { success: true };
+                    }
+                    else {
+                        return {
+                            success: false,
+                            message: t('not_active').d('Functions and Pages is not active, please activate it first. Visit: https://esa.console.aliyun.com/edge/pages to activate.')
+                        };
+                    }
                 }
                 else if (response.statusCode === 403) {
                     return {
@@ -90,7 +98,6 @@ export class ApiService {
                 }
             }
             catch (error) {
-                isShowError && console.log(error);
                 return {
                     success: false,
                     message: t('login_failed').d('An error occurred while trying to log in.')
@@ -101,15 +108,15 @@ export class ApiService {
     quickDeployRoutine(edgeRoutine) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                // 上传代码到unstable版本
+                // Upload code to unstable version
                 const stagingRes = yield this.getRoutineStagingCodeUploadInfo(edgeRoutine);
                 if (stagingRes) {
-                    // 生产版本
+                    // Production version
                     const commitRes = yield this.commitRoutineStagingCode({
                         Name: edgeRoutine.name,
                         CodeDescription: edgeRoutine.description
                     });
-                    // 发布到生产环境
+                    // Deploy to production environment
                     if (commitRes) {
                         const deployRes = yield this.publishRoutineCodeVersion({
                             Name: edgeRoutine.name,
@@ -129,7 +136,6 @@ export class ApiService {
     }
     publishRoutineCodeVersion(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 let params = {
                     action: 'PublishRoutineCodeVersion',
@@ -145,15 +151,11 @@ export class ApiService {
                         return this;
                     }
                 };
-                const CanaryAreaList = (_a = requestParams.CanaryAreaList) !== null && _a !== void 0 ? _a : [];
-                const CanaryAreaListString = JSON.stringify(CanaryAreaList);
                 let request = new $OpenApi.OpenApiRequest({
                     query: {
                         Env: requestParams.Env,
                         Name: requestParams.Name,
-                        CodeVersion: requestParams.CodeVersion,
-                        CanaryCodeVersion: requestParams.CanaryCodeVersion,
-                        CanaryAreaList: CanaryAreaListString
+                        CodeVersion: requestParams.CodeVersion
                     }
                 });
                 let runtime = {
@@ -224,11 +226,11 @@ export class ApiService {
             return null;
         });
     }
-    listRoutineCanaryAreas() {
+    listUserRoutines(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'ListRoutineCanaryAreas',
+                    action: 'ListUserRoutines',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -241,44 +243,9 @@ export class ApiService {
                         return this;
                     }
                 };
-                let request = new $OpenApi.OpenApiRequest();
-                let runtime = {
-                    toMap: function () {
-                        return this;
-                    }
-                };
-                const res = yield this.client.callApi(params, request, runtime);
-                if (res.statusCode === 200 && res.body) {
-                    const ret = {
-                        CanaryAreas: res.body.CanaryAreas
-                    };
-                    return ret;
-                }
-            }
-            catch (error) {
-                console.log(error);
-            }
-            return null;
-        });
-    }
-    getRoutineUserInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let params = {
-                    action: 'GetRoutineUserInfo',
-                    version: '2024-09-10',
-                    protocol: 'https',
-                    method: 'GET',
-                    authType: 'AK',
-                    bodyType: 'json',
-                    reqBodyType: 'json',
-                    style: 'RPC',
-                    pathname: '/',
-                    toMap: function () {
-                        return this;
-                    }
-                };
-                let request = new $OpenApi.OpenApiRequest();
+                let request = new $OpenApi.OpenApiRequest({
+                    query: requestParams || {}
+                });
                 let runtime = {
                     toMap: function () {
                         return this;
@@ -286,11 +253,7 @@ export class ApiService {
                 };
                 const res = yield this.client.callApi(params, request, runtime);
                 if (res.statusCode === 200 && res.body) {
-                    const ret = {
-                        Subdomains: res.body.RoutineName,
-                        Routines: res.body.Routines
-                    };
-                    return ret;
+                    return res;
                 }
             }
             catch (error) {
@@ -568,7 +531,6 @@ export class ApiService {
     }
     getRoutine(requestParams_1) {
         return __awaiter(this, arguments, void 0, function* (requestParams, isShowError = true) {
-            var _a, _b, _c, _d, _e, _f;
             try {
                 let params = {
                     action: 'GetRoutine',
@@ -598,14 +560,7 @@ export class ApiService {
                 if (res.statusCode === 200 && res.body) {
                     const routineResponse = {
                         code: res.statusCode,
-                        data: {
-                            RequestId: (_a = res.body) === null || _a === void 0 ? void 0 : _a.RequestId,
-                            CodeVersions: ((_b = res.body) === null || _b === void 0 ? void 0 : _b.CodeVersions) || [],
-                            Envs: ((_c = res.body) === null || _c === void 0 ? void 0 : _c.Envs) || [],
-                            CreateTime: (_d = res.body) === null || _d === void 0 ? void 0 : _d.CreateTime,
-                            Description: (_e = res.body) === null || _e === void 0 ? void 0 : _e.Description,
-                            DefaultRelatedRecord: (_f = res.body) === null || _f === void 0 ? void 0 : _f.DefaultRelatedRecord
-                        }
+                        data: res.body
                     };
                     return routineResponse;
                 }
@@ -637,7 +592,8 @@ export class ApiService {
             let request = new $OpenApi.OpenApiRequest({
                 query: {
                     Name: edgeRoutine.name,
-                    Description: edgeRoutine.description
+                    Description: edgeRoutine.description,
+                    HasAssets: edgeRoutine.hasAssets
                 }
             });
             let runtime = {
@@ -710,7 +666,6 @@ export class ApiService {
                     body: formData,
                     headers: formData.getHeaders()
                 });
-                // console.log('oss result', oss);
                 if (ossRes && ossRes.status === 200) {
                     return true;
                 }
@@ -966,5 +921,181 @@ export class ApiService {
             return null;
         });
     }
+    /**
+     * 调用 CreateRoutineWithAssetsCodeVersion API 获取 OSS 上传配置
+     */
+    CreateRoutineWithAssetsCodeVersion(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            try {
+                let params = {
+                    action: 'CreateRoutineWithAssetsCodeVersion',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'POST',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    body: {
+                        Name: requestParams.Name,
+                        CodeDescription: requestParams.CodeDescription,
+                        ExtraInfo: requestParams.ExtraInfo,
+                        ConfOptions: {
+                            NotFoundStrategy: (_a = requestParams.ConfOptions) === null || _a === void 0 ? void 0 : _a.NotFoundStrategy
+                        }
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const result = yield this.client.callApi(params, request, runtime);
+                if (result.statusCode === 200 && result.body) {
+                    return {
+                        code: result.statusCode.toString(),
+                        data: {
+                            RequestId: result.body.RequestId,
+                            CodeVersion: result.body.CodeVersion,
+                            Status: result.body.Status,
+                            OssPostConfig: result.body.OssPostConfig
+                        }
+                    };
+                }
+                return null;
+            }
+            catch (error) {
+                console.error('Error calling CreateRoutineWithAssetsCodeVersion:', error);
+                return null;
+            }
+        });
+    }
+    /**
+     * 上传文件到 OSS
+     */
+    uploadToOss(ossConfig, zipBuffer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const { OSSAccessKeyId, Signature, Url, Key, Policy, XOssSecurityToken } = ossConfig;
+                const formData = new FormData();
+                formData.append('OSSAccessKeyId', OSSAccessKeyId);
+                formData.append('Signature', Signature);
+                formData.append('x-oss-security-token', XOssSecurityToken);
+                formData.append('policy', Policy);
+                formData.append('key', Key);
+                formData.append('file', zipBuffer);
+                const ossRes = yield fetch(Url, {
+                    method: 'POST',
+                    body: formData,
+                    headers: formData.getHeaders()
+                });
+                return ossRes && (ossRes.status === 200 || ossRes.status === 204);
+            }
+            catch (error) {
+                console.error('Error uploading to OSS:', error);
+                return false;
+            }
+        });
+    }
+    createRoutineCodeDeployment(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'CreateRoutineCodeDeployment',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'POST',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        Env: requestParams.Env,
+                        Strategy: requestParams.Strategy,
+                        CodeVersions: JSON.stringify(requestParams.CodeVersions)
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: {
+                            RequestId: res.body.RequestId,
+                            Strategy: res.body.Strategy,
+                            DeploymentId: res.body.DeploymentId,
+                            CodeVersions: res.body.CodeVersions
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
+    getRoutineCodeVersionInfo(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'GetRoutineCodeVersionInfo',
+                    version: '2024-09-10',
+                    protocol: 'https',
+                    method: 'GET',
+                    authType: 'AK',
+                    bodyType: 'json',
+                    reqBodyType: 'json',
+                    style: 'RPC',
+                    pathname: '/',
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        Name: requestParams.Name,
+                        CodeVersion: requestParams.CodeVersion
+                    }
+                });
+                let runtime = {
+                    toMap: function () {
+                        return this;
+                    }
+                };
+                const res = yield this.client.callApi(params, request, runtime);
+                if (res.statusCode === 200 && res.body) {
+                    const ret = {
+                        code: res.statusCode,
+                        data: res.body
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
 }
 ApiService.instance = null;

package/dist/libs/git/index.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { execSync } from 'child_process';
-import { exit } from 'process';
+import logger from '../../libs/logger.js';
 export function isInstalledGit() {
     try {
         execSync('git --version');
@@ -30,23 +30,100 @@ export function isGitConfigured() {
 }
 export function cloneRepository(url, path) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (!isInstalledGit()) {
+            logger.error('Git is not installed on your system.');
+            logger.info('Please install Git first:');
+            logger.info('  • macOS: brew install git');
+            logger.info('  • Ubuntu/Debian: sudo apt-get install git');
+            logger.info('  • Windows: Download from https://git-scm.com/');
+            logger.info('  • Or visit: https://git-scm.com/downloads');
+            return false;
+        }
         try {
             execSync(`git clone ${url} ${path}`, { stdio: 'inherit' });
-            console.log('Repository cloned successfully.');
+            logger.log('Repository cloned successfully.');
+            return true;
         }
         catch (error) {
-            console.error('Error occurred while cloning the repository:', error);
-            exit(0);
+            logger.error(`Error occurred while cloning the repository: ${error}`);
+            return false;
         }
     });
 }
-export function installGit(path) {
+export function installGit(path, debug = false, autoInstall = false) {
+    if (!isInstalledGit()) {
+        if (autoInstall) {
+            logger.info('Git not found. Attempting to auto-install...');
+            if (autoInstallGit()) {
+                logger.info('Git installed successfully! Now initializing repository...');
+            }
+            else {
+                logger.error('Failed to auto-install Git.');
+                logger.info('Please install Git manually:');
+                logger.info('  • macOS: brew install git');
+                logger.info('  • Ubuntu/Debian: sudo apt-get install git');
+                logger.info('  • Windows: Download from https://git-scm.com/');
+                logger.info('  • Or visit: https://git-scm.com/downloads');
+                return false;
+            }
+        }
+        else {
+            logger.error('Git is not installed on your system.');
+            logger.info('Please install Git first:');
+            logger.info('  • macOS: brew install git');
+            logger.info('  • Ubuntu/Debian: sudo apt-get install git');
+            logger.info('  • Windows: Download from https://git-scm.com/');
+            logger.info('  • Or visit: https://git-scm.com/downloads');
+            return false;
+        }
+    }
+    try {
+        execSync('git init', { stdio: 'ignore', cwd: path });
+        if (debug) {
+            logger.log('Git repository initialized successfully.');
+        }
+        return true;
+    }
+    catch (error) {
+        logger.error(`Error occurred while initializing Git repository: ${error}`);
+        return false;
+    }
+}
+/**
+ * Attempt to automatically install Git on supported platforms
+ * @returns true if installation was successful, false otherwise
+ */
+export function autoInstallGit() {
     try {
-        execSync('git init', { stdio: 'inherit', cwd: path });
-        console.log('Git has been installed successfully.');
+        const platform = process.platform;
+        if (platform === 'darwin') {
+            // macOS - try using Homebrew
+            logger.info('Attempting to install Git using Homebrew...');
+            execSync('brew install git', { stdio: 'inherit' });
+            logger.success('Git installed successfully via Homebrew!');
+            return true;
+        }
+        else if (platform === 'linux') {
+            // Linux - try using apt-get (Ubuntu/Debian)
+            logger.info('Attempting to install Git using apt-get...');
+            execSync('sudo apt-get update && sudo apt-get install -y git', {
+                stdio: 'inherit'
+            });
+            logger.success('Git installed successfully via apt-get!');
+            return true;
+        }
+        else {
+            logger.warn('Auto-installation is not supported on this platform.');
+            logger.info('Please install Git manually from: https://git-scm.com/downloads');
+            return false;
+        }
     }
     catch (error) {
-        console.error('Error occurred during Git installation:', error);
-        exit(0);
+        logger.error(`Failed to auto-install Git: ${error}`);
+        logger.info('Please install Git manually:');
+        logger.info('  • macOS: brew install git');
+        logger.info('  • Ubuntu/Debian: sudo apt-get install git');
+        logger.info('  • Windows: Download from https://git-scm.com/');
+        return false;
     }
 }

package/dist/libs/interface.js

@@ -7,7 +7,6 @@ export var PublishType;
 (function (PublishType) {
     PublishType["Staging"] = "staging";
     PublishType["Production"] = "production";
-    PublishType["Canary"] = "canary";
 })(PublishType || (PublishType = {}));
 var BasicType;
 (function (BasicType) {