@geek-fun/serverlessinsight 0.5.7 → 0.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geek-fun/serverlessinsight",
3
- "version": "0.5.7",
3
+ "version": "0.5.8",
4
4
  "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
5
5
  "homepage": "https://serverlessinsight.geekfun.club",
6
6
  "main": "dist/src/index.js",
@@ -82,11 +82,78 @@ const createOssOperations = (ossClient, region, dnsOps) => {
82
82
  return false;
83
83
  }
84
84
  };
85
+ const buildCorsRuleForDomain = (domain) => ({
86
+ allowedOrigin: [`https://${domain}`, `http://${domain}`],
87
+ allowedMethod: ['GET', 'HEAD'],
88
+ allowedHeader: ['*'],
89
+ exposeHeader: ['ETag', 'Content-Length'],
90
+ maxAgeSeconds: '3600',
91
+ });
92
+ const isDomainCorsRule = (rule, domain) => {
93
+ const origins = Array.isArray(rule.allowedOrigin) ? rule.allowedOrigin : [rule.allowedOrigin];
94
+ const expected = new Set([`https://${domain}`, `http://${domain}`]);
95
+ return origins.length === expected.size && origins.every((o) => expected.has(o));
96
+ };
97
+ const addCorsRuleForDomain = async (bucketName, domain) => {
98
+ try {
99
+ useBucket(bucketName);
100
+ let existingRules = [];
101
+ try {
102
+ const corsResult = await ossClient.getBucketCORS(bucketName);
103
+ if (corsResult.rules && corsResult.rules.length > 0) {
104
+ existingRules = corsResult.rules;
105
+ }
106
+ }
107
+ catch {
108
+ // no existing CORS config
109
+ }
110
+ if (existingRules.some((rule) => isDomainCorsRule(rule, domain))) {
111
+ logger_1.logger.info(lang_1.lang.__('OSS_CORS_RULE_EXISTS', { domain }));
112
+ return;
113
+ }
114
+ const allRules = [...existingRules, buildCorsRuleForDomain(domain)];
115
+ await ossClient.putBucketCORS(bucketName, allRules);
116
+ logger_1.logger.info(lang_1.lang.__('OSS_CORS_RULE_ADDED', { domain }));
117
+ }
118
+ catch (error) {
119
+ logger_1.logger.warn(lang_1.lang.__('OSS_CORS_RULE_ADD_FAILED', { domain, error: String(error) }));
120
+ }
121
+ };
122
+ const removeCorsRuleForDomain = async (bucketName, domain) => {
123
+ try {
124
+ useBucket(bucketName);
125
+ let existingRules = [];
126
+ try {
127
+ const corsResult = await ossClient.getBucketCORS(bucketName);
128
+ if (corsResult.rules && corsResult.rules.length > 0) {
129
+ existingRules = corsResult.rules;
130
+ }
131
+ }
132
+ catch {
133
+ return;
134
+ }
135
+ const remainingRules = existingRules.filter((rule) => !isDomainCorsRule(rule, domain));
136
+ if (remainingRules.length === existingRules.length) {
137
+ return;
138
+ }
139
+ if (remainingRules.length > 0) {
140
+ await ossClient.putBucketCORS(bucketName, remainingRules);
141
+ }
142
+ else {
143
+ await ossClient.deleteBucketCORS(bucketName);
144
+ }
145
+ logger_1.logger.info(lang_1.lang.__('OSS_CORS_RULE_REMOVED', { domain }));
146
+ }
147
+ catch (error) {
148
+ logger_1.logger.warn(lang_1.lang.__('OSS_CORS_RULE_REMOVE_FAILED', { domain, error: String(error) }));
149
+ }
150
+ };
85
151
  const bindCustomDomain = async (bucketName, domain) => {
86
152
  const mainDomain = (0, domainUtils_1.extractMainDomain)(domain);
87
153
  const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, mainDomain);
88
154
  const ossEndpoint = getOssEndpoint(bucketName);
89
155
  const bucketCnameBound = await putBucketCname(bucketName, domain);
156
+ await addCorsRuleForDomain(bucketName, domain);
90
157
  if (!dnsOps) {
91
158
  logger_1.logger.warn(lang_1.lang.__('OSS_DNS_MANUAL_CONFIG_REQUIRED', { domain, cname: ossEndpoint }));
92
159
  return { domain, cname: ossEndpoint, bucketCnameBound };
@@ -120,6 +187,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
120
187
  }
121
188
  };
122
189
  const unbindCustomDomain = async (bucketName, domain, dnsRecordId) => {
190
+ await removeCorsRuleForDomain(bucketName, domain);
123
191
  await deleteBucketCname(bucketName, domain);
124
192
  if (!dnsOps || !dnsRecordId || dnsRecordId === 'existing') {
125
193
  return;
@@ -8,6 +8,127 @@ const createCosOperations = (cosClient, region, dnsOps) => {
8
8
  const getCosEndpoint = (bucketName) => {
9
9
  return `${bucketName}.cos.${region}.myqcloud.com`;
10
10
  };
11
+ const buildCorsRuleForDomain = (domain) => ({
12
+ AllowedOrigin: [`https://${domain}`, `http://${domain}`],
13
+ AllowedMethod: ['GET', 'HEAD'],
14
+ AllowedHeader: ['*'],
15
+ ExposeHeader: ['ETag', 'Content-Length'],
16
+ MaxAgeSeconds: 3600,
17
+ });
18
+ const isDomainCorsRule = (rule, domain) => {
19
+ const origins = rule.AllowedOrigin || [];
20
+ const expected = new Set([`https://${domain}`, `http://${domain}`]);
21
+ return origins.length === expected.size && origins.every((o) => expected.has(o));
22
+ };
23
+ const addCorsRuleForDomain = async (bucketName, domain) => {
24
+ try {
25
+ let existingRules = [];
26
+ try {
27
+ const corsResult = await new Promise((resolve, reject) => {
28
+ cosClient.getBucketCors({ Bucket: bucketName, Region: region }, (err, data) => {
29
+ if (err)
30
+ reject(err);
31
+ else
32
+ resolve(data);
33
+ });
34
+ });
35
+ if (corsResult.CORSRules && corsResult.CORSRules.length > 0) {
36
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
37
+ existingRules = corsResult.CORSRules;
38
+ }
39
+ }
40
+ catch {
41
+ // no existing CORS config
42
+ }
43
+ if (existingRules.some((rule) => isDomainCorsRule(rule, domain))) {
44
+ logger_1.logger.info(lang_1.lang.__('COS_CORS_RULE_EXISTS', { domain }));
45
+ return;
46
+ }
47
+ const allRules = [...existingRules, buildCorsRuleForDomain(domain)];
48
+ await new Promise((resolve, reject) => {
49
+ cosClient.putBucketCors({
50
+ Bucket: bucketName,
51
+ Region: region,
52
+ CORSRules: allRules.map((r) => ({
53
+ AllowedOrigin: r.AllowedOrigin,
54
+ AllowedMethod: r.AllowedMethod,
55
+ AllowedHeader: r.AllowedHeader || [],
56
+ ExposeHeader: r.ExposeHeader || [],
57
+ MaxAgeSeconds: r.MaxAgeSeconds || 0,
58
+ })),
59
+ }, (err) => {
60
+ if (err)
61
+ reject(err);
62
+ else
63
+ resolve();
64
+ });
65
+ });
66
+ logger_1.logger.info(lang_1.lang.__('COS_CORS_RULE_ADDED', { domain }));
67
+ }
68
+ catch (error) {
69
+ logger_1.logger.warn(lang_1.lang.__('COS_CORS_RULE_ADD_FAILED', { domain, error: String(error) }));
70
+ }
71
+ };
72
+ const removeCorsRuleForDomain = async (bucketName, domain) => {
73
+ try {
74
+ let existingRules = [];
75
+ try {
76
+ const corsResult = await new Promise((resolve, reject) => {
77
+ cosClient.getBucketCors({ Bucket: bucketName, Region: region }, (err, data) => {
78
+ if (err)
79
+ reject(err);
80
+ else
81
+ resolve(data);
82
+ });
83
+ });
84
+ if (corsResult.CORSRules && corsResult.CORSRules.length > 0) {
85
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
86
+ existingRules = corsResult.CORSRules;
87
+ }
88
+ }
89
+ catch {
90
+ return;
91
+ }
92
+ const remainingRules = existingRules.filter((rule) => !isDomainCorsRule(rule, domain));
93
+ if (remainingRules.length === existingRules.length) {
94
+ return;
95
+ }
96
+ if (remainingRules.length > 0) {
97
+ await new Promise((resolve, reject) => {
98
+ cosClient.putBucketCors({
99
+ Bucket: bucketName,
100
+ Region: region,
101
+ CORSRules: remainingRules.map((r) => ({
102
+ AllowedOrigin: r.AllowedOrigin,
103
+ AllowedMethod: r.AllowedMethod,
104
+ AllowedHeader: r.AllowedHeader || [],
105
+ ExposeHeader: r.ExposeHeader || [],
106
+ MaxAgeSeconds: r.MaxAgeSeconds || 0,
107
+ })),
108
+ }, (err) => {
109
+ if (err)
110
+ reject(err);
111
+ else
112
+ resolve();
113
+ });
114
+ });
115
+ }
116
+ else {
117
+ await new Promise((resolve, reject) => {
118
+ cosClient.deleteBucketCors({ Bucket: bucketName, Region: region }, (err) => {
119
+ if (err)
120
+ reject(err);
121
+ else
122
+ resolve();
123
+ });
124
+ });
125
+ }
126
+ logger_1.logger.info(lang_1.lang.__('COS_CORS_RULE_REMOVED', { domain }));
127
+ }
128
+ catch (error) {
129
+ logger_1.logger.warn(lang_1.lang.__('COS_CORS_RULE_REMOVE_FAILED', { domain, error: String(error) }));
130
+ }
131
+ };
11
132
  const bindCustomDomain = async (bucketName, domain) => {
12
133
  const mainDomain = (0, domainUtils_1.extractMainDomain)(domain);
13
134
  const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, mainDomain);
@@ -40,6 +161,7 @@ const createCosOperations = (cosClient, region, dnsOps) => {
40
161
  catch (error) {
41
162
  logger_1.logger.warn(lang_1.lang.__('COS_BUCKET_DOMAIN_BIND_FAILED', { error: String(error) }));
42
163
  }
164
+ await addCorsRuleForDomain(bucketName, domain);
43
165
  if (!dnsOps) {
44
166
  logger_1.logger.warn(lang_1.lang.__('COS_DNS_MANUAL_CONFIG_REQUIRED', { domain, cname: cosEndpoint }));
45
167
  return { domain, cname: cosEndpoint, bucketDomainBound };
@@ -73,6 +195,7 @@ const createCosOperations = (cosClient, region, dnsOps) => {
73
195
  }
74
196
  };
75
197
  const unbindCustomDomain = async (bucketName, domain, dnsRecordId) => {
198
+ await removeCorsRuleForDomain(bucketName, domain);
76
199
  try {
77
200
  const existingRules = await new Promise((resolve, reject) => {
78
201
  cosClient.getBucketDomain({
@@ -272,6 +272,11 @@ exports.en = {
272
272
  OSS_BUCKET_CNAME_BIND_FAILED: 'Failed to bind bucket CNAME: {{error}}',
273
273
  OSS_BUCKET_CNAME_UNBIND_FAILED: 'Failed to unbind bucket CNAME: {{error}}',
274
274
  OSS_BUCKET_CNAME_NEED_VERIFY: 'Domain ownership verification required. Please add TXT record in DNS console, then retry.',
275
+ OSS_CORS_RULE_ADDED: 'Added CORS rule for custom domain: {{domain}}',
276
+ OSS_CORS_RULE_EXISTS: 'CORS rule already exists for custom domain: {{domain}}',
277
+ OSS_CORS_RULE_ADD_FAILED: 'Failed to add CORS rule for {{domain}}: {{error}}',
278
+ OSS_CORS_RULE_REMOVED: 'Removed CORS rule for custom domain: {{domain}}',
279
+ OSS_CORS_RULE_REMOVE_FAILED: 'Failed to remove CORS rule for {{domain}}: {{error}}',
275
280
  // Tencent COS DNS messages
276
281
  COS_DNS_CNAME_CREATED: 'Created DNS CNAME record: {{domain}} -> {{cname}}',
277
282
  COS_DNS_CNAME_EXISTS: 'DNS CNAME record already exists: {{domain}} -> {{cname}}',
@@ -284,6 +289,11 @@ exports.en = {
284
289
  COS_BUCKET_DOMAIN_BIND_FAILED: 'Failed to bind bucket domain: {{error}}',
285
290
  COS_BUCKET_DOMAIN_UNBOUND: 'Unbound custom domain from bucket: {{domain}}',
286
291
  COS_BUCKET_DOMAIN_UNBIND_FAILED: 'Failed to unbind bucket domain: {{error}}',
292
+ COS_CORS_RULE_ADDED: 'Added CORS rule for custom domain: {{domain}}',
293
+ COS_CORS_RULE_EXISTS: 'CORS rule already exists for custom domain: {{domain}}',
294
+ COS_CORS_RULE_ADD_FAILED: 'Failed to add CORS rule for {{domain}}: {{error}}',
295
+ COS_CORS_RULE_REMOVED: 'Removed CORS rule for custom domain: {{domain}}',
296
+ COS_CORS_RULE_REMOVE_FAILED: 'Failed to remove CORS rule for {{domain}}: {{error}}',
287
297
  // Dependency graph messages
288
298
  DEPENDENCY_GRAPH_GENERATED: 'Dependency graph generated',
289
299
  EXECUTION_ORDER: 'Execution order',
@@ -271,6 +271,11 @@ exports.zhCN = {
271
271
  OSS_BUCKET_CNAME_BIND_FAILED: '绑定存储桶 CNAME 失败: {{error}}',
272
272
  OSS_BUCKET_CNAME_UNBIND_FAILED: '解绑存储桶 CNAME 失败: {{error}}',
273
273
  OSS_BUCKET_CNAME_NEED_VERIFY: '需要验证域名所有权。请在 DNS 控制台添加 TXT 记录后重试。',
274
+ OSS_CORS_RULE_ADDED: '已为自定义域名添加 CORS 规则: {{domain}}',
275
+ OSS_CORS_RULE_EXISTS: '自定义域名的 CORS 规则已存在: {{domain}}',
276
+ OSS_CORS_RULE_ADD_FAILED: '为 {{domain}} 添加 CORS 规则失败: {{error}}',
277
+ OSS_CORS_RULE_REMOVED: '已移除自定义域名的 CORS 规则: {{domain}}',
278
+ OSS_CORS_RULE_REMOVE_FAILED: '移除 {{domain}} 的 CORS 规则失败: {{error}}',
274
279
  // Tencent COS DNS messages
275
280
  COS_DNS_CNAME_CREATED: '已创建 DNS CNAME 记录: {{domain}} -> {{cname}}',
276
281
  COS_DNS_CNAME_EXISTS: 'DNS CNAME 记录已存在: {{domain}} -> {{cname}}',
@@ -282,6 +287,11 @@ exports.zhCN = {
282
287
  COS_BUCKET_DOMAIN_BIND_FAILED: '绑定存储桶域名失败: {{error}}',
283
288
  COS_BUCKET_DOMAIN_UNBOUND: '已解绑存储桶自定义域名: {{domain}}',
284
289
  COS_BUCKET_DOMAIN_UNBIND_FAILED: '解绑存储桶域名失败: {{error}}',
290
+ COS_CORS_RULE_ADDED: '已为自定义域名添加 CORS 规则: {{domain}}',
291
+ COS_CORS_RULE_EXISTS: '自定义域名的 CORS 规则已存在: {{domain}}',
292
+ COS_CORS_RULE_ADD_FAILED: '为 {{domain}} 添加 CORS 规则失败: {{error}}',
293
+ COS_CORS_RULE_REMOVED: '已移除自定义域名的 CORS 规则: {{domain}}',
294
+ COS_CORS_RULE_REMOVE_FAILED: '移除 {{domain}} 的 CORS 规则失败: {{error}}',
285
295
  // Dependency graph messages
286
296
  DEPENDENCY_GRAPH_GENERATED: '依赖图已生成',
287
297
  EXECUTION_ORDER: '执行顺序',
@@ -138,6 +138,11 @@ const createBucketResource = async (context, bucket, state) => {
138
138
  ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
139
139
  };
140
140
  instances.push(dnsInstance);
141
+ // Refresh bucket info to capture auto-added CORS rule
142
+ bucketInfo = await client.oss.getBucket(config.bucketName);
143
+ if (bucketInfo) {
144
+ instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
145
+ }
141
146
  }
142
147
  }
143
148
  // Upload static files if code path is specified
@@ -212,6 +217,11 @@ const updateBucketResource = async (context, bucket, state) => {
212
217
  ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
213
218
  };
214
219
  instances.push(dnsInstance);
220
+ // Refresh bucket info to capture auto-added CORS rule
221
+ const refreshedInfo = await client.oss.getBucket(config.bucketName);
222
+ if (refreshedInfo) {
223
+ instances[0] = buildOssInstanceFromProvider(refreshedInfo, sid);
224
+ }
215
225
  }
216
226
  }
217
227
  else if (existingDnsInstance) {
@@ -94,6 +94,11 @@ const createBucketResource = async (context, bucket, state) => {
94
94
  ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
95
95
  };
96
96
  instances.push(dnsInstance);
97
+ // Refresh bucket info to capture auto-added CORS rule
98
+ const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
99
+ if (refreshedInfo) {
100
+ instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
101
+ }
97
102
  }
98
103
  }
99
104
  const resourceState = {
@@ -150,6 +155,11 @@ const updateBucketResource = async (context, bucket, state) => {
150
155
  ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
151
156
  };
152
157
  instances.push(dnsInstance);
158
+ // Refresh bucket info to capture auto-added CORS rule
159
+ const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
160
+ if (refreshedInfo) {
161
+ instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
162
+ }
153
163
  }
154
164
  }
155
165
  else if (existingDnsInstance) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geek-fun/serverlessinsight",
3
- "version": "0.5.7",
3
+ "version": "0.5.8",
4
4
  "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
5
5
  "homepage": "https://serverlessinsight.geekfun.club",
6
6
  "main": "dist/src/index.js",