apitally 0.3.0 → 0.5.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/README.md +1 -1
- package/lib/cjs/common/client.cjs +7 -4
- package/lib/cjs/common/client.cjs.map +1 -1
- package/lib/cjs/common/logging.cjs.map +1 -1
- package/lib/cjs/common/packageVersions.cjs.map +1 -1
- package/lib/cjs/common/paramValidation.cjs.map +1 -1
- package/lib/cjs/common/requestCounter.cjs +1 -2
- package/lib/cjs/common/requestCounter.cjs.map +1 -1
- package/lib/cjs/common/serverErrorCounter.cjs +154 -0
- package/lib/cjs/common/serverErrorCounter.cjs.map +1 -0
- package/lib/cjs/common/types.cjs.map +1 -1
- package/lib/cjs/common/validationErrorCounter.cjs +27 -25
- package/lib/cjs/common/validationErrorCounter.cjs.map +1 -1
- package/lib/cjs/express/index.cjs.map +1 -1
- package/lib/cjs/express/listEndpoints.cjs.map +1 -1
- package/lib/cjs/express/middleware.cjs +25 -4
- package/lib/cjs/express/middleware.cjs.map +1 -1
- package/lib/cjs/fastify/index.cjs.map +1 -1
- package/lib/cjs/fastify/plugin.cjs +20 -3
- package/lib/cjs/fastify/plugin.cjs.map +1 -1
- package/lib/cjs/index.cjs.map +1 -1
- package/lib/cjs/koa/index.cjs.map +1 -1
- package/lib/cjs/koa/middleware.cjs +32 -16
- package/lib/cjs/koa/middleware.cjs.map +1 -1
- package/lib/cjs/nestjs/index.cjs.map +1 -1
- package/lib/esm/common/client.js +6 -3
- package/lib/esm/common/client.js.map +1 -1
- package/lib/esm/common/logging.js.map +1 -1
- package/lib/esm/common/packageVersions.js.map +1 -1
- package/lib/esm/common/paramValidation.js.map +1 -1
- package/lib/esm/common/requestCounter.js +1 -2
- package/lib/esm/common/requestCounter.js.map +1 -1
- package/lib/esm/common/serverErrorCounter.js +143 -0
- package/lib/esm/common/serverErrorCounter.js.map +1 -0
- package/lib/esm/common/types.js.map +1 -1
- package/lib/esm/common/validationErrorCounter.js +27 -25
- package/lib/esm/common/validationErrorCounter.js.map +1 -1
- package/lib/esm/express/index.js.map +1 -1
- package/lib/esm/express/listEndpoints.js.map +1 -1
- package/lib/esm/express/middleware.js +25 -4
- package/lib/esm/express/middleware.js.map +1 -1
- package/lib/esm/fastify/index.js.map +1 -1
- package/lib/esm/fastify/plugin.js +20 -3
- package/lib/esm/fastify/plugin.js.map +1 -1
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/koa/index.js.map +1 -1
- package/lib/esm/koa/middleware.js +32 -16
- package/lib/esm/koa/middleware.js.map +1 -1
- package/lib/esm/nestjs/index.js.map +1 -1
- package/lib/types/common/client.d.ts +2 -0
- package/lib/types/common/client.d.ts.map +1 -1
- package/lib/types/common/serverErrorCounter.d.ts +16 -0
- package/lib/types/common/serverErrorCounter.d.ts.map +1 -0
- package/lib/types/common/types.d.ts +13 -0
- package/lib/types/common/types.d.ts.map +1 -1
- package/lib/types/common/validationErrorCounter.d.ts +2 -1
- package/lib/types/common/validationErrorCounter.d.ts.map +1 -1
- package/lib/types/fastify/plugin.d.ts +2 -1
- package/lib/types/fastify/plugin.d.ts.map +1 -1
- package/package.json +8 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverErrorCounter.js","names":["createHash","MAX_MSG_LENGTH","MAX_STACKTRACE_LENGTH","ServerErrorCounter","_classCallCheck","_defineProperty","errorCounts","Map","errorDetails","sentryEventIds","tryImportSentry","_createClass","key","value","addServerError","serverError","getKey","has","set","get","captureSentryEventId","getAndResetServerErrors","_this","data","forEach","count","push","consumer","method","path","type","msg","getTruncatedMessage","traceback","getTruncatedStack","sentry_event_id","error_count","clear","hashInput","toUpperCase","trim","join","update","digest","length","suffix","cutoff","substring","stack","lines","split","truncatedLines","_iterator","_createForOfIteratorHelper","_step","s","n","done","line","err","e","f","serverErrorKey","sentry","lastEventId","eventId","_tryImportSentry","_asyncToGenerator","_regeneratorRuntime","mark","_callee","wrap","_callee$","_context","prev","next","sent","t0","stop","apply","arguments","default"],"sources":["../../../src/common/serverErrorCounter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","names":[],"sources":["../../../src/common/types.ts"],"sourcesContent":[null],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","names":[],"sources":["../../../src/common/types.ts"],"sourcesContent":[null],"mappings":"","ignoreList":[]}
|
|
@@ -1,52 +1,54 @@
|
|
|
1
|
-
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
1
|
import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
|
|
3
2
|
import _createClass from "@babel/runtime/helpers/createClass";
|
|
4
3
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
|
+
import { createHash } from "crypto";
|
|
5
5
|
var ValidationErrorCounter = /*#__PURE__*/function () {
|
|
6
6
|
function ValidationErrorCounter() {
|
|
7
7
|
_classCallCheck(this, ValidationErrorCounter);
|
|
8
8
|
_defineProperty(this, "errorCounts", void 0);
|
|
9
|
+
_defineProperty(this, "errorDetails", void 0);
|
|
9
10
|
this.errorCounts = new Map();
|
|
11
|
+
this.errorDetails = new Map();
|
|
10
12
|
}
|
|
11
|
-
_createClass(ValidationErrorCounter, [{
|
|
12
|
-
key: "getKey",
|
|
13
|
-
value: function getKey(validationError) {
|
|
14
|
-
return [validationError.consumer || "", validationError.method.toUpperCase(), validationError.path, validationError.loc, validationError.msg, validationError.type].join("|");
|
|
15
|
-
}
|
|
16
|
-
}, {
|
|
13
|
+
return _createClass(ValidationErrorCounter, [{
|
|
17
14
|
key: "addValidationError",
|
|
18
15
|
value: function addValidationError(validationError) {
|
|
19
16
|
var key = this.getKey(validationError);
|
|
17
|
+
if (!this.errorDetails.has(key)) {
|
|
18
|
+
this.errorDetails.set(key, validationError);
|
|
19
|
+
}
|
|
20
20
|
this.errorCounts.set(key, (this.errorCounts.get(key) || 0) + 1);
|
|
21
21
|
}
|
|
22
22
|
}, {
|
|
23
23
|
key: "getAndResetValidationErrors",
|
|
24
24
|
value: function getAndResetValidationErrors() {
|
|
25
|
+
var _this = this;
|
|
25
26
|
var data = [];
|
|
26
27
|
this.errorCounts.forEach(function (count, key) {
|
|
27
|
-
var
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
loc: loc.split("."),
|
|
40
|
-
msg: msg,
|
|
41
|
-
type: type,
|
|
42
|
-
error_count: count
|
|
43
|
-
});
|
|
28
|
+
var validationError = _this.errorDetails.get(key);
|
|
29
|
+
if (validationError) {
|
|
30
|
+
data.push({
|
|
31
|
+
consumer: validationError.consumer || null,
|
|
32
|
+
method: validationError.method,
|
|
33
|
+
path: validationError.path,
|
|
34
|
+
loc: validationError.loc.split("."),
|
|
35
|
+
msg: validationError.msg,
|
|
36
|
+
type: validationError.type,
|
|
37
|
+
error_count: count
|
|
38
|
+
});
|
|
39
|
+
}
|
|
44
40
|
});
|
|
45
41
|
this.errorCounts.clear();
|
|
42
|
+
this.errorDetails.clear();
|
|
46
43
|
return data;
|
|
47
44
|
}
|
|
45
|
+
}, {
|
|
46
|
+
key: "getKey",
|
|
47
|
+
value: function getKey(validationError) {
|
|
48
|
+
var hashInput = [validationError.consumer || "", validationError.method.toUpperCase(), validationError.path, validationError.loc, validationError.msg.trim(), validationError.type].join("|");
|
|
49
|
+
return createHash("md5").update(hashInput).digest("hex");
|
|
50
|
+
}
|
|
48
51
|
}]);
|
|
49
|
-
return ValidationErrorCounter;
|
|
50
52
|
}();
|
|
51
53
|
export { ValidationErrorCounter as default };
|
|
52
54
|
//# sourceMappingURL=validationErrorCounter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationErrorCounter.js","names":["ValidationErrorCounter","_classCallCheck","_defineProperty","errorCounts","Map","_createClass","key","value","
|
|
1
|
+
{"version":3,"file":"validationErrorCounter.js","names":["createHash","ValidationErrorCounter","_classCallCheck","_defineProperty","errorCounts","Map","errorDetails","_createClass","key","value","addValidationError","validationError","getKey","has","set","get","getAndResetValidationErrors","_this","data","forEach","count","push","consumer","method","path","loc","split","msg","type","error_count","clear","hashInput","toUpperCase","trim","join","update","digest","default"],"sources":["../../../src/common/validationErrorCounter.ts"],"sourcesContent":[null],"mappings":";;;AAAA,SAASA,UAAU,QAAQ,QAAQ;AAAC,IAQfC,sBAAsB;EAIzC,SAAAA,uBAAA;IAAAC,eAAA,OAAAD,sBAAA;IAAAE,eAAA;IAAAA,eAAA;IACE,IAAI,CAACC,WAAW,GAAG,IAAIC,GAAG,EAAE;IAC5B,IAAI,CAACC,YAAY,GAAG,IAAID,GAAG,EAAE;EAC/B;EAAC,OAAAE,YAAA,CAAAN,sBAAA;IAAAO,GAAA;IAAAC,KAAA,EAEM,SAAAC,mBACLC,eAAqD;MAErD,IAAMH,GAAG,GAAG,IAAI,CAACI,MAAM,CAACD,eAAe,CAAC;MACxC,IAAI,CAAC,IAAI,CAACL,YAAY,CAACO,GAAG,CAACL,GAAG,CAAC,EAAE;QAC/B,IAAI,CAACF,YAAY,CAACQ,GAAG,CAACN,GAAG,EAAEG,eAAe,CAAC;MAC7C;MACA,IAAI,CAACP,WAAW,CAACU,GAAG,CAACN,GAAG,EAAE,CAAC,IAAI,CAACJ,WAAW,CAACW,GAAG,CAACP,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjE;EAAC;IAAAA,GAAA;IAAAC,KAAA,EAEM,SAAAO,4BAAA,EAA2B;MAAA,IAAAC,KAAA;MAChC,IAAMC,IAAI,GAAgC,EAAE;MAC5C,IAAI,CAACd,WAAW,CAACe,OAAO,CAAC,UAACC,KAAK,EAAEZ,GAAG,EAAI;QACtC,IAAMG,eAAe,GAAGM,KAAI,CAACX,YAAY,CAACS,GAAG,CAACP,GAAG,CAAC;QAClD,IAAIG,eAAe,EAAE;UACnBO,IAAI,CAACG,IAAI,CAAC;YACRC,QAAQ,EAAEX,eAAe,CAACW,QAAQ,IAAI,IAAI;YAC1CC,MAAM,EAAEZ,eAAe,CAACY,MAAM;YAC9BC,IAAI,EAAEb,eAAe,CAACa,IAAI;YAC1BC,GAAG,EAAEd,eAAe,CAACc,GAAG,CAACC,KAAK,CAAC,GAAG,CAAC;YACnCC,GAAG,EAAEhB,eAAe,CAACgB,GAAG;YACxBC,IAAI,EAAEjB,eAAe,CAACiB,IAAI;YAC1BC,WAAW,EAAET;WACd,CAAC;QACJ;MACF,CAAC,CAAC;MACF,IAAI,CAAChB,WAAW,CAAC0B,KAAK,EAAE;MACxB,IAAI,CAACxB,YAAY,CAACwB,KAAK,EAAE;MACzB,OAAOZ,IAAI;IACb;EAAC;IAAAV,GAAA;IAAAC,KAAA,EAEO,SAAAG,OAAOD,eAAqD;MAClE,IAAMoB,SAAS,GAAG,CAChBpB,eAAe,CAACW,QAAQ,IAAI,EAAE,EAC9BX,eAAe,CAACY,MAAM,CAACS,WAAW,EAAE,EACpCrB,eAAe,CAACa,IAAI,EACpBb,eAAe,CAACc,GAAG,EACnBd,eAAe,CAACgB,GAAG,CAACM,IAAI,EAAE,EAC1BtB,eAAe,CAACiB,IAAI,CACrB,CAACM,IAAI,CAAC,GAAG,CAAC;MACX,OAAOlC,UAAU,CAAC,KAAK,CAAC,CAACmC,MAAM,CAACJ,SAAS,CAAC,CAACK,MAAM,CAAC,KAAK,CAAC;IAC1D;EAAC;AAAA;AAAA,SAlDkBnC,sBAAsB,IAAAoC,OAAA","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/express/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,iBAAiB"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/express/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,iBAAiB","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listEndpoints.js","names":["regExpToParseExpressPathRegExp","regExpToReplaceExpressPathRegExpParams","regexpExpressParamRegexp","EXPRESS_ROOT_PATH_REGEXP_VALUE","STACK_ITEM_VALID_NAMES","getRouteMethods","route","methods","Object","keys","filter","method","map","toUpperCase","getRouteMiddlewares","stack","item","handle","name","hasParams","expressPathRegExp","test","parseExpressRoute","basePath","paths","Array","isArray","path","push","apply","_toConsumableArray","endpoints","completePath","concat","endpoint","middlewares","parseExpressPath","params","expressPathRegExpExec","exec","parsedRegExp","toString","paramIndex","paramName","paramId","replace","parsedPath","parseEndpoints","app","_router","addEndpoints","parseStack","currentEndpoints","endpointsToAdd","forEach","newEndpoint","existingEndpoint","find","undefined","newMethods","includes","stackItem","newEndpoints","isExpressPathRegexp","regexp","newBasePath","regExpPath","getEndpoints","flatMap"],"sources":["../../../src/express/listEndpoints.js"],"sourcesContent":[null],"mappings":";AAAA;AAEA,IAAMA,8BAA8B,GAClC,iFAAiF;AACnF,IAAMC,sCAAsC,GAAG,0BAA0B;AACzE,IAAMC,wBAAwB,GAAG,2BAA2B;AAE5D,IAAMC,8BAA8B,GAAG,mBAAmB;AAC1D,IAAMC,sBAAsB,GAAG,CAAC,QAAQ,EAAE,gBAAgB,EAAE,aAAa,CAAC;AAE1E;;;AAGA,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAaC,KAAK;EACrC,IAAIC,OAAO,GAAGC,MAAM,CAACC,IAAI,CAACH,KAAK,CAACC,OAAO,CAAC;EAExCA,OAAO,GAAGA,OAAO,CAACG,MAAM,CAAC,UAACC,MAAM;IAAA,OAAKA,MAAM,KAAK,MAAM;EAAA,EAAC;EACvDJ,OAAO,GAAGA,OAAO,CAACK,GAAG,CAAC,UAACD,MAAM;IAAA,OAAKA,MAAM,CAACE,WAAW,EAAE;EAAA,EAAC;EAEvD,OAAON,OAAO;AAChB,CAAC;AAED;;;;;;AAMA,IAAMO,mBAAmB,GAAG,SAAtBA,mBAAmBA,CAAaR,KAAK;EACzC,OAAOA,KAAK,CAACS,KAAK,CAACH,GAAG,CAAC,UAACI,IAAI,EAAI;IAC9B,OAAOA,IAAI,CAACC,MAAM,CAACC,IAAI,IAAI,WAAW;EACxC,CAAC,CAAC;AACJ,CAAC;AAED;;;;;AAKA,IAAMC,SAAS,GAAG,SAAZA,SAASA,CAAaC,iBAAiB;EAC3C,OAAOlB,wBAAwB,CAACmB,IAAI,CAACD,iBAAiB,CAAC;AACzD,CAAC;AAED;;;;;AAKA,IAAME,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAahB,KAAK,EAAEiB,QAAQ;EACjD,IAAMC,KAAK,GAAG,EAAE;EAEhB,IAAIC,KAAK,CAACC,OAAO,CAACpB,KAAK,CAACqB,IAAI,CAAC,EAAE;IAC7BH,KAAK,CAACI,IAAI,CAAAC,KAAA,CAAVL,KAAK,EAAAM,kBAAA,CAASxB,KAAK,CAACqB,IAAI,EAAC;EAC3B,CAAC,MAAM;IACLH,KAAK,CAACI,IAAI,CAACtB,KAAK,CAACqB,IAAI,CAAC;EACxB;EAEA,IAAMI,SAAS,GAAGP,KAAK,CAACZ,GAAG,CAAC,UAACe,IAAI,EAAI;IACnC,IAAMK,YAAY,GAChBT,QAAQ,IAAII,IAAI,KAAK,GAAG,GAAGJ,QAAQ,MAAAU,MAAA,CAAMV,QAAQ,EAAAU,MAAA,CAAGN,IAAI,CAAE;IAE5D,IAAMO,QAAQ,GAAG;MACfP,IAAI,EAAEK,YAAY;MAClBzB,OAAO,EAAEF,eAAe,CAACC,KAAK,CAAC;MAC/B6B,WAAW,EAAErB,mBAAmB,CAACR,KAAK;KACvC;IAED,OAAO4B,QAAQ;EACjB,CAAC,CAAC;EAEF,OAAOH,SAAS;AAClB,CAAC;AAED;;;;;AAKA,IAAMK,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAahB,iBAAiB,EAAEiB,MAAM;EAC1D,IAAIC,qBAAqB,GACvBtC,8BAA8B,CAACuC,IAAI,CAACnB,iBAAiB,CAAC;EACxD,IAAIoB,YAAY,GAAGpB,iBAAiB,CAACqB,QAAQ,EAAE;EAC/C,IAAIC,UAAU,GAAG,CAAC;EAElB,OAAOvB,SAAS,CAACqB,YAAY,CAAC,EAAE;IAC9B,IAAMG,SAAS,GAAGN,MAAM,CAACK,UAAU,CAAC,CAACxB,IAAI;IACzC,IAAM0B,OAAO,OAAAX,MAAA,CAAOU,SAAS,CAAE;IAE/BH,YAAY,GAAGA,YAAY,CAACK,OAAO,CACjC5C,sCAAsC,EACtC2C,OAAO,CACR;IAEDF,UAAU,EAAE;EACd;EAEA,IAAIF,YAAY,KAAKpB,iBAAiB,CAACqB,QAAQ,EAAE,EAAE;IACjDH,qBAAqB,GAAGtC,8BAA8B,CAACuC,IAAI,CAACC,YAAY,CAAC;EAC3E;EAEA,IAAMM,UAAU,GAAGR,qBAAqB,CAAC,CAAC,CAAC,CAACO,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;EAEjE,OAAOC,UAAU;AACnB,CAAC;AAED;;;;;;AAMA,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAAaC,GAAG,EAAEzB,QAAQ,EAAEQ,SAAS;EACvD,IAAMhB,KAAK,GAAGiC,GAAG,CAACjC,KAAK,IAAKiC,GAAG,CAACC,OAAO,IAAID,GAAG,CAACC,OAAO,CAAClC,KAAM;EAE7DgB,SAAS,GAAGA,SAAS,IAAI,EAAE;EAC3BR,QAAQ,GAAGA,QAAQ,IAAI,EAAE;EAEzB,IAAI,CAACR,KAAK,EAAE;IACVgB,SAAS,GAAGmB,YAAY,CAACnB,SAAS,EAAE,CAClC;MACEJ,IAAI,EAAEJ,QAAQ;MACdhB,OAAO,EAAE,EAAE;MACX4B,WAAW,EAAE;KACd,CACF,CAAC;EACJ,CAAC,MAAM;IACLJ,SAAS,GAAGoB,UAAU,CAACpC,KAAK,EAAEQ,QAAQ,EAAEQ,SAAS,CAAC;EACpD;EAEA,OAAOA,SAAS;AAClB,CAAC;AAED;;;;;;;;;AASA,IAAMmB,YAAY,GAAG,SAAfA,YAAYA,CAAaE,gBAAgB,EAAEC,cAAc;EAC7DA,cAAc,CAACC,OAAO,CAAC,UAACC,WAAW,EAAI;IACrC,IAAMC,gBAAgB,GAAGJ,gBAAgB,CAACK,IAAI,CAC5C,UAACzC,IAAI;MAAA,OAAKA,IAAI,CAACW,IAAI,KAAK4B,WAAW,CAAC5B,IAAI;IAAA,EACzC;IAED,IAAI6B,gBAAgB,KAAKE,SAAS,EAAE;MAClC,IAAMC,UAAU,GAAGJ,WAAW,CAAChD,OAAO,CAACG,MAAM,CAC3C,UAACC,MAAM;QAAA,OAAK,CAAC6C,gBAAgB,CAACjD,OAAO,CAACqD,QAAQ,CAACjD,MAAM,CAAC;MAAA,EACvD;MAED6C,gBAAgB,CAACjD,OAAO,GAAGiD,gBAAgB,CAACjD,OAAO,CAAC0B,MAAM,CAAC0B,UAAU,CAAC;IACxE,CAAC,MAAM;MACLP,gBAAgB,CAACxB,IAAI,CAAC2B,WAAW,CAAC;IACpC;EACF,CAAC,CAAC;EAEF,OAAOH,gBAAgB;AACzB,CAAC;AAED;;;;;;AAMA,IAAMD,UAAU,GAAG,SAAbA,UAAUA,CAAapC,KAAK,EAAEQ,QAAQ,EAAEQ,SAAS;EACrDhB,KAAK,CAACuC,OAAO,CAAC,UAACO,SAAS,EAAI;IAC1B,IAAIA,SAAS,CAACvD,KAAK,EAAE;MACnB,IAAMwD,YAAY,GAAGxC,iBAAiB,CAACuC,SAAS,CAACvD,KAAK,EAAEiB,QAAQ,CAAC;MAEjEQ,SAAS,GAAGmB,YAAY,CAACnB,SAAS,EAAE+B,YAAY,CAAC;IACnD,CAAC,MAAM,IAAI1D,sBAAsB,CAACwD,QAAQ,CAACC,SAAS,CAAC3C,IAAI,CAAC,EAAE;MAC1D,IAAM6C,mBAAmB,GAAG/D,8BAA8B,CAACqB,IAAI,CAC7DwC,SAAS,CAACG,MAAM,CACjB;MAED,IAAIC,WAAW,GAAG1C,QAAQ;MAE1B,IAAIwC,mBAAmB,EAAE;QACvB,IAAMjB,UAAU,GAAGV,gBAAgB,CAACyB,SAAS,CAACG,MAAM,EAAEH,SAAS,CAACpD,IAAI,CAAC;QAErEwD,WAAW,QAAAhC,MAAA,CAAQa,UAAU,CAAE;MACjC,CAAC,MAAM,IACL,CAACe,SAAS,CAAClC,IAAI,IACfkC,SAAS,CAACG,MAAM,IAChBH,SAAS,CAACG,MAAM,CAACvB,QAAQ,EAAE,KAAKtC,8BAA8B,EAC9D;QACA,IAAM+D,UAAU,cAAAjC,MAAA,CAAc4B,SAAS,CAACG,MAAM,OAAI;QAElDC,WAAW,QAAAhC,MAAA,CAAQiC,UAAU,CAAE;MACjC;MAEAnC,SAAS,GAAGgB,cAAc,CAACc,SAAS,CAAC5C,MAAM,EAAEgD,WAAW,EAAElC,SAAS,CAAC;IACtE;EACF,CAAC,CAAC;EAEF,OAAOA,SAAS;AAClB,CAAC;AAED,IAAMoC,YAAY,GAAG,SAAfA,YAAYA,CAAanB,GAAG;EAChC,IAAMjB,SAAS,GAAGgB,cAAc,CAACC,GAAG,CAAC;EACrC,OAAOjB,SAAS,CAACqC,OAAO,CAAC,UAAC9D,KAAK;IAAA,OAC7BA,KAAK,CAACC,OAAO,CACVG,MAAM,CAAC,UAACC,MAAM;MAAA,OAAK,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAACiD,QAAQ,CAACjD,MAAM,CAACE,WAAW,EAAE,CAAC;IAAA,EAAC,CACvED,GAAG,CAAC,UAACD,MAAM;MAAA,OAAM;QAChBA,MAAM,EAANA,MAAM;QACNgB,IAAI,EAAErB,KAAK,CAACqB;OACb;IAAA,CAAC,CAAC;EAAA,EACN;AACH,CAAC;AAED,eAAewC,YAAY"}
|
|
1
|
+
{"version":3,"file":"listEndpoints.js","names":["regExpToParseExpressPathRegExp","regExpToReplaceExpressPathRegExpParams","regexpExpressParamRegexp","EXPRESS_ROOT_PATH_REGEXP_VALUE","STACK_ITEM_VALID_NAMES","getRouteMethods","route","methods","Object","keys","filter","method","map","toUpperCase","getRouteMiddlewares","stack","item","handle","name","hasParams","expressPathRegExp","test","parseExpressRoute","basePath","paths","Array","isArray","path","push","apply","_toConsumableArray","endpoints","completePath","concat","endpoint","middlewares","parseExpressPath","params","expressPathRegExpExec","exec","parsedRegExp","toString","paramIndex","paramName","paramId","replace","parsedPath","parseEndpoints","app","_router","addEndpoints","parseStack","currentEndpoints","endpointsToAdd","forEach","newEndpoint","existingEndpoint","find","undefined","newMethods","includes","stackItem","newEndpoints","isExpressPathRegexp","regexp","newBasePath","regExpPath","getEndpoints","flatMap"],"sources":["../../../src/express/listEndpoints.js"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -8,18 +8,27 @@ import { getPackageVersion } from "../common/packageVersions.js";
|
|
|
8
8
|
import listEndpoints from "./listEndpoints.js";
|
|
9
9
|
export var useApitally = function useApitally(app, config) {
|
|
10
10
|
var client = new ApitallyClient(config);
|
|
11
|
-
var middleware = getMiddleware(client);
|
|
11
|
+
var middleware = getMiddleware(app, client);
|
|
12
12
|
app.use(middleware);
|
|
13
13
|
setTimeout(function () {
|
|
14
14
|
client.setAppInfo(getAppInfo(app, config.appVersion));
|
|
15
15
|
}, 100);
|
|
16
16
|
};
|
|
17
|
-
var getMiddleware = function getMiddleware(client) {
|
|
17
|
+
var getMiddleware = function getMiddleware(app, client) {
|
|
18
18
|
var validatorInstalled = getPackageVersion("express-validator") !== null;
|
|
19
19
|
var celebrateInstalled = getPackageVersion("celebrate") !== null;
|
|
20
20
|
var nestInstalled = getPackageVersion("@nestjs/core") !== null;
|
|
21
21
|
var classValidatorInstalled = getPackageVersion("class-validator") !== null;
|
|
22
|
+
var errorHandlerConfigured = false;
|
|
22
23
|
return function (req, res, next) {
|
|
24
|
+
if (!errorHandlerConfigured) {
|
|
25
|
+
// Add error handling middleware to the bottom of the stack when handling the first request
|
|
26
|
+
app.use(function (err, req, res, next) {
|
|
27
|
+
res.locals.serverError = err;
|
|
28
|
+
next(err);
|
|
29
|
+
});
|
|
30
|
+
errorHandlerConfigured = true;
|
|
31
|
+
}
|
|
23
32
|
try {
|
|
24
33
|
var startTime = performance.now();
|
|
25
34
|
var originalJson = res.json;
|
|
@@ -31,8 +40,9 @@ var getMiddleware = function getMiddleware(client) {
|
|
|
31
40
|
try {
|
|
32
41
|
if (req.route) {
|
|
33
42
|
var responseTime = performance.now() - startTime;
|
|
43
|
+
var consumer = getConsumer(req);
|
|
34
44
|
client.requestCounter.addRequest({
|
|
35
|
-
consumer:
|
|
45
|
+
consumer: consumer,
|
|
36
46
|
method: req.method,
|
|
37
47
|
path: req.route.path,
|
|
38
48
|
statusCode: res.statusCode,
|
|
@@ -53,12 +63,23 @@ var getMiddleware = function getMiddleware(client) {
|
|
|
53
63
|
}
|
|
54
64
|
validationErrors.forEach(function (error) {
|
|
55
65
|
client.validationErrorCounter.addValidationError(_objectSpread({
|
|
56
|
-
consumer:
|
|
66
|
+
consumer: consumer,
|
|
57
67
|
method: req.method,
|
|
58
68
|
path: req.route.path
|
|
59
69
|
}, error));
|
|
60
70
|
});
|
|
61
71
|
}
|
|
72
|
+
if (res.statusCode === 500 && res.locals.serverError) {
|
|
73
|
+
var serverError = res.locals.serverError;
|
|
74
|
+
client.serverErrorCounter.addServerError({
|
|
75
|
+
consumer: consumer,
|
|
76
|
+
method: req.method,
|
|
77
|
+
path: req.route.path,
|
|
78
|
+
type: serverError.name,
|
|
79
|
+
msg: serverError.message,
|
|
80
|
+
traceback: serverError.stack || ""
|
|
81
|
+
});
|
|
82
|
+
}
|
|
62
83
|
}
|
|
63
84
|
} catch (error) {
|
|
64
85
|
client.logger.error("Error while logging request in Apitally middleware.", {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["performance","ApitallyClient","getPackageVersion","listEndpoints","useApitally","app","config","client","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","validatorInstalled","celebrateInstalled","nestInstalled","classValidatorInstalled","req","res","next","startTime","now","originalJson","json","body","
|
|
1
|
+
{"version":3,"file":"middleware.js","names":["performance","ApitallyClient","getPackageVersion","listEndpoints","useApitally","app","config","client","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","validatorInstalled","celebrateInstalled","nestInstalled","classValidatorInstalled","errorHandlerConfigured","req","res","next","err","locals","serverError","startTime","now","originalJson","json","body","call","on","route","responseTime","consumer","getConsumer","requestCounter","addRequest","method","path","statusCode","requestSize","get","responseSize","validationErrors","push","apply","_toConsumableArray","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","forEach","error","validationErrorCounter","addValidationError","_objectSpread","serverErrorCounter","addServerError","type","name","msg","message","traceback","stack","logger","request","response","consumerIdentifier","String","responseBody","errors","Array","isArray","location","loc","concat","validation","Object","values","source","keys","key","subsetJoiMessage","messageWithKey","split","find","includes","versions","process","version","replace","expressVersion","apitallyVersion","paths","fromEntries"],"sources":["../../../src/express/middleware.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["default","apitallyPlugin"],"sources":["../../../src/fastify/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAO,IAAIC,cAAc,QAAQ,aAAa"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["default","apitallyPlugin"],"sources":["../../../src/fastify/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAO,IAAIC,cAAc,QAAQ,aAAa","ignoreList":[]}
|
|
@@ -48,9 +48,16 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
48
48
|
} catch (error) {} // eslint-disable-line no-empty
|
|
49
49
|
done();
|
|
50
50
|
});
|
|
51
|
+
fastify.addHook("onError", function (request, reply, error, done) {
|
|
52
|
+
if (!error.statusCode || error.statusCode === 500) {
|
|
53
|
+
reply.serverError = error;
|
|
54
|
+
}
|
|
55
|
+
done();
|
|
56
|
+
});
|
|
51
57
|
fastify.addHook("onResponse", function (request, reply, done) {
|
|
52
58
|
if (request.method.toUpperCase() !== "OPTIONS") {
|
|
53
59
|
// Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath
|
|
60
|
+
var consumer = getConsumer(request);
|
|
54
61
|
var path = "routeOptions" in request ? request.routeOptions.url : request.routerPath;
|
|
55
62
|
var requestSize = request.headers["content-length"];
|
|
56
63
|
var responseSize = reply.getHeader("content-length");
|
|
@@ -58,7 +65,7 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
58
65
|
responseSize = responseSize[0];
|
|
59
66
|
}
|
|
60
67
|
client.requestCounter.addRequest({
|
|
61
|
-
consumer:
|
|
68
|
+
consumer: consumer,
|
|
62
69
|
method: request.method,
|
|
63
70
|
path: path,
|
|
64
71
|
statusCode: reply.statusCode,
|
|
@@ -70,16 +77,26 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
70
77
|
var validationErrors = extractAjvErrors(reply.payload.message);
|
|
71
78
|
validationErrors.forEach(function (error) {
|
|
72
79
|
client.validationErrorCounter.addValidationError(_objectSpread({
|
|
73
|
-
consumer:
|
|
80
|
+
consumer: consumer,
|
|
74
81
|
method: request.method,
|
|
75
82
|
path: path
|
|
76
83
|
}, error));
|
|
77
84
|
});
|
|
78
85
|
}
|
|
86
|
+
if (reply.statusCode === 500 && reply.serverError) {
|
|
87
|
+
client.serverErrorCounter.addServerError({
|
|
88
|
+
consumer: consumer,
|
|
89
|
+
method: request.method,
|
|
90
|
+
path: path,
|
|
91
|
+
type: reply.serverError.name,
|
|
92
|
+
msg: reply.serverError.message,
|
|
93
|
+
traceback: reply.serverError.stack || ""
|
|
94
|
+
});
|
|
95
|
+
}
|
|
79
96
|
}
|
|
80
97
|
done();
|
|
81
98
|
});
|
|
82
|
-
case
|
|
99
|
+
case 10:
|
|
83
100
|
case "end":
|
|
84
101
|
return _context2.stop();
|
|
85
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","names":["fp","ApitallyClient","getPackageVersion","apitallyPlugin","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee2","fastify","config","client","routes","wrap","_callee2$","_context2","prev","next","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setAppInfo","getAppInfo","appVersion","_callee","_callee$","_context","handleShutdown","stop","request","reply","payload","done","JSON","parse","error","
|
|
1
|
+
{"version":3,"file":"plugin.js","names":["fp","ApitallyClient","getPackageVersion","apitallyPlugin","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee2","fastify","config","client","routes","wrap","_callee2$","_context2","prev","next","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","forEach","includes","toUpperCase","push","path","url","setAppInfo","getAppInfo","appVersion","_callee","_callee$","_context","handleShutdown","stop","request","reply","payload","done","JSON","parse","error","statusCode","serverError","consumer","getConsumer","routerPath","requestSize","headers","responseSize","getHeader","requestCounter","addRequest","responseTime","getResponseTime","code","message","validationErrors","extractAjvErrors","validationErrorCounter","addValidationError","_objectSpread","serverErrorCounter","addServerError","type","name","msg","traceback","stack","_x","_x2","apply","arguments","versions","process","version","replace","fastifyVersion","apitallyVersion","paths","Object","fromEntries","consumerIdentifier","String","regex","matches","match","exec","index","map","m","i","endIndex","length","matchSplit","split","loc","join","substring"],"sources":["../../../src/fastify/plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/lib/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":""}
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"","ignoreList":[]}
|
package/lib/esm/koa/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/koa/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,iBAAiB"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/koa/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,iBAAiB","ignoreList":[]}
|
|
@@ -13,7 +13,7 @@ export var useApitally = function useApitally(app, config) {
|
|
|
13
13
|
var getMiddleware = function getMiddleware(client) {
|
|
14
14
|
return /*#__PURE__*/function () {
|
|
15
15
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ctx, next) {
|
|
16
|
-
var
|
|
16
|
+
var path, statusCode, startTime;
|
|
17
17
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
18
18
|
while (1) switch (_context.prev = _context.next) {
|
|
19
19
|
case 0:
|
|
@@ -22,46 +22,62 @@ var getMiddleware = function getMiddleware(client) {
|
|
|
22
22
|
_context.next = 4;
|
|
23
23
|
return next();
|
|
24
24
|
case 4:
|
|
25
|
-
_context.next =
|
|
25
|
+
_context.next = 12;
|
|
26
26
|
break;
|
|
27
27
|
case 6:
|
|
28
28
|
_context.prev = 6;
|
|
29
29
|
_context.t0 = _context["catch"](1);
|
|
30
|
+
path = getPath(ctx);
|
|
30
31
|
statusCode = _context.t0.statusCode || _context.t0.status || 500;
|
|
32
|
+
if (path && statusCode === 500 && _context.t0 instanceof Error) {
|
|
33
|
+
client.serverErrorCounter.addServerError({
|
|
34
|
+
consumer: getConsumer(ctx),
|
|
35
|
+
method: ctx.request.method,
|
|
36
|
+
path: path,
|
|
37
|
+
type: _context.t0.name,
|
|
38
|
+
msg: _context.t0.message,
|
|
39
|
+
traceback: _context.t0.stack || ""
|
|
40
|
+
});
|
|
41
|
+
}
|
|
31
42
|
throw _context.t0;
|
|
32
|
-
case
|
|
33
|
-
_context.prev =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
43
|
+
case 12:
|
|
44
|
+
_context.prev = 12;
|
|
45
|
+
if (!path) {
|
|
46
|
+
path = getPath(ctx);
|
|
47
|
+
}
|
|
48
|
+
if (path) {
|
|
49
|
+
try {
|
|
37
50
|
client.requestCounter.addRequest({
|
|
38
51
|
consumer: getConsumer(ctx),
|
|
39
52
|
method: ctx.request.method,
|
|
40
|
-
path:
|
|
53
|
+
path: path,
|
|
41
54
|
statusCode: statusCode || ctx.response.status,
|
|
42
55
|
responseTime: performance.now() - startTime,
|
|
43
56
|
requestSize: ctx.request.length,
|
|
44
57
|
responseSize: ctx.response.length
|
|
45
58
|
});
|
|
59
|
+
} catch (error) {
|
|
60
|
+
client.logger.error("Error while logging request in Apitally middleware.", {
|
|
61
|
+
context: ctx,
|
|
62
|
+
error: error
|
|
63
|
+
});
|
|
46
64
|
}
|
|
47
|
-
} catch (error) {
|
|
48
|
-
client.logger.error("Error while logging request in Apitally middleware.", {
|
|
49
|
-
context: ctx,
|
|
50
|
-
error: error
|
|
51
|
-
});
|
|
52
65
|
}
|
|
53
|
-
return _context.finish(
|
|
54
|
-
case
|
|
66
|
+
return _context.finish(12);
|
|
67
|
+
case 16:
|
|
55
68
|
case "end":
|
|
56
69
|
return _context.stop();
|
|
57
70
|
}
|
|
58
|
-
}, _callee, null, [[1, 6,
|
|
71
|
+
}, _callee, null, [[1, 6, 12, 16]]);
|
|
59
72
|
}));
|
|
60
73
|
return function (_x, _x2) {
|
|
61
74
|
return _ref.apply(this, arguments);
|
|
62
75
|
};
|
|
63
76
|
}();
|
|
64
77
|
};
|
|
78
|
+
var getPath = function getPath(ctx) {
|
|
79
|
+
return ctx._matchedRoute || ctx.routePath; // _matchedRoute is set by koa-router, routePath is set by koa-route
|
|
80
|
+
};
|
|
65
81
|
var getConsumer = function getConsumer(ctx) {
|
|
66
82
|
return ctx.state.consumerIdentifier ? String(ctx.state.consumerIdentifier) : null;
|
|
67
83
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["ApitallyClient","getPackageVersion","useApitally","app","config","client","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","ctx","next","
|
|
1
|
+
{"version":3,"file":"middleware.js","names":["ApitallyClient","getPackageVersion","useApitally","app","config","client","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","ctx","next","path","statusCode","startTime","wrap","_callee$","_context","prev","performance","now","t0","getPath","status","Error","serverErrorCounter","addServerError","consumer","getConsumer","method","request","type","name","msg","message","traceback","stack","requestCounter","addRequest","response","responseTime","requestSize","length","responseSize","error","logger","context","finish","stop","_x","_x2","apply","arguments","_matchedRoute","routePath","state","consumerIdentifier","String","versions","process","version","replace","koaVersion","apitallyVersion","push","paths","listEndpoints","Object","fromEntries","isKoaRouterMiddleware","router","Array","isArray","endpoints","forEach","layer","methods","includes","toUpperCase"],"sources":["../../../src/koa/middleware.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/nestjs/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,qBAAqB"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/nestjs/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,qBAAqB","ignoreList":[]}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Logger } from "./logging.js";
|
|
2
2
|
import RequestCounter from "./requestCounter.js";
|
|
3
|
+
import ServerErrorCounter from "./serverErrorCounter.js";
|
|
3
4
|
import { ApitallyConfig, AppInfo } from "./types.js";
|
|
4
5
|
import ValidationErrorCounter from "./validationErrorCounter.js";
|
|
5
6
|
export declare class ApitallyClient {
|
|
@@ -14,6 +15,7 @@ export declare class ApitallyClient {
|
|
|
14
15
|
private appInfoSent;
|
|
15
16
|
requestCounter: RequestCounter;
|
|
16
17
|
validationErrorCounter: ValidationErrorCounter;
|
|
18
|
+
serverErrorCounter: ServerErrorCounter;
|
|
17
19
|
logger: Logger;
|
|
18
20
|
constructor({ clientId, env, logger }: ApitallyConfig);
|
|
19
21
|
static getInstance(): ApitallyClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAa,MAAM,cAAc,CAAC;AAEjD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACL,cAAc,EACd,OAAO,EAGR,MAAM,YAAY,CAAC;AACpB,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AAQjE,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAiB;IACzC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,WAAW,CAAkB;IAE9B,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC;gBAEV,EAAE,QAAQ,EAAE,GAAW,EAAE,MAAM,EAAE,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAa,MAAM,cAAc,CAAC;AAEjD,OAAO,cAAc,MAAM,qBAAqB,CAAC;AACjD,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,cAAc,EACd,OAAO,EAGR,MAAM,YAAY,CAAC;AACpB,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AAQjE,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAiB;IACzC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,iBAAiB,CAAuC;IAChE,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,WAAW,CAAkB;IAE9B,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;gBAEV,EAAE,QAAQ,EAAE,GAAW,EAAE,MAAM,EAAE,EAAE,cAAc;WAuC/C,WAAW;WAOL,QAAQ;IAMf,cAAc;IAM3B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,SAAS;YAaH,IAAI;IAclB,OAAO,CAAC,QAAQ;IAOT,UAAU,CAAC,OAAO,EAAE,OAAO;YAMpB,WAAW;YAkCX,gBAAgB;CAqC/B"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ConsumerMethodPath, ServerError, ServerErrorsItem } from "./types.js";
|
|
2
|
+
export default class ServerErrorCounter {
|
|
3
|
+
private errorCounts;
|
|
4
|
+
private errorDetails;
|
|
5
|
+
private sentryEventIds;
|
|
6
|
+
private sentry;
|
|
7
|
+
constructor();
|
|
8
|
+
addServerError(serverError: ConsumerMethodPath & ServerError): void;
|
|
9
|
+
getAndResetServerErrors(): ServerErrorsItem[];
|
|
10
|
+
private getKey;
|
|
11
|
+
private getTruncatedMessage;
|
|
12
|
+
private getTruncatedStack;
|
|
13
|
+
private captureSentryEventId;
|
|
14
|
+
private tryImportSentry;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=serverErrorCounter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serverErrorCounter.d.ts","sourceRoot":"","sources":["../../../src/common/serverErrorCounter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAK/E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACrC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,MAAM,CAA4B;;IASnC,cAAc,CAAC,WAAW,EAAE,kBAAkB,GAAG,WAAW;IAS5D,uBAAuB;IAsB9B,OAAO,CAAC,MAAM;IAYd,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;YASd,eAAe;CAO9B"}
|
|
@@ -50,11 +50,24 @@ export type ValidationErrorsItem = ConsumerMethodPath & {
|
|
|
50
50
|
type: string;
|
|
51
51
|
error_count: number;
|
|
52
52
|
};
|
|
53
|
+
export type ServerError = {
|
|
54
|
+
type: string;
|
|
55
|
+
msg: string;
|
|
56
|
+
traceback: string;
|
|
57
|
+
};
|
|
58
|
+
export type ServerErrorsItem = ConsumerMethodPath & {
|
|
59
|
+
type: string;
|
|
60
|
+
msg: string;
|
|
61
|
+
traceback: string;
|
|
62
|
+
sentry_event_id: string | null;
|
|
63
|
+
error_count: number;
|
|
64
|
+
};
|
|
53
65
|
export type RequestsDataPayload = {
|
|
54
66
|
time_offset: number;
|
|
55
67
|
instance_uuid: string;
|
|
56
68
|
message_uuid: string;
|
|
57
69
|
requests: Array<RequestsItem>;
|
|
58
70
|
validation_errors: Array<ValidationErrorsItem>;
|
|
71
|
+
server_errors: Array<ServerErrorsItem>;
|
|
59
72
|
};
|
|
60
73
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;AAEZ,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,GAAG;IACtD,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9B,iBAAiB,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;AAEZ,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG;IAC7C,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,GAAG;IACtD,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9B,iBAAiB,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC/C,aAAa,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;CACxC,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ConsumerMethodPath, ValidationError, ValidationErrorsItem } from "./types.js";
|
|
2
2
|
export default class ValidationErrorCounter {
|
|
3
3
|
private errorCounts;
|
|
4
|
+
private errorDetails;
|
|
4
5
|
constructor();
|
|
5
|
-
private getKey;
|
|
6
6
|
addValidationError(validationError: ConsumerMethodPath & ValidationError): void;
|
|
7
7
|
getAndResetValidationErrors(): ValidationErrorsItem[];
|
|
8
|
+
private getKey;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=validationErrorCounter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validationErrorCounter.d.ts","sourceRoot":"","sources":["../../../src/common/validationErrorCounter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validationErrorCounter.d.ts","sourceRoot":"","sources":["../../../src/common/validationErrorCounter.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,OAAO,OAAO,sBAAsB;IACzC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,YAAY,CAAoD;;IAOjE,kBAAkB,CACvB,eAAe,EAAE,kBAAkB,GAAG,eAAe;IAShD,2BAA2B;IAqBlC,OAAO,CAAC,MAAM;CAWf"}
|