esa-cli 0.0.2-beta.10 → 0.0.2-beta.13

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,7 @@ export class ApiService {
                 }
             }
             catch (error) {
-                isShowError && console.log(error);
+                console.log('error', error);
                 return {
                     success: false,
                     message: t('login_failed').d('An error occurred while trying to log in.')
@@ -130,7 +129,6 @@ export class ApiService {
     }
     publishRoutineCodeVersion(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             try {
                 let params = {
                     action: 'PublishRoutineCodeVersion',
@@ -146,15 +144,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 +219,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() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'GetRoutineUserInfo',
+                    action: 'ListUserRoutines',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -287,11 +244,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 +522,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 +551,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,8 +583,7 @@ export class ApiService {
             let request = new $OpenApi.OpenApiRequest({
                 query: {
                     Name: edgeRoutine.name,
-                    Description: edgeRoutine.description,
-                    SpecName: edgeRoutine.specName
+                    Description: edgeRoutine.description
                 }
             });
             let runtime = {
@@ -696,7 +638,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;
                 }
@@ -709,7 +651,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,
@@ -772,11 +713,11 @@ export class ApiService {
             return null;
         });
     }
-    ListRoutineOptionalSpecs() {
+    createRoutineRelatedRecord(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'ListRoutineOptionalSpecs',
+                    action: 'CreateRoutineRelatedRecord',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -789,7 +730,14 @@ export class ApiService {
                         return this;
                     }
                 };
-                let request = new $OpenApi.OpenApiRequest();
+                let request = new $OpenApi.OpenApiRequest({
+                    query: {
+                        RecordName: requestParams.RecordName,
+                        SiteId: requestParams.SiteId,
+                        SiteName: requestParams.SiteName,
+                        Name: requestParams.Name
+                    }
+                });
                 let runtime = {
                     toMap: function () {
                         return this;
@@ -800,8 +748,8 @@ export class ApiService {
                     const ret = {
                         code: res.statusCode,
                         data: {
-                            RequestId: res.body.RequestId,
-                            Specs: res.body.Specs
+                            Status: res.body.Status,
+                            RequestId: res.body.RequestId
                         }
                     };
                     return ret;
@@ -813,11 +761,11 @@ export class ApiService {
             return null;
         });
     }
-    createRoutineRelatedRecord(requestParams) {
+    deleteRoutineRelatedRecord(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'CreateRoutineRelatedRecord',
+                    action: 'DeleteRoutineRelatedRecord',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -835,7 +783,8 @@ export class ApiService {
                         RecordName: requestParams.RecordName,
                         SiteId: requestParams.SiteId,
                         SiteName: requestParams.SiteName,
-                        Name: requestParams.Name
+                        Name: requestParams.Name,
+                        RecordId: requestParams.RecordId
                     }
                 });
                 let runtime = {
@@ -861,11 +810,11 @@ export class ApiService {
             return null;
         });
     }
-    deleteRoutineRelatedRecord(requestParams) {
+    listRoutineRelatedRecords(requestParams) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let params = {
-                    action: 'DeleteRoutineRelatedRecord',
+                    action: 'ListRoutineRelatedRecords',
                     version: '2024-09-10',
                     protocol: 'https',
                     method: 'GET',
@@ -880,11 +829,190 @@ export class ApiService {
                 };
                 let request = new $OpenApi.OpenApiRequest({
                     query: {
-                        RecordName: requestParams.RecordName,
+                        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,
-                        SiteName: requestParams.SiteName,
+                        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* () {
+            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({
+                    query: {
                         Name: requestParams.Name,
-                        RecordId: requestParams.RecordId
+                        CodeDescription: requestParams.CodeDescription,
+                        BuildId: requestParams.BuildId
+                    }
+                });
+                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 = {
@@ -897,8 +1025,10 @@ export class ApiService {
                     const ret = {
                         code: res.statusCode,
                         data: {
-                            Status: res.body.Status,
-                            RequestId: res.body.RequestId
+                            RequestId: res.body.RequestId,
+                            Strategy: res.body.Strategy,
+                            DeploymentId: res.body.DeploymentId,
+                            CodeVersions: res.body.CodeVersions
                         }
                     };
                     return ret;
@@ -910,5 +1040,48 @@ export class ApiService {
             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

@@ -9,6 +9,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');
@@ -32,7 +33,7 @@ export function cloneRepository(url, path) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             execSync(`git clone ${url} ${path}`, { stdio: 'inherit' });
-            console.log('Repository cloned successfully.');
+            logger.log('Repository cloned successfully.');
         }
         catch (error) {
             console.error('Error occurred while cloning the repository:', error);
@@ -40,10 +41,13 @@ export function cloneRepository(url, path) {
         }
     });
 }
-export function installGit(path) {
+export function installGit(path, debug = false) {
     try {
-        execSync('git init', { stdio: 'inherit', cwd: path });
-        console.log('Git has been installed successfully.');
+        execSync('git init', { stdio: 'ignore', cwd: path });
+        if (debug) {
+            logger.log('Git has been installed successfully.');
+        }
+        return true;
     }
     catch (error) {
         console.error('Error occurred during Git installation:', error);

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) {

package/dist/libs/logger.js

@@ -1,10 +1,10 @@
+import os from 'os';
+import path from 'path';
 import chalk from 'chalk';
-import { format, createLogger } from 'winston';
-import DailyRotateFile from 'winston-daily-rotate-file';
 import Table from 'cli-table3';
-import path from 'path';
-import os from 'os';
 import ora from 'ora';
+import { format, createLogger } from 'winston';
+import DailyRotateFile from 'winston-daily-rotate-file';
 import t from '../i18n/index.js';
 import { getProjectConfig } from '../utils/fileUtils/index.js';
 const transport = new DailyRotateFile({
@@ -72,7 +72,7 @@ class Logger {
         console.log(`\t${message}`);
     }
     success(message) {
-        console.log(`\n🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
+        console.log(`🎉 ${chalk.bgGreen(' SUCCESS ')} ${chalk.green(message)}`);
     }
     debug(message) {
         this.logger.debug(message);
@@ -146,15 +146,71 @@ class Logger {
         if (messages.length === 0)
             return;
         const lines = [];
-        lines.push(`╭─ ${messages[0]}`);
+        lines.push(`╭ ${messages[0]}`);
         for (let i = 1; i < messages.length - 1; i++) {
             lines.push(`│ ${messages[i]}`);
         }
         if (messages.length > 1) {
-            lines.push(`╰─ ${messages[messages.length - 1]}`);
+            lines.push(`╰ ${messages[messages.length - 1]}`);
         }
         console.log(lines.join('\n'));
     }
+    // Cloudflare-like step rendering helpers
+    cfStepHeader(title, step, total) {
+        console.log(`\n╭ ${title} ${chalk.green(`Step ${step} of ${total}`)}`);
+        console.log('│');
+    }
+    cfStepItem(prompt) {
+        console.log(`├ ${prompt}`);
+    }
+    cfStepKV(key, value) {
+        const orange = chalk.hex('#FFA500');
+        console.log(`│ ${orange(key)} ${value}`);
+    }
+    cfStepSpacer() {
+        console.log('│');
+    }
+    cfStepEnd(str) {
+        console.log(`╰ ${str || ''}`);
+    }
+    cfStepEndInline() {
+        try {
+            process.stdout.write('╰ ');
+        }
+        catch (_a) {
+            console.log('╰');
+        }
+    }
+    divider() {
+        console.log(chalk.yellow('--------------------------------------------------------'));
+    }
+    // Replace the previous single terminal line with new content
+    replacePrevLine(content) {
+        try {
+            // Move cursor up 1 line, clear it, carriage return, print new content
+            process.stdout.write('\x1b[1A');
+            process.stdout.write('\x1b[2K');
+            process.stdout.write('\r');
+            console.log(content);
+        }
+        catch (_a) {
+            console.log(content);
+        }
+    }
+    // Replace multiple previous lines with one consolidated line
+    replacePrevLines(linesToReplace, content) {
+        try {
+            for (let i = 0; i < linesToReplace; i++) {
+                process.stdout.write('\x1b[1A'); // move up
+                process.stdout.write('\x1b[2K'); // clear line
+            }
+            process.stdout.write('\r');
+            console.log(content);
+        }
+        catch (_a) {
+            console.log(content);
+        }
+    }
 }
 const logger = Logger.getInstance();
 export default logger;

package/dist/libs/service.js

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import ora from 'ora';
-import chain from 'lodash';
 import FormData from 'form-data';
+import chain from 'lodash';
 import fetch from 'node-fetch';
+import ora from 'ora';
 import t from '../i18n/index.js';
 import api from './api.js';
 import { Environment } from './interface.js';

package/dist/libs/templates/index.js

@@ -1,5 +1,5 @@
-import { getSummary } from '../../commands/common/constant.js';
 import chalk from 'chalk';
+import { getSummary } from '../../commands/common/constant.js';
 import logger from '../logger.js';
 export default class Template {
     constructor(path, title) {