@geek-fun/serverlessinsight 0.3.4 → 0.4.1

package/dist/src/commands/index.js

@@ -8,26 +8,62 @@ const deploy_1 = require("./deploy");
 const template_1 = require("./template");
 const destroy_1 = require("./destroy");
 const local_1 = require("./local");
+// Global error handler
+const handleCommandError = (error, commandName) => {
+    // Log error message as string to preserve newlines
+    common_1.logger.error(`Command '${commandName}' failed with error:\n${error?.message || 'Unknown error occurred'}`);
+    if (error?.stack && process.env.DEBUG) {
+        common_1.logger.debug(`Stack trace:\n${error.stack}`);
+    }
+    let exitCode = 1;
+    if (error?.code) {
+        if (typeof error.code === 'number') {
+            exitCode = error.code;
+        }
+        else if (typeof error.code === 'string') {
+            const errorCodeMap = {
+                ENOENT: 2,
+                EACCES: 3,
+                VALIDATION: 4,
+                NETWORK: 5,
+            };
+            exitCode = errorCodeMap[error.code] || 1;
+        }
+    }
+    process.exit(exitCode);
+};
+const actionWrapper = (commandName, handler) => {
+    // Reset context before each command execution
+    (0, common_1.clearContext)();
+    return async (...args) => {
+        try {
+            await handler(...args);
+        }
+        catch (error) {
+            handleCommandError(error, commandName);
+        }
+    };
+};
 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) => {
+    .action(actionWrapper('show', async (options) => {
     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
     .command('validate [stackName]')
     .description('validate serverless Iac yaml')
     .option('-f, --file <path>', 'specify the yaml file')
     .option('-s, --stage <stage>', 'specify the stage')
-    .action(async (stackName, { file, stage }) => {
+    .action(actionWrapper('validate', async (stackName, { file, stage }) => {
     common_1.logger.debug('log command info');
     await (0, validate_1.validate)(stackName, { stage, location: file });
-});
+}));
 program
     .command('deploy <stackName>')
     .description('deploy serverless Iac yaml')
@@ -43,7 +79,7 @@ program
     previous[key] = val;
     return previous;
 }, {})
-    .action(async (stackName, { stage, parameter, file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
+    .action(actionWrapper('deploy', async (stackName, { stage, parameter, file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
     await (0, deploy_1.deploy)(stackName, {
         stage,
         parameters: parameter,
@@ -54,16 +90,16 @@ program
         accessKeySecret,
         securityToken,
     });
-});
+}));
 program
     .command('template <stackName>')
     .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(async (stackName, { format, file, stage }) => {
+    .action(actionWrapper('template', 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')
@@ -73,7 +109,7 @@ program
     .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 }) => {
+    .action(actionWrapper('destroy', async (stackName, { file, region, provider, accessKeyId, accessKeySecret, securityToken }) => {
     await (0, destroy_1.destroyStack)(stackName, {
         location: file,
         region,
@@ -82,20 +118,22 @@ program
         accessKeySecret,
         securityToken,
     });
-});
+}));
 program
     .command('local <stackName>')
     .description('run Serverless application locally for debugging')
+    .option('-f, --file <path>', 'specify the yaml file')
     .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 }) => {
+    .action(actionWrapper('local', async (stackName, { stage, port, debug, watch, file }) => {
     await (0, local_1.runLocal)(stackName, {
         stage,
         port: Number(port) || 3000,
         debug: !!debug,
         watch: typeof watch === 'boolean' ? watch : true,
+        location: file,
     });
-});
+}));
 program.parse();

package/dist/src/commands/local.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLocal = void 0;
 const common_1 = require("../common");
 const localStack_1 = require("../stack/localStack");
+const parser_1 = require("../parser");
 const runLocal = async (stackName, opts) => {
-    const { stage, port, debug, watch } = opts;
-    await (0, common_1.setContext)({ stage });
+    const { stage, port, debug, watch, location } = opts;
+    await (0, common_1.setContext)({ stage, location });
+    const ctx = (0, common_1.getContext)();
+    const iac = (0, parser_1.revalYaml)((0, common_1.getIacLocation)(location), ctx);
     common_1.logger.info(`run-local starting: stack=${stackName} stage=${stage} port=${port} debug=${debug} watch=${watch}`);
-    await (0, localStack_1.startLocalStack)();
+    await (0, localStack_1.startLocalStack)(iac);
     // if (watch) {
     //   const cwd = process.cwd();
     //   try {

package/dist/src/commands/template.js

@@ -11,7 +11,9 @@ const common_1 = require("../common");
 const parser_1 = require("../parser");
 const template = async (stackName, options) => {
     const iac = (0, parser_1.parseYaml)((0, common_1.getIacLocation)(options.location));
-    await (0, common_1.setContext)({ ...options, stackName, provider: iac.provider.name }, true);
+    const credentials = (0, common_1.getCredentials)();
+    const shouldFetchIamInfo = (0, common_1.hasCredentials)(credentials);
+    await (0, common_1.setContext)({ ...options, stackName, provider: iac.provider.name }, shouldFetchIamInfo);
     const { template } = (0, deploy_1.generateStackTemplate)(stackName, iac);
     if (typeof template === 'string') {
         common_1.logger.info(`\n${template}`);

package/dist/src/common/constants.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SI_BOOTSTRAP_BUCKET_PREFIX = exports.SI_BOOTSTRAP_FC_PREFIX = exports.OSS_DEPLOYMENT_TIMEOUT = exports.CODE_ZIP_SIZE_LIMIT = void 0;
+exports.SI_LOCALSTACK_SERVER_PORT = exports.SI_BOOTSTRAP_BUCKET_PREFIX = exports.SI_BOOTSTRAP_FC_PREFIX = exports.ROS_STACK_OPERATION_TIMEOUT = 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.ROS_STACK_OPERATION_TIMEOUT = 3600; // in seconds
 exports.SI_BOOTSTRAP_FC_PREFIX = 'si-bootstrap-api';
 exports.SI_BOOTSTRAP_BUCKET_PREFIX = 'si-bootstrap-artifacts';
+exports.SI_LOCALSTACK_SERVER_PORT = 4567;

package/dist/src/common/context.js

@@ -3,35 +3,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContext = exports.setContext = exports.getIacLocation = void 0;
-const node_path_1 = __importDefault(require("node:path"));
+exports.clearContext = exports.getContext = exports.setContext = exports.getIacLocation = void 0;
 const node_fs_1 = __importDefault(require("node:fs"));
-const providerEnum_1 = require("./providerEnum");
-const node_async_hooks_1 = require("node:async_hooks");
+const node_path_1 = __importDefault(require("node:path"));
+const credentials_1 = require("./credentials");
 const imsClient_1 = require("./imsClient");
-const asyncLocalStorage = new node_async_hooks_1.AsyncLocalStorage();
+const providerEnum_1 = require("./providerEnum");
+let context;
+const DEFAULT_IAC_FILES = [
+    'serverlessinsight.yml',
+    'serverlessInsight.yml',
+    'ServerlessInsight.yml',
+    'serverless-insight.yml',
+];
 const getIacLocation = (location) => {
     const projectRoot = node_path_1.default.resolve(process.cwd());
-    if (location) {
-        const candidate = node_path_1.default.isAbsolute(location) ? location : node_path_1.default.resolve(projectRoot, location);
-        if (node_fs_1.default.existsSync(candidate)) {
-            return candidate;
+    const searchTargets = location ? [location] : DEFAULT_IAC_FILES;
+    const attempted = new Set();
+    const toAbsolutePath = (target) => node_path_1.default.isAbsolute(target) ? target : node_path_1.default.resolve(projectRoot, target);
+    const tryResolveCandidate = (target) => {
+        const resolved = toAbsolutePath(target);
+        attempted.add(resolved);
+        if (!node_fs_1.default.existsSync(resolved)) {
+            return undefined;
         }
-        throw new Error(`IaC file not found at '${candidate}'`);
-    }
-    const candidates = [
-        'serverlessinsight.yml',
-        'serverlessInsight.yml',
-        'ServerlessInsight.yml',
-        'serverless-insight.yml',
-    ];
-    for (const name of candidates) {
-        const candidate = node_path_1.default.resolve(projectRoot, name);
-        if (node_fs_1.default.existsSync(candidate)) {
-            return candidate;
+        const stats = node_fs_1.default.statSync(resolved);
+        if (stats.isDirectory()) {
+            for (const fileName of DEFAULT_IAC_FILES) {
+                const nested = node_path_1.default.join(resolved, fileName);
+                attempted.add(nested);
+                if (node_fs_1.default.existsSync(nested) && node_fs_1.default.statSync(nested).isFile()) {
+                    return nested;
+                }
+            }
+            return undefined;
+        }
+        return resolved;
+    };
+    for (const candidate of searchTargets) {
+        const match = tryResolveCandidate(candidate);
+        if (match) {
+            return match;
         }
     }
-    throw new Error(`No IaC file found. Tried: ${candidates.map((n) => `'${node_path_1.default.resolve(projectRoot, n)}'`).join(', ')}`);
+    const attemptedList = Array.from(attempted)
+        .map((n) => `'${n}'`)
+        .join(', ');
+    throw new Error(`No IaC file found. Tried: ${attemptedList}`);
 };
 exports.getIacLocation = getIacLocation;
 const setContext = async (config, reaValToken = false) => {
@@ -40,14 +58,19 @@ const setContext = async (config, reaValToken = false) => {
         process.env.ROS_REGION_ID ??
         process.env.ALIYUN_REGION ??
         'cn-hangzhou';
-    const context = {
+    const credentials = (0, credentials_1.getCredentials)({
+        accessKeyId: config.accessKeyId,
+        accessKeySecret: config.accessKeySecret,
+        securityToken: config.securityToken,
+    });
+    const newContext = {
         stage: config.stage ?? 'default',
         stackName: config.stackName ?? '',
         provider: (config.provider ?? config.iacProvider?.name ?? providerEnum_1.ProviderEnum.ALIYUN),
         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,
+        accessKeyId: credentials.accessKeyId,
+        accessKeySecret: credentials.accessKeySecret,
+        securityToken: credentials.securityToken,
         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]) => ({
@@ -56,17 +79,20 @@ const setContext = async (config, reaValToken = false) => {
         }), {}),
     };
     if (reaValToken) {
-        const iamInfo = await (0, imsClient_1.getIamInfo)(context);
-        context.accountId = iamInfo?.accountId;
+        const iamInfo = await (0, imsClient_1.getIamInfo)(newContext);
+        newContext.accountId = iamInfo?.accountId;
     }
-    asyncLocalStorage.enterWith(context);
+    context = newContext;
 };
 exports.setContext = setContext;
 const getContext = () => {
-    const context = asyncLocalStorage.getStore();
     if (!context) {
         throw new Error('No context found');
     }
     return context;
 };
 exports.getContext = getContext;
+const clearContext = () => {
+    context = undefined;
+};
+exports.clearContext = clearContext;

package/dist/src/common/credentials.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasCredentials = exports.getCredentials = void 0;
+const getCredentials = (config) => {
+    return {
+        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,
+    };
+};
+exports.getCredentials = getCredentials;
+const hasCredentials = (credentials) => {
+    return !!credentials.accessKeyId && !!credentials.accessKeySecret;
+};
+exports.hasCredentials = hasCredentials;

package/dist/src/common/iacHelper.js

@@ -36,13 +36,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatRosId = exports.calcValue = exports.calcRefs = exports.getFileSource = exports.readCodeSize = exports.resolveCode = void 0;
+exports.splitDomain = exports.formatRosId = exports.getIacDefinition = 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 parser_1 = require("../parser");
+const logger_1 = require("./logger");
 const resolveCode = (location) => {
     const filePath = node_path_1.default.resolve(process.cwd(), location);
     const fileContent = node_fs_1.default.readFileSync(filePath);
@@ -104,7 +106,7 @@ exports.calcRefs = calcRefs;
 const getParam = (key, records) => {
     return records?.find((param) => param.key === key)?.value;
 };
-const calcValue = (rawValue, ctx) => {
+const calcValue = (rawValue, ctx, iacVars) => {
     const containsStage = rawValue.match(/\$\{ctx.stage}/);
     const containsVar = rawValue.match(/\$\{vars.\w+}/);
     const containsMap = rawValue.match(/\$\{stages\.(\w+)}/);
@@ -113,14 +115,40 @@ const calcValue = (rawValue, ctx) => {
         value = rawValue.replace(/\$\{ctx.stage}/g, ctx.stage);
     }
     if (containsVar?.length) {
-        value = value.replace(/\$\{vars\.(\w+)}/g, (_, key) => getParam(key, ctx.parameters));
+        // Use provided iacVars or parse from file
+        const vars = iacVars ?? (0, parser_1.parseYaml)(ctx.iacLocation).vars;
+        const mergedParams = Array.from(new Map([
+            ...Object.entries(vars ?? {}).map(([key, value]) => [key, String(value)]),
+            ...(ctx.parameters ?? []).map(({ key, value }) => [key, value]),
+        ].filter(([, v]) => v !== undefined)).entries()).map(([key, value]) => ({ key, value }));
+        value = value.replace(/\$\{vars\.(\w+)}/g, (_, key) => {
+            const paramValue = getParam(key, mergedParams);
+            if (!paramValue) {
+                logger_1.logger.warn(`Variable '${key}' not found in vars or parameters, using empty string`);
+            }
+            return paramValue || '';
+        });
     }
     if (containsMap?.length) {
-        value = value.replace(/\$\{stages\.(\w+)}/g, (_, key) => getParam(key, (0, lodash_1.get)(ctx.stages, `${ctx.stage}`)));
+        value = value.replace(/\$\{stages\.(\w+)}/g, (_, key) => {
+            const stageValue = getParam(key, (0, lodash_1.get)(ctx.stages, `${ctx.stage}`));
+            if (!stageValue) {
+                logger_1.logger.warn(`Stage variable '${key}' not found in stage '${ctx.stage}', using empty string`);
+            }
+            return stageValue || '';
+        });
     }
     return value;
 };
 exports.calcValue = calcValue;
+const getIacDefinition = (iac, rawValue) => {
+    const matchFn = rawValue.match(/^\$\{functions\.(\w+(\.\w+)?)}$/);
+    if (matchFn?.length) {
+        return iac.functions?.find((fc) => fc.key === matchFn[1]);
+    }
+    return iac.functions?.find((fc) => fc.key === rawValue);
+};
+exports.getIacDefinition = getIacDefinition;
 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');
@@ -135,3 +163,10 @@ const formatRosId = (id) => {
     return result;
 };
 exports.formatRosId = formatRosId;
+const splitDomain = (domain) => {
+    const parts = domain.split('.');
+    const rr = parts.length > 2 ? parts[0] : '@';
+    const domainName = parts.length > 2 ? parts.slice(1).join('.') : domain;
+    return { rr, domainName };
+};
+exports.splitDomain = splitDomain;

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

@@ -8,4 +8,5 @@ export * from './constants';
 export * from './imsClient';
 export * from './base64';
 export * from './rosAssets';
-export * from './domainHelper';
+export * from './requestHelper';
+export * from './credentials';

package/dist/src/common/index.js

@@ -24,4 +24,5 @@ __exportStar(require("./constants"), exports);
 __exportStar(require("./imsClient"), exports);
 __exportStar(require("./base64"), exports);
 __exportStar(require("./rosAssets"), exports);
-__exportStar(require("./domainHelper"), exports);
+__exportStar(require("./requestHelper"), exports);
+__exportStar(require("./credentials"), exports);

package/dist/src/common/logger.js

@@ -10,6 +10,12 @@ const logger = (0, pino_1.default)({
     level: ['ServerlessInsight', '*'].includes(process.env.DEBUG || '') ? 'debug' : 'info',
     transport: {
         target: 'pino-pretty',
+        options: {
+            colorize: true,
+            translateTime: 'HH:MM:ss',
+            ignore: 'pid,hostname',
+            messageFormat: '{msg}',
+        },
     },
 });
 exports.logger = logger;

package/dist/src/common/requestHelper.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readRequestBody = void 0;
+const readRequestBody = (req) => {
+    return new Promise((resolve, reject) => {
+        let body = '';
+        req.on('data', (chunk) => {
+            body += chunk.toString();
+        });
+        req.on('end', () => {
+            resolve(body);
+        });
+        req.on('error', reject);
+    });
+};
+exports.readRequestBody = readRequestBody;

package/dist/src/common/rosClient.js

@@ -43,11 +43,14 @@ 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 constants_1 = require("./constants");
 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,
     regionId: process.env.ALIYUN_REGION,
     disableRollback: false,
+    readTimeout: constants_1.ROS_STACK_OPERATION_TIMEOUT,
+    connectTimeout: constants_1.ROS_STACK_OPERATION_TIMEOUT,
 }));
 const createStack = async (stackName, templateBody, context) => {
     const parameters = context.parameters?.map((parameter) => new ros20190910_1.CreateStackRequestParameters({

package/dist/src/parser/eventParser.js

@@ -9,7 +9,7 @@ const parseEvent = (events) => {
         key,
         name: event.name,
         type: event.type,
-        triggers: event.triggers,
+        triggers: event.triggers?.map((trigger) => ({ ...trigger, method: trigger.method ?? 'GET' })),
         domain: event.domain,
     }));
 };

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

@@ -1,2 +1,3 @@
-import { ServerlessIac } from '../types';
+import { ServerlessIac, Context } from '../types';
 export declare const parseYaml: (iacLocation: string) => ServerlessIac;
+export declare const revalYaml: (iacLocation: string, ctx: Context) => ServerlessIac;

package/dist/src/parser/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseYaml = void 0;
+exports.revalYaml = exports.parseYaml = void 0;
 const node_fs_1 = require("node:fs");
 const functionParser_1 = require("./functionParser");
 const eventParser_1 = require("./eventParser");
@@ -10,6 +10,7 @@ const yaml_1 = require("yaml");
 const validator_1 = require("../validator");
 const bucketParser_1 = require("./bucketParser");
 const tableParser_1 = require("./tableParser");
+const common_1 = require("../common");
 const validateExistence = (path) => {
     if (!(0, node_fs_1.existsSync)(path)) {
         throw new Error(`File does not exist at path: ${path}`);
@@ -38,3 +39,33 @@ const parseYaml = (iacLocation) => {
     return transformYaml(iacJson);
 };
 exports.parseYaml = parseYaml;
+const evaluateObject = (obj, ctx, iacVars) => {
+    if (typeof obj === 'string') {
+        return (0, common_1.calcValue)(obj, ctx, iacVars);
+    }
+    if (Array.isArray(obj)) {
+        return obj.map((item) => evaluateObject(item, ctx, iacVars));
+    }
+    if (typeof obj === 'object' && obj !== null) {
+        return Object.fromEntries(Object.entries(obj).map(([key, val]) => [key, evaluateObject(val, ctx, iacVars)]));
+    }
+    return obj;
+};
+const revalYaml = (iacLocation, ctx) => {
+    validateExistence(iacLocation);
+    const yamlContent = (0, node_fs_1.readFileSync)(iacLocation, 'utf8');
+    const iacJson = (0, yaml_1.parse)(yamlContent);
+    (0, validator_1.validateYaml)(iacJson);
+    const evaluatedIacJson = evaluateObject(iacJson, ctx, iacJson.vars);
+    const iac = transformYaml(evaluatedIacJson);
+    // Set default values for optional fields in functions
+    if (iac.functions) {
+        iac.functions = iac.functions.map((fn) => ({
+            ...fn,
+            memory: fn.memory || 128,
+            timeout: fn.timeout || 3,
+        }));
+    }
+    return iac;
+};
+exports.revalYaml = revalYaml;