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

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) {
@@ -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,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 +555,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 +591,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 +646,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 +659,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 +722,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 +739,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 +757,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 +770,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 +792,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 +819,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 +838,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 +854,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/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/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,29 +35,14 @@ 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);
-            console.log({
-                name: name,
-                specName: spec,
-                code: code
-            });
             const res = yield createEdgeRoutine({
                 name: name,
-                specName: spec,
                 code: code
             });
             if (res) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esa-cli",
-  "version": "0.0.2-beta.10",
+  "version": "0.0.2-beta.12",
   "description": "A CLI for operating Alibaba Cloud ESA EdgeRoutine (Edge Functions).",
   "main": "bin/enter.cjs",
   "type": "module",
@@ -18,7 +18,6 @@
     "watch": "tsc --watch",
     "eslint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "lint-staged": "lint-staged",
-    "prepare": "npm run build",
     "test": "FORCE_COLOR=0 npx vitest ",
     "coverage": "vitest --coverage"
   },
@@ -67,7 +66,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",
@@ -80,7 +79,7 @@
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.5",
     "cross-spawn": "^7.0.3",
-    "esa-template": "^0.0.3",
+    "esa-template": "^0.0.7",
     "esbuild": "^0.21.1",
     "esbuild-plugin-less": "^1.3.8",
     "form-data": "^4.0.0",