@geek-fun/serverlessinsight 0.6.11 → 0.6.13

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.6.11",
+    "version": "0.6.13",
     "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
     "homepage": "https://serverlessinsight.geekfun.club",
     "main": "dist/src/index.js",

package/dist/src/common/aliyunClient/ossOperations.js

@@ -40,27 +40,19 @@ const createOssOperations = (ossClient, region, dnsOps) => {
     const useBucket = (bucketName) => {
         ossClient.useBucket(bucketName);
     };
-    const getBucketExtranetEndpoint = async (bucketName) => {
+    const getBucketCnameEndpoint = async (bucketName) => {
         const infoResult = await ossClient.getBucketInfo(bucketName);
-        const endpoint = infoResult.bucket.ExtranetEndpoint;
-        if (!endpoint) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND', { bucketName }));
+        const bucket = infoResult.bucket;
+        const actualBucketName = bucket.Name || bucketName;
+        const location = bucket.Location;
+        if (!location) {
+            throw new Error(lang_1.lang.__('OSS_BUCKET_LOCATION_NOT_FOUND', { bucketName }));
         }
-        return endpoint;
-    };
-    const getCnameEndpointFromExtranet = (extranetEndpoint) => {
-        const suffix = '.aliyuncs.com';
-        if (!extranetEndpoint.endsWith(suffix)) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_ENDPOINT_INVALID_FORMAT', { extranetEndpoint }));
-        }
-        const withoutAliyun = extranetEndpoint.slice(0, -suffix.length);
-        const lastDotIndex = withoutAliyun.lastIndexOf('.');
-        if (lastDotIndex <= 0) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_ENDPOINT_INVALID_FORMAT', { extranetEndpoint }));
-        }
-        const bucketPart = withoutAliyun.slice(0, lastDotIndex);
-        const regionWithout = withoutAliyun.slice(lastDotIndex + 1).replace(/^oss-/, '');
-        return `${bucketPart}.${regionWithout}.taihangcda.cn`;
+        const derivedRegion = location.replace(/^oss-/, '');
+        const isChinaRegion = derivedRegion.startsWith('cn-');
+        return isChinaRegion
+            ? `${actualBucketName}.${derivedRegion}.taihangcda.cn`
+            : `${actualBucketName}.oss-${derivedRegion}.aliyuncs.com`;
     };
     const buildCertificateXml = (cert) => {
         if (!cert)
@@ -244,8 +236,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         const normalizedDomain = (0, domainUtils_1.normalizeDomain)(domain);
         const mainDomain = (0, domainUtils_1.extractMainDomain)(normalizedDomain);
         const hostRecord = (0, domainUtils_1.extractHostRecord)(normalizedDomain, mainDomain);
-        const extranetEndpoint = await getBucketExtranetEndpoint(bucketName);
-        const ossEndpoint = getCnameEndpointFromExtranet(extranetEndpoint);
+        const ossEndpoint = await getBucketCnameEndpoint(bucketName);
         let cnameResult = await putBucketCname(bucketName, normalizedDomain, certificate);
         let txtRecordId;
         if (cnameResult.needVerification) {
@@ -276,7 +267,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         const tokenInfo = await createCnameToken(bucketName, domain);
         const txtRecordName = '_dnsauth';
         const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, (0, domainUtils_1.extractMainDomain)(domain));
-        const fullTxtRecord = hostRecord ? `${txtRecordName}.${hostRecord}` : txtRecordName;
+        const fullTxtRecord = hostRecord && hostRecord !== '@' ? `${txtRecordName}.${hostRecord}` : txtRecordName;
         logger_1.logger.info(lang_1.lang.__('OSS_CNAME_VERIFICATION_TOKEN_CREATED', {
             domain,
             txtRecord: fullTxtRecord,
@@ -398,7 +389,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         }
         const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, (0, domainUtils_1.extractMainDomain)(domain));
         const txtRecordName = '_dnsauth';
-        const fullTxtRecord = hostRecord ? `${txtRecordName}.${hostRecord}` : txtRecordName;
+        const fullTxtRecord = hostRecord && hostRecord !== '@' ? `${txtRecordName}.${hostRecord}` : txtRecordName;
         logger_1.logger.warn(lang_1.lang.__('OSS_CNAME_VERIFICATION_RETRY_FAILED', {
             domain,
             txtRecord: `${fullTxtRecord}.${(0, domainUtils_1.extractMainDomain)(domain)}`,

package/dist/src/common/hashUtils.js

@@ -3,20 +3,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diffAttributes = exports.attributesEqual = exports.computeFileHash = void 0;
+exports.diffAttributes = exports.attributesEqual = exports.computeDirectoryHash = exports.computeFileHash = void 0;
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
-/**
- * Compute SHA-256 hash of a file.
- * Used for tracking external artifacts like function code zip files.
- * @param filePath - Path to the file to hash
- * @returns Hex-encoded SHA-256 hash of the file contents
- */
+const node_path_1 = __importDefault(require("node:path"));
 const computeFileHash = (filePath) => {
     const fileBuffer = node_fs_1.default.readFileSync(filePath);
     return node_crypto_1.default.createHash('sha256').update(fileBuffer).digest('hex');
 };
 exports.computeFileHash = computeFileHash;
+const computeDirectoryHash = (dirPath) => {
+    const files = [];
+    const collectFiles = (currentPath) => {
+        const entries = node_fs_1.default.readdirSync(currentPath, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = node_path_1.default.join(currentPath, entry.name);
+            if (entry.isDirectory()) {
+                collectFiles(fullPath);
+            }
+            else if (entry.isFile()) {
+                files.push(fullPath);
+            }
+        }
+    };
+    collectFiles(dirPath);
+    files.sort();
+    const hash = node_crypto_1.default.createHash('sha256');
+    for (const file of files) {
+        const relativePath = node_path_1.default.relative(dirPath, file).split(node_path_1.default.sep).join('/');
+        hash.update(relativePath);
+        const content = node_fs_1.default.readFileSync(file);
+        hash.update(content);
+    }
+    return hash.digest('hex');
+};
+exports.computeDirectoryHash = computeDirectoryHash;
 /**
  * Deep equality comparison for two values.
  * Handles primitives, objects, arrays, null, and undefined.

package/dist/src/lang/en.js

@@ -330,7 +330,7 @@ exports.en = {
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: 'Failed to disable Block Public Access for bucket {{bucketName}}: {{error}}. ' +
         'You may need to manually disable Block Public Access in the Alibaba Cloud OSS Console.',
     OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND: 'ExtranetEndpoint not found for bucket: {{bucketName}}. The bucket may not have public access enabled.',
-    OSS_BUCKET_ENDPOINT_INVALID_FORMAT: 'Invalid OSS endpoint format: {{extranetEndpoint}}. Expected format: {bucket}.oss-{region}.aliyuncs.com',
+    OSS_BUCKET_LOCATION_NOT_FOUND: 'Location not found for bucket: {{bucketName}}',
     // Tencent COS DNS messages
     COS_DNS_CNAME_CREATED: 'Created DNS CNAME record: {{domain}} -> {{cname}}',
     COS_DNS_CNAME_EXISTS: 'DNS CNAME record already exists: {{domain}} -> {{cname}}',

package/dist/src/lang/zh-CN.js

@@ -328,7 +328,7 @@ exports.zhCN = {
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLED: '已为存储桶禁用公共访问阻止: {{bucketName}}',
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: '禁用存储桶 {{bucketName}} 的公共访问阻止失败：{{error}}。您可能需要在阿里云 OSS 控制台手动禁用公共访问阻止。',
     OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND: '存储桶 {{bucketName}} 未找到外网访问端点。该存储桶可能未启用公共访问。',
-    OSS_BUCKET_ENDPOINT_INVALID_FORMAT: 'OSS 端点格式无效：{{extranetEndpoint}}。预期格式：{bucket}.oss-{region}.aliyuncs.com',
+    OSS_BUCKET_LOCATION_NOT_FOUND: '存储桶 {{bucketName}} 未找到地域信息',
     // Tencent COS DNS messages
     COS_DNS_CNAME_CREATED: '已创建 DNS CNAME 记录: {{domain}} -> {{cname}}',
     COS_DNS_CNAME_EXISTS: 'DNS CNAME 记录已存在: {{domain}} -> {{cname}}',

package/dist/src/stack/aliyunStack/fc3Planner.js

@@ -5,6 +5,32 @@ const common_1 = require("../../common");
 const aliyunClient_1 = require("../../common/aliyunClient");
 const fc3Types_1 = require("./fc3Types");
 const lang_1 = require("../../lang");
+/**
+ * Provider-managed logConfig fields that are set by the system after creation.
+ * These should not be compared when detecting changes.
+ */
+const PROVIDER_MANAGED_LOG_CONFIG_FIELDS = ['project', 'logstore', 'logBeginRule'];
+/**
+ * Normalize definition for comparison by excluding provider-managed fields.
+ * This prevents false-positive change detection when the system populates
+ * fields like logConfig.project and logConfig.logstore after creation.
+ */
+const normalizeDefinitionForComparison = (definition) => {
+    const { logConfig, ...rest } = definition;
+    if (!logConfig || typeof logConfig !== 'object') {
+        return definition;
+    }
+    const normalizedLogConfig = {};
+    for (const [key, value] of Object.entries(logConfig)) {
+        if (!PROVIDER_MANAGED_LOG_CONFIG_FIELDS.includes(key)) {
+            normalizedLogConfig[key] = value;
+        }
+    }
+    return {
+        ...rest,
+        logConfig: Object.keys(normalizedLogConfig).length > 0 ? normalizedLogConfig : null,
+    };
+};
 const isSecurityGroupId = (value) => value.startsWith('sg-');
 const resolveSecurityGroupId = async (context, securityGroupName, vpcId) => {
     if (isSecurityGroupId(securityGroupName)) {
@@ -74,7 +100,7 @@ const generateFunctionPlan = async (context, state, functions) => {
                 };
             }
             const currentDefinition = currentState.definition || {};
-            const definitionChanged = !(0, common_1.attributesEqual)(currentDefinition, desiredDefinition);
+            const definitionChanged = !(0, common_1.attributesEqual)(normalizeDefinitionForComparison(currentDefinition), normalizeDefinitionForComparison(desiredDefinition));
             if (definitionChanged) {
                 return {
                     logicalId,

package/dist/src/stack/aliyunStack/fc3Resource.js

@@ -358,6 +358,7 @@ const createResource = async (context, fn, state) => {
                 project: dependentResources.logConfig.project,
                 logstore: dependentResources.logConfig.logstore,
                 enableRequestMetrics: true,
+                enableInstanceMetrics: true,
             },
         };
     }
@@ -547,6 +548,7 @@ const updateResource = async (context, fn, state) => {
                 project: logConfig.project,
                 logstore: logConfig.logstore,
                 enableRequestMetrics: true,
+                enableInstanceMetrics: true,
             },
         };
     }

package/dist/src/stack/aliyunStack/ossPlanner.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBucketPlan = void 0;
+const node_path_1 = __importDefault(require("node:path"));
 const aliyunClient_1 = require("../../common/aliyunClient");
 const ossTypes_1 = require("./ossTypes");
 const stateManager_1 = require("../../common/stateManager");
@@ -24,7 +28,17 @@ const generateBucketPlan = async (context, state, buckets) => {
         const logicalId = `buckets.${bucket.key}`;
         const currentState = (0, stateManager_1.getResource)(state, logicalId);
         const config = (0, ossTypes_1.bucketToOssBucketConfig)(bucket);
-        const desiredDefinition = (0, ossTypes_1.extractOssBucketDefinition)(config);
+        const websiteCodeHash = (() => {
+            if (!bucket.website?.code)
+                return undefined;
+            try {
+                return (0, hashUtils_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code));
+            }
+            catch {
+                return null;
+            }
+        })();
+        const desiredDefinition = (0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash);
         if (!currentState) {
             return {
                 logicalId,

package/dist/src/stack/aliyunStack/ossResource.js

@@ -136,11 +136,14 @@ const createBucketResource = async (context, bucket, state) => {
     const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
     const logicalId = `buckets.${bucket.key}`;
     const instances = [buildOssInstanceFromProvider(bucketInfo, sid)];
+    const websiteCodeHash = bucket.website?.code
+        ? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
+        : undefined;
     const partialResourceState = {
         mode: 'managed',
         region: context.region,
         definition: {
-            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
             ...(bucket.website?.domain != null ? { domainBound: null } : {}),
         },
         instances,
@@ -224,7 +227,7 @@ const createBucketResource = async (context, bucket, state) => {
         mode: 'managed',
         region: context.region,
         definition: {
-            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
             ...(bucket.website?.domain != null
                 ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
                 : {}),
@@ -260,6 +263,9 @@ const updateBucketResource = async (context, bucket, state) => {
     const sid = (0, common_1.buildSid)('aliyun', 'oss', context.stage, config.bucketName);
     const logicalId = `buckets.${bucket.key}`;
     const instances = [buildOssInstanceFromProvider(bucketInfo, sid)];
+    const websiteCodeHash = bucket.website?.code
+        ? (0, common_1.computeDirectoryHash)(node_path_1.default.resolve(process.cwd(), bucket.website.code))
+        : undefined;
     const existingState = state.resources[logicalId];
     const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
     const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
@@ -338,7 +344,7 @@ const updateBucketResource = async (context, bucket, state) => {
         mode: 'managed',
         region: context.region,
         definition: {
-            ...(0, ossTypes_1.extractOssBucketDefinition)(config),
+            ...(0, ossTypes_1.extractOssBucketDefinition)(config, websiteCodeHash),
             ...(bucket.website?.domain != null
                 ? { domainBound: cnameInfo?.bucketCnameBound ?? null }
                 : {}),

package/dist/src/stack/aliyunStack/ossTypes.js

@@ -57,7 +57,7 @@ const bucketToOssBucketConfig = (bucket) => {
     return config;
 };
 exports.bucketToOssBucketConfig = bucketToOssBucketConfig;
-const extractOssBucketDefinition = (config) => {
+const extractOssBucketDefinition = (config, websiteCodeHash) => {
     return {
         bucketName: config.bucketName,
         acl: config.acl ?? null,
@@ -67,6 +67,7 @@ const extractOssBucketDefinition = (config) => {
                 errorDocument: config.websiteConfig.errorDocument ?? null,
             }
             : {},
+        websiteCodeHash: websiteCodeHash ?? null,
         storageClass: config.storageClass ?? null,
         domain: config.domain ?? null,
         wwwBindApex: config.wwwBindApex ?? false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.6.11",
+  "version": "0.6.13",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",