@geek-fun/serverlessinsight 0.9.2 → 0.9.4

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.
Files changed (105) hide show
  1. package/.serverlessinsight/state-cdn-flow-app-cdn-flow-service.json.backup +1 -1
  2. package/.serverlessinsight/state-iam-test-app-iam-test-service.json.backup +2 -2
  3. package/.serverlessinsight/state-insight-poc-app-insight-poc-tencent.json.backup +4 -8
  4. package/.serverlessinsight/state-insight-poc-app-log-insight-poc-tencent-log.json.backup +3 -8
  5. package/.serverlessinsight/state-insight-poc-deploy-app-insight-poc-deploy.json.backup +4 -4
  6. package/.serverlessinsight/state-insight-poc-destroy-app-insight-poc-destroy.json.backup +1 -1
  7. package/.serverlessinsight/state-insight-poc-timer-app-insight-poc-timer.json.backup +28 -5
  8. package/.serverlessinsight/state-insight-volc-app-insight-volc.json.backup +2 -2
  9. package/.serverlessinsight/state-insight-volc-nested-app-insight-volc-nested.json.backup +3 -3
  10. package/.serverlessinsight/state-nested-drift-app-nested-drift-service.json.backup +20 -5
  11. package/.serverlessinsight/state-role-reconcile-test-app-role-reconcile-test-service.json.backup +3 -3
  12. package/AGENTS.md +10 -0
  13. package/CHANGELOG.md +62 -0
  14. package/README.md +256 -175
  15. package/README.zh-CN.md +249 -159
  16. package/dist/package.json +22 -19
  17. package/dist/src/commands/index.js +21 -52
  18. package/dist/src/commands/local.js +16 -3
  19. package/dist/src/commands/plan.js +35 -4
  20. package/dist/src/common/aliyunClient/apigwOperations.js +48 -9
  21. package/dist/src/common/aliyunClient/fc3Operations.js +7 -1
  22. package/dist/src/common/aliyunClient/ossOperations.js +214 -221
  23. package/dist/src/common/bucketPolicy.js +63 -0
  24. package/dist/src/common/domainUtils.js +4 -1
  25. package/dist/src/common/functionDefinition.js +25 -0
  26. package/dist/src/common/index.js +4 -0
  27. package/dist/src/common/jsonOutput.js +6 -1
  28. package/dist/src/common/nameBuilder.js +3 -1
  29. package/dist/src/common/planCapabilities.js +119 -0
  30. package/dist/src/common/planCompare.js +119 -66
  31. package/dist/src/common/planFormatter.js +22 -14
  32. package/dist/src/common/planRedaction.js +26 -0
  33. package/dist/src/common/refreshPlanner.js +66 -21
  34. package/dist/src/common/tencentClient/cosOperations.js +326 -322
  35. package/dist/src/common/tencentClient/scfOperations.js +9 -2
  36. package/dist/src/common/tencentClient/tdsqlcOperations.js +6 -11
  37. package/dist/src/common/triggerMapper.js +16 -1
  38. package/dist/src/common/volcengineClient/apigwOperations.js +82 -0
  39. package/dist/src/common/volcengineClient/iamOperations.js +27 -3
  40. package/dist/src/common/volcengineClient/tosOperations.js +62 -56
  41. package/dist/src/lang/en.js +33 -8
  42. package/dist/src/lang/index.js +28 -14
  43. package/dist/src/lang/zh-CN.js +33 -8
  44. package/dist/src/parser/eventParser.js +1 -0
  45. package/dist/src/parser/functionParser.js +1 -1
  46. package/dist/src/stack/aliyunStack/apigwDomainPlan.js +82 -0
  47. package/dist/src/stack/aliyunStack/apigwExecutor.js +4 -1
  48. package/dist/src/stack/aliyunStack/apigwPlanner.js +165 -25
  49. package/dist/src/stack/aliyunStack/apigwResource.js +172 -126
  50. package/dist/src/stack/aliyunStack/apigwTypes.js +3 -7
  51. package/dist/src/stack/aliyunStack/deployer.js +2 -0
  52. package/dist/src/stack/aliyunStack/esServerlessTypes.js +8 -4
  53. package/dist/src/stack/aliyunStack/fc3Executor.js +7 -3
  54. package/dist/src/stack/aliyunStack/fc3Planner.js +124 -155
  55. package/dist/src/stack/aliyunStack/fc3Resource.js +48 -52
  56. package/dist/src/stack/aliyunStack/fc3Types.js +30 -16
  57. package/dist/src/stack/aliyunStack/ossPlanner.js +15 -1
  58. package/dist/src/stack/aliyunStack/ossResource.js +113 -102
  59. package/dist/src/stack/aliyunStack/ossTypes.js +20 -20
  60. package/dist/src/stack/localStack/aliyunFc.js +1 -6
  61. package/dist/src/stack/localStack/event.js +31 -60
  62. package/dist/src/stack/localStack/function.js +24 -65
  63. package/dist/src/stack/localStack/functionRunner.js +10 -2
  64. package/dist/src/stack/localStack/httpAdapter.js +54 -0
  65. package/dist/src/stack/localStack/httpError.js +5 -0
  66. package/dist/src/stack/localStack/legacyLambda.js +26 -0
  67. package/dist/src/stack/localStack/localContext.js +29 -0
  68. package/dist/src/stack/localStack/localRoute.js +12 -0
  69. package/dist/src/stack/localStack/localRuntimes.js +22 -0
  70. package/dist/src/stack/localStack/localServer.js +8 -3
  71. package/dist/src/stack/localStack/requestBody.js +24 -0
  72. package/dist/src/stack/localStack/requestId.js +18 -0
  73. package/dist/src/stack/localStack/tencent.js +147 -0
  74. package/dist/src/stack/localStack/timer.js +23 -2
  75. package/dist/src/stack/localStack/volcengine.js +68 -0
  76. package/dist/src/stack/scfStack/cosPlanner.js +9 -14
  77. package/dist/src/stack/scfStack/cosResource.js +42 -50
  78. package/dist/src/stack/scfStack/cosTypes.js +19 -14
  79. package/dist/src/stack/scfStack/deployer.js +2 -0
  80. package/dist/src/stack/scfStack/scfExecutor.js +7 -3
  81. package/dist/src/stack/scfStack/scfHttpTrigger.js +106 -0
  82. package/dist/src/stack/scfStack/scfPlanner.js +67 -16
  83. package/dist/src/stack/scfStack/scfResource.js +170 -321
  84. package/dist/src/stack/scfStack/scfTypes.js +4 -3
  85. package/dist/src/stack/scfStack/tdsqlcPlanner.js +10 -13
  86. package/dist/src/stack/volcengineStack/apigwDomains.js +64 -0
  87. package/dist/src/stack/volcengineStack/apigwPlanner.js +71 -15
  88. package/dist/src/stack/volcengineStack/apigwResource.js +60 -24
  89. package/dist/src/stack/volcengineStack/apigwTypes.js +5 -1
  90. package/dist/src/stack/volcengineStack/deployer.js +6 -0
  91. package/dist/src/stack/volcengineStack/tosPlanner.js +8 -13
  92. package/dist/src/stack/volcengineStack/tosResource.js +22 -35
  93. package/dist/src/stack/volcengineStack/tosTypes.js +5 -8
  94. package/dist/src/stack/volcengineStack/vefaasPlanner.js +142 -49
  95. package/dist/src/stack/volcengineStack/vefaasResource.js +17 -12
  96. package/dist/src/stack/volcengineStack/vefaasTypes.js +6 -3
  97. package/dist/tsconfig.tsbuildinfo +1 -1
  98. package/package.json +22 -19
  99. package/release-notes.md +53 -0
  100. package/samples/README_TENCENT_COS.md +3 -3
  101. package/samples/README_TENCENT_SCF.md +3 -3
  102. package/samples/tencent-local/index.js +13 -0
  103. package/samples/tencent-local/serverlessinsight.yml +23 -0
  104. package/samples/volcengine-local/index.js +13 -0
  105. package/samples/volcengine-local/serverlessinsight.yml +28 -0
@@ -0,0 +1,106 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.reconcileScfHttpTrigger = exports.ownedScfHttpTrigger = exports.normalizeScfHttpTriggerDesc = exports.SCF_HTTP_TRIGGER_TYPE = void 0;
4
+ const triggerMapper_1 = require("../../common/triggerMapper");
5
+ const nameBuilder_1 = require("../../common/nameBuilder");
6
+ const sidUtils_1 = require("../../common/sidUtils");
7
+ const planCompare_1 = require("../../common/planCompare");
8
+ const lang_1 = require("../../lang");
9
+ exports.SCF_HTTP_TRIGGER_TYPE = 'TENCENT_SCF_HTTP_TRIGGER';
10
+ const isFunctionUrl = (trigger) => trigger.Type === 'http' && Boolean(trigger.TriggerDesc?.includes('NetConfig'));
11
+ const normalizeScfHttpTriggerDesc = (value) => {
12
+ try {
13
+ const parsed = JSON.parse(value ?? '');
14
+ if (!parsed.AuthType || !parsed.NetConfig)
15
+ return null;
16
+ return {
17
+ AuthType: parsed.AuthType,
18
+ NetConfig: {
19
+ EnableIntranet: parsed.NetConfig.EnableIntranet ?? false,
20
+ EnableExtranet: parsed.NetConfig.EnableExtranet ?? true,
21
+ },
22
+ };
23
+ }
24
+ catch {
25
+ return null;
26
+ }
27
+ };
28
+ exports.normalizeScfHttpTriggerDesc = normalizeScfHttpTriggerDesc;
29
+ const ownedScfHttpTrigger = (instances, definition) => {
30
+ const recorded = instances.find((instance) => instance.type === exports.SCF_HTTP_TRIGGER_TYPE);
31
+ if (typeof recorded?.id === 'string')
32
+ return { id: recorded.id, triggerDesc: recorded.triggerDesc };
33
+ if (!definition.http)
34
+ return undefined;
35
+ const fn = instances.find((instance) => typeof instance.functionName === 'string' || instance.type == null);
36
+ const legacy = fn?.triggers?.find((trigger) => trigger.type === 'http' &&
37
+ trigger.owned !== false &&
38
+ typeof trigger.triggerName === 'string' &&
39
+ typeof trigger.triggerDesc === 'string' &&
40
+ trigger.triggerDesc.includes('NetConfig'));
41
+ return legacy
42
+ ? { id: String(legacy.triggerName), triggerDesc: String(legacy.triggerDesc) }
43
+ : undefined;
44
+ };
45
+ exports.ownedScfHttpTrigger = ownedScfHttpTrigger;
46
+ const reconcileScfHttpTrigger = async (context, fn, instances, definition, client, repair = false, recoverCreated = false) => {
47
+ const owned = (0, exports.ownedScfHttpTrigger)(instances, definition);
48
+ const remove = async (id) => {
49
+ try {
50
+ await client.scf.deleteTrigger({ FunctionName: fn.name, TriggerName: id, Type: 'http' });
51
+ }
52
+ catch (error) {
53
+ const code = error.code;
54
+ if (code !== 'ResourceNotFound' && code !== 'ResourceNotFound.TriggerName')
55
+ throw error;
56
+ }
57
+ };
58
+ if (!fn.triggers?.http) {
59
+ if (owned)
60
+ await remove(owned.id);
61
+ return [];
62
+ }
63
+ if (!fn.triggers.http.auth_type)
64
+ throw new Error(lang_1.lang.__('HTTP_TRIGGER_AUTH_TYPE_REQUIRED', { functionName: fn.name }));
65
+ const desc = (0, triggerMapper_1.buildTencentHttpTriggerDesc)((0, triggerMapper_1.mapAuthType)(context.provider, fn.triggers.http.auth_type), (0, triggerMapper_1.mapAccess)(fn.triggers.http.access));
66
+ const record = (id) => ({
67
+ type: exports.SCF_HTTP_TRIGGER_TYPE,
68
+ id,
69
+ sid: (0, sidUtils_1.buildSid)('tencent', 'scf-http-trigger', context.stage, `${fn.name}.${id}`),
70
+ triggerDesc: desc,
71
+ });
72
+ const before = (await client.scf.getFunction(fn.name))?.Triggers ?? [];
73
+ const live = before.find((trigger) => isFunctionUrl(trigger) && (!owned || trigger.TriggerName === owned.id));
74
+ if (live && !owned) {
75
+ if (recoverCreated &&
76
+ definition.http &&
77
+ live.TriggerName &&
78
+ !(0, planCompare_1.remoteDiffersFromDesired)({ http: (0, exports.normalizeScfHttpTriggerDesc)(live.TriggerDesc) }, { http: (0, exports.normalizeScfHttpTriggerDesc)(desc) }))
79
+ return [record(live.TriggerName)];
80
+ return [];
81
+ }
82
+ if (live &&
83
+ owned &&
84
+ !repair &&
85
+ !(0, planCompare_1.remoteDiffersFromDesired)({ http: (0, exports.normalizeScfHttpTriggerDesc)(live.TriggerDesc) }, { http: (0, exports.normalizeScfHttpTriggerDesc)(desc) }))
86
+ return [record(owned.id)];
87
+ if (owned)
88
+ await remove(owned.id);
89
+ const created = await client.scf.createTrigger({
90
+ FunctionName: fn.name,
91
+ TriggerName: (0, nameBuilder_1.buildFunctionHttpTriggerName)(fn.key),
92
+ Type: 'http',
93
+ TriggerDesc: desc,
94
+ Qualifier: '$DEFAULT',
95
+ Enable: 'OPEN',
96
+ });
97
+ const observed = created?.TriggerName
98
+ ? created
99
+ : (await client.scf.getFunction(fn.name))?.Triggers?.find((trigger) => isFunctionUrl(trigger) &&
100
+ (!before.some((previous) => previous.TriggerName === trigger.TriggerName) ||
101
+ trigger.TriggerName === owned?.id));
102
+ if (!observed?.TriggerName)
103
+ throw new Error(lang_1.lang.__('SCF_HTTP_TRIGGER_ID_UNAVAILABLE', { functionName: fn.name }));
104
+ return [record(observed.TriggerName)];
105
+ };
106
+ exports.reconcileScfHttpTrigger = reconcileScfHttpTrigger;
@@ -1,6 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateFunctionPlan = void 0;
4
+ const scfHttpTrigger_1 = require("./scfHttpTrigger");
5
+ const planCompare_1 = require("../../common/planCompare");
6
+ const triggerMapper_1 = require("../../common/triggerMapper");
4
7
  const tencentClient_1 = require("../../common/tencentClient");
5
8
  const logger_1 = require("../../common/logger");
6
9
  const lang_1 = require("../../lang");
@@ -42,13 +45,27 @@ const generateFunctionPlan = async (context, state, functions) => {
42
45
  }
43
46
  const codePath = fn.code.path;
44
47
  const desiredCodeHash = await (0, hashUtils_1.computeZipContentHash)(codePath);
45
- const desiredDefinition = (0, scfTypes_1.extractScfDefinition)(config, desiredCodeHash, fn.iam);
48
+ const desiredDefinition = (0, scfTypes_1.extractScfDefinition)(config, desiredCodeHash, fn.iam, fn);
46
49
  const client = (0, tencentClient_1.createTencentClient)(context);
50
+ const recordedDomain = currentState?.instances?.find((i) => i.type === 'TENCENT_SCF_CUSTOM_DOMAIN');
51
+ const recordedTimers = (currentState?.instances ?? []).filter((i) => i.type === 'TENCENT_SCF_TIMER_TRIGGER');
47
52
  return (0, refreshPlanner_1.planRefreshedResource)({
48
53
  logicalId,
49
54
  resourceType: 'SCF',
50
55
  currentState,
51
56
  desiredDefinition,
57
+ removedDependents: {
58
+ ...(!fn.triggers?.http &&
59
+ (0, scfHttpTrigger_1.ownedScfHttpTrigger)(currentState?.instances ?? [], currentState?.definition ?? {})
60
+ ? { http: currentState?.definition.http ?? { auth_type: 'public' } }
61
+ : {}),
62
+ ...(!fn.domain && recordedDomain
63
+ ? { domain: currentState?.definition?.domain ?? { domain_name: recordedDomain.id } }
64
+ : {}),
65
+ ...(!fn.triggers?.timer && recordedTimers.length > 0
66
+ ? { timers: currentState?.definition?.timers ?? [] }
67
+ : {}),
68
+ },
52
69
  read: () => (0, refreshCache_1.cachedRefreshRead)(context, `scf.getFunction:${fn.name}`, () => client.scf.getFunction(fn.name)),
53
70
  isOwned: (remote) => (0, ownershipTag_1.isOwnedByStack)(context, logicalId, remote.Tags),
54
71
  foreignError: () => new Error(lang_1.lang.__('RESOURCE_EXISTS_NOT_OWNED', {
@@ -57,6 +74,33 @@ const generateFunctionPlan = async (context, state, functions) => {
57
74
  tagKey: ownershipTag_1.OWNERSHIP_TAG_KEY,
58
75
  })),
59
76
  extraUpdate: async () => {
77
+ const updates = [];
78
+ if (fn.triggers?.http) {
79
+ const live = await (0, refreshCache_1.cachedRefreshRead)(context, `scf.getFunction:${fn.name}`, () => client.scf.getFunction(fn.name));
80
+ const trigger = (live?.Triggers ?? []).find((entry) => entry.Type === 'http' && entry.TriggerDesc?.includes('NetConfig'));
81
+ const desired = JSON.parse((0, triggerMapper_1.buildTencentHttpTriggerDesc)((0, triggerMapper_1.mapAuthType)(context.provider, fn.triggers.http.auth_type), (0, triggerMapper_1.mapAccess)(fn.triggers.http.access)));
82
+ const actual = (0, scfHttpTrigger_1.normalizeScfHttpTriggerDesc)(trigger?.TriggerDesc);
83
+ if (!actual || (0, planCompare_1.remoteDiffersFromDesired)({ http: actual }, { http: desired }))
84
+ updates.push({
85
+ update: true,
86
+ drifted: !(0, planCompare_1.definitionsDiffer)(currentState?.definition ?? {}, {
87
+ http: desiredDefinition.http,
88
+ }),
89
+ reason: 'PLAN_DRIFT_HTTP_TRIGGER',
90
+ });
91
+ }
92
+ if (fn.domain) {
93
+ const domain = await (0, refreshCache_1.cachedRefreshRead)(context, `scf.getCustomDomain:${fn.domain.domain_name}`, () => client.scf.getCustomDomain(fn.domain.domain_name));
94
+ if (!domain ||
95
+ (domain.Protocol !== undefined && domain.Protocol !== fn.domain.protocol))
96
+ updates.push({
97
+ update: true,
98
+ drifted: !(0, planCompare_1.definitionsDiffer)(currentState?.definition ?? {}, {
99
+ domain: desiredDefinition.domain,
100
+ }),
101
+ reason: 'PLAN_DRIFT_FUNCTION_DOMAIN',
102
+ });
103
+ }
60
104
  // Issue #234 M3: nested topic drift — probed only when logging is
61
105
  // declared; unresolvable/unreadable topics are not drift. Runs via
62
106
  // the skeleton's extraUpdate hook (issue #246) so a topic-only
@@ -70,7 +114,7 @@ const generateFunctionPlan = async (context, state, functions) => {
70
114
  liveTopic.StorageType !== clsOperations_1.CLS_TOPIC_STORAGE_TYPE ||
71
115
  liveTopic.Period !== clsOperations_1.CLS_TOPIC_PERIOD;
72
116
  if (topicDrifted) {
73
- return { update: true, drifted: true, reason: 'PLAN_DRIFT_CLS_TOPIC' };
117
+ updates.push({ update: true, drifted: true, reason: 'PLAN_DRIFT_CLS_TOPIC' });
74
118
  }
75
119
  }
76
120
  catch (error) {
@@ -78,6 +122,7 @@ const generateFunctionPlan = async (context, state, functions) => {
78
122
  functionName: fn.name,
79
123
  error: String(error),
80
124
  }));
125
+ throw error;
81
126
  }
82
127
  }
83
128
  // Issue #258: timer trigger drift — the live GetFunction trigger
@@ -85,9 +130,8 @@ const generateFunctionPlan = async (context, state, functions) => {
85
130
  // read is refresh-cached, so this reuses the fetch the skeleton
86
131
  // already made. Manual deletes, console cron edits and extra
87
132
  // triggers all mark the function drifted.
88
- const timerStateInstances = (currentState?.instances ?? []).filter((i) => i.type === 'TENCENT_SCF_TIMER_TRIGGER');
89
133
  const desiredTimers = fn.triggers?.timer ?? [];
90
- if (desiredTimers.length > 0 || timerStateInstances.length > 0) {
134
+ if (fn.triggers?.timer !== undefined) {
91
135
  try {
92
136
  const live = await (0, refreshCache_1.cachedRefreshRead)(context, `scf.getFunction:${fn.name}`, () => client.scf.getFunction(fn.name));
93
137
  const liveTimers = (live?.Triggers ?? []).filter((trigger) => trigger.Type === 'timer' && trigger.TriggerName);
@@ -101,10 +145,17 @@ const generateFunctionPlan = async (context, state, functions) => {
101
145
  // GetFunction reports Enable as 1/0
102
146
  return (liveTimer.TriggerDesc !== (0, siCron_1.translateSiCron)(timer.cron, 'tencent') ||
103
147
  (liveTimer.CustomArgument ?? undefined) !== timer.payload ||
148
+ (liveTimer.Description ?? undefined) !== timer.description ||
104
149
  (liveTimer.Enable === 1) !== timer.enable);
105
150
  });
106
151
  if (extraTimer || desiredChanged) {
107
- return { update: true, drifted: true, reason: 'PLAN_DRIFT_TIMER_TRIGGER' };
152
+ updates.push({
153
+ update: true,
154
+ drifted: !(0, planCompare_1.definitionsDiffer)(currentState?.definition ?? {}, {
155
+ timers: desiredDefinition.timers,
156
+ }),
157
+ reason: 'PLAN_DRIFT_TIMER_TRIGGER',
158
+ });
108
159
  }
109
160
  }
110
161
  catch (error) {
@@ -112,9 +163,14 @@ const generateFunctionPlan = async (context, state, functions) => {
112
163
  functionName: fn.name,
113
164
  error: String(error),
114
165
  }));
166
+ throw error;
115
167
  }
116
168
  }
117
- return { update: false, drifted: false };
169
+ return {
170
+ update: updates.length > 0,
171
+ drifted: updates.some((entry) => entry.drifted),
172
+ reasons: updates.map((entry) => entry.reason),
173
+ };
118
174
  },
119
175
  cloudToDefinition: scfTypes_1.cloudScfToDefinition,
120
176
  enrichRemoteAttributes: async (remote, attributes) => {
@@ -125,18 +181,13 @@ const generateFunctionPlan = async (context, state, functions) => {
125
181
  if (!desiredLog || !remote.ClsLogsetId || !remote.ClsTopicId) {
126
182
  return attributes;
127
183
  }
128
- try {
129
- const logsetName = await (0, refreshCache_1.cachedRefreshRead)(context, `cls.getLogsetNameById:${remote.ClsLogsetId}`, () => client.cls.getLogsetNameById(remote.ClsLogsetId));
130
- const topics = await (0, refreshCache_1.cachedRefreshRead)(context, `cls.listTopicsByLogset:${remote.ClsLogsetId}`, () => client.cls.listTopicsByLogset(remote.ClsLogsetId));
131
- const topicName = topics?.find((t) => t.TopicId === remote.ClsTopicId)?.TopicName;
132
- if (!logsetName || !topicName) {
133
- return attributes;
134
- }
135
- return { ...attributes, logConfig: { logset: logsetName, topic: topicName } };
136
- }
137
- catch {
184
+ const logsetName = await (0, refreshCache_1.cachedRefreshRead)(context, `cls.getLogsetNameById:${remote.ClsLogsetId}`, () => client.cls.getLogsetNameById(remote.ClsLogsetId));
185
+ const topics = await (0, refreshCache_1.cachedRefreshRead)(context, `cls.listTopicsByLogset:${remote.ClsLogsetId}`, () => client.cls.listTopicsByLogset(remote.ClsLogsetId));
186
+ const topicName = topics?.find((t) => t.TopicId === remote.ClsTopicId)?.TopicName;
187
+ if (!logsetName || !topicName) {
138
188
  return attributes;
139
189
  }
190
+ return { ...attributes, logConfig: { logset: logsetName, topic: topicName } };
140
191
  },
141
192
  refresh: context.refresh,
142
193
  });