esa-cli 0.0.2-beta.8 → 0.0.5

package/dist/libs/apiService.js

@@ -12,7 +12,6 @@ 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';
 export class ApiService {
     constructor(cliConfig) {
@@ -569,7 +568,7 @@ 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;
+            var _a, _b, _c, _d, _e, _f;
             try {
                 let params = {
                     action: 'GetRoutine',
@@ -602,12 +601,10 @@ export class ApiService {
                         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
+                            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
                         }
                     };
                     return routineResponse;
@@ -640,8 +637,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 +692,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,12 +705,12 @@ 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,
                     headers: formData.getHeaders()
                 });
+                // console.log('oss result', oss);
                 if (ossRes && ossRes.status === 200) {
                     return true;
                 }
@@ -772,11 +768,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 +785,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 +803,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 +816,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 +838,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 +865,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 +884,10 @@ export class ApiService {
                 };
                 let request = new $OpenApi.OpenApiRequest({
                     query: {
-                        RecordName: requestParams.RecordName,
-                        SiteId: requestParams.SiteId,
-                        SiteName: requestParams.SiteName,
                         Name: requestParams.Name,
-                        RecordId: requestParams.RecordId
+                        PageNumber: requestParams.PageNumber,
+                        PageSize: requestParams.PageSize,
+                        SearchKeyWord: requestParams.SearchKeyWord
                     }
                 });
                 let runtime = {
@@ -897,8 +900,61 @@ export class ApiService {
                     const ret = {
                         code: res.statusCode,
                         data: {
-                            Status: res.body.Status,
-                            RequestId: res.body.RequestId
+                            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;

package/dist/libs/templates/index.js

@@ -1,5 +1,6 @@
 import { getSummary } from '../../commands/common/constant.js';
 import chalk from 'chalk';
+import logger from '../logger.js';
 export default class Template {
     constructor(path, title) {
         this.path = path;
@@ -10,7 +11,7 @@ export default class Template {
         list.forEach((summary) => {
             const title = chalk.bold(summary.title);
             const command = chalk.green(summary.command);
-            console.log(`${title}: ${command}`);
+            logger.log(`${title}: ${command}`);
         });
     }
 }

package/dist/utils/checkIsRoutineCreated.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import path from 'path';
 import { createEdgeRoutine } from '../commands/commit/index.js';
-import { displaySelectSpec } from '../commands/deploy/index.js';
 import { ApiService } from '../libs/apiService.js';
 import { readEdgeRoutineFile } from './fileUtils/index.js';
 import logger from '../libs/logger.js';
@@ -36,26 +35,22 @@ export function validRoutine(name) {
 }
 export function checkRoutineExist(name, entry) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
         const isCreatedRoutine = yield isRoutineExist(name);
         if (!isCreatedRoutine) {
             logger.log(t('first_deploy').d('This is the first time to deploy, we will create a new routine for you.'));
             const entryFile = path.resolve(entry !== null && entry !== void 0 ? entry : '', 'src/index.js');
             yield prodBuild(false, entryFile, entry);
             const code = readEdgeRoutineFile(entry) || '';
-            const server = yield ApiService.getInstance();
-            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;
-            }, []);
-            const spec = yield displaySelectSpec(specList);
-            yield createEdgeRoutine({
+            const res = yield createEdgeRoutine({
                 name: name,
-                specName: spec,
                 code: code
             });
+            if (res) {
+                logger.success(t('routine_create_success').d('Routine created successfully.'));
+            }
+            else {
+                logger.error(t('routine_create_fail').d('Routine created failed.'));
+            }
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.8",
+  "version": "0.0.5",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -67,7 +67,7 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@alicloud/esa20240910": "2.8.1",
+    "@alicloud/esa20240910": "2.25.0",
     "@alicloud/openapi-client": "^0.4.7",
     "@babel/generator": "^7.26.3",
     "@babel/parser": "^7.24.4",