@geek-fun/serverlessinsight 0.3.0 → 0.3.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "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,51 +49,54 @@
         "function"
     ],
     "dependencies": {
-        "@alicloud/ims20190815": "^2.1.4",
-        "@alicloud/openapi-client": "^0.4.12",
-        "@alicloud/ros-cdk-apigateway": "^1.6.0",
-        "@alicloud/ros-cdk-core": "^1.6.0",
-        "@alicloud/ros-cdk-dns": "^1.6.0",
-        "@alicloud/ros-cdk-ecs": "^1.6.0",
-        "@alicloud/ros-cdk-elasticsearchserverless": "^1.6.0",
-        "@alicloud/ros-cdk-fc3": "^1.6.0",
-        "@alicloud/ros-cdk-nas": "^1.6.0",
-        "@alicloud/ros-cdk-oss": "^1.6.0",
-        "@alicloud/ros-cdk-ossdeployment": "^1.6.0",
-        "@alicloud/ros-cdk-ram": "^1.6.0",
-        "@alicloud/ros-cdk-rds": "^1.6.0",
-        "@alicloud/ros-cdk-sls": "^1.6.0",
-        "@alicloud/ros20190910": "^3.5.2",
+        "@alicloud/ims20190815": "^2.3.2",
+        "@alicloud/openapi-client": "^0.4.15",
+        "@alicloud/ros-cdk-apigateway": "^1.10.0",
+        "@alicloud/ros-cdk-core": "^1.10.0",
+        "@alicloud/ros-cdk-dns": "^1.10.0",
+        "@alicloud/ros-cdk-ecs": "^1.10.0",
+        "@alicloud/ros-cdk-elasticsearchserverless": "^1.10.0",
+        "@alicloud/ros-cdk-fc3": "^1.10.0",
+        "@alicloud/ros-cdk-nas": "^1.10.0",
+        "@alicloud/ros-cdk-oss": "^1.10.0",
+        "@alicloud/ros-cdk-ossdeployment": "^1.10.0",
+        "@alicloud/ros-cdk-ots": "^1.10.0",
+        "@alicloud/ros-cdk-ram": "^1.10.0",
+        "@alicloud/ros-cdk-rds": "^1.10.0",
+        "@alicloud/ros-cdk-ros": "^1.10.0",
+        "@alicloud/ros-cdk-sls": "^1.10.0",
+        "@alicloud/ros-cdk-vpc": "^1.10.0",
+        "@alicloud/ros20190910": "^3.6.0",
         "ajv": "^8.17.1",
-        "ali-oss": "^6.22.0",
-        "chalk": "^5.4.1",
-        "commander": "^12.1.0",
+        "ali-oss": "^6.23.0",
+        "chalk": "^5.6.2",
+        "commander": "^14.0.1",
         "i": "^0.3.7",
-        "i18n": "^0.15.1",
+        "i18n": "^0.15.2",
         "jszip": "^3.10.1",
         "lodash": "^4.17.21",
-        "npm": "^11.1.0",
-        "pino": "^9.5.0",
-        "pino-pretty": "^13.0.0",
-        "yaml": "^2.7.0"
+        "npm": "^11.5.2",
+        "pino": "^9.9.4",
+        "pino-pretty": "^13.1.1",
+        "yaml": "^2.8.1"
     },
     "devDependencies": {
         "@types/ali-oss": "^6.16.11",
         "@types/i18n": "^0.13.12",
-        "@types/jest": "^29.5.14",
-        "@types/lodash": "^4.17.13",
-        "@types/node": "^22.10.1",
-        "@typescript-eslint/eslint-plugin": "^8.17.0",
-        "@typescript-eslint/parser": "^8.17.0",
-        "eslint": "^9.16.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "globals": "^15.13.0",
+        "@types/jest": "^30.0.0",
+        "@types/lodash": "^4.17.20",
+        "@types/node": "^24.3.0",
+        "@typescript-eslint/eslint-plugin": "^8.39.1",
+        "@typescript-eslint/parser": "^8.39.1",
+        "eslint": "^9.33.0",
+        "eslint-config-prettier": "^10.1.8",
+        "eslint-plugin-prettier": "^5.5.4",
+        "globals": "^16.3.0",
         "husky": "^9.1.7",
-        "jest": "^29.7.0",
-        "prettier": "^3.4.2",
-        "ts-jest": "^29.2.5",
+        "jest": "^30.0.5",
+        "prettier": "^3.6.2",
+        "ts-jest": "^29.4.1",
         "ts-node": "^10.9.2",
-        "typescript": "^5.7.2"
+        "typescript": "^5.9.2"
     }
 }

package/dist/src/commands/deploy.js

@@ -8,9 +8,9 @@ const deploy = async (stackName, options) => {
     common_1.logger.info('Validating yaml...');
     const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
     common_1.logger.info('Yaml is valid! 🎉');
-    const context = (0, common_1.constructActionContext)({ ...options, stackName, iacProvider: iac.provider });
+    await (0, common_1.setContext)({ ...options, stackName, iacProvider: iac.provider }, true);
     common_1.logger.info('Deploying stack...');
-    await (0, stack_1.deployStack)(stackName, iac, context);
+    await (0, stack_1.deployStack)(stackName, iac);
     common_1.logger.info('Stack deployed! 🎉');
 };
 exports.deploy = deploy;

package/dist/src/commands/destroy.js

@@ -5,7 +5,8 @@ const common_1 = require("../common");
 const parser_1 = require("../parser");
 const destroyStack = async (stackName, options) => {
     const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
-    const context = (0, common_1.constructActionContext)({ stackName, ...options, iacProvider: iac.provider });
+    await (0, common_1.setContext)({ stackName, ...options, iacProvider: iac.provider }, true);
+    const context = (0, common_1.getContext)();
     common_1.logger.info(`Destroying stack: ${stackName}, provider: ${context.provider}, region: ${context.region}...`);
     await (0, common_1.rosStackDelete)(context);
 };

package/dist/src/commands/index.js

@@ -7,15 +7,16 @@ const validate_1 = require("./validate");
 const deploy_1 = require("./deploy");
 const template_1 = require("./template");
 const destroy_1 = require("./destroy");
-const common_2 = require("../common");
+const local_1 = require("./local");
 const program = new commander_1.Command();
 program.name('si').description('CLI for ServerlessInsight').version((0, common_1.getVersion)());
 program
     .command('show')
     .description('show string')
     .action(async (options) => {
-    const context = (0, common_1.constructActionContext)({ ...options });
-    const result = await (0, common_2.getIamInfo)(context);
+    await (0, common_1.setContext)({ ...options });
+    const context = (0, common_1.getContext)();
+    const result = await (0, common_1.getIamInfo)(context);
     console.log('result:', JSON.stringify(result));
 });
 program
@@ -23,9 +24,9 @@ program
     .description('validate serverless Iac yaml')
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-s, --stage <stage>', 'specify the stage')
-    .action((stackName, { file, stage }) => {
+    .action(async (stackName, { file, stage }) => {
     common_1.logger.debug('log command info');
-    (0, validate_1.validate)(stackName, { stage, location: file });
+    await (0, validate_1.validate)(stackName, { stage, location: file });
 });
 program
     .command('deploy <stackName>')
@@ -33,10 +34,10 @@ program
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-s, --stage <stage>', 'specify the stage')
     .option('-r, --region <region>', 'specify the region')
-    .option('-pr, --provider <provider>', 'specify the provider')
-    .option('-ak, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
-    .option('-as, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
-    .option('-at, --securityToken <securityToken>', 'specify the SecurityToken')
+    .option('-v, --provider <provider>', 'specify the provider')
+    .option('-k, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
+    .option('-x, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
+    .option('-n, --securityToken <securityToken>', 'specify the SecurityToken')
     .option('-p, --parameter <key=value>', 'override parameters', (value, previous) => {
     const [key, val] = value.split('=');
     previous[key] = val;
@@ -56,21 +57,21 @@ program
 });
 program
     .command('template <stackName>')
-    .description('print ROS template')
+    .description('print platform specific infrastructure as code template')
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-s, --stage <stage>', 'specify the stage')
     .option('-t, --format <type>', 'output content type (JSON or YAML)', 'JSON')
-    .action((stackName, { format, file, stage }) => {
-    (0, template_1.template)(stackName, { format, location: file, stage });
+    .action(async (stackName, { format, file, stage }) => {
+    await (0, template_1.template)(stackName, { format, location: file, stage });
 });
 program
     .command('destroy <stackName>')
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-r, --region <region>', 'specify the region')
-    .option('-pr, --provider <provider>', 'specify the provider')
-    .option('-ak, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
-    .option('-as, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
-    .option('-at, --securityToken <securityToken>', 'specify the SecurityToken')
+    .option('-v, --provider <provider>', 'specify the provider')
+    .option('-k, --accessKeyId <accessKeyId>', 'specify the AccessKeyId')
+    .option('-x, --accessKeySecret <accessKeySecret>', 'specify the AccessKeySecret')
+    .option('-n, --securityToken <securityToken>', 'specify the SecurityToken')
     .description('destroy serverless stack')
     .action(async (stackName, { file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
     await (0, destroy_1.destroyStack)(stackName, {
@@ -82,4 +83,19 @@ program
         securityToken,
     });
 });
+program
+    .command('local <stackName>')
+    .description('run Serverless application locally for debugging')
+    .option('-s, --stage <stage>', 'specify the stage', 'default')
+    .option('-p, --port <port>', 'specify the port', '3000')
+    .option('-d, --debug', 'enable debug mode')
+    .option('-w, --watch', 'enable file watch', true)
+    .action(async (stackName, { stage, port, debug, watch }) => {
+    await (0, local_1.runLocal)(stackName, {
+        stage,
+        port: Number(port) || 3000,
+        debug: !!debug,
+        watch: typeof watch === 'boolean' ? watch : true,
+    });
+});
 program.parse();

package/dist/src/commands/local.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runLocal = void 0;
+const common_1 = require("../common");
+const localStack_1 = require("../stack/localStack");
+const runLocal = async (stackName, opts) => {
+    const { stage, port, debug, watch } = opts;
+    await (0, common_1.setContext)({ stage });
+    common_1.logger.info(`run-local starting: stack=${stackName} stage=${stage} port=${port} debug=${debug} watch=${watch}`);
+    await (0, localStack_1.startLocalStack)();
+    // if (watch) {
+    //   const cwd = process.cwd();
+    //   try {
+    //     fs.watch(cwd, { recursive: true }, (eventType, filename) => {
+    //       if (!filename) return;
+    //       const filePath = path.join(cwd, filename);
+    //       logger.info(`file change detected: ${eventType} ${filePath}`);
+    //     });
+    //     logger.info(`watching files under ${process.cwd()}`);
+    //   } catch (err) {
+    //     logger.warn(`file watch not available: ${String(err)}`);
+    //   }
+    // }
+    //
+    // const shutdown = () => {
+    //   logger.info('shutting down run-local server');
+    //   server.close(() => process.exit(0));
+    // };
+    // process.on('SIGINT', shutdown);
+    // process.on('SIGTERM', shutdown);
+    //
+    // // return server for tests if needed
+    // return { server, port, stage, debug, watch };
+};
+exports.runLocal = runLocal;

package/dist/src/commands/template.js

@@ -9,10 +9,10 @@ const yaml_1 = __importDefault(require("yaml"));
 const deploy_1 = require("../stack/deploy");
 const common_1 = require("../common");
 const parser_1 = require("../parser");
-const template = (stackName, options) => {
+const template = async (stackName, options) => {
     const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
-    const context = (0, common_1.constructActionContext)({ ...options, stackName, provider: iac.provider.name });
-    const { template } = (0, deploy_1.generateStackTemplate)(stackName, iac, context);
+    await (0, common_1.setContext)({ ...options, stackName, provider: iac.provider.name }, true);
+    const { template } = (0, deploy_1.generateStackTemplate)(stackName, iac);
     if (typeof template === 'string') {
         common_1.logger.info(`\n${template}`);
     }

package/dist/src/commands/validate.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validate = void 0;
 const common_1 = require("../common");
 const parser_1 = require("../parser");
-const validate = (stackName, options) => {
-    const context = (0, common_1.constructActionContext)({ stackName, ...options });
+const validate = async (stackName, options) => {
+    await (0, common_1.setContext)({ stackName, ...options });
+    const context = (0, common_1.getContext)();
     (0, parser_1.parseYaml)(context.iacLocation);
     common_1.logger.info('Yaml is valid! 🎉');
 };

package/dist/src/common/constants.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CODE_ZIP_SIZE_LIMIT = void 0;
-exports.CODE_ZIP_SIZE_LIMIT = 15 * 1000 * 1000;
+exports.SI_BOOTSTRAP_BUCKET_PREFIX = exports.SI_BOOTSTRAP_FC_PREFIX = exports.OSS_DEPLOYMENT_TIMEOUT = exports.CODE_ZIP_SIZE_LIMIT = void 0;
+exports.CODE_ZIP_SIZE_LIMIT = 300 * 1000; // 300 KB ROS TemplateBody size limit 512 KB
+exports.OSS_DEPLOYMENT_TIMEOUT = 3000; // in seconds
+exports.SI_BOOTSTRAP_FC_PREFIX = 'si-bootstrap-api';
+exports.SI_BOOTSTRAP_BUCKET_PREFIX = 'si-bootstrap-artifacts';

package/dist/src/common/{actionContext.js → context.js}

@@ -3,9 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.constructActionContext = exports.getIacLocation = void 0;
+exports.getContext = exports.setContext = exports.getIacLocation = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const providerEnum_1 = require("./providerEnum");
+const node_async_hooks_1 = require("node:async_hooks");
+const imsClient_1 = require("./imsClient");
+const asyncLocalStorage = new node_async_hooks_1.AsyncLocalStorage();
 const getIacLocation = (location) => {
     const projectRoot = node_path_1.default.resolve(process.cwd());
     return location
@@ -16,21 +19,39 @@ const getIacLocation = (location) => {
             node_path_1.default.resolve(projectRoot, 'serverless-insight.yml');
 };
 exports.getIacLocation = getIacLocation;
-const constructActionContext = (config) => {
-    return {
+const setContext = async (config, reaValToken = false) => {
+    const region = config.region ??
+        config.iacProvider?.region ??
+        process.env.ROS_REGION_ID ??
+        process.env.ALIYUN_REGION ??
+        'cn-hangzhou';
+    const context = {
         stage: config.stage ?? 'default',
         stackName: config.stackName ?? '',
         provider: (config.provider ?? config.iacProvider?.name ?? providerEnum_1.ProviderEnum.ALIYUN),
-        region: config.region ??
-            config.iacProvider?.region ??
-            process.env.ROS_REGION_ID ??
-            process.env.ALIYUN_REGION ??
-            'cn-hangzhou',
+        region,
         accessKeyId: config.accessKeyId ?? process.env.ALIYUN_ACCESS_KEY_ID,
         accessKeySecret: config.accessKeySecret ?? process.env.ALIYUN_ACCESS_KEY_SECRET,
         securityToken: config.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
         iacLocation: (0, exports.getIacLocation)(config.location),
         parameters: Object.entries(config.parameters ?? {}).map(([key, value]) => ({ key, value })),
+        stages: Object.entries(config.stages ?? {}).reduce((acc, [stage, parameters]) => ({
+            ...acc,
+            [stage]: Object.entries(parameters).map(([key, value]) => ({ key, value })),
+        }), {}),
     };
+    if (reaValToken) {
+        const iamInfo = await (0, imsClient_1.getIamInfo)(context);
+        context.accountId = iamInfo?.accountId;
+    }
+    asyncLocalStorage.enterWith(context);
 };
-exports.constructActionContext = constructActionContext;
+exports.setContext = setContext;
+const getContext = () => {
+    const context = asyncLocalStorage.getStore();
+    if (!context) {
+        throw new Error('No context found');
+    }
+    return context;
+};
+exports.getContext = getContext;

package/dist/src/common/iacHelper.js

@@ -36,12 +36,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceReference = exports.getFileSource = exports.readCodeSize = exports.resolveCode = void 0;
+exports.formatRosId = exports.calcValue = exports.calcRefs = exports.getFileSource = exports.readCodeSize = 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"));
 const ossDeployment = __importStar(require("@alicloud/ros-cdk-ossdeployment"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
+const lodash_1 = require("lodash");
 const resolveCode = (location) => {
     const filePath = node_path_1.default.resolve(process.cwd(), location);
     const fileContent = node_fs_1.default.readFileSync(filePath);
@@ -65,19 +66,17 @@ const getFileSource = (fcName, location) => {
     return { source, objectKey };
 };
 exports.getFileSource = getFileSource;
-const evalCtx = (value, ctx) => {
-    const containsStage = value.match(/\$\{ctx.\w+}/);
-    return containsStage ? value.replace(/\$\{ctx.stage}/g, ctx.stage) : value;
-};
-const replaceReference = (value, ctx) => {
-    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 (value.match(/\$\{ctx.\w+}/)) {
-            return evalCtx(value, ctx);
+const calcRefs = (rawValue, ctx) => {
+    if (typeof rawValue === 'string') {
+        const containsStage = rawValue.match(/\$\{ctx.\w+}/);
+        const matchVar = rawValue.match(/^\$\{vars\.(\w+)}$/);
+        const containsVar = rawValue.match(/\$\{vars\.(\w+)}/);
+        const matchMap = rawValue.match(/^\$\{stages\.(\w+)}$/);
+        const containsMap = rawValue.match(/\$\{stages\.(\w+)}/);
+        const matchFn = rawValue.match(/^\$\{functions\.(\w+(\.\w+)?)}$/);
+        let value = rawValue;
+        if (containsStage) {
+            value = value.replace(/\$\{ctx.stage}/g, ctx.stage);
         }
         if (matchVar?.length) {
             return ros.Fn.ref(matchVar[1]);
@@ -88,23 +87,51 @@ const replaceReference = (value, ctx) => {
         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}'));
-        }
-        if (containsVar?.length) {
-            return ros.Fn.sub(value.replace(/\$\{vars\.(\w+)}/g, '${$1}'));
-        }
-        if (containsMap?.length) {
-            return ros.Fn.sub(value.replace(/\$\{stages\.(\w+)}/g, '${$1}'));
+        if (containsMap?.length || containsVar?.length) {
+            value = ros.Fn.sub(rawValue.replace(/\$\{stages\.(\w+)}/g, '${$1}').replace(/\$\{vars\.(\w+)}/g, '${$1}'));
         }
         return value;
     }
-    if (Array.isArray(value)) {
-        return value.map((item) => (0, exports.replaceReference)(item, ctx));
+    if (Array.isArray(rawValue)) {
+        return rawValue.map((item) => (0, exports.calcRefs)(item, ctx));
     }
-    if (typeof value === 'object' && value !== null) {
-        return Object.fromEntries(Object.entries(value).map(([key, val]) => [key, (0, exports.replaceReference)(val, ctx)]));
+    if (typeof rawValue === 'object' && rawValue !== null) {
+        return Object.fromEntries(Object.entries(rawValue).map(([key, val]) => [key, (0, exports.calcRefs)(val, ctx)]));
+    }
+    return rawValue;
+};
+exports.calcRefs = calcRefs;
+const getParam = (key, records) => {
+    return records?.find((param) => param.key === key)?.value;
+};
+const calcValue = (rawValue, ctx) => {
+    const containsStage = rawValue.match(/\$\{ctx.stage}/);
+    const containsVar = rawValue.match(/\$\{vars.\w+}/);
+    const containsMap = rawValue.match(/\$\{stages\.(\w+)}/);
+    let value = rawValue;
+    if (containsStage?.length) {
+        value = rawValue.replace(/\$\{ctx.stage}/g, ctx.stage);
+    }
+    if (containsVar?.length) {
+        value = value.replace(/\$\{vars\.(\w+)}/g, (_, key) => getParam(key, ctx.parameters));
+    }
+    if (containsMap?.length) {
+        value = value.replace(/\$\{stages\.(\w+)}/g, (_, key) => getParam(key, (0, lodash_1.get)(ctx.stages, `${ctx.stage}`)));
     }
     return value;
 };
-exports.replaceReference = replaceReference;
+exports.calcValue = calcValue;
+const formatRosId = (id) => {
+    // Insert underscore before uppercase letters, but only when they follow a lowercase letter
+    let result = id.replace(/([a-z])([A-Z])/g, '$1_$2');
+    // Convert to lowercase
+    result = result.toLowerCase();
+    // Replace special characters with underscores
+    result = result.replace(/[/*,/#,-]/g, '_');
+    // Remove any number of underscores to single one
+    result = result.replace(/_+/g, '_');
+    // Remove leading underscores
+    result = result.replace(/^_/, '');
+    return result;
+};
+exports.formatRosId = formatRosId;

package/dist/src/common/index.d.ts

@@ -2,7 +2,7 @@ export * from './providerEnum';
 export * from './logger';
 export * from './getVersion';
 export * from './rosClient';
-export * from './actionContext';
+export * from './context';
 export * from './iacHelper';
 export * from './constants';
 export * from './imsClient';

package/dist/src/common/index.js

@@ -18,7 +18,7 @@ __exportStar(require("./providerEnum"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./getVersion"), exports);
 __exportStar(require("./rosClient"), exports);
-__exportStar(require("./actionContext"), exports);
+__exportStar(require("./context"), exports);
 __exportStar(require("./iacHelper"), exports);
 __exportStar(require("./constants"), exports);
 __exportStar(require("./imsClient"), exports);

package/dist/src/common/rosAssets.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishAssets = exports.getAssets = void 0;
+exports.cleanupAssets = exports.publishAssets = exports.constructAssets = exports.getAssets = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
 const ossDeployment = __importStar(require("@alicloud/ros-cdk-ossdeployment"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -44,6 +44,7 @@ const jszip_1 = __importDefault(require("jszip"));
 const logger_1 = require("./logger");
 const lodash_1 = require("lodash");
 const ali_oss_1 = __importDefault(require("ali-oss"));
+const context_1 = require("./context");
 const buildAssets = (rootPath, relativePath) => {
     const location = node_path_1.default.resolve(rootPath, relativePath);
     if (!node_fs_1.default.existsSync(location)) {
@@ -95,7 +96,8 @@ const zipAssets = async (assetsPath) => {
     });
     return zipPath;
 };
-const constructAssets = async ({ files, rootPath }, region) => {
+const constructAssets = async ({ files, rootPath, }) => {
+    const { region } = (0, context_1.getContext)();
     const assets = await Promise.all(Object.entries(files)
         .filter(([, fileItem]) => !fileItem.source.path.endsWith('.template.json'))
         .map(async ([, fileItem]) => {
@@ -111,6 +113,7 @@ const constructAssets = async ({ files, rootPath }, region) => {
     }));
     return !(0, lodash_1.isEmpty)(assets) ? assets : undefined;
 };
+exports.constructAssets = constructAssets;
 const ensureBucketExits = async (bucketName, ossClient) => await ossClient.getBucketInfo(bucketName).catch((err) => {
     if (err.code === 'NoSuchBucket') {
         logger_1.logger.info(`Bucket: ${bucketName} not exists, creating...`);
@@ -124,18 +127,19 @@ const ensureBucketExits = async (bucketName, ossClient) => await ossClient.getBu
         throw err;
     }
 });
-const publishAssets = async (assets, context) => {
-    const constructedAssets = await constructAssets(assets, context.region);
-    if (!constructedAssets?.length) {
+const publishAssets = async (assets) => {
+    if (!assets?.length) {
         logger_1.logger.info('No assets to publish, skipped!');
         return;
     }
-    const bucketName = constructedAssets[0].bucketName;
+    const context = (0, context_1.getContext)();
+    const bucketName = assets[0].bucketName;
     const client = new ali_oss_1.default({
         region: `oss-${context.region}`,
         accessKeyId: context.accessKeyId,
         accessKeySecret: context.accessKeySecret,
         bucket: bucketName,
+        timeout: 600000, // 10 minutes
     });
     await ensureBucketExits(bucketName, client);
     const headers = {
@@ -143,10 +147,32 @@ const publishAssets = async (assets, context) => {
         'x-oss-object-acl': 'default',
         'x-oss-forbid-overwrite': 'false',
     };
-    await Promise.all(constructedAssets.map(async ({ source, objectKey }) => {
+    await Promise.all(assets.map(async ({ source, objectKey }) => {
         await client.put(objectKey, node_path_1.default.normalize(source), { headers });
-        logger_1.logger.info(`Upload file: ${source}) to bucket: ${bucketName} successfully!`);
+        logger_1.logger.debug(`Upload file: ${source} to bucket: ${bucketName} successfully!`);
     }));
     return bucketName;
 };
 exports.publishAssets = publishAssets;
+const cleanupAssets = async (assets) => {
+    if (!assets?.length) {
+        logger_1.logger.info('No assets to cleanup, skipped!');
+        return;
+    }
+    const context = (0, context_1.getContext)();
+    const bucketName = assets[0].bucketName;
+    const client = new ali_oss_1.default({
+        region: `oss-${context.region}`,
+        accessKeyId: context.accessKeyId,
+        accessKeySecret: context.accessKeySecret,
+        bucket: bucketName,
+    });
+    await Promise.all(assets.map(async ({ objectKey }) => {
+        await client.delete(objectKey);
+        logger_1.logger.debug(`Cleanup file: ${objectKey} from bucket: ${bucketName} successfully!`);
+    }));
+    // delete the bucket
+    await client.deleteBucket(bucketName);
+    logger_1.logger.debug(`Cleanup bucket: ${bucketName} successfully!`);
+};
+exports.cleanupAssets = cleanupAssets;

package/dist/src/common/rosClient.js

@@ -37,11 +37,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rosStackDelete = exports.rosStackDeploy = void 0;
-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 tea_util_1 = __importDefault(require("@alicloud/tea-util"));
 const logger_1 = require("./logger");
 const lang_1 = require("../lang");
+const context_1 = require("./context");
 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,
@@ -85,7 +86,7 @@ const updateStack = async (stackId, templateBody, context) => {
         return await getStackActionResult(response.body?.stackId || '', context.region);
     }
     catch (err) {
-        const { Message: message, statusCode } = err?.data || {};
+        const { message, statusCode } = err || {};
         if (statusCode === 400 && message.includes('Update the completely same stack')) {
             logger_1.logger.warn(`${lang_1.lang.__('UPDATE_COMPLETELY_SAME_STACK')}`);
             return null;
@@ -154,7 +155,8 @@ const getStackActionResult = async (stackId, region) => {
         }, 5000); // 5 seconds interval
     });
 };
-const rosStackDeploy = async (stackName, templateBody, context) => {
+const rosStackDeploy = async (stackName, templateBody) => {
+    const context = (0, context_1.getContext)();
     const stackInfo = await getStackByName(stackName, context.region);
     if (stackInfo) {
         const { Status: stackStatus } = stackInfo;
@@ -186,7 +188,7 @@ const rosStackDelete = async ({ stackName, region, }) => {
         });
         await client.deleteStack(deleteStackRequest);
         await getStackActionResult(stackInfo.stackId, region);
-        logger_1.logger.info(`Stack: ${stackName} deleted! ♻️`);
+        logger_1.logger.info(`Stack: ${stackName} deleted!🗑 `);
     }
     catch (err) {
         logger_1.logger.error(`Stack: ${stackName} delete failed! ❌, error: ${JSON.stringify(err)}`);

package/dist/src/parser/index.js

@@ -9,6 +9,7 @@ const tagParser_1 = require("./tagParser");
 const yaml_1 = require("yaml");
 const validator_1 = require("../validator");
 const bucketParser_1 = require("./bucketParser");
+const tableParser_1 = require("./tableParser");
 const validateExistence = (path) => {
     if (!(0, node_fs_1.existsSync)(path)) {
         throw new Error(`File does not exist at path: ${path}`);
@@ -24,6 +25,7 @@ const transformYaml = (iacJson) => {
         functions: (0, functionParser_1.parseFunction)(iacJson.functions),
         events: (0, eventParser_1.parseEvent)(iacJson.events),
         databases: (0, databaseParser_1.parseDatabase)(iacJson.databases),
+        tables: (0, tableParser_1.parseTable)(iacJson.tables),
         tags: (0, tagParser_1.parseTag)(iacJson.tags),
         buckets: (0, bucketParser_1.parseBucket)(iacJson.buckets),
     };