@stuntman/server 0.1.11 → 0.2.0
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/api/api.js +1 -1
- package/dist/api/api.js.map +1 -1
- package/dist/api/utils.d.ts.map +1 -1
- package/dist/api/utils.js.map +1 -1
- package/dist/api/validators.d.ts.map +1 -1
- package/dist/api/validators.js +8 -5
- package/dist/api/validators.js.map +1 -1
- package/dist/ipUtils.js +1 -1
- package/dist/ipUtils.js.map +1 -1
- package/dist/mock.d.ts.map +1 -1
- package/dist/mock.js +3 -3
- package/dist/mock.js.map +1 -1
- package/dist/ruleExecutor.d.ts +1 -1
- package/dist/ruleExecutor.d.ts.map +1 -1
- package/dist/ruleExecutor.js +8 -3
- package/dist/ruleExecutor.js.map +1 -1
- package/dist/rules/index.d.ts +1 -1
- package/dist/rules/index.d.ts.map +1 -1
- package/dist/rules/index.js +4 -67
- package/dist/rules/index.js.map +1 -1
- package/dist/rules/loadRules.d.ts +4 -0
- package/dist/rules/loadRules.d.ts.map +1 -0
- package/dist/rules/loadRules.js +78 -0
- package/dist/rules/loadRules.js.map +1 -0
- package/package.json +2 -2
- package/src/api/api.ts +2 -2
- package/src/api/utils.ts +2 -2
- package/src/api/validators.ts +13 -6
- package/src/ipUtils.ts +2 -2
- package/src/mock.ts +7 -4
- package/src/ruleExecutor.ts +13 -6
- package/src/rules/index.ts +3 -42
- package/src/rules/loadRules.ts +54 -0
package/dist/api/api.js
CHANGED
|
@@ -129,7 +129,7 @@ class API {
|
|
|
129
129
|
});
|
|
130
130
|
return;
|
|
131
131
|
}
|
|
132
|
-
shared_1.logger.error({
|
|
132
|
+
shared_1.logger.error({ error: (0, shared_1.errorToLog)(error), uuid }, 'unexpected error');
|
|
133
133
|
if (res) {
|
|
134
134
|
res.status(shared_1.HttpCode.INTERNAL_SERVER_ERROR).json({
|
|
135
135
|
error: { message: error.message, httpCode: shared_1.HttpCode.INTERNAL_SERVER_ERROR, uuid },
|
package/dist/api/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":";;;;;;AACA,sDAA6F;AAC7F,+BAAoC;AACpC,wCAA6C;AAC7C,kDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":"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"}
|
package/dist/api/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAKlD,eAAO,MAAM,eAAe,mBAAoB,SAAS,cAAc,KAAG,SAAS,IAgDlF,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,GAAG,WAC2D,CAAC;AAErG,eAAO,MAAM,cAAc,aAAc,SAAS,QAAQ,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAKlD,eAAO,MAAM,eAAe,mBAAoB,SAAS,cAAc,KAAG,SAAS,IAgDlF,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,GAAG,WAC2D,CAAC;AAErG,eAAO,MAAM,cAAc,aAAc,SAAS,QAAQ,KAAG,SAAS,IASrE,CAAC"}
|
package/dist/api/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gFAAuD;AAEvD,6CAA0C;AAC1C,6CAAgE;AAEhE,OAAO;AACA,MAAM,eAAe,GAAG,CAAC,cAAuC,EAAiB,EAAE;IACtF,eAAM,CAAC,KAAK,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC;IAC5D,IAAA,6CAAgC,EAAC,cAAc,CAAC,CAAC;IACjD,MAAM,IAAI,GAAkB;QACxB,EAAE,EAAE,cAAc,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC,GAAqB,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC;QAClG,UAAU,EAAE,cAAc,CAAC,UAAU;QACrC,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAC1C,GAAG,CAAC,cAAc,CAAC,eAAe,KAAK,SAAS,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC;QACxG,GAAG,CAAC,cAAc,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,cAAc,EAAE,CAAC;QACrG,GAAG,CAAC,cAAc,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;QAC7E,GAAG,CAAC,cAAc,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC;QACnF,GAAG,CAAC,cAAc,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;QACtF,GAAG,CAAC,cAAc,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,YAAY,EAAE,CAAC;KAClG,CAAC;IACF,0FAA0F;IAC1F,IAAI,cAAc,CAAC,OAAO,CAAC,YAAY,EAAE;QACrC,IAAI,CAAC,OAAO,GAAG;YACX,YAAY,EACR,UAAU,IAAI,cAAc,CAAC,OAAO,CAAC,YAAY;gBAC7C,CAAC,CAAC,CAAC,GAAqB,EAAE,EAAE,CACtB,IAAI,QAAQ,CACR,UAAU,EACT,cAAc,CAAC,OAAO,CAAC,YAAqD,CAAC,QAAQ,CACzF,CAAC,GAAG,CAAC;gBACZ,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY;SAChD,CAAC;KACL;SAAM;QACH,IAAI,CAAC,OAAO,GAAG;YACX,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,IAAI;gBACxC,aAAa,EAAE,CAAC,CAAC,GAAqB,EAAE,EAAE,CACtC,IAAI,QAAQ,CACR,UAAU,EACT,cAAc,CAAC,OAAO,CAAC,aAAsD,CAAC,QAAQ,CAC1F,CAAC,GAAG,CAAC,CAAmC;aAChD,CAAC;YACF,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,IAAI;gBACzC,cAAc,EAAE,CAAC,CAAC,GAAqB,EAAE,GAAsB,EAAE,EAAE,CAC/D,IAAI,QAAQ,CACR,UAAU,EACV,UAAU,EACT,cAAc,CAAC,OAAO,CAAC,cAAuD,CAAC,QAAQ,CAC3F,CAAC,GAAG,EAAE,GAAG,CAAC,CAAoC;aACtD,CAAC;SACe,CAAC;KACzB;IACD,eAAM,CAAC,KAAK,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAhDW,QAAA,eAAe,mBAgD1B;AAEK,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,EAAE,CACzC,IAAA,8BAAmB,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;AADxF,QAAA,gBAAgB,oBACwE;AAE9F,MAAM,cAAc,GAAG,CAAC,QAA2B,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/api/validators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAElD,eAAO,MAAM,gCAAgC,SAAU,SAAS,cAAc,KAAG,
|
|
1
|
+
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/api/validators.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAElD,eAAO,MAAM,gCAAgC,SAAU,SAAS,cAAc,KAAG,IAkIhF,CAAC;AAEF,eAAO,MAAM,wBAAwB,qBAAsB,SAAS,IAAI,SA2BvE,CAAC"}
|
package/dist/api/validators.js
CHANGED
|
@@ -53,7 +53,8 @@ const validateSerializedRuleProperties = (rule) => {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
if (typeof rule.actions.mockResponse.rawHeaders !== 'undefined' &&
|
|
56
|
-
(
|
|
56
|
+
(typeof rule.actions.mockResponse.rawHeaders === 'string' ||
|
|
57
|
+
!Array.isArray(rule.actions.mockResponse.rawHeaders) ||
|
|
57
58
|
rule.actions.mockResponse.rawHeaders.length % 2 !== 0 ||
|
|
58
59
|
rule.actions.mockResponse.rawHeaders.some((header) => typeof header !== 'string'))) {
|
|
59
60
|
throw new shared_1.AppError({
|
|
@@ -66,10 +67,12 @@ const validateSerializedRuleProperties = (rule) => {
|
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
if (typeof rule.actions.modifyRequest !== 'undefined' &&
|
|
70
|
+
if (typeof rule.actions.modifyRequest !== 'undefined' &&
|
|
71
|
+
(typeof rule.actions.modifyRequest.remoteFn !== 'string' || !rule.actions.modifyRequest.remoteFn.trim())) {
|
|
70
72
|
throw new shared_1.AppError({ httpCode: shared_1.HttpCode.BAD_REQUEST, message: 'invalid rule.actions.modifyRequest' });
|
|
71
73
|
}
|
|
72
|
-
if (typeof rule.actions.modifyResponse !== 'undefined' &&
|
|
74
|
+
if (typeof rule.actions.modifyResponse !== 'undefined' &&
|
|
75
|
+
(typeof rule.actions.modifyResponse.remoteFn !== 'string' || !rule.actions.modifyResponse.remoteFn.trim())) {
|
|
73
76
|
throw new shared_1.AppError({ httpCode: shared_1.HttpCode.BAD_REQUEST, message: 'invalid rule.actions.modifyResponse' });
|
|
74
77
|
}
|
|
75
78
|
if (typeof rule.disableAfterUse !== 'undefined' &&
|
|
@@ -83,7 +86,7 @@ const validateSerializedRuleProperties = (rule) => {
|
|
|
83
86
|
throw new shared_1.AppError({ httpCode: shared_1.HttpCode.BAD_REQUEST, message: 'invalid rule.removeAfterUse' });
|
|
84
87
|
}
|
|
85
88
|
if (typeof rule.labels !== 'undefined' &&
|
|
86
|
-
(!Array.isArray(rule.labels) || rule.labels.some((label) => typeof label !== 'string'))) {
|
|
89
|
+
(typeof rule.labels !== 'object' || !Array.isArray(rule.labels) || rule.labels.some((label) => typeof label !== 'string'))) {
|
|
87
90
|
throw new shared_1.AppError({ httpCode: shared_1.HttpCode.BAD_REQUEST, message: 'invalid rule.labels' });
|
|
88
91
|
}
|
|
89
92
|
if (rule.actions.mockResponse && rule.actions.modifyResponse) {
|
|
@@ -122,7 +125,7 @@ const validateDeserializedRule = (deserializedRule) => {
|
|
|
122
125
|
});
|
|
123
126
|
}
|
|
124
127
|
catch (error) {
|
|
125
|
-
shared_1.logger.error({ ruleId: deserializedRule.id }, error);
|
|
128
|
+
shared_1.logger.error({ ruleId: deserializedRule.id, error: (0, shared_1.errorToLog)(error) }, 'match function threw an error');
|
|
126
129
|
throw new shared_1.AppError({
|
|
127
130
|
httpCode: shared_1.HttpCode.UNPROCESSABLE_ENTITY,
|
|
128
131
|
message: 'match function threw an error',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/api/validators.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/api/validators.ts"],"names":[],"mappings":"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"}
|
package/dist/ipUtils.js
CHANGED
|
@@ -59,7 +59,7 @@ class IPUtils {
|
|
|
59
59
|
return new Promise((resolve, reject) => {
|
|
60
60
|
const callback = (error, addresses) => {
|
|
61
61
|
if (error) {
|
|
62
|
-
shared_1.logger.debug({ error, hostname }, 'error resolving hostname');
|
|
62
|
+
shared_1.logger.debug({ error: (0, shared_1.errorToLog)(error), hostname }, 'error resolving hostname');
|
|
63
63
|
reject(error);
|
|
64
64
|
return;
|
|
65
65
|
}
|
package/dist/ipUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipUtils.js","sourceRoot":"","sources":["../src/ipUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAAuC;AACvC,qDAAwD;AACxD,uCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"ipUtils.js","sourceRoot":"","sources":["../src/ipUtils.ts"],"names":[],"mappings":"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"}
|
package/dist/mock.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":";;AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAQhC,qBAAa,IAAI;IACb,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAQ;IACjD,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5D,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAQ;IACzC,OAAO,CAAC,IAAI,CAAoB;IAEhC,IAAI,SAAS,eAQZ;IAED,IAAW,YAAY,IAAI,QAAQ,CAAC,qBAAqB,CAExD;gBAEW,OAAO,EAAE,QAAQ,CAAC,MAAM;YA4BtB,cAAc;IAqI5B,IAAI;YA+BU,YAAY;
|
|
1
|
+
{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":";;AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAQhC,qBAAa,IAAI;IACb,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAQ;IACjD,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAQ;IAC5C,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5D,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAQ;IACzC,OAAO,CAAC,IAAI,CAAoB;IAEhC,IAAI,SAAS,eAQZ;IAED,IAAW,YAAY,IAAI,QAAQ,CAAC,qBAAqB,CAExD;gBAEW,OAAO,EAAE,QAAQ,CAAC,MAAM;YA4BtB,cAAc;IAqI5B,IAAI;YA+BU,YAAY;IAqDnB,KAAK;IA6BL,IAAI;IAaX,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,WAAW;IAepE,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,GAAG,IAAI;CAYzD"}
|
package/dist/mock.js
CHANGED
|
@@ -120,7 +120,7 @@ class Mock {
|
|
|
120
120
|
}
|
|
121
121
|
catch (error) {
|
|
122
122
|
// swallow the exeception, don't think much can be done at this point
|
|
123
|
-
shared_1.logger.warn({ ...logContext, error }, `error trying to resolve IP for "${hostname}"`);
|
|
123
|
+
shared_1.logger.warn({ ...logContext, error: (0, shared_1.errorToLog)(error) }, `error trying to resolve IP for "${hostname}"`);
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
const originalResponse = this.options.mock.disableProxy
|
|
@@ -183,7 +183,7 @@ class Mock {
|
|
|
183
183
|
this.mockApp.use((error, req, res) => {
|
|
184
184
|
const ctx = requestContext_1.default.get(req);
|
|
185
185
|
const uuid = (ctx === null || ctx === void 0 ? void 0 : ctx.uuid) || (0, uuid_1.v4)();
|
|
186
|
-
shared_1.logger.error({
|
|
186
|
+
shared_1.logger.error({ error: (0, shared_1.errorToLog)(error), uuid }, 'unexpected error');
|
|
187
187
|
if (res) {
|
|
188
188
|
res.status(shared_1.HttpCode.INTERNAL_SERVER_ERROR).json({
|
|
189
189
|
error: { message: error.message, httpCode: shared_1.HttpCode.INTERNAL_SERVER_ERROR, uuid },
|
|
@@ -224,7 +224,7 @@ class Mock {
|
|
|
224
224
|
targetResponse = await (0, undici_1.request)(mockEntry.modifiedRequest.url, requestOptions);
|
|
225
225
|
}
|
|
226
226
|
catch (error) {
|
|
227
|
-
shared_1.logger.error({ ...logContext, error, request: mockEntry.modifiedRequest }, 'error fetching');
|
|
227
|
+
shared_1.logger.error({ ...logContext, error: (0, shared_1.errorToLog)(error), request: mockEntry.modifiedRequest }, 'error fetching');
|
|
228
228
|
throw error;
|
|
229
229
|
}
|
|
230
230
|
finally {
|
package/dist/mock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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"}
|
package/dist/ruleExecutor.d.ts
CHANGED
|
@@ -18,6 +18,6 @@ declare class RuleExecutor implements Stuntman.RuleExecutorInterface {
|
|
|
18
18
|
getRules(): Promise<readonly Stuntman.LiveRule[]>;
|
|
19
19
|
getRule(id: string): Promise<Stuntman.LiveRule | undefined>;
|
|
20
20
|
}
|
|
21
|
-
export declare const getRuleExecutor: (mockUuid: string) => RuleExecutor;
|
|
21
|
+
export declare const getRuleExecutor: (mockUuid: string, overrideRules?: Stuntman.DeployedRule[]) => RuleExecutor;
|
|
22
22
|
export {};
|
|
23
23
|
//# sourceMappingURL=ruleExecutor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleExecutor.d.ts","sourceRoot":"","sources":["../src/ruleExecutor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAclD,cAAM,YAAa,YAAW,QAAQ,CAAC,qBAAqB;IAExD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,SAAS,CAAmB;IAEpC,OAAO,KAAK,YAAY,GAQvB;gBAEW,KAAK,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE;IAInC,OAAO,CAAC,UAAU;YAKJ,cAAc;IAmBtB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAmBnF,OAAO,CAAC,WAAW;IAUb,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACrC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAC5B,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI;IAYrC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAC7B,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI;IAWhC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ruleExecutor.d.ts","sourceRoot":"","sources":["../src/ruleExecutor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAclD,cAAM,YAAa,YAAW,QAAQ,CAAC,qBAAqB;IAExD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,SAAS,CAAmB;IAEpC,OAAO,KAAK,YAAY,GAQvB;gBAEW,KAAK,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE;IAInC,OAAO,CAAC,UAAU;YAKJ,cAAc;IAmBtB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAmBnF,OAAO,CAAC,WAAW;IAUb,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACrC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAC5B,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI;IAYrC,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAC7B,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI;IAWhC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC;IAqE9E,QAAQ,IAAI,OAAO,CAAC,SAAS,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAKjD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC;CAIpE;AAED,eAAO,MAAM,eAAe,aAAc,MAAM,kBAAkB,SAAS,YAAY,EAAE,KAAG,YAW3F,CAAC"}
|
package/dist/ruleExecutor.js
CHANGED
|
@@ -125,7 +125,7 @@ class RuleExecutor {
|
|
|
125
125
|
return matchResult.result;
|
|
126
126
|
}
|
|
127
127
|
catch (error) {
|
|
128
|
-
shared_1.logger.error({ ...logContext, ruleId: rule.id, error }, 'error in rule match function');
|
|
128
|
+
shared_1.logger.error({ ...logContext, ruleId: rule.id, error: (0, shared_1.errorToLog)(error) }, 'error in rule match function');
|
|
129
129
|
}
|
|
130
130
|
return undefined;
|
|
131
131
|
});
|
|
@@ -180,9 +180,14 @@ class RuleExecutor {
|
|
|
180
180
|
return this._rules.find((r) => r.id === id);
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
|
-
const getRuleExecutor = (mockUuid) => {
|
|
183
|
+
const getRuleExecutor = (mockUuid, overrideRules) => {
|
|
184
184
|
if (!ruleExecutors[mockUuid]) {
|
|
185
|
-
|
|
185
|
+
if (overrideRules === null) {
|
|
186
|
+
ruleExecutors[mockUuid] = new RuleExecutor();
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
ruleExecutors[mockUuid] = new RuleExecutor((overrideRules !== null && overrideRules !== void 0 ? overrideRules : [...rules_1.DEFAULT_RULES, ...rules_1.CUSTOM_RULES]).map((r) => ({ ...r, ttlSeconds: Infinity })));
|
|
190
|
+
}
|
|
186
191
|
}
|
|
187
192
|
return ruleExecutors[mockUuid];
|
|
188
193
|
};
|
package/dist/ruleExecutor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ruleExecutor.js","sourceRoot":"","sources":["../src/ruleExecutor.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"ruleExecutor.js","sourceRoot":"","sources":["../src/ruleExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/rules/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAgB,CAAC"}
|
package/dist/rules/index.js
CHANGED
|
@@ -1,71 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
3
|
exports.CUSTOM_RULES = exports.DEFAULT_RULES = void 0;
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const echo_1 = require("./echo");
|
|
35
|
-
const shared_1 = require("@stuntman/shared");
|
|
36
|
-
exports.DEFAULT_RULES = [catchAll_1.catchAllRule, echo_1.echoRule];
|
|
37
|
-
exports.CUSTOM_RULES = [];
|
|
38
|
-
const loadAdditionalRules = () => {
|
|
39
|
-
if (!shared_1.stuntmanConfig.mock.rulesPath || !fs_1.default.existsSync(shared_1.stuntmanConfig.mock.rulesPath)) {
|
|
40
|
-
shared_1.logger.debug({ rulesPath: shared_1.stuntmanConfig.mock.rulesPath }, `additional rules directory not found`);
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
shared_1.logger.debug({ rulesPath: shared_1.stuntmanConfig.mock.rulesPath }, `loading additional rules`);
|
|
44
|
-
const filePaths = glob_1.default.sync('*.[tj]s', { absolute: true, cwd: shared_1.stuntmanConfig.mock.rulesPath });
|
|
45
|
-
for (const filePath of filePaths) {
|
|
46
|
-
// TODO add .ts rule support
|
|
47
|
-
try {
|
|
48
|
-
const loadedFile = /\.js$/.test(filePath) ? require(filePath) : tsImport.loadSync(filePath);
|
|
49
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
50
|
-
const exportedRules = Object.values(loadedFile).filter((rule) => {
|
|
51
|
-
if (!rule || !rule.id || typeof rule.matches !== 'function') {
|
|
52
|
-
shared_1.logger.error({ filePath, rule }, 'invalid exported rule');
|
|
53
|
-
return false;
|
|
54
|
-
}
|
|
55
|
-
return true;
|
|
56
|
-
});
|
|
57
|
-
exports.CUSTOM_RULES.push(...exportedRules);
|
|
58
|
-
}
|
|
59
|
-
catch (error) {
|
|
60
|
-
shared_1.logger.error({ filePath, error }, 'error importing rule');
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
const ruleIds = [...exports.DEFAULT_RULES, ...exports.CUSTOM_RULES].map((rule) => rule.id);
|
|
64
|
-
const duplicatedRuleIds = ruleIds.filter((currentValue, currentIndex) => ruleIds.indexOf(currentValue) !== currentIndex);
|
|
65
|
-
if (duplicatedRuleIds.length > 0) {
|
|
66
|
-
shared_1.logger.error({ duplicatedRuleIds }, 'duplicated rule ids');
|
|
67
|
-
throw new Error('duplicated rule ids');
|
|
68
|
-
}
|
|
69
|
-
};
|
|
70
|
-
loadAdditionalRules();
|
|
4
|
+
const loadRules_1 = require("./loadRules");
|
|
5
|
+
var loadRules_2 = require("./loadRules");
|
|
6
|
+
Object.defineProperty(exports, "DEFAULT_RULES", { enumerable: true, get: function () { return loadRules_2.DEFAULT_RULES; } });
|
|
7
|
+
exports.CUSTOM_RULES = (0, loadRules_1.loadRules)();
|
|
71
8
|
//# sourceMappingURL=index.js.map
|
package/dist/rules/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/rules/index.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,yCAA4C;AAAnC,0GAAA,aAAa,OAAA;AAET,QAAA,YAAY,GAA4B,IAAA,qBAAS,GAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadRules.d.ts","sourceRoot":"","sources":["../../src/rules/loadRules.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,QAAQ,MAAM,kBAAkB,CAAC;AAElD,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,YAAY,EAA6B,CAAC;AAE/E,eAAO,MAAM,SAAS,QAAO,SAAS,YAAY,EA2CjD,CAAC"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
28
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
+
exports.loadRules = exports.DEFAULT_RULES = void 0;
|
|
30
|
+
const fs_1 = __importDefault(require("fs"));
|
|
31
|
+
const glob_1 = __importDefault(require("glob"));
|
|
32
|
+
const tsImport = __importStar(require("ts-import"));
|
|
33
|
+
const catchAll_1 = require("./catchAll");
|
|
34
|
+
const echo_1 = require("./echo");
|
|
35
|
+
const shared_1 = require("@stuntman/shared");
|
|
36
|
+
exports.DEFAULT_RULES = [catchAll_1.catchAllRule, echo_1.echoRule];
|
|
37
|
+
const loadRules = () => {
|
|
38
|
+
const customRules = [];
|
|
39
|
+
if (!shared_1.stuntmanConfig.mock.rulesPath || !fs_1.default.existsSync(shared_1.stuntmanConfig.mock.rulesPath)) {
|
|
40
|
+
shared_1.logger.debug({ rulesPath: shared_1.stuntmanConfig.mock.rulesPath }, `additional rules directory not found`);
|
|
41
|
+
return [];
|
|
42
|
+
}
|
|
43
|
+
shared_1.logger.debug({ rulesPath: shared_1.stuntmanConfig.mock.rulesPath }, `loading additional rules`);
|
|
44
|
+
const filePaths = glob_1.default.sync('*.[tj]s', { absolute: true, cwd: shared_1.stuntmanConfig.mock.rulesPath });
|
|
45
|
+
const tsImportCompiledFileNames = filePaths.map((p) => p.replace(/\.[^/.]+$/u, '.js'));
|
|
46
|
+
const tsImportDuplicatedCompiledFileNames = tsImportCompiledFileNames.filter((currentValue, currentIndex) => tsImportCompiledFileNames.indexOf(currentValue) !== currentIndex);
|
|
47
|
+
if (tsImportDuplicatedCompiledFileNames.length > 0) {
|
|
48
|
+
shared_1.logger.error({ tsImportDuplicatedCompiledFileNames }, 'duplicated compiled file names https://github.com/radarsu/ts-import/issues/32');
|
|
49
|
+
throw new Error('duplicated compiled file names https://github.com/radarsu/ts-import/issues/32');
|
|
50
|
+
}
|
|
51
|
+
for (const filePath of filePaths) {
|
|
52
|
+
// TODO add .ts rule support
|
|
53
|
+
try {
|
|
54
|
+
const loadedFile = tsImport.loadSync(filePath, { useCache: false });
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
56
|
+
const exportedRules = Object.values(loadedFile).filter((rule) => {
|
|
57
|
+
if (!rule || !rule.id || typeof rule.matches !== 'function') {
|
|
58
|
+
shared_1.logger.error({ filePath, rule }, 'invalid exported rule');
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
return true;
|
|
62
|
+
});
|
|
63
|
+
customRules.push(...exportedRules);
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
shared_1.logger.error({ filePath, error: (0, shared_1.errorToLog)(error) }, 'error importing rule');
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
const ruleIds = [...exports.DEFAULT_RULES, ...customRules].map((rule) => rule.id);
|
|
70
|
+
const duplicatedRuleIds = ruleIds.filter((currentValue, currentIndex) => ruleIds.indexOf(currentValue) !== currentIndex);
|
|
71
|
+
if (duplicatedRuleIds.length > 0) {
|
|
72
|
+
shared_1.logger.error({ duplicatedRuleIds }, 'duplicated rule ids');
|
|
73
|
+
throw new Error('duplicated rule ids');
|
|
74
|
+
}
|
|
75
|
+
return customRules;
|
|
76
|
+
};
|
|
77
|
+
exports.loadRules = loadRules;
|
|
78
|
+
//# sourceMappingURL=loadRules.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadRules.js","sourceRoot":"","sources":["../../src/rules/loadRules.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stuntman/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Stuntman - HTTP proxy / mock server with API",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"CHANGELOG.md"
|
|
67
67
|
],
|
|
68
68
|
"scripts": {
|
|
69
|
-
"test": "SUPPRESS_NO_CONFIG_WARNING=1 jest --coverage",
|
|
69
|
+
"test": "LOG_LEVEL=silent SUPPRESS_NO_CONFIG_WARNING=1 jest --coverage",
|
|
70
70
|
"clean": "rm -fr dist",
|
|
71
71
|
"build": "tsc && cp -rv src/api/webgui dist/api",
|
|
72
72
|
"lint": "prettier --check \"./{src,test}/**/*\" && eslint \"./{src,test}/**/*\"",
|
package/src/api/api.ts
CHANGED
|
@@ -3,7 +3,7 @@ import express, { NextFunction, Request, Response, Express as ExpressServer } fr
|
|
|
3
3
|
import { v4 as uuidv4 } from 'uuid';
|
|
4
4
|
import { getTrafficStore } from '../storage';
|
|
5
5
|
import { getRuleExecutor } from '../ruleExecutor';
|
|
6
|
-
import { logger, AppError, HttpCode, MAX_RULE_TTL_SECONDS, stringify, INDEX_DTS } from '@stuntman/shared';
|
|
6
|
+
import { logger, AppError, HttpCode, MAX_RULE_TTL_SECONDS, stringify, INDEX_DTS, errorToLog } from '@stuntman/shared';
|
|
7
7
|
import type * as Stuntman from '@stuntman/shared';
|
|
8
8
|
import RequestContext from '../requestContext';
|
|
9
9
|
import serializeJavascript from 'serialize-javascript';
|
|
@@ -158,7 +158,7 @@ export class API {
|
|
|
158
158
|
});
|
|
159
159
|
return;
|
|
160
160
|
}
|
|
161
|
-
logger.error({
|
|
161
|
+
logger.error({ error: errorToLog(error), uuid }, 'unexpected error');
|
|
162
162
|
if (res) {
|
|
163
163
|
res.status(HttpCode.INTERNAL_SERVER_ERROR).json({
|
|
164
164
|
error: { message: error.message, httpCode: HttpCode.INTERNAL_SERVER_ERROR, uuid },
|
package/src/api/utils.ts
CHANGED
|
@@ -57,8 +57,8 @@ export const deserializeRule = (serializedRule: Stuntman.SerializedRule): Stuntm
|
|
|
57
57
|
export const escapedSerialize = (obj: any) =>
|
|
58
58
|
serializeJavascript(obj).replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/\n/g, "\\n'\n+ '");
|
|
59
59
|
|
|
60
|
-
export const liveRuleToRule = (liveRule: Stuntman.LiveRule) => {
|
|
61
|
-
const ruleClone: Stuntman.Rule = { ...liveRule };
|
|
60
|
+
export const liveRuleToRule = (liveRule: Stuntman.LiveRule): Stuntman.Rule => {
|
|
61
|
+
const ruleClone: Stuntman.SharedProps<Stuntman.Rule, Stuntman.LiveRule> = { ...liveRule };
|
|
62
62
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
63
63
|
// @ts-ignore
|
|
64
64
|
delete ruleClone.counter;
|
package/src/api/validators.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AppError, HttpCode, MAX_RULE_TTL_SECONDS, MIN_RULE_TTL_SECONDS, logger, RawHeaders } from '@stuntman/shared';
|
|
1
|
+
import { AppError, HttpCode, MAX_RULE_TTL_SECONDS, MIN_RULE_TTL_SECONDS, logger, RawHeaders, errorToLog } from '@stuntman/shared';
|
|
2
2
|
import type * as Stuntman from '@stuntman/shared';
|
|
3
3
|
|
|
4
4
|
export const validateSerializedRuleProperties = (rule: Stuntman.SerializedRule): void => {
|
|
@@ -61,7 +61,8 @@ export const validateSerializedRuleProperties = (rule: Stuntman.SerializedRule):
|
|
|
61
61
|
}
|
|
62
62
|
if (
|
|
63
63
|
typeof rule.actions.mockResponse.rawHeaders !== 'undefined' &&
|
|
64
|
-
(
|
|
64
|
+
(typeof rule.actions.mockResponse.rawHeaders === 'string' ||
|
|
65
|
+
!Array.isArray(rule.actions.mockResponse.rawHeaders) ||
|
|
65
66
|
rule.actions.mockResponse.rawHeaders.length % 2 !== 0 ||
|
|
66
67
|
rule.actions.mockResponse.rawHeaders.some((header) => typeof header !== 'string'))
|
|
67
68
|
) {
|
|
@@ -75,10 +76,16 @@ export const validateSerializedRuleProperties = (rule: Stuntman.SerializedRule):
|
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
|
-
if (
|
|
79
|
+
if (
|
|
80
|
+
typeof rule.actions.modifyRequest !== 'undefined' &&
|
|
81
|
+
(typeof rule.actions.modifyRequest.remoteFn !== 'string' || !rule.actions.modifyRequest.remoteFn.trim())
|
|
82
|
+
) {
|
|
79
83
|
throw new AppError({ httpCode: HttpCode.BAD_REQUEST, message: 'invalid rule.actions.modifyRequest' });
|
|
80
84
|
}
|
|
81
|
-
if (
|
|
85
|
+
if (
|
|
86
|
+
typeof rule.actions.modifyResponse !== 'undefined' &&
|
|
87
|
+
(typeof rule.actions.modifyResponse.remoteFn !== 'string' || !rule.actions.modifyResponse.remoteFn.trim())
|
|
88
|
+
) {
|
|
82
89
|
throw new AppError({ httpCode: HttpCode.BAD_REQUEST, message: 'invalid rule.actions.modifyResponse' });
|
|
83
90
|
}
|
|
84
91
|
if (
|
|
@@ -97,7 +104,7 @@ export const validateSerializedRuleProperties = (rule: Stuntman.SerializedRule):
|
|
|
97
104
|
}
|
|
98
105
|
if (
|
|
99
106
|
typeof rule.labels !== 'undefined' &&
|
|
100
|
-
(!Array.isArray(rule.labels) || rule.labels.some((label) => typeof label !== 'string'))
|
|
107
|
+
(typeof rule.labels !== 'object' || !Array.isArray(rule.labels) || rule.labels.some((label) => typeof label !== 'string'))
|
|
101
108
|
) {
|
|
102
109
|
throw new AppError({ httpCode: HttpCode.BAD_REQUEST, message: 'invalid rule.labels' });
|
|
103
110
|
}
|
|
@@ -138,7 +145,7 @@ export const validateDeserializedRule = (deserializedRule: Stuntman.Rule) => {
|
|
|
138
145
|
url: 'http://dummy.invalid/',
|
|
139
146
|
});
|
|
140
147
|
} catch (error: any) {
|
|
141
|
-
logger.error({ ruleId: deserializedRule.id }, error);
|
|
148
|
+
logger.error({ ruleId: deserializedRule.id, error: errorToLog(error) }, 'match function threw an error');
|
|
142
149
|
throw new AppError({
|
|
143
150
|
httpCode: HttpCode.UNPROCESSABLE_ENTITY,
|
|
144
151
|
message: 'match function threw an error',
|
package/src/ipUtils.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { networkInterfaces } from 'os';
|
|
2
2
|
import dns, { Resolver as DNSResolver } from 'node:dns';
|
|
3
3
|
import { getDnsResolutionCache } from './storage';
|
|
4
|
-
import { logger } from '@stuntman/shared';
|
|
4
|
+
import { errorToLog, logger } from '@stuntman/shared';
|
|
5
5
|
|
|
6
6
|
const localhostIPs: string[] = ['127.0.0.1'];
|
|
7
7
|
const IP_WITH_OPTIONAL_PORT_REGEX = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}(:[0-9]+)?$/i;
|
|
@@ -40,7 +40,7 @@ export class IPUtils {
|
|
|
40
40
|
return new Promise<[string, ...string[]]>((resolve, reject) => {
|
|
41
41
|
const callback = (error: NodeJS.ErrnoException | null, addresses: string | string[]) => {
|
|
42
42
|
if (error) {
|
|
43
|
-
logger.debug({ error, hostname }, 'error resolving hostname');
|
|
43
|
+
logger.debug({ error: errorToLog(error), hostname }, 'error resolving hostname');
|
|
44
44
|
reject(error);
|
|
45
45
|
return;
|
|
46
46
|
}
|
package/src/mock.ts
CHANGED
|
@@ -6,7 +6,7 @@ import express from 'express';
|
|
|
6
6
|
import { v4 as uuidv4 } from 'uuid';
|
|
7
7
|
import { getRuleExecutor } from './ruleExecutor';
|
|
8
8
|
import { getTrafficStore } from './storage';
|
|
9
|
-
import { RawHeaders, logger, HttpCode, naiveGQLParser, escapeStringRegexp } from '@stuntman/shared';
|
|
9
|
+
import { RawHeaders, logger, HttpCode, naiveGQLParser, escapeStringRegexp, errorToLog } from '@stuntman/shared';
|
|
10
10
|
import RequestContext from './requestContext';
|
|
11
11
|
import type * as Stuntman from '@stuntman/shared';
|
|
12
12
|
import { IPUtils } from './ipUtils';
|
|
@@ -148,7 +148,7 @@ export class Mock {
|
|
|
148
148
|
}
|
|
149
149
|
} catch (error) {
|
|
150
150
|
// swallow the exeception, don't think much can be done at this point
|
|
151
|
-
logger.warn({ ...logContext, error }, `error trying to resolve IP for "${hostname}"`);
|
|
151
|
+
logger.warn({ ...logContext, error: errorToLog(error as Error) }, `error trying to resolve IP for "${hostname}"`);
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
|
|
@@ -224,7 +224,7 @@ export class Mock {
|
|
|
224
224
|
this.mockApp.use((error: Error, req: express.Request, res: express.Response) => {
|
|
225
225
|
const ctx: RequestContext | null = RequestContext.get(req);
|
|
226
226
|
const uuid = ctx?.uuid || uuidv4();
|
|
227
|
-
logger.error({
|
|
227
|
+
logger.error({ error: errorToLog(error), uuid }, 'unexpected error');
|
|
228
228
|
if (res) {
|
|
229
229
|
res.status(HttpCode.INTERNAL_SERVER_ERROR).json({
|
|
230
230
|
error: { message: error.message, httpCode: HttpCode.INTERNAL_SERVER_ERROR, uuid },
|
|
@@ -272,7 +272,10 @@ export class Mock {
|
|
|
272
272
|
);
|
|
273
273
|
targetResponse = await fetchRequest(mockEntry.modifiedRequest.url, requestOptions);
|
|
274
274
|
} catch (error) {
|
|
275
|
-
logger.error(
|
|
275
|
+
logger.error(
|
|
276
|
+
{ ...logContext, error: errorToLog(error as Error), request: mockEntry.modifiedRequest },
|
|
277
|
+
'error fetching'
|
|
278
|
+
);
|
|
276
279
|
throw error;
|
|
277
280
|
} finally {
|
|
278
281
|
controller = null;
|
package/src/ruleExecutor.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AwaitLock from 'await-lock';
|
|
2
|
-
import { AppError, DEFAULT_RULE_PRIORITY, HttpCode, logger } from '@stuntman/shared';
|
|
2
|
+
import { AppError, DEFAULT_RULE_PRIORITY, HttpCode, errorToLog, logger } from '@stuntman/shared';
|
|
3
3
|
import type * as Stuntman from '@stuntman/shared';
|
|
4
4
|
import { CUSTOM_RULES, DEFAULT_RULES } from './rules';
|
|
5
5
|
|
|
@@ -136,7 +136,10 @@ class RuleExecutor implements Stuntman.RuleExecutorInterface {
|
|
|
136
136
|
}
|
|
137
137
|
return matchResult.result;
|
|
138
138
|
} catch (error) {
|
|
139
|
-
logger.error(
|
|
139
|
+
logger.error(
|
|
140
|
+
{ ...logContext, ruleId: rule.id, error: errorToLog(error as Error) },
|
|
141
|
+
'error in rule match function'
|
|
142
|
+
);
|
|
140
143
|
}
|
|
141
144
|
return undefined;
|
|
142
145
|
});
|
|
@@ -200,11 +203,15 @@ class RuleExecutor implements Stuntman.RuleExecutorInterface {
|
|
|
200
203
|
}
|
|
201
204
|
}
|
|
202
205
|
|
|
203
|
-
export const getRuleExecutor = (mockUuid: string): RuleExecutor => {
|
|
206
|
+
export const getRuleExecutor = (mockUuid: string, overrideRules?: Stuntman.DeployedRule[]): RuleExecutor => {
|
|
204
207
|
if (!ruleExecutors[mockUuid]) {
|
|
205
|
-
|
|
206
|
-
[
|
|
207
|
-
|
|
208
|
+
if (overrideRules === null) {
|
|
209
|
+
ruleExecutors[mockUuid] = new RuleExecutor();
|
|
210
|
+
} else {
|
|
211
|
+
ruleExecutors[mockUuid] = new RuleExecutor(
|
|
212
|
+
(overrideRules ?? [...DEFAULT_RULES, ...CUSTOM_RULES]).map((r) => ({ ...r, ttlSeconds: Infinity }))
|
|
213
|
+
);
|
|
214
|
+
}
|
|
208
215
|
}
|
|
209
216
|
return ruleExecutors[mockUuid]!;
|
|
210
217
|
};
|
package/src/rules/index.ts
CHANGED
|
@@ -1,44 +1,5 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
|
-
import glob from 'glob';
|
|
3
|
-
import * as tsImport from 'ts-import';
|
|
4
|
-
import { catchAllRule } from './catchAll';
|
|
5
|
-
import { echoRule } from './echo';
|
|
6
|
-
import { stuntmanConfig, logger } from '@stuntman/shared';
|
|
7
1
|
import type * as Stuntman from '@stuntman/shared';
|
|
2
|
+
import { loadRules } from './loadRules';
|
|
3
|
+
export { DEFAULT_RULES } from './loadRules';
|
|
8
4
|
|
|
9
|
-
export const
|
|
10
|
-
export const CUSTOM_RULES: Stuntman.DeployedRule[] = [];
|
|
11
|
-
|
|
12
|
-
const loadAdditionalRules = () => {
|
|
13
|
-
if (!stuntmanConfig.mock.rulesPath || !fs.existsSync(stuntmanConfig.mock.rulesPath)) {
|
|
14
|
-
logger.debug({ rulesPath: stuntmanConfig.mock.rulesPath }, `additional rules directory not found`);
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
logger.debug({ rulesPath: stuntmanConfig.mock.rulesPath }, `loading additional rules`);
|
|
18
|
-
const filePaths = glob.sync('*.[tj]s', { absolute: true, cwd: stuntmanConfig.mock.rulesPath });
|
|
19
|
-
for (const filePath of filePaths) {
|
|
20
|
-
// TODO add .ts rule support
|
|
21
|
-
try {
|
|
22
|
-
const loadedFile = /\.js$/.test(filePath) ? require(filePath) : tsImport.loadSync(filePath);
|
|
23
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
24
|
-
const exportedRules = (Object.values(loadedFile) as Stuntman.DeployedRule[]).filter((rule) => {
|
|
25
|
-
if (!rule || !rule.id || typeof rule.matches !== 'function') {
|
|
26
|
-
logger.error({ filePath, rule }, 'invalid exported rule');
|
|
27
|
-
return false;
|
|
28
|
-
}
|
|
29
|
-
return true;
|
|
30
|
-
});
|
|
31
|
-
CUSTOM_RULES.push(...exportedRules);
|
|
32
|
-
} catch (error) {
|
|
33
|
-
logger.error({ filePath, error }, 'error importing rule');
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
const ruleIds = [...DEFAULT_RULES, ...CUSTOM_RULES].map((rule) => rule.id);
|
|
37
|
-
const duplicatedRuleIds = ruleIds.filter((currentValue, currentIndex) => ruleIds.indexOf(currentValue) !== currentIndex);
|
|
38
|
-
if (duplicatedRuleIds.length > 0) {
|
|
39
|
-
logger.error({ duplicatedRuleIds }, 'duplicated rule ids');
|
|
40
|
-
throw new Error('duplicated rule ids');
|
|
41
|
-
}
|
|
42
|
-
};
|
|
43
|
-
|
|
44
|
-
loadAdditionalRules();
|
|
5
|
+
export const CUSTOM_RULES: Stuntman.DeployedRule[] = loadRules();
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import glob from 'glob';
|
|
3
|
+
import * as tsImport from 'ts-import';
|
|
4
|
+
import { catchAllRule } from './catchAll';
|
|
5
|
+
import { echoRule } from './echo';
|
|
6
|
+
import { stuntmanConfig, logger, errorToLog } from '@stuntman/shared';
|
|
7
|
+
import type * as Stuntman from '@stuntman/shared';
|
|
8
|
+
|
|
9
|
+
export const DEFAULT_RULES: Stuntman.DeployedRule[] = [catchAllRule, echoRule];
|
|
10
|
+
|
|
11
|
+
export const loadRules = (): Stuntman.DeployedRule[] => {
|
|
12
|
+
const customRules: Stuntman.DeployedRule[] = [];
|
|
13
|
+
if (!stuntmanConfig.mock.rulesPath || !fs.existsSync(stuntmanConfig.mock.rulesPath)) {
|
|
14
|
+
logger.debug({ rulesPath: stuntmanConfig.mock.rulesPath }, `additional rules directory not found`);
|
|
15
|
+
return [];
|
|
16
|
+
}
|
|
17
|
+
logger.debug({ rulesPath: stuntmanConfig.mock.rulesPath }, `loading additional rules`);
|
|
18
|
+
const filePaths = glob.sync('*.[tj]s', { absolute: true, cwd: stuntmanConfig.mock.rulesPath });
|
|
19
|
+
const tsImportCompiledFileNames = filePaths.map((p) => p.replace(/\.[^/.]+$/u, '.js'));
|
|
20
|
+
const tsImportDuplicatedCompiledFileNames = tsImportCompiledFileNames.filter(
|
|
21
|
+
(currentValue, currentIndex) => tsImportCompiledFileNames.indexOf(currentValue) !== currentIndex
|
|
22
|
+
);
|
|
23
|
+
if (tsImportDuplicatedCompiledFileNames.length > 0) {
|
|
24
|
+
logger.error(
|
|
25
|
+
{ tsImportDuplicatedCompiledFileNames },
|
|
26
|
+
'duplicated compiled file names https://github.com/radarsu/ts-import/issues/32'
|
|
27
|
+
);
|
|
28
|
+
throw new Error('duplicated compiled file names https://github.com/radarsu/ts-import/issues/32');
|
|
29
|
+
}
|
|
30
|
+
for (const filePath of filePaths) {
|
|
31
|
+
// TODO add .ts rule support
|
|
32
|
+
try {
|
|
33
|
+
const loadedFile = tsImport.loadSync(filePath, { useCache: false });
|
|
34
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
35
|
+
const exportedRules = (Object.values(loadedFile) as Stuntman.DeployedRule[]).filter((rule) => {
|
|
36
|
+
if (!rule || !rule.id || typeof rule.matches !== 'function') {
|
|
37
|
+
logger.error({ filePath, rule }, 'invalid exported rule');
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
return true;
|
|
41
|
+
});
|
|
42
|
+
customRules.push(...exportedRules);
|
|
43
|
+
} catch (error) {
|
|
44
|
+
logger.error({ filePath, error: errorToLog(error as Error) }, 'error importing rule');
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
const ruleIds = [...DEFAULT_RULES, ...customRules].map((rule) => rule.id);
|
|
48
|
+
const duplicatedRuleIds = ruleIds.filter((currentValue, currentIndex) => ruleIds.indexOf(currentValue) !== currentIndex);
|
|
49
|
+
if (duplicatedRuleIds.length > 0) {
|
|
50
|
+
logger.error({ duplicatedRuleIds }, 'duplicated rule ids');
|
|
51
|
+
throw new Error('duplicated rule ids');
|
|
52
|
+
}
|
|
53
|
+
return customRules;
|
|
54
|
+
};
|