@geek-fun/serverlessinsight 0.0.4 → 0.0.6

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.0.4",
+    "version": "0.0.6",
     "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
     "homepage": "https://serverlessinsight.geekfun.club",
     "main": "dist/src/index.js",
@@ -49,33 +49,34 @@
         "function"
     ],
     "dependencies": {
-        "@alicloud/openapi-client": "^0.4.11",
-        "@alicloud/ros-cdk-apigateway": "^1.2.0",
-        "@alicloud/ros-cdk-core": "^1.2.0",
-        "@alicloud/ros-cdk-fc": "^1.2.0",
-        "@alicloud/ros-cdk-ram": "^1.2.0",
-        "@alicloud/ros20190910": "^3.4.3",
+        "@alicloud/openapi-client": "^0.4.12",
+        "@alicloud/ros-cdk-apigateway": "^1.4.0",
+        "@alicloud/ros-cdk-core": "^1.4.0",
+        "@alicloud/ros-cdk-fc3": "^1.4.0",
+        "@alicloud/ros-cdk-ram": "^1.4.0",
+        "@alicloud/ros20190910": "^3.5.0",
         "ajv": "^8.17.1",
-        "chalk": "^4.1.2",
-        "commander": "^11.1.0",
+        "chalk": "^5.3.0",
+        "commander": "^12.1.0",
         "i18n": "^0.15.1",
-        "pino": "^8.17.2",
+        "pino": "^9.4.0",
         "pino-pretty": "^11.2.2",
         "yaml": "^2.5.1"
     },
     "devDependencies": {
-        "@types/i18n": "^0.13.10",
-        "@types/jest": "^29.5.11",
-        "@types/node": "^20.11.5",
-        "@typescript-eslint/eslint-plugin": "^6.19.0",
-        "@typescript-eslint/parser": "^6.19.0",
-        "eslint": "^8.56.0",
+        "@types/i18n": "^0.13.12",
+        "@types/jest": "^29.5.13",
+        "@types/node": "^22.7.4",
+        "@typescript-eslint/eslint-plugin": "^8.8.0",
+        "@typescript-eslint/parser": "^8.8.0",
+        "eslint": "^8.57.1",
         "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-prettier": "^5.2.1",
+        "globals": "^15.9.0",
         "husky": "^9.1.6",
         "jest": "^29.7.0",
-        "prettier": "^3.2.4",
-        "ts-jest": "^29.1.1",
+        "prettier": "^3.3.3",
+        "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",
         "typescript": "^5.6.2"
     }

package/dist/src/common/iacHelper.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceVars = exports.resolveCode = void 0;
+exports.replaceReference = exports.resolveCode = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const ros = __importStar(require("@alicloud/ros-cdk-core"));
@@ -36,18 +36,22 @@ const resolveCode = (location) => {
     return fileContent.toString('base64');
 };
 exports.resolveCode = resolveCode;
-const replaceVars = (value, stage) => {
+const replaceReference = (value, stage) => {
     if (typeof value === 'string') {
         const matchVar = value.match(/^\$\{vars\.(\w+)}$/);
         const containsVar = value.match(/\$\{vars\.(\w+)}/);
         const matchMap = value.match(/^\$\{stages\.(\w+)}$/);
         const containsMap = value.match(/\$\{stages\.(\w+)}/);
+        const matchFn = value.match(/^\$\{functions\.(\w+(\.\w+)?)}$/);
         if (matchVar?.length) {
             return ros.Fn.ref(matchVar[1]);
         }
         if (matchMap?.length) {
             return ros.Fn.findInMap('stages', '', matchMap[1]);
         }
+        if (matchFn?.length) {
+            return ros.Fn.getAtt(matchFn[1], 'FunctionName');
+        }
         if (containsMap?.length && containsVar?.length) {
             return ros.Fn.sub(value.replace(/\$\{stages\.(\w+)}/g, '${$1}').replace(/\$\{vars\.(\w+)}/g, '${$1}'));
         }
@@ -60,11 +64,11 @@ const replaceVars = (value, stage) => {
         return value;
     }
     if (Array.isArray(value)) {
-        return value.map((item) => (0, exports.replaceVars)(item, stage));
+        return value.map((item) => (0, exports.replaceReference)(item, stage));
     }
     if (typeof value === 'object' && value !== null) {
-        return Object.fromEntries(Object.entries(value).map(([key, val]) => [key, (0, exports.replaceVars)(val, stage)]));
+        return Object.fromEntries(Object.entries(value).map(([key, val]) => [key, (0, exports.replaceReference)(val, stage)]));
     }
     return value;
 };
-exports.replaceVars = replaceVars;
+exports.replaceReference = replaceReference;

package/dist/src/common/rosClient.js

@@ -31,6 +31,7 @@ const tea_util_1 = __importDefault(require("@alicloud/tea-util"));
 const ros20190910_1 = __importStar(require("@alicloud/ros20190910"));
 const openapi_client_1 = require("@alicloud/openapi-client");
 const logger_1 = require("./logger");
+const lang_1 = require("../lang");
 const client = new ros20190910_1.default(new openapi_client_1.Config({
     accessKeyId: process.env.ALIYUN_ACCESS_KEY_ID,
     accessKeySecret: process.env.ALIYUN_ACCESS_KEY_SECRET,
@@ -44,31 +45,45 @@ const createStack = async (stackName, templateBody, context) => {
     }));
     const createStackRequest = new ros20190910_1.CreateStackRequest({
         regionId: context.region,
+        sync: true,
         stackName,
         templateBody: JSON.stringify(templateBody),
         parameters,
         tags: context.tags?.map((tag) => new ros20190910_1.CreateStackRequestTags(tag)),
     });
-    console.log('createStackRequest:', createStackRequest);
     const response = await client.createStack(createStackRequest);
-    console.log(`创建中，资源栈ID:${response.body?.stackId}`);
-    return response.body?.stackId;
+    logger_1.logger.info(`创建中，资源栈ID:${response.body?.stackId}`);
+    // wait for stack create complete
+    return await getStackActionResult(response.body?.stackId || '', context.region);
 };
 const updateStack = async (stackId, templateBody, context) => {
     const parameters = context.parameters?.map((parameter) => new ros20190910_1.UpdateStackRequestParameters({
         parameterKey: tea_util_1.default.assertAsString(parameter.key),
         parameterValue: tea_util_1.default.assertAsString(parameter.key),
     }));
-    const createStackRequest = new ros20190910_1.UpdateStackRequest({
+    const updateStackRequest = new ros20190910_1.UpdateStackRequest({
         regionId: context.region,
         stackId,
         templateBody: JSON.stringify(templateBody),
         parameters,
         tags: context.tags?.map((tag) => new ros20190910_1.CreateStackRequestTags(tag)),
     });
-    const response = await client.updateStack(createStackRequest);
-    console.log(`更新中，资源栈ID:${response.body?.stackId}`);
-    return response.body?.stackId;
+    try {
+        const response = await client.updateStack(updateStackRequest);
+        logger_1.logger.info(`更新中，资源栈ID:${response.body?.stackId}`);
+        // wait for stack update complete
+        return await getStackActionResult(response.body?.stackId || '', context.region);
+    }
+    catch (err) {
+        const { Message: message, statusCode } = err?.data || {};
+        if (statusCode === 400 && message.includes('Update the completely same stack')) {
+            logger_1.logger.warn(`${lang_1.lang.__('UPDATE_COMPLETELY_SAME_STACK')}`);
+            return null;
+        }
+        else {
+            throw err;
+        }
+    }
 };
 const getStackByName = async (stackName, region) => {
     const result = await client.listStacks(new ros20190910_1.ListStacksRequest({
@@ -84,21 +99,67 @@ const getStackByName = async (stackName, region) => {
         return null;
     }
 };
+const getStackActionResult = async (stackId, region) => {
+    return new Promise((resolve, reject) => {
+        const startTime = Date.now();
+        const interval = setInterval(async () => {
+            try {
+                const result = await client.getStack(new ros20190910_1.GetStackRequest({ regionId: region, stackId }));
+                const status = result.body?.status ?? '';
+                logger_1.logger.info(`stack status: ${status}`);
+                if ([
+                    'CREATE_COMPLETE',
+                    'UPDATE_COMPLETE',
+                    'DELETE_COMPLETE',
+                    'CHECK_COMPLETE',
+                    'IMPORT_CREATE_COMPLETE',
+                    'IMPORT_UPDATE_COMPLETE',
+                ].includes(status)) {
+                    clearInterval(interval);
+                    resolve(result.body);
+                }
+                else if ([
+                    'CREATE_ROLLBACK_FAILED',
+                    'CREATE_ROLLBACK_COMPLETE',
+                    'ROLLBACK_FAILED',
+                    'ROLLBACK_COMPLETE',
+                    'IMPORT_CREATE_ROLLBACK_FAILED',
+                    'IMPORT_CREATE_ROLLBACK_COMPLETE',
+                    'IMPORT_UPDATE_ROLLBACK_FAILED',
+                    'IMPORT_UPDATE_ROLLBACK_COMPLETE',
+                ].includes(status)) {
+                    clearInterval(interval);
+                    reject(new Error(`Stack operation failed with status: ${status}`));
+                }
+                else if (Date.now() - startTime > 3600000) {
+                    // 1 hour in milliseconds
+                    clearInterval(interval);
+                    reject(new Error('Stack operation did not finish within 1 hour'));
+                }
+            }
+            catch (error) {
+                clearInterval(interval);
+                reject(error);
+            }
+        }, 5000); // 5 seconds interval
+    });
+};
 const rosStackDeploy = async (stackName, templateBody, context) => {
     const stackInfo = await getStackByName(stackName, context.region);
     if (stackInfo) {
         const { Status: stackStatus } = stackInfo;
         if (stackStatus?.indexOf('IN_PROGRESS') >= 0) {
-            logger_1.logger.error(`fail to update stack, because stack status is ${stackStatus}`);
             throw new Error(`fail to update stack, because stack status is ${stackStatus}`);
         }
         logger_1.logger.info(`Update stack: ${stackName} deploying... `);
-        return await updateStack(stackInfo.stackId, templateBody, context);
+        const stack = await updateStack(stackInfo.stackId, templateBody, context);
+        logger_1.logger.info(`stackUpdate success! stackName:${stack?.stackName}, stackId:${stack?.stackId}`);
     }
     else {
         // create stack
         logger_1.logger.info(`Create stack: ${stackName} deploying... `);
-        return await createStack(stackName, templateBody, context);
+        const stack = await createStack(stackName, templateBody, context);
+        logger_1.logger.info(`createStack success! stackName:${stack?.stackName}, stackId:${stack?.stackId}`);
     }
 };
 exports.rosStackDeploy = rosStackDeploy;

package/dist/src/lang/index.js

@@ -4,6 +4,12 @@ exports.lang = void 0;
 const i18n_1 = require("i18n");
 const lang = new i18n_1.I18n({
     locales: ['en', 'cn'],
-    register: [{ hello: 'hello' }, { hello: '你好' }],
+    register: [
+        {
+            hello: 'hello',
+            UPDATE_COMPLETELY_SAME_STACK: 'The stack is completely the same, update SKIPPED',
+        },
+        { hello: '你好', UPDATE_COMPLETELY_SAME_STACK: '栈完全相同，更新跳过' },
+    ],
 });
 exports.lang = lang;

package/dist/src/stack/iacSchema.js

@@ -94,6 +94,21 @@ const schema = {
                                 required: ['method', 'path', 'backend'],
                             },
                         },
+                        custom_domain: {
+                            type: 'object',
+                            properties: {
+                                domain_name: { type: 'string' },
+                                certificate_name: { type: 'string' },
+                                certificate_body: { type: 'string' },
+                                certificate_private_key: { type: 'string' },
+                            },
+                            required: [
+                                'domain_name',
+                                'certificate_name',
+                                'certificate_body',
+                                'certificate_private_key',
+                            ],
+                        },
                     },
                     required: ['name', 'type', 'triggers'],
                 },

package/dist/src/stack/iacStack.js

@@ -27,7 +27,7 @@ exports.IacStack = void 0;
 const ros = __importStar(require("@alicloud/ros-cdk-core"));
 const ros_cdk_core_1 = require("@alicloud/ros-cdk-core");
 const types_1 = require("../types");
-const fc = __importStar(require("@alicloud/ros-cdk-fc"));
+const fc = __importStar(require("@alicloud/ros-cdk-fc3"));
 const ram = __importStar(require("@alicloud/ros-cdk-ram"));
 const agw = __importStar(require("@alicloud/ros-cdk-apigateway"));
 const common_1 = require("../common");
@@ -36,7 +36,7 @@ class IacStack extends ros.Stack {
         super(scope, iac.service, {
             stackName: context.stackName,
             tags: iac.tags.reduce((acc, tag) => {
-                acc[tag.key] = (0, common_1.replaceVars)(tag.value, context.stage);
+                acc[tag.key] = (0, common_1.replaceReference)(tag.value, context.stage);
                 return acc;
             }, {}),
         });
@@ -46,32 +46,26 @@ class IacStack extends ros.Stack {
             defaultValue: value,
         }));
         // Define Mappings
-        new ros.RosMapping(this, 'stages', { mapping: (0, common_1.replaceVars)(iac.stages, context.stage) });
-        new ros.RosInfo(this, ros.RosInfo.description, (0, common_1.replaceVars)(`${iac.service} stack`, context.stage));
-        const service = new fc.RosService(this, (0, common_1.replaceVars)(`${iac.service}-service`, context.stage), {
-            serviceName: (0, common_1.replaceVars)(`${iac.service}-service`, context.stage),
-            tags: (0, common_1.replaceVars)(iac.tags, context.stage),
-        }, true);
+        new ros.RosMapping(this, 'stages', { mapping: (0, common_1.replaceReference)(iac.stages, context.stage) });
+        new ros.RosInfo(this, ros.RosInfo.description, (0, common_1.replaceReference)(`${iac.service} stack`, context.stage));
         iac.functions.forEach((fnc) => {
-            const func = new fc.RosFunction(this, fnc.key, {
-                functionName: (0, common_1.replaceVars)(fnc.name, context.stage),
-                serviceName: (0, common_1.replaceVars)(service.serviceName, context.stage),
-                handler: (0, common_1.replaceVars)(fnc.handler, context.stage),
-                runtime: (0, common_1.replaceVars)(fnc.runtime, context.stage),
-                memorySize: (0, common_1.replaceVars)(fnc.memory, context.stage),
-                timeout: (0, common_1.replaceVars)(fnc.timeout, context.stage),
-                environmentVariables: (0, common_1.replaceVars)(fnc.environment, context.stage),
+            new fc.RosFunction(this, fnc.key, {
+                functionName: (0, common_1.replaceReference)(fnc.name, context.stage),
+                handler: (0, common_1.replaceReference)(fnc.handler, context.stage),
+                runtime: (0, common_1.replaceReference)(fnc.runtime, context.stage),
+                memorySize: (0, common_1.replaceReference)(fnc.memory, context.stage),
+                timeout: (0, common_1.replaceReference)(fnc.timeout, context.stage),
+                environmentVariables: (0, common_1.replaceReference)(fnc.environment, context.stage),
                 code: {
                     zipFile: (0, common_1.resolveCode)(fnc.code),
                 },
             }, true);
-            func.addDependsOn(service);
         });
         const apiGateway = iac.events?.filter((event) => event.type === types_1.EventTypes.API_GATEWAY);
         if (apiGateway?.length) {
-            const gatewayAccessRole = new ram.RosRole(this, (0, common_1.replaceVars)(`${iac.service}_role`, context.stage), {
-                roleName: (0, common_1.replaceVars)(`${iac.service}-gateway-access-role`, context.stage),
-                description: (0, common_1.replaceVars)(`${iac.service} role`, context.stage),
+            const gatewayAccessRole = new ram.RosRole(this, (0, common_1.replaceReference)(`${iac.service}_role`, context.stage), {
+                roleName: (0, common_1.replaceReference)(`${iac.service}-gateway-access-role`, context.stage),
+                description: (0, common_1.replaceReference)(`${iac.service} role`, context.stage),
                 assumeRolePolicyDocument: {
                     version: '1',
                     statement: [
@@ -86,7 +80,7 @@ class IacStack extends ros.Stack {
                 },
                 policies: [
                     {
-                        policyName: (0, common_1.replaceVars)(`${iac.service}-policy`, context.stage),
+                        policyName: (0, common_1.replaceReference)(`${iac.service}-policy`, context.stage),
                         policyDocument: {
                             version: '1',
                             statement: [
@@ -101,35 +95,47 @@ class IacStack extends ros.Stack {
                     },
                 ],
             }, true);
-            const apiGatewayGroup = new agw.RosGroup(this, (0, common_1.replaceVars)(`${iac.service}_apigroup`, context.stage), {
-                groupName: (0, common_1.replaceVars)(`${iac.service}_apigroup`, context.stage),
-                tags: (0, common_1.replaceVars)(iac.tags, context.stage),
+            const apiGatewayGroup = new agw.RosGroup(this, (0, common_1.replaceReference)(`${iac.service}_apigroup`, context.stage), {
+                groupName: (0, common_1.replaceReference)(`${iac.service}_apigroup`, context.stage),
+                tags: (0, common_1.replaceReference)(iac.tags, context.stage),
             }, true);
+            // new agw.RosCustomDomain(
+            //   this,
+            //   'customDomain',
+            //   {
+            //     domainName: 'example.com',
+            //     certificateName: 'example.com',
+            //     certificateBody: 'example.com',
+            //     certificatePrivateKey: 'example.com',
+            //     groupId: apiGatewayGroup.attrGroupId,
+            //   },
+            //   true,
+            // );
             apiGateway.forEach((event) => {
                 event.triggers.forEach((trigger) => {
                     const key = `${trigger.method}_${trigger.path}`.toLowerCase().replace(/\//g, '_');
-                    const api = new agw.RosApi(this, (0, common_1.replaceVars)(`${event.key}_api_${key}`, context.stage), {
-                        apiName: (0, common_1.replaceVars)(`${event.name}_api_${key}`, context.stage),
+                    const api = new agw.RosApi(this, (0, common_1.replaceReference)(`${event.key}_api_${key}`, context.stage), {
+                        apiName: (0, common_1.replaceReference)(`${event.name}_api_${key}`, context.stage),
                         groupId: apiGatewayGroup.attrGroupId,
                         visibility: 'PRIVATE',
                         requestConfig: {
                             requestProtocol: 'HTTP',
-                            requestHttpMethod: (0, common_1.replaceVars)(trigger.method, context.stage),
-                            requestPath: (0, common_1.replaceVars)(trigger.path, context.stage),
+                            requestHttpMethod: (0, common_1.replaceReference)(trigger.method, context.stage),
+                            requestPath: (0, common_1.replaceReference)(trigger.path, context.stage),
                             requestMode: 'PASSTHROUGH',
                         },
                         serviceConfig: {
                             serviceProtocol: 'FunctionCompute',
                             functionComputeConfig: {
                                 fcRegionId: context.region,
-                                serviceName: service.serviceName,
-                                functionName: trigger.backend,
+                                functionName: (0, common_1.replaceReference)(trigger.backend, trigger.backend),
                                 roleArn: gatewayAccessRole.attrArn,
+                                fcVersion: '3.0',
                             },
                         },
                         resultSample: 'ServerlessInsight resultSample',
                         resultType: 'JSON',
-                        tags: (0, common_1.replaceVars)(iac.tags, context.stage),
+                        tags: (0, common_1.replaceReference)(iac.tags, context.stage),
                     }, true);
                     api.addDependsOn(apiGatewayGroup);
                 });

package/dist/src/stack/parse.js

@@ -5,10 +5,16 @@ const yaml_1 = require("yaml");
 const node_fs_1 = require("node:fs");
 const iacSchema_1 = require("./iacSchema");
 const mapToArr = (obj) => {
-    return Object.entries(obj).map(([key, value]) => typeof value === 'string' ? { [key]: value } : { key, ...value });
+    if (!obj) {
+        return [];
+    }
+    return Object.entries(obj)?.map(([key, value]) => typeof value === 'string' ? { [key]: value } : { key, ...value });
 };
 const mapToKvArr = (obj) => {
-    return Object.entries(obj).map(([key, value]) => ({ key, value }));
+    if (!obj) {
+        return [];
+    }
+    return Object.entries(obj)?.map(([key, value]) => ({ key, value }));
 };
 const validateExistence = (path) => {
     if (!(0, node_fs_1.existsSync)(path)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",
@@ -49,33 +49,34 @@
     "function"
   ],
   "dependencies": {
-    "@alicloud/openapi-client": "^0.4.11",
-    "@alicloud/ros-cdk-apigateway": "^1.2.0",
-    "@alicloud/ros-cdk-core": "^1.2.0",
-    "@alicloud/ros-cdk-fc": "^1.2.0",
-    "@alicloud/ros-cdk-ram": "^1.2.0",
-    "@alicloud/ros20190910": "^3.4.3",
+    "@alicloud/openapi-client": "^0.4.12",
+    "@alicloud/ros-cdk-apigateway": "^1.4.0",
+    "@alicloud/ros-cdk-core": "^1.4.0",
+    "@alicloud/ros-cdk-fc3": "^1.4.0",
+    "@alicloud/ros-cdk-ram": "^1.4.0",
+    "@alicloud/ros20190910": "^3.5.0",
     "ajv": "^8.17.1",
-    "chalk": "^4.1.2",
-    "commander": "^11.1.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
     "i18n": "^0.15.1",
-    "pino": "^8.17.2",
+    "pino": "^9.4.0",
     "pino-pretty": "^11.2.2",
     "yaml": "^2.5.1"
   },
   "devDependencies": {
-    "@types/i18n": "^0.13.10",
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.5",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
-    "eslint": "^8.56.0",
+    "@types/i18n": "^0.13.12",
+    "@types/jest": "^29.5.13",
+    "@types/node": "^22.7.4",
+    "@typescript-eslint/eslint-plugin": "^8.8.0",
+    "@typescript-eslint/parser": "^8.8.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
+    "globals": "^15.9.0",
     "husky": "^9.1.6",
     "jest": "^29.7.0",
-    "prettier": "^3.2.4",
-    "ts-jest": "^29.1.1",
+    "prettier": "^3.3.3",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2"
   }