@serverless-devs/engine 0.0.1-beta.1 → 0.0.1-beta.10

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 (15) hide show
  1. package/lib/actions/index.d.ts +2 -1
  2. package/lib/actions/index.js +62 -21
  3. package/lib/actions/index.js.map +1 -1
  4. package/lib/constants/index.d.ts +6 -0
  5. package/lib/constants/index.js +8 -0
  6. package/lib/constants/index.js.map +1 -1
  7. package/lib/index.d.ts +3 -1
  8. package/lib/index.js +208 -75
  9. package/lib/index.js.map +1 -1
  10. package/lib/types.d.ts +10 -4
  11. package/lib/types.js.map +1 -1
  12. package/lib/utils/index.d.ts +8 -4
  13. package/lib/utils/index.js +24 -33
  14. package/lib/utils/index.js.map +1 -1
  15. package/package.json +7 -6
package/lib/actions/index.d.ts CHANGED
@@ -4,6 +4,7 @@ interface IOptions {
4
4
  hookLevel: `${IActionLevel}`;
5
5
  projectName?: string;
6
6
  logger: ILoggerInstance;
7
+ skipActions?: boolean;
7
8
  }
8
9
  declare class Actions {
9
10
  private actions;
@@ -13,7 +14,7 @@ declare class Actions {
13
14
  private inputs;
14
15
  constructor(actions?: IAction[], option?: IOptions);
15
16
  setValue(key: string, value: any): void;
16
- start(hookType: `${IHookType}`, inputs?: Record<string, any>): Promise<Record<string, any>>;
17
+ start(hookType: `${IHookType}`, inputs?: Record<string, any>): Promise<{}>;
17
18
  private run;
18
19
  private plugin;
19
20
  private component;
package/lib/actions/index.js CHANGED
@@ -38,12 +38,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
38
38
  const parse_spec_1 = require("@serverless-devs/parse-spec");
39
39
  const lodash_1 = require("lodash");
40
40
  const utils = __importStar(require("@serverless-devs/utils"));
41
+ const utils_1 = require("@serverless-devs/utils");
41
42
  const fs_extra_1 = __importDefault(require("fs-extra"));
42
43
  const execa_1 = __importDefault(require("execa"));
43
44
  const load_component_1 = __importDefault(require("@serverless-devs/load-component"));
44
45
  const string_argv_1 = __importDefault(require("string-argv"));
45
- const utils_1 = require("../utils");
46
+ const utils_2 = require("../utils");
46
47
  const chalk_1 = __importDefault(require("chalk"));
48
+ const constants_1 = require("../constants");
47
49
  const debug = require('@serverless-cd/debug')('serverless-devs:engine');
48
50
  class Actions {
49
51
  constructor(actions = [], option = {}) {
@@ -54,20 +56,26 @@ class Actions {
54
56
  this.logger = option.logger;
55
57
  }
56
58
  setValue(key, value) {
59
+ if (this.option.skipActions)
60
+ return;
57
61
  (0, lodash_1.set)(this.record, key, value);
58
62
  }
59
63
  start(hookType, inputs = {}) {
60
64
  return __awaiter(this, void 0, void 0, function* () {
65
+ if (this.option.skipActions)
66
+ return {};
61
67
  this.inputs = inputs;
62
68
  const hooks = (0, lodash_1.filter)(this.actions, (item) => item.hookType === hookType);
63
69
  if ((0, lodash_1.isEmpty)(hooks))
64
70
  return {};
65
- this.logger.info(`Start the ${hookType}-action in ${this.option.hookLevel === parse_spec_1.IActionLevel.PROJECT
66
- ? `${this.option.projectName} project`
67
- : parse_spec_1.IActionLevel.GLOBAL}`);
71
+ this.record.lable =
72
+ this.option.hookLevel === parse_spec_1.IActionLevel.PROJECT
73
+ ? `project ${this.option.projectName}`
74
+ : parse_spec_1.IActionLevel.GLOBAL;
75
+ this.logger.debug(`Start executing the ${hookType}-action in ${this.record.lable}`);
68
76
  const newHooks = (0, parse_spec_1.getInputs)(hooks, this.record.magic);
69
77
  for (const hook of newHooks) {
70
- debug(`${hook.level} action item: ${(0, utils_1.stringify)(hook)}`);
78
+ debug(`${hook.level} action item: ${(0, utils_2.stringify)(hook)}`);
71
79
  if (hook.actionType === parse_spec_1.IActionType.RUN) {
72
80
  yield this.run(hook);
73
81
  }
@@ -79,10 +87,12 @@ class Actions {
79
87
  yield this.component(hook);
80
88
  }
81
89
  }
82
- this.logger.info(`End the ${hookType}-action in ${this.option.hookLevel === parse_spec_1.IActionLevel.PROJECT
83
- ? `${this.option.projectName} project`
84
- : parse_spec_1.IActionLevel.GLOBAL}`);
85
- return this.record.pluginOutput;
90
+ // pre-action执行完毕，清空pluginOutput, post-action应获取componentProps
91
+ if (hookType === parse_spec_1.IHookType.PRE) {
92
+ this.record.pluginOutput = {};
93
+ }
94
+ this.logger.debug(`The ${hookType}-action successfully to execute in ${this.record.lable}`);
95
+ return this.record;
86
96
  });
87
97
  }
88
98
  run(hook) {
@@ -97,24 +107,43 @@ class Actions {
97
107
  }
98
108
  catch (e) {
99
109
  const error = e;
100
- // pre hook, throw error
101
- if (hook.hookType !== parse_spec_1.IHookType.PRE)
102
- return;
103
110
  if (utils.isWindow()) {
104
111
  debug('Command run execution environment：CMD');
105
112
  debug('Please check whether the actions section of yaml can be executed in the current environment.');
106
113
  }
107
- (0, utils_1.throwError)('Global pre-action failed to execute:' + error.message);
114
+ if ((0, utils_2.getAllowFailure)(hook.allow_failure, { exitCode: constants_1.EXIT_CODE.RUN }))
115
+ return;
116
+ throw new utils_1.TipsError(error.message, {
117
+ exitCode: constants_1.EXIT_CODE.RUN,
118
+ prefix: `${this.record.lable} ${hook.hookType}-action failed to execute:`,
119
+ });
108
120
  }
121
+ return;
109
122
  }
123
+ if ((0, utils_2.getAllowFailure)(hook.allow_failure, { exitCode: constants_1.EXIT_CODE.DEVS }))
124
+ return;
125
+ throw new utils_1.TipsError(`The ${hook.path} directory does not exist.`, {
126
+ exitCode: constants_1.EXIT_CODE.DEVS,
127
+ prefix: `${this.record.lable} ${hook.hookType}-action failed to execute:`,
128
+ });
110
129
  });
111
130
  }
112
131
  plugin(hook) {
113
132
  return __awaiter(this, void 0, void 0, function* () {
114
- const instance = yield (0, load_component_1.default)(hook.value);
115
- // TODO: inputs
116
- const inputs = (0, lodash_1.isEmpty)(this.record.pluginOutput) ? this.inputs : this.record.pluginOutput;
117
- this.record.pluginOutput = yield instance(inputs, hook.args);
133
+ try {
134
+ const instance = yield (0, load_component_1.default)(hook.value);
135
+ const inputs = (0, lodash_1.isEmpty)(this.record.pluginOutput) ? this.inputs : this.record.pluginOutput;
136
+ this.record.pluginOutput = yield instance(inputs, hook.args);
137
+ }
138
+ catch (e) {
139
+ const error = e;
140
+ if ((0, utils_2.getAllowFailure)(hook.allow_failure, { exitCode: constants_1.EXIT_CODE.PLUGIN }))
141
+ return;
142
+ throw new utils_1.TipsError(error.message, {
143
+ exitCode: constants_1.EXIT_CODE.PLUGIN,
144
+ prefix: `${this.record.lable} ${hook.hookType}-action failed to execute:`,
145
+ });
146
+ }
118
147
  });
119
148
  }
120
149
  component(hook) {
@@ -122,19 +151,31 @@ class Actions {
122
151
  const argv = (0, string_argv_1.default)(hook.value);
123
152
  const { _ } = utils.parseArgv(argv);
124
153
  const [componentName, method] = _;
125
- const instance = yield (0, load_component_1.default)(componentName);
154
+ const instance = yield (0, load_component_1.default)(componentName, { logger: this.logger });
126
155
  if (instance[method]) {
127
156
  // 方法存在，执行报错，退出码101
128
157
  const newInputs = Object.assign(Object.assign({}, this.record.componentProps), { argv: (0, lodash_1.filter)(argv.slice(2), (o) => !(0, lodash_1.includes)([componentName, method], o)) });
129
158
  try {
130
159
  return yield instance[method](newInputs);
131
160
  }
132
- catch (error) {
133
- (0, utils_1.throw101Error)(error, `${hook.actionType}-action failed to execute:`);
161
+ catch (e) {
162
+ const error = e;
163
+ if ((0, utils_2.getAllowFailure)(hook.allow_failure, { exitCode: constants_1.EXIT_CODE.COMPONENT }))
164
+ return;
165
+ throw new utils_1.TipsError(error.message, {
166
+ exitCode: constants_1.EXIT_CODE.COMPONENT,
167
+ prefix: `${this.record.lable} ${hook.hookType}-action failed to execute:`,
168
+ });
134
169
  }
135
170
  }
171
+ if ((0, utils_2.getAllowFailure)(hook.allow_failure, { exitCode: constants_1.EXIT_CODE.DEVS }))
172
+ return;
136
173
  // 方法不存在，此时系统将会认为是未找到组件方法，系统的exit code为100；
137
- (0, utils_1.throw100Error)(`The [${method}] command was not found.`, `Please check the component ${componentName} has the ${method} method. Serverless Devs documents：${chalk_1.default.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')}`);
174
+ throw new utils_1.TipsError(`The [${method}] command was not found.`, {
175
+ exitCode: constants_1.EXIT_CODE.DEVS,
176
+ prefix: `${this.record.lable} ${hook.hookType}-action failed to execute:`,
177
+ tips: `Please check the component ${componentName} has the ${method} method. Serverless Devs documents：${chalk_1.default.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')}`,
178
+ });
138
179
  });
139
180
  }
140
181
  }
package/lib/actions/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"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"}
package/lib/constants/index.d.ts CHANGED
@@ -0,0 +1,6 @@
1
+ export declare const EXIT_CODE: {
2
+ DEVS: number;
3
+ COMPONENT: number;
4
+ PLUGIN: number;
5
+ RUN: number;
6
+ };
package/lib/constants/index.js CHANGED
@@ -1,2 +1,10 @@
1
1
  "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EXIT_CODE = void 0;
4
+ exports.EXIT_CODE = {
5
+ DEVS: 100,
6
+ COMPONENT: 101,
7
+ PLUGIN: 101,
8
+ RUN: 101,
9
+ };
2
10
  //# sourceMappingURL=index.js.map
package/lib/constants/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG;IACvB,IAAI,EAAE,GAAG;IACT,SAAS,EAAE,GAAG;IACd,MAAM,EAAE,GAAG;IACX,GAAG,EAAE,GAAG;CACT,CAAC"}
package/lib/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { IEngineOptions, IContext } from './types';
2
- export { IEngineOptions, IContext } from './types';
2
+ export { IEngineOptions, IContext, IEngineError } from './types';
3
3
  declare class Engine {
4
4
  private options;
5
5
  context: IContext;
@@ -11,7 +11,9 @@ declare class Engine {
11
11
  private globalActionInstance;
12
12
  private actionInstance;
13
13
  constructor(options: IEngineOptions);
14
+ private beforeStart;
14
15
  start(): Promise<IContext>;
16
+ private getOutput;
15
17
  private validate;
16
18
  private download;
17
19
  private getLogger;
package/lib/index.js CHANGED
@@ -47,34 +47,78 @@ const credential_1 = __importDefault(require("@serverless-devs/credential"));
47
47
  const load_component_1 = __importDefault(require("@serverless-devs/load-component"));
48
48
  const logger_1 = __importDefault(require("@serverless-devs/logger"));
49
49
  const utils = __importStar(require("@serverless-devs/utils"));
50
+ const utils_2 = require("@serverless-devs/utils");
51
+ const constants_1 = require("./constants");
52
+ const assert_1 = __importDefault(require("assert"));
50
53
  const debug = require('@serverless-cd/debug')('serverless-devs:engine');
51
54
  class Engine {
52
55
  constructor(options) {
53
56
  this.options = options;
54
- this.context = { status: types_1.STEP_STATUS.PENING, completed: false };
57
+ this.context = {
58
+ status: types_1.STEP_STATUS.PENING,
59
+ completed: false,
60
+ error: [],
61
+ };
55
62
  this.record = { status: types_1.STEP_STATUS.PENING, editStatusAble: true };
56
63
  this.spec = {};
57
64
  debug('engine start');
65
+ // 初始化参数
58
66
  this.options.args = (0, lodash_1.get)(this.options, 'args', process.argv.slice(2));
67
+ this.options.cwd = (0, lodash_1.get)(this.options, 'cwd', process.cwd());
68
+ this.options.template = utils.getAbsolutePath((0, lodash_1.get)(this.options, 'template'), this.options.cwd);
59
69
  debug(`engine options: ${(0, utils_1.stringify)(options)}`);
60
70
  }
61
- start() {
71
+ beforeStart() {
62
72
  return __awaiter(this, void 0, void 0, function* () {
63
- this.context.status = types_1.STEP_STATUS.RUNNING;
64
- this.parseSpecInstance = new parse_spec_1.default((0, lodash_1.get)(this.options, 'yamlPath'), this.options.args);
73
+ // 初始化 spec
74
+ this.parseSpecInstance = new parse_spec_1.default((0, lodash_1.get)(this.options, 'template'), this.options.args);
65
75
  this.spec = this.parseSpecInstance.start();
66
- const { steps: _steps, yaml, access = yaml.access } = this.spec;
76
+ // 初始化行参环境变量 > .env (parse-spec require .env)
77
+ (0, lodash_1.each)(this.options.env, (value, key) => {
78
+ process.env[key] = value;
79
+ });
80
+ const { steps: _steps } = this.spec;
81
+ // 参数校验
67
82
  this.validate();
83
+ // 初始化 logger
68
84
  this.glog = this.getLogger();
69
85
  this.logger = this.glog.__generate('engine');
70
- const steps = yield this.download(_steps);
86
+ this.context.steps = yield this.download(_steps);
87
+ });
88
+ }
89
+ // engine应收敛所有的异常，不应该抛出异常
90
+ start() {
91
+ return __awaiter(this, void 0, void 0, function* () {
92
+ this.context.status = types_1.STEP_STATUS.RUNNING;
93
+ try {
94
+ yield this.beforeStart();
95
+ }
96
+ catch (error) {
97
+ this.context.status = types_1.STEP_STATUS.FAILURE;
98
+ this.context.completed = true;
99
+ this.context.error.push(error);
100
+ return this.context;
101
+ }
102
+ const { steps: _steps, yaml, access = yaml.access } = this.spec;
103
+ // 初始化全局的 action
71
104
  this.globalActionInstance = new actions_1.default(yaml.actions, {
72
105
  hookLevel: parse_spec_1.IActionLevel.GLOBAL,
73
106
  logger: this.logger,
107
+ skipActions: this.spec.skipActions,
74
108
  });
75
- const credential = yield (0, utils_1.getCredential)(access);
76
- yield this.globalActionInstance.start(parse_spec_1.IHookType.PRE, { access, credential });
77
- this.context.steps = (0, lodash_1.map)(steps, (item) => {
109
+ const credential = yield (0, utils_1.getCredential)(access, this.logger);
110
+ // 处理 global-pre
111
+ try {
112
+ this.globalActionInstance.setValue('magic', this.getFilterContext());
113
+ yield this.globalActionInstance.start(parse_spec_1.IHookType.PRE, { access, credential });
114
+ }
115
+ catch (error) {
116
+ this.context.error.push(error);
117
+ this.context.status = types_1.STEP_STATUS.FAILURE;
118
+ yield this.doCompleted();
119
+ return this.context;
120
+ }
121
+ this.context.steps = (0, lodash_1.map)(this.context.steps, (item) => {
78
122
  return Object.assign(Object.assign({}, item), { stepCount: (0, lodash_1.uniqueId)(), status: types_1.STEP_STATUS.PENING, done: false });
79
123
  });
80
124
  const res = yield new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
@@ -95,6 +139,7 @@ class Engine {
95
139
  this.context.status = status;
96
140
  yield this.doCompleted();
97
141
  this.context.steps = (0, lodash_1.map)(this.context.steps, (item) => (0, lodash_1.omit)(item, ['instance']));
142
+ this.context.output = this.getOutput();
98
143
  debug(`context: ${(0, utils_1.stringify)(this.context)}`);
99
144
  debug('engine end');
100
145
  resolve(this.context);
@@ -113,24 +158,12 @@ class Engine {
113
158
  invoke: {
114
159
  id: item.stepCount,
115
160
  src: () => __awaiter(this, void 0, void 0, function* () {
116
- // 并行时如果已经执行过，则跳过。
161
+ // 并行时如果已经执行，则跳过。
117
162
  if (item.done)
118
163
  return;
119
164
  this.record.startTime = Date.now();
120
165
  // 记录 context
121
166
  this.recordContext(item, { status: types_1.STEP_STATUS.RUNNING });
122
- // 先判断if条件，成功则执行该步骤。
123
- if (item.if) {
124
- // 替换 failure()
125
- item.if = (0, lodash_1.replace)(item.if, types_1.STEP_IF.FAILURE, this.record.status === types_1.STEP_STATUS.FAILURE ? 'true' : 'false');
126
- // 替换 success()
127
- item.if = (0, lodash_1.replace)(item.if, types_1.STEP_IF.SUCCESS, this.record.status !== types_1.STEP_STATUS.FAILURE ? 'true' : 'false');
128
- // 替换 always()
129
- item.if = (0, lodash_1.replace)(item.if, types_1.STEP_IF.ALWAYS, 'true');
130
- return item.if === 'true'
131
- ? yield Promise.all((0, lodash_1.map)(flowProject, (o) => this.handleSrc(o)))
132
- : yield Promise.all((0, lodash_1.map)(flowProject, (o) => this.doSkip(o)));
133
- }
134
167
  // 检查全局的执行状态，如果是failure，则不执行该步骤, 并记录状态为 skipped
135
168
  if (this.record.status === types_1.STEP_STATUS.FAILURE) {
136
169
  return yield Promise.all((0, lodash_1.map)(flowProject, (o) => this.doSkip(o)));
@@ -158,21 +191,30 @@ class Engine {
158
191
  return res;
159
192
  });
160
193
  }
194
+ getOutput() {
195
+ const output = {};
196
+ (0, lodash_1.each)(this.context.steps, (item) => {
197
+ if (!(0, lodash_1.isEmpty)(item.output)) {
198
+ (0, lodash_1.set)(output, item.projectName, item.output);
199
+ }
200
+ });
201
+ return output;
202
+ }
161
203
  validate() {
162
204
  const { steps, method } = this.spec;
163
- if ((0, lodash_1.isEmpty)(steps)) {
164
- throw new Error('steps is empty');
165
- }
166
- if ((0, lodash_1.isEmpty)(method)) {
167
- throw new Error('method is empty');
168
- }
205
+ (0, assert_1.default)(!(0, lodash_1.isEmpty)(steps), 'steps is required');
206
+ (0, assert_1.default)(method, 'method is required');
169
207
  }
170
208
  download(steps) {
171
209
  return __awaiter(this, void 0, void 0, function* () {
172
210
  const newSteps = [];
173
211
  for (const step of steps) {
174
- const instance = yield (0, load_component_1.default)(step.component, this.glog.__generate(step.projectName));
175
- newSteps.push(Object.assign(Object.assign({}, step), { instance }));
212
+ const logger = this.glog.__generate(step.projectName);
213
+ const instance = yield (0, load_component_1.default)(step.component, {
214
+ logger,
215
+ engineLogger: this.logger,
216
+ });
217
+ newSteps.push(Object.assign(Object.assign({}, step), { instance, logger }));
176
218
  }
177
219
  return newSteps;
178
220
  });
@@ -181,12 +223,12 @@ class Engine {
181
223
  const customLogger = (0, lodash_1.get)(this.options, 'logConfig.customLogger');
182
224
  if (customLogger) {
183
225
  debug('use custom logger');
184
- if (customLogger instanceof logger_1.default) {
226
+ if ((customLogger === null || customLogger === void 0 ? void 0 : customLogger.CODE) === logger_1.default.CODE) {
185
227
  return customLogger;
186
228
  }
187
229
  throw new Error('customLogger must be instance of Logger');
188
230
  }
189
- return new logger_1.default(Object.assign(Object.assign({ traceId: Math.random().toString(16).slice(2), logDir: path_1.default.join(utils.getRootHome(), 'logs') }, this.options.logConfig), { level: (0, lodash_1.get)(this.options, 'logConfig.level', this.spec.debug ? 'DEBUG' : undefined) }));
231
+ return new logger_1.default(Object.assign(Object.assign({ traceId: (0, lodash_1.get)(process.env, 'serverless_devs_trace_id', (0, utils_1.randomId)()), logDir: path_1.default.join(utils.getRootHome(), 'logs') }, this.options.logConfig), { level: (0, lodash_1.get)(this.options, 'logConfig.level', this.spec.debug ? 'DEBUG' : 'INFO') }));
190
232
  }
191
233
  recordContext(item, options = {}) {
192
234
  const { status, error, output, process_time, props, done } = options;
@@ -198,7 +240,7 @@ class Engine {
198
240
  }
199
241
  if (error) {
200
242
  obj.error = error;
201
- this.context.error = error;
243
+ this.context.error.push(error);
202
244
  }
203
245
  if (props) {
204
246
  obj.props = props;
@@ -220,70 +262,123 @@ class Engine {
220
262
  const data = {
221
263
  cwd: path_1.default.dirname(this.spec.yaml.path),
222
264
  vars: this.spec.yaml.vars,
223
- credential: item.credential,
224
265
  };
225
266
  for (const obj of this.context.steps) {
226
- data[obj.projectName] = { output: obj.output || {}, props: obj.props || {} };
267
+ data[obj.projectName] = { output: obj.output || {} };
268
+ }
269
+ if (item) {
270
+ data.credentials = item.credential;
271
+ data.that = {
272
+ name: item.projectName,
273
+ access: item.access,
274
+ component: item.component,
275
+ props: item.props,
276
+ output: data[item.projectName].output,
277
+ };
227
278
  }
228
- data.that = {
229
- name: item.projectName,
230
- access: item.access,
231
- component: item.component,
232
- props: data[item.projectName].props,
233
- output: data[item.projectName].output,
234
- };
235
279
  return data;
236
280
  }
237
281
  doCompleted() {
238
282
  return __awaiter(this, void 0, void 0, function* () {
239
283
  this.context.completed = true;
284
+ if (this.context.status === types_1.STEP_STATUS.FAILURE) {
285
+ try {
286
+ yield this.globalActionInstance.start(parse_spec_1.IHookType.FAIL, this.context);
287
+ }
288
+ catch (error) {
289
+ this.context.status = types_1.STEP_STATUS.FAILURE;
290
+ this.context.error.push(error);
291
+ }
292
+ }
240
293
  if (this.context.status === types_1.STEP_STATUS.SUCCESS) {
241
- yield this.globalActionInstance.start(parse_spec_1.IHookType.SUCCESS, this.context);
294
+ try {
295
+ yield this.globalActionInstance.start(parse_spec_1.IHookType.SUCCESS, this.context);
296
+ }
297
+ catch (error) {
298
+ this.context.status = types_1.STEP_STATUS.FAILURE;
299
+ this.context.error.push(error);
300
+ }
242
301
  }
243
- if (this.context.status === types_1.STEP_STATUS.FAILURE) {
244
- yield this.globalActionInstance.start(parse_spec_1.IHookType.FAIL, this.context);
302
+ try {
303
+ yield this.globalActionInstance.start(parse_spec_1.IHookType.COMPLETE, this.context);
304
+ }
305
+ catch (error) {
306
+ this.context.status = types_1.STEP_STATUS.FAILURE;
307
+ this.context.error.push(error);
245
308
  }
246
- yield this.globalActionInstance.start(parse_spec_1.IHookType.COMPLETE, this.context);
247
309
  });
248
310
  }
249
311
  handleSrc(item) {
250
312
  return __awaiter(this, void 0, void 0, function* () {
251
- this.logger.info(`Start executing project ${item.projectName}`);
313
+ const { method } = this.spec;
314
+ this.logger.write(`⌛ Steps for [${method}] of [${item.projectName}]\n====================`);
252
315
  try {
316
+ // project pre hook and project component
253
317
  yield this.handleAfterSrc(item);
254
- // 项目的output, 再次获取魔法变量
255
- this.actionInstance.setValue('magic', this.getFilterContext(item));
256
- const newInputs = yield this.getProps(item);
257
- yield this.actionInstance.start(parse_spec_1.IHookType.SUCCESS, newInputs);
258
318
  }
259
319
  catch (error) {
260
- const newInputs = yield this.getProps(item);
261
- yield this.actionInstance.start(parse_spec_1.IHookType.FAIL, newInputs);
320
+ // project fail hook
321
+ try {
322
+ const newInputs = yield this.getProps(item);
323
+ const res = yield this.actionInstance.start(parse_spec_1.IHookType.FAIL, newInputs);
324
+ this.recordContext(item, (0, lodash_1.get)(res, 'pluginOutput', {}));
325
+ }
326
+ catch (error) {
327
+ this.record.status = types_1.STEP_STATUS.FAILURE;
328
+ this.recordContext(item, { error });
329
+ }
262
330
  }
263
- finally {
264
- this.recordContext(item, { done: true });
331
+ // 若记录的全局状态为true，则进行输出成功的日志
332
+ if (this.record.status === types_1.STEP_STATUS.SUCCESS) {
333
+ // project success hook
334
+ try {
335
+ // 项目的output, 再次获取魔法变量
336
+ this.actionInstance.setValue('magic', this.getFilterContext(item));
337
+ const newInputs = yield this.getProps(item);
338
+ const res = yield this.actionInstance.start(parse_spec_1.IHookType.SUCCESS, Object.assign(Object.assign({}, newInputs), { output: (0, lodash_1.get)(item, 'output', {}) }));
339
+ this.recordContext(item, (0, lodash_1.get)(res, 'pluginOutput', {}));
340
+ }
341
+ catch (error) {
342
+ this.record.status = types_1.STEP_STATUS.FAILURE;
343
+ this.recordContext(item, { error });
344
+ }
345
+ }
346
+ // project complete hook
347
+ try {
265
348
  const newInputs = yield this.getProps(item);
266
- yield this.actionInstance.start(parse_spec_1.IHookType.COMPLETE, newInputs);
349
+ const res = yield this.actionInstance.start(parse_spec_1.IHookType.COMPLETE, Object.assign(Object.assign({}, newInputs), { output: (0, lodash_1.get)(item, 'output', {}) }));
350
+ this.recordContext(item, (0, lodash_1.get)(res, 'pluginOutput', {}));
267
351
  }
268
- // 若记录的全局状态为true，则进行输出成功的日志
269
- this.record.status === types_1.STEP_STATUS.SUCCESS &&
270
- this.logger.info(`Project ${item.projectName} successfully to execute`);
352
+ catch (error) {
353
+ this.record.status = types_1.STEP_STATUS.FAILURE;
354
+ this.recordContext(item, { error, done: true });
355
+ }
356
+ if (this.record.status === types_1.STEP_STATUS.SUCCESS) {
357
+ this.logger.debug(`Project ${item.projectName} successfully to execute`);
358
+ }
359
+ // const msg = `${this.record.status === STEP_STATUS.SUCCESS ? '🚀' : chalk.red('✖')} Result for [${method}] of [${item.projectName}]\n====================`;;
360
+ // this.logger.write(msg);
271
361
  });
272
362
  }
273
363
  handleAfterSrc(item) {
274
364
  return __awaiter(this, void 0, void 0, function* () {
275
365
  try {
276
366
  debug(`project item: ${(0, utils_1.stringify)(item)}`);
277
- item.credential = yield (0, utils_1.getCredential)(item.access);
367
+ item.credential = yield (0, utils_1.getCredential)(item.access, this.logger);
368
+ (0, lodash_1.each)(item.credential, (v) => {
369
+ this.glog.__setSecret([v]);
370
+ });
278
371
  const newAction = this.parseSpecInstance.parseActions(item.actions, parse_spec_1.IActionLevel.PROJECT);
279
372
  debug(`project actions: ${JSON.stringify(newAction)}`);
280
373
  this.actionInstance = new actions_1.default(newAction, {
281
374
  hookLevel: parse_spec_1.IActionLevel.PROJECT,
282
375
  projectName: item.projectName,
283
- logger: this.logger,
376
+ logger: item.logger,
377
+ skipActions: this.spec.skipActions,
284
378
  });
285
- this.actionInstance.setValue('magic', this.getFilterContext(item));
286
379
  const newInputs = yield this.getProps(item);
380
+ item.props = (0, lodash_1.get)(newInputs, 'props', {});
381
+ this.actionInstance.setValue('magic', this.getFilterContext(item));
287
382
  const pluginResult = yield this.actionInstance.start(parse_spec_1.IHookType.PRE, newInputs);
288
383
  const response = yield this.doSrc(item, pluginResult);
289
384
  // 记录全局的执行状态
@@ -333,16 +428,24 @@ class Engine {
333
428
  debug(`magic context: ${JSON.stringify(magic)}`);
334
429
  const newInputs = (0, parse_spec_1.getInputs)(item.props, magic);
335
430
  const { projectName, method } = this.spec;
336
- // TODO: inputs数据
337
431
  const result = {
432
+ cwd: this.options.cwd,
338
433
  props: newInputs,
339
- method,
340
- yaml: this.spec.yaml,
341
- projectName: item.projectName,
342
- access: item.access,
343
- component: item.component,
344
- credential: new credential_1.default(),
434
+ command: method,
345
435
  args: (0, lodash_1.filter)(this.options.args, (o) => !(0, lodash_1.includes)([projectName, method], o)),
436
+ yaml: {
437
+ path: this.spec.yaml.path,
438
+ },
439
+ resource: {
440
+ name: item.projectName,
441
+ component: item.component,
442
+ access: item.access,
443
+ },
444
+ outputs: this.getOutput(),
445
+ getCredential: () => __awaiter(this, void 0, void 0, function* () {
446
+ const res = yield new credential_1.default({ logger: this.logger }).get(item.access);
447
+ return (0, lodash_1.get)(res, 'credential', {});
448
+ }),
346
449
  };
347
450
  this.recordContext(item, { props: newInputs });
348
451
  debug(`get props: ${JSON.stringify(result)}`);
@@ -363,12 +466,32 @@ class Engine {
363
466
  try {
364
467
  return yield item.instance[method](componentProps);
365
468
  }
366
- catch (error) {
367
- (0, utils_1.throw101Error)(error, `Project ${item.projectName} failed to execute:`);
469
+ catch (e) {
470
+ const useAllowFailure = (0, utils_1.getAllowFailure)(item.allow_failure, {
471
+ exitCode: constants_1.EXIT_CODE.COMPONENT,
472
+ command: method,
473
+ });
474
+ if (useAllowFailure)
475
+ return;
476
+ const error = e;
477
+ throw new utils_2.TipsError(error.message, {
478
+ exitCode: constants_1.EXIT_CODE.COMPONENT,
479
+ prefix: `Project ${item.projectName} failed to execute:`,
480
+ });
368
481
  }
369
482
  }
483
+ const useAllowFailure = (0, utils_1.getAllowFailure)(item.allow_failure, {
484
+ exitCode: constants_1.EXIT_CODE.DEVS,
485
+ command: method,
486
+ });
487
+ if (useAllowFailure)
488
+ return;
370
489
  // 方法不存在，此时系统将会认为是未找到组件方法，系统的exit code为100；
371
- (0, utils_1.throw100Error)(`The [${method}] command was not found.`, `Please check the component ${item.component} has the ${method} method. Serverless Devs documents：${chalk_1.default.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')}`);
490
+ throw new utils_2.TipsError(`The [${method}] command was not found.`, {
491
+ exitCode: constants_1.EXIT_CODE.DEVS,
492
+ tips: `Please check the component ${item.component} has the ${method} method. Serverless Devs documents：${chalk_1.default.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')}`,
493
+ prefix: `Project ${item.projectName} failed to execute:`,
494
+ });
372
495
  }
373
496
  // 应用级操作
374
497
  if ((0, lodash_1.isFunction)(item.instance[method])) {
@@ -376,12 +499,22 @@ class Engine {
376
499
  try {
377
500
  return yield item.instance[method](componentProps);
378
501
  }
379
- catch (error) {
380
- (0, utils_1.throw101Error)(error, `Project ${item.projectName} failed to execute:`);
502
+ catch (e) {
503
+ const useAllowFailure = (0, utils_1.getAllowFailure)(item.allow_failure, {
504
+ exitCode: constants_1.EXIT_CODE.COMPONENT,
505
+ command: method,
506
+ });
507
+ if (useAllowFailure)
508
+ return;
509
+ const error = e;
510
+ throw new utils_2.TipsError(error.message, {
511
+ exitCode: constants_1.EXIT_CODE.COMPONENT,
512
+ prefix: `Project ${item.projectName} failed to execute:`,
513
+ });
381
514
  }
382
515
  }
383
516
  // 方法不存在，进行警告，但是并不会报错，最终的exit code为0；
384
- (0, utils_1.throwError)(`The [${method}] command was not found.`, `Please check the component ${item.component} has the ${method} method. Serverless Devs documents：https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command`);
517
+ this.logger.tips(`The [${method}] command was not found.`, `Please check the component ${item.component} has the ${method} method. Serverless Devs documents：https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command`);
385
518
  });
386
519
  }
387
520
  doSkip(item) {
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -1,9 +1,12 @@
1
+ /// <reference types="node" />
1
2
  import { IStep } from '@serverless-devs/parse-spec';
2
3
  import { IOptions as ILogConfig } from '@serverless-devs/logger/lib/type';
3
- import Logger from '@serverless-devs/logger';
4
+ import Logger, { ILoggerInstance } from '@serverless-devs/logger';
5
+ import { AssertionError } from 'assert';
6
+ import { TipsError } from '@serverless-devs/utils';
4
7
  export interface IEngineOptions {
5
- args: string[];
6
- yamlPath?: string;
8
+ args?: string[];
9
+ template?: string;
7
10
  env?: Record<string, string>;
8
11
  cwd?: string;
9
12
  logConfig?: EngineLogger;
@@ -12,6 +15,7 @@ export type EngineLogger = Partial<ILogConfig> & {
12
15
  customLogger?: Logger;
13
16
  };
14
17
  export type IStepOptions = IStep & {
18
+ logger: ILoggerInstance;
15
19
  instance?: any;
16
20
  id?: string;
17
21
  if?: string;
@@ -63,6 +67,8 @@ export interface IContext {
63
67
  status: IStatus;
64
68
  completed: boolean;
65
69
  inputs: Record<string, any>;
66
- error: Error;
70
+ error: IEngineError[];
71
+ output: Record<string, any>;
67
72
  }
73
+ export type IEngineError = Error | AssertionError | TipsError;
68
74
  export {};
package/lib/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA+BA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,gCAAqB,CAAA;IACrB,gCAAqB,CAAA;IACrB,8BAAmB,CAAA;AACrB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,sCAAkB,CAAA;IAClB,+DAA2C,CAAA;AAC7C,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAID,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACnB,oCAAgB,CAAA;AAClB,CAAC,EAFI,gBAAgB,KAAhB,gBAAgB,QAEpB;AAEY,QAAA,WAAW,mCAAQ,gBAAgB,GAAK,gBAAgB,EAAG"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAkCA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,gCAAqB,CAAA;IACrB,gCAAqB,CAAA;IACrB,8BAAmB,CAAA;AACrB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,sCAAkB,CAAA;IAClB,+DAA2C,CAAA;AAC7C,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAID,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACnB,oCAAgB,CAAA;AAClB,CAAC,EAFI,gBAAgB,KAAhB,gBAAgB,QAEpB;AAEY,QAAA,WAAW,mCAAQ,gBAAgB,GAAK,gBAAgB,EAAG"}
package/lib/utils/index.d.ts CHANGED
@@ -1,7 +1,11 @@
1
+ import { ILoggerInstance } from '@serverless-devs/logger';
2
+ import { IAllowFailure } from '@serverless-devs/parse-spec';
1
3
  export declare function getLogPath(filePath: string): string;
4
+ export declare const randomId: () => string;
2
5
  export declare function getProcessTime(time: number): number;
3
- export declare function throw101Error(error: Error, prefix: string): void;
4
- export declare function throw100Error(message: string, tips?: string): void;
5
- export declare function throwError(message: string, tips?: string): void;
6
- export declare function getCredential(access?: string): Promise<Record<string, string>>;
6
+ export declare function getCredential(access: string | undefined, logger: ILoggerInstance): Promise<Record<string, string>>;
7
7
  export declare const stringify: (value: any) => string;
8
+ export declare const getAllowFailure: (allowFailure: boolean | IAllowFailure | undefined, data: {
9
+ exitCode?: number;
10
+ command?: string;
11
+ }) => boolean;
package/lib/utils/index.js CHANGED
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.stringify = exports.getCredential = exports.throwError = exports.throw100Error = exports.throw101Error = exports.getProcessTime = exports.getLogPath = void 0;
15
+ exports.getAllowFailure = exports.stringify = exports.getCredential = exports.getProcessTime = exports.randomId = exports.getLogPath = void 0;
16
16
  const credential_1 = __importDefault(require("@serverless-devs/credential"));
17
17
  const flatted_1 = __importDefault(require("flatted"));
18
18
  const lodash_1 = require("lodash");
@@ -20,44 +20,16 @@ function getLogPath(filePath) {
20
20
  return `step_${filePath}.log`;
21
21
  }
22
22
  exports.getLogPath = getLogPath;
23
+ const randomId = () => Math.random().toString(16).slice(2);
24
+ exports.randomId = randomId;
23
25
  function getProcessTime(time) {
24
26
  return (Math.round((Date.now() - time) / 10) * 10) / 1000;
25
27
  }
26
28
  exports.getProcessTime = getProcessTime;
27
- function throw101Error(error, prefix) {
28
- let jsonMsg;
29
- try {
30
- jsonMsg = JSON.parse(error.message);
31
- }
32
- catch (error) { }
33
- if (jsonMsg && jsonMsg.tips) {
34
- throw new Error(JSON.stringify({
35
- code: 101,
36
- message: jsonMsg.message,
37
- tips: jsonMsg.tips,
38
- prefix,
39
- }));
40
- }
41
- throw new Error(JSON.stringify({
42
- code: 101,
43
- message: error.message,
44
- stack: error.stack,
45
- prefix,
46
- }));
47
- }
48
- exports.throw101Error = throw101Error;
49
- function throw100Error(message, tips) {
50
- throw new Error(JSON.stringify({ code: 100, message, tips }));
51
- }
52
- exports.throw100Error = throw100Error;
53
- function throwError(message, tips) {
54
- throw new Error(JSON.stringify({ message, tips }));
55
- }
56
- exports.throwError = throwError;
57
- function getCredential(access) {
29
+ function getCredential(access, logger) {
58
30
  return __awaiter(this, void 0, void 0, function* () {
59
31
  try {
60
- const instance = new credential_1.default();
32
+ const instance = new credential_1.default({ logger });
61
33
  const res = yield instance.get(access);
62
34
  return (0, lodash_1.get)(res, 'credential', {});
63
35
  }
@@ -85,4 +57,23 @@ const stringify = (value) => {
85
57
  }
86
58
  };
87
59
  exports.stringify = stringify;
60
+ const getAllowFailure = (allowFailure, data) => {
61
+ if (!allowFailure)
62
+ return false;
63
+ if (typeof allowFailure === 'boolean') {
64
+ return allowFailure;
65
+ }
66
+ if ('exitCode' in data && 'command' in data) {
67
+ return ((0, lodash_1.includes)((0, lodash_1.get)(allowFailure, 'exit_code'), (0, lodash_1.get)(data, 'exitCode')) &&
68
+ (0, lodash_1.includes)((0, lodash_1.get)(allowFailure, 'command'), (0, lodash_1.get)(data, 'command')));
69
+ }
70
+ if ('exitCode' in data) {
71
+ return (0, lodash_1.includes)((0, lodash_1.get)(allowFailure, 'exit_code'), (0, lodash_1.get)(data, 'exitCode'));
72
+ }
73
+ if ('command' in data) {
74
+ return (0, lodash_1.includes)((0, lodash_1.get)(allowFailure, 'command'), (0, lodash_1.get)(data, 'command'));
75
+ }
76
+ return false;
77
+ };
78
+ exports.getAllowFailure = getAllowFailure;
88
79
  //# sourceMappingURL=index.js.map
package/lib/utils/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serverless-devs/engine",
3
- "version": "0.0.1-beta.1",
3
+ "version": "0.0.1-beta.10",
4
4
  "description": "request for serverless-devs",
5
5
  "main": "lib/index.js",
6
6
  "author": "xsahxl",
@@ -18,11 +18,11 @@
18
18
  "lodash": "^4.17.21",
19
19
  "string-argv": "^0.3.2",
20
20
  "xstate": "^4.37.2",
21
- "@serverless-devs/logger": "^0.0.1",
22
- "@serverless-devs/load-component": "^0.0.1-beta.1",
23
- "@serverless-devs/credential": "^0.0.2",
24
- "@serverless-devs/utils": "^0.0.7",
25
- "@serverless-devs/parse-spec": "^0.0.1-beta.1"
21
+ "@serverless-devs/credential": "^0.0.2-beta.1",
22
+ "@serverless-devs/logger": "^0.0.2-beta.3",
23
+ "@serverless-devs/load-component": "^0.0.2-beta.3",
24
+ "@serverless-devs/parse-spec": "^0.0.1-beta.6",
25
+ "@serverless-devs/utils": "^0.0.8-beta.2"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@types/fs-extra": "^11.0.1",
@@ -30,6 +30,7 @@
30
30
  },
31
31
  "scripts": {
32
32
  "clean": "rimraf lib node_modules",
33
+ "watch": "tsc -w",
33
34
  "build": "tsc"
34
35
  }
35
36
  }