apitally 0.5.0 → 0.6.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 +4 -4
- package/lib/cjs/express/middleware.cjs +7 -1
- package/lib/cjs/express/middleware.cjs.map +1 -1
- package/lib/cjs/fastify/plugin.cjs +10 -3
- package/lib/cjs/fastify/plugin.cjs.map +1 -1
- package/lib/cjs/koa/middleware.cjs +7 -1
- package/lib/cjs/koa/middleware.cjs.map +1 -1
- package/lib/esm/express/middleware.js +7 -1
- package/lib/esm/express/middleware.js.map +1 -1
- package/lib/esm/fastify/plugin.js +10 -3
- package/lib/esm/fastify/plugin.js.map +1 -1
- package/lib/esm/koa/middleware.js +7 -1
- package/lib/esm/koa/middleware.js.map +1 -1
- package/lib/types/express/middleware.d.ts +1 -0
- package/lib/types/express/middleware.d.ts.map +1 -1
- package/lib/types/fastify/plugin.d.ts +1 -0
- package/lib/types/fastify/plugin.d.ts.map +1 -1
- package/package.json +10 -9
package/README.md
CHANGED
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
<picture>
|
|
3
3
|
<source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
|
|
4
4
|
<source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
|
|
5
|
-
<img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png">
|
|
5
|
+
<img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
|
|
6
6
|
</picture>
|
|
7
7
|
</p>
|
|
8
8
|
|
|
9
9
|
<p align="center"><b>API monitoring made easy.</b></p>
|
|
10
10
|
|
|
11
|
-
<p align="center"><i>Apitally is a simple
|
|
11
|
+
<p align="center"><i>Apitally is a simple API monitoring & analytics tool with a focus on data privacy.<br>It is super easy to use for API projects in Node.js or Python and never collects sensitive data.</i></p>
|
|
12
12
|
|
|
13
13
|
<p align="center">🔗 <b><a href="https://apitally.io" target="_blank">apitally.io</a></b></p>
|
|
14
14
|
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
|
|
19
19
|
# Apitally client library for Node.js
|
|
20
20
|
|
|
21
|
-
[](https://github.com/apitally/apitally-js/actions)
|
|
22
|
+
[](https://codecov.io/gh/apitally/apitally-js)
|
|
23
23
|
[](https://www.npmjs.com/package/apitally)
|
|
24
24
|
|
|
25
25
|
This client library for Apitally currently supports the following Node.js web
|
|
@@ -108,7 +108,13 @@ var getMiddleware = function getMiddleware(app, client) {
|
|
|
108
108
|
};
|
|
109
109
|
};
|
|
110
110
|
var getConsumer = function getConsumer(req) {
|
|
111
|
-
|
|
111
|
+
if (req.apitallyConsumer) {
|
|
112
|
+
return String(req.apitallyConsumer);
|
|
113
|
+
} else if (req.consumerIdentifier) {
|
|
114
|
+
// For backwards compatibility
|
|
115
|
+
return String(req.consumerIdentifier);
|
|
116
|
+
}
|
|
117
|
+
return null;
|
|
112
118
|
};
|
|
113
119
|
var extractExpressValidatorErrors = function extractExpressValidatorErrors(responseBody) {
|
|
114
120
|
var errors = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.cjs","names":["_perf_hooks","require","_client","_packageVersions","_listEndpoints","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useApitally","exports","app","config","client","ApitallyClient","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","validatorInstalled","getPackageVersion","celebrateInstalled","nestInstalled","classValidatorInstalled","errorHandlerConfigured","req","res","next","err","locals","serverError","startTime","performance","now","originalJson","json","body","call","on","route","responseTime","consumer","getConsumer","requestCounter","addRequest","method","path","statusCode","requestSize","get","responseSize","validationErrors","_toConsumableArray2","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","error","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","message","traceback","stack","logger","request","response","
|
|
1
|
+
{"version":3,"file":"middleware.cjs","names":["_perf_hooks","require","_client","_packageVersions","_listEndpoints","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useApitally","exports","app","config","client","ApitallyClient","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","validatorInstalled","getPackageVersion","celebrateInstalled","nestInstalled","classValidatorInstalled","errorHandlerConfigured","req","res","next","err","locals","serverError","startTime","performance","now","originalJson","json","body","call","on","route","responseTime","consumer","getConsumer","requestCounter","addRequest","method","path","statusCode","requestSize","get","responseSize","validationErrors","_toConsumableArray2","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","error","validationErrorCounter","addValidationError","serverErrorCounter","addServerError","type","name","msg","message","traceback","stack","logger","request","response","apitallyConsumer","String","consumerIdentifier","responseBody","errors","Array","isArray","location","loc","concat","validation","values","source","key","subsetJoiMessage","messageWithKey","split","find","includes","versions","process","version","replace","expressVersion","apitallyVersion","paths","listEndpoints","fromEntries"],"sources":["../../../src/express/middleware.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -21,7 +21,8 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
21
21
|
case 0:
|
|
22
22
|
client = new _client.ApitallyClient(config);
|
|
23
23
|
routes = [];
|
|
24
|
-
fastify.decorateRequest("
|
|
24
|
+
fastify.decorateRequest("apitallyConsumer", null);
|
|
25
|
+
fastify.decorateRequest("consumerIdentifier", null); // For backwards compatibility
|
|
25
26
|
fastify.decorateReply("payload", null);
|
|
26
27
|
fastify.addHook("onRoute", function (routeOptions) {
|
|
27
28
|
var methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method];
|
|
@@ -103,7 +104,7 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
103
104
|
}
|
|
104
105
|
done();
|
|
105
106
|
});
|
|
106
|
-
case
|
|
107
|
+
case 11:
|
|
107
108
|
case "end":
|
|
108
109
|
return _context2.stop();
|
|
109
110
|
}
|
|
@@ -133,7 +134,13 @@ var getAppInfo = function getAppInfo(routes, appVersion) {
|
|
|
133
134
|
};
|
|
134
135
|
};
|
|
135
136
|
var getConsumer = function getConsumer(request) {
|
|
136
|
-
|
|
137
|
+
if (request.apitallyConsumer) {
|
|
138
|
+
return String(request.apitallyConsumer);
|
|
139
|
+
} else if (request.consumerIdentifier) {
|
|
140
|
+
// For backwards compatibility
|
|
141
|
+
return String(request.consumerIdentifier);
|
|
142
|
+
}
|
|
143
|
+
return null;
|
|
137
144
|
};
|
|
138
145
|
var extractAjvErrors = function extractAjvErrors(message) {
|
|
139
146
|
var regex = /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.cjs","names":["_fastifyPlugin","_interopRequireDefault","require","_client","_packageVersions","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","apitallyPlugin","_ref","_asyncToGenerator2","_regenerator","mark","_callee2","fastify","config","client","routes","wrap","_callee2$","_context2","prev","next","ApitallyClient","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","includes","toUpperCase","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","serverErrorCounter","addServerError","type","name","msg","traceback","stack","_x","_x2","versions","process","version","replace","fastifyVersion","getPackageVersion","apitallyVersion","paths","fromEntries","
|
|
1
|
+
{"version":3,"file":"plugin.cjs","names":["_fastifyPlugin","_interopRequireDefault","require","_client","_packageVersions","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","apitallyPlugin","_ref","_asyncToGenerator2","_regenerator","mark","_callee2","fastify","config","client","routes","wrap","_callee2$","_context2","prev","next","ApitallyClient","decorateRequest","decorateReply","addHook","routeOptions","methods","Array","isArray","method","includes","toUpperCase","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","serverErrorCounter","addServerError","type","name","msg","traceback","stack","_x","_x2","versions","process","version","replace","fastifyVersion","getPackageVersion","apitallyVersion","paths","fromEntries","apitallyConsumer","String","consumerIdentifier","regex","matches","match","exec","index","map","m","i","endIndex","matchSplit","split","loc","join","substring","_default","exports","fp"],"sources":["../../../src/fastify/plugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -86,7 +86,13 @@ var getPath = function getPath(ctx) {
|
|
|
86
86
|
return ctx._matchedRoute || ctx.routePath; // _matchedRoute is set by koa-router, routePath is set by koa-route
|
|
87
87
|
};
|
|
88
88
|
var getConsumer = function getConsumer(ctx) {
|
|
89
|
-
|
|
89
|
+
if (ctx.state.apitallyConsumer) {
|
|
90
|
+
return String(ctx.state.apitallyConsumer);
|
|
91
|
+
} else if (ctx.state.consumerIdentifier) {
|
|
92
|
+
// For backwards compatibility
|
|
93
|
+
return String(ctx.state.consumerIdentifier);
|
|
94
|
+
}
|
|
95
|
+
return null;
|
|
90
96
|
};
|
|
91
97
|
var getAppInfo = function getAppInfo(app, appVersion) {
|
|
92
98
|
var versions = [["nodejs", process.version.replace(/^v/, "")]];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.cjs","names":["_client","require","_packageVersions","useApitally","exports","app","config","client","ApitallyClient","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","_ref","_asyncToGenerator2","_regenerator","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","
|
|
1
|
+
{"version":3,"file":"middleware.cjs","names":["_client","require","_packageVersions","useApitally","exports","app","config","client","ApitallyClient","middleware","getMiddleware","use","setTimeout","setAppInfo","getAppInfo","appVersion","_ref","_asyncToGenerator2","_regenerator","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","apitallyConsumer","String","consumerIdentifier","versions","process","version","replace","koaVersion","getPackageVersion","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":[]}
|
|
@@ -101,7 +101,13 @@ var getMiddleware = function getMiddleware(app, client) {
|
|
|
101
101
|
};
|
|
102
102
|
};
|
|
103
103
|
var getConsumer = function getConsumer(req) {
|
|
104
|
-
|
|
104
|
+
if (req.apitallyConsumer) {
|
|
105
|
+
return String(req.apitallyConsumer);
|
|
106
|
+
} else if (req.consumerIdentifier) {
|
|
107
|
+
// For backwards compatibility
|
|
108
|
+
return String(req.consumerIdentifier);
|
|
109
|
+
}
|
|
110
|
+
return null;
|
|
105
111
|
};
|
|
106
112
|
var extractExpressValidatorErrors = function extractExpressValidatorErrors(responseBody) {
|
|
107
113
|
var errors = [];
|
|
@@ -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","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","
|
|
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","apitallyConsumer","String","consumerIdentifier","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":[]}
|
|
@@ -14,7 +14,8 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
14
14
|
case 0:
|
|
15
15
|
client = new ApitallyClient(config);
|
|
16
16
|
routes = [];
|
|
17
|
-
fastify.decorateRequest("
|
|
17
|
+
fastify.decorateRequest("apitallyConsumer", null);
|
|
18
|
+
fastify.decorateRequest("consumerIdentifier", null); // For backwards compatibility
|
|
18
19
|
fastify.decorateReply("payload", null);
|
|
19
20
|
fastify.addHook("onRoute", function (routeOptions) {
|
|
20
21
|
var methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method];
|
|
@@ -96,7 +97,7 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
96
97
|
}
|
|
97
98
|
done();
|
|
98
99
|
});
|
|
99
|
-
case
|
|
100
|
+
case 11:
|
|
100
101
|
case "end":
|
|
101
102
|
return _context2.stop();
|
|
102
103
|
}
|
|
@@ -126,7 +127,13 @@ var getAppInfo = function getAppInfo(routes, appVersion) {
|
|
|
126
127
|
};
|
|
127
128
|
};
|
|
128
129
|
var getConsumer = function getConsumer(request) {
|
|
129
|
-
|
|
130
|
+
if (request.apitallyConsumer) {
|
|
131
|
+
return String(request.apitallyConsumer);
|
|
132
|
+
} else if (request.consumerIdentifier) {
|
|
133
|
+
// For backwards compatibility
|
|
134
|
+
return String(request.consumerIdentifier);
|
|
135
|
+
}
|
|
136
|
+
return null;
|
|
130
137
|
};
|
|
131
138
|
var extractAjvErrors = function extractAjvErrors(message) {
|
|
132
139
|
var regex = /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;
|
|
@@ -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","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","
|
|
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","apitallyConsumer","String","consumerIdentifier","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":[]}
|
|
@@ -79,7 +79,13 @@ var getPath = function getPath(ctx) {
|
|
|
79
79
|
return ctx._matchedRoute || ctx.routePath; // _matchedRoute is set by koa-router, routePath is set by koa-route
|
|
80
80
|
};
|
|
81
81
|
var getConsumer = function getConsumer(ctx) {
|
|
82
|
-
|
|
82
|
+
if (ctx.state.apitallyConsumer) {
|
|
83
|
+
return String(ctx.state.apitallyConsumer);
|
|
84
|
+
} else if (ctx.state.consumerIdentifier) {
|
|
85
|
+
// For backwards compatibility
|
|
86
|
+
return String(ctx.state.consumerIdentifier);
|
|
87
|
+
}
|
|
88
|
+
return null;
|
|
83
89
|
};
|
|
84
90
|
var getAppInfo = function getAppInfo(app, appVersion) {
|
|
85
91
|
var versions = [["nodejs", process.version.replace(/^v/, "")]];
|
|
@@ -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","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","
|
|
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","apitallyConsumer","String","consumerIdentifier","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":"middleware.d.ts","sourceRoot":"","sources":["../../../src/express/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAKxE,OAAO,EAAE,cAAc,EAA4B,MAAM,oBAAoB,CAAC;AAG9E,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,OAAO;QACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;CACF;AAED,eAAO,MAAM,WAAW,QAAS,OAAO,UAAU,cAAc,SAO/D,CAAC"}
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/express/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AAKxE,OAAO,EAAE,cAAc,EAA4B,MAAM,oBAAoB,CAAC;AAG9E,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,OAAO;QACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;CACF;AAED,eAAO,MAAM,WAAW,QAAS,OAAO,UAAU,cAAc,SAO/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/fastify/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAkB,MAAM,SAAS,CAAC;AAKhF,OAAO,EAAE,cAAc,EAA6B,MAAM,oBAAoB,CAAC;AAE/E,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,YAAY;QACpB,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,CAAC,EAAE,YAAY,CAAC;KAC5B;IAED,UAAU,cAAc;QACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;CACF;;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/fastify/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAkB,MAAM,SAAS,CAAC;AAKhF,OAAO,EAAE,cAAc,EAA6B,MAAM,oBAAoB,CAAC;AAE/E,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,YAAY;QACpB,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,CAAC,EAAE,YAAY,CAAC;KAC5B;IAED,UAAU,cAAc;QACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;CACF;;AA8JD,wBAEG"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apitally",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "API monitoring for REST APIs built with Express, Fastify, Koa, and NestJS.",
|
|
3
|
+
"version": "0.6.0",
|
|
4
|
+
"description": "Simple API monitoring & analytics for REST APIs built with Express, Fastify, Koa, and NestJS.",
|
|
5
5
|
"author": "Apitally <hello@apitally.io>",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"keywords": [
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
"fastify",
|
|
13
13
|
"koa",
|
|
14
14
|
"logging",
|
|
15
|
+
"metrics",
|
|
15
16
|
"middleware",
|
|
16
17
|
"monitor",
|
|
17
18
|
"monitoring",
|
|
@@ -24,10 +25,10 @@
|
|
|
24
25
|
],
|
|
25
26
|
"repository": {
|
|
26
27
|
"type": "git",
|
|
27
|
-
"url": "git+ssh://git@github.com/apitally/
|
|
28
|
+
"url": "git+ssh://git@github.com/apitally/apitally-js.git"
|
|
28
29
|
},
|
|
29
30
|
"bugs": {
|
|
30
|
-
"url": "https://github.com/apitally/
|
|
31
|
+
"url": "https://github.com/apitally/apitally-js/issues"
|
|
31
32
|
},
|
|
32
33
|
"homepage": "https://apitally.io",
|
|
33
34
|
"type": "module",
|
|
@@ -211,9 +212,9 @@
|
|
|
211
212
|
"@types/koa-bodyparser": "^4.3.12",
|
|
212
213
|
"@types/koa-route": "^3.2.8",
|
|
213
214
|
"@types/node": "^20.9.0",
|
|
214
|
-
"@types/supertest": "^
|
|
215
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
216
|
-
"@typescript-eslint/parser": "^
|
|
215
|
+
"@types/supertest": "^6.0.0",
|
|
216
|
+
"@typescript-eslint/eslint-plugin": "^7.0.0",
|
|
217
|
+
"@typescript-eslint/parser": "^7.0.0",
|
|
217
218
|
"@vitest/coverage-v8": "^1.5.0",
|
|
218
219
|
"babel-plugin-transform-import-meta": "^2.2.1",
|
|
219
220
|
"babel-plugin-transform-require-extensions": "^2.0.1",
|
|
@@ -228,11 +229,11 @@
|
|
|
228
229
|
"install": "^0.13.0",
|
|
229
230
|
"koa": "^2.14.2",
|
|
230
231
|
"koa-bodyparser": "^4.4.1",
|
|
231
|
-
"koa-route": "^
|
|
232
|
+
"koa-route": "^4.0.0",
|
|
232
233
|
"nock": "^13.3.8",
|
|
233
234
|
"npm": "^10.2.4",
|
|
234
235
|
"prettier": "^3.1.0",
|
|
235
|
-
"supertest": "^
|
|
236
|
+
"supertest": "^7.0.0",
|
|
236
237
|
"ts-node": "^10.9.1",
|
|
237
238
|
"typescript": "^5.2.2",
|
|
238
239
|
"unplugin-swc": "^1.4.4",
|