esa-cli 0.0.2-beta.9 → 1.0.0

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);
@@ -140,9 +137,6 @@ class Client {
         const request = new $ESA.CreateRoutineRequest(params);
         return this.callApi(this.client.createRoutineWithOptions.bind(this.client), request);
     }
-    listRoutineOptionalSpecs() {
-        return this.callApi(this.client.listRoutineOptionalSpecsWithOptions.bind(this.client));
-    }
     createRoutineRelatedRecord(params) {
         const request = new $ESA.CreateRoutineRelatedRecordRequest(params);
         return this.callApi(this.client.createRoutineRelatedRecordWithOptions.bind(this.client), request);
@@ -151,5 +145,34 @@ class Client {
         const request = new $ESA.DeleteRoutineRelatedRecordRequest(params);
         return this.callApi(this.client.deleteRoutineRelatedRecordWithOptions.bind(this.client), request);
     }
+    createRoutineRoute(params) {
+        const request = new $ESA.CreateRoutineRouteRequest(params);
+        const newRequest = Object.assign(request, { mode: 'simple' });
+        return this.callApi(this.client.createRoutineRouteWithOptions.bind(this.client), newRequest);
+    }
+    deleteRoutineRoute(params) {
+        const request = new $ESA.DeleteRoutineRouteRequest(params);
+        return this.callApi(this.client.deleteRoutineRouteWithOptions.bind(this.client), request);
+    }
+    getRoutineRoute(params) {
+        const request = new $ESA.GetRoutineRouteRequest(params);
+        return this.callApi(this.client.getRoutineRouteWithOptions.bind(this.client), request);
+    }
+    listSiteRoutes(params) {
+        const request = new $ESA.ListSiteRoutesRequest(params);
+        return this.callApi(this.client.listSiteRoutes.bind(this.client), request);
+    }
+    listRoutineRoutes(params) {
+        const request = new $ESA.ListRoutineRoutesRequest(params);
+        return this.callApi(this.client.listRoutineRoutes.bind(this.client), request);
+    }
+    updateRoutineRoute(params) {
+        const request = new $ESA.UpdateRoutineRouteRequest(params);
+        return this.callApi(this.client.updateRoutineRoute.bind(this.client), request);
+    }
+    listRoutineCodeVersions(params) {
+        const request = new $ESA.ListRoutineCodeVersionsRequest(params);
+        return this.callApi(this.client.listRoutineCodeVersions.bind(this.client), request);
+    }
 }
 export default new Client();

package/dist/libs/apiService.js

@@ -10,10 +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 chain from 'lodash';
 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;
@@ -49,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',
@@ -91,7 +90,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.')
@@ -102,15 +100,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,
@@ -130,7 +128,6 @@ export class ApiService {
     }
     publishRoutineCodeVersion(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 let params = {
                     action: 'PublishRoutineCodeVersion',
@@ -146,15 +143,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 = {
@@ -225,48 +218,11 @@ export class ApiService {
             return null;
         });
     }
-    listRoutineCanaryAreas() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let params = {
-                    action: 'ListRoutineCanaryAreas',
-                    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 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() {
+    listUserRoutines(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'GetRoutineUserInfo',
+                    action: 'ListUserRoutines',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -279,7 +235,9 @@ export class ApiService {
                         return this;
                     }
                 };
-                let request = new $OpenApi.OpenApiRequest();
+                let request = new $OpenApi.OpenApiRequest({
+                    query: requestParams || {}
+                });
                 let runtime = {
                     toMap: function () {
                         return this;
@@ -287,11 +245,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) {
@@ -569,7 +523,6 @@ export class ApiService {
     }
     getRoutine(requestParams_1) {
         return __awaiter(this, arguments, void 0, function* (requestParams, isShowError = true) {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
             try {
                 let params = {
                     action: 'GetRoutine',
@@ -599,16 +552,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) || [],
-                            RelatedRecords: ((_c = res.body) === null || _c === void 0 ? void 0 : _c.RelatedRecords) || [],
-                            Envs: ((_d = res.body) === null || _d === void 0 ? void 0 : _d.Envs) || [],
-                            CreateTime: (_e = res.body) === null || _e === void 0 ? void 0 : _e.CreateTime,
-                            Description: (_f = res.body) === null || _f === void 0 ? void 0 : _f.Description,
-                            RelatedRoutes: ((_g = res.body) === null || _g === void 0 ? void 0 : _g.RelatedRoutes) || [],
-                            DefaultRelatedRecord: (_h = res.body) === null || _h === void 0 ? void 0 : _h.DefaultRelatedRecord
-                        }
+                        data: res.body
                     };
                     return routineResponse;
                 }
@@ -640,7 +584,8 @@ export class ApiService {
             let request = new $OpenApi.OpenApiRequest({
                 query: {
                     Name: edgeRoutine.name,
-                    Description: edgeRoutine.description
+                    Description: edgeRoutine.description,
+                    HasAssets: edgeRoutine.hasAssets
                 }
             });
             let runtime = {
@@ -695,7 +640,7 @@ export class ApiService {
                     }
                 };
                 const uploadResult = yield this.client.callApi(params, request, runtime);
-                const ossConfig = chain(uploadResult).get('body.OssPostConfig');
+                const ossConfig = uploadResult.body.OssPostConfig;
                 if (uploadResult.statusCode !== 200 || !ossConfig) {
                     return false;
                 }
@@ -708,7 +653,6 @@ export class ApiService {
                 formData.append('policy', policy);
                 formData.append('key', key);
                 formData.append('file', edgeRoutine.code);
-                // TODO: 检查oss结果;
                 const ossRes = yield fetch(Url, {
                     method: 'POST',
                     body: formData,
@@ -868,5 +812,282 @@ export class ApiService {
             return null;
         });
     }
+    listRoutineRelatedRecords(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'ListRoutineRelatedRecords',
+                    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,
+                        PageNumber: requestParams.PageNumber,
+                        PageSize: requestParams.PageSize,
+                        SearchKeyWord: requestParams.SearchKeyWord
+                    }
+                });
+                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: {
+                            PageNumber: res.body.PageNumber,
+                            PageSize: res.body.PageSize,
+                            TotalCount: res.body.TotalCount,
+                            RelatedRecords: res.body.RelatedRecords
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            return null;
+        });
+    }
+    createRoutineRoute(requestParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let params = {
+                    action: 'CreateRoutineRoute',
+                    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: {
+                        SiteId: requestParams.SiteId,
+                        RoutineName: requestParams.RoutineName,
+                        RouteName: requestParams.RouteName,
+                        RouteEnable: 'on',
+                        Rule: requestParams.Rule,
+                        Bypass: requestParams.Bypass,
+                        Mode: 'simple'
+                    }
+                });
+                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,
+                            ConfigId: res.body.ConfigId
+                        }
+                    };
+                    return ret;
+                }
+            }
+            catch (error) {
+                console.log(error);
+            }
+            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;