apitally 0.2.0 → 0.3.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 +5 -9
- package/lib/cjs/common/client.cjs +25 -100
- package/lib/cjs/common/client.cjs.map +1 -1
- package/lib/cjs/express/index.cjs +0 -14
- package/lib/cjs/express/index.cjs.map +1 -1
- package/lib/cjs/express/middleware.cjs +1 -8
- package/lib/cjs/express/middleware.cjs.map +1 -1
- package/lib/cjs/fastify/index.cjs +0 -14
- package/lib/cjs/fastify/index.cjs.map +1 -1
- package/lib/cjs/fastify/plugin.cjs +28 -34
- package/lib/cjs/fastify/plugin.cjs.map +1 -1
- package/lib/cjs/koa/index.cjs +0 -14
- package/lib/cjs/koa/index.cjs.map +1 -1
- package/lib/cjs/koa/middleware.cjs +1 -8
- package/lib/cjs/koa/middleware.cjs.map +1 -1
- package/lib/cjs/nestjs/index.cjs +0 -26
- package/lib/cjs/nestjs/index.cjs.map +1 -1
- package/lib/esm/common/client.js +25 -100
- package/lib/esm/common/client.js.map +1 -1
- package/lib/esm/express/index.js +1 -4
- package/lib/esm/express/index.js.map +1 -1
- package/lib/esm/express/middleware.js +1 -8
- package/lib/esm/express/middleware.js.map +1 -1
- package/lib/esm/fastify/index.js +1 -4
- package/lib/esm/fastify/index.js.map +1 -1
- package/lib/esm/fastify/plugin.js +28 -34
- package/lib/esm/fastify/plugin.js.map +1 -1
- package/lib/esm/koa/index.js +1 -4
- package/lib/esm/koa/index.js.map +1 -1
- package/lib/esm/koa/middleware.js +1 -8
- package/lib/esm/koa/middleware.js.map +1 -1
- package/lib/esm/nestjs/index.js +1 -4
- package/lib/esm/nestjs/index.js.map +1 -1
- package/lib/types/common/client.d.ts +1 -9
- package/lib/types/common/client.d.ts.map +1 -1
- package/lib/types/common/types.d.ts +0 -4
- package/lib/types/common/types.d.ts.map +1 -1
- package/lib/types/express/index.d.ts +0 -2
- package/lib/types/express/index.d.ts.map +1 -1
- package/lib/types/express/middleware.d.ts +0 -2
- package/lib/types/express/middleware.d.ts.map +1 -1
- package/lib/types/fastify/index.d.ts +0 -2
- package/lib/types/fastify/index.d.ts.map +1 -1
- package/lib/types/fastify/plugin.d.ts +0 -2
- package/lib/types/fastify/plugin.d.ts.map +1 -1
- package/lib/types/koa/index.d.ts +0 -2
- package/lib/types/koa/index.d.ts.map +1 -1
- package/lib/types/koa/middleware.d.ts.map +1 -1
- package/lib/types/nestjs/index.d.ts +0 -2
- package/lib/types/nestjs/index.d.ts.map +1 -1
- package/package.json +2 -4
- package/lib/cjs/common/index.cjs +0 -13
- package/lib/cjs/common/index.cjs.map +0 -1
- package/lib/cjs/common/keyRegistry.cjs +0 -162
- package/lib/cjs/common/keyRegistry.cjs.map +0 -1
- package/lib/cjs/express/auth.cjs +0 -105
- package/lib/cjs/express/auth.cjs.map +0 -1
- package/lib/cjs/fastify/auth.cjs +0 -105
- package/lib/cjs/fastify/auth.cjs.map +0 -1
- package/lib/cjs/koa/auth.cjs +0 -113
- package/lib/cjs/koa/auth.cjs.map +0 -1
- package/lib/cjs/nestjs/auth.cjs +0 -132
- package/lib/cjs/nestjs/auth.cjs.map +0 -1
- package/lib/esm/common/index.js +0 -1
- package/lib/esm/common/index.js.map +0 -1
- package/lib/esm/common/keyRegistry.js +0 -155
- package/lib/esm/common/keyRegistry.js.map +0 -1
- package/lib/esm/express/auth.js +0 -98
- package/lib/esm/express/auth.js.map +0 -1
- package/lib/esm/fastify/auth.js +0 -98
- package/lib/esm/fastify/auth.js.map +0 -1
- package/lib/esm/koa/auth.js +0 -106
- package/lib/esm/koa/auth.js.map +0 -1
- package/lib/esm/nestjs/auth.js +0 -126
- package/lib/esm/nestjs/auth.js.map +0 -1
- package/lib/types/common/index.d.ts +0 -2
- package/lib/types/common/index.d.ts.map +0 -1
- package/lib/types/common/keyRegistry.d.ts +0 -29
- package/lib/types/common/keyRegistry.d.ts.map +0 -1
- package/lib/types/express/auth.d.ts +0 -6
- package/lib/types/express/auth.d.ts.map +0 -1
- package/lib/types/fastify/auth.d.ts +0 -6
- package/lib/types/fastify/auth.d.ts.map +0 -1
- package/lib/types/koa/auth.d.ts +0 -6
- package/lib/types/koa/auth.d.ts.map +0 -1
- package/lib/types/nestjs/auth.d.ts +0 -12
- package/lib/types/nestjs/auth.d.ts.map +0 -1
package/lib/cjs/koa/index.cjs
CHANGED
|
@@ -3,25 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
Object.defineProperty(exports, "KeyInfo", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _keyRegistry.KeyInfo;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
Object.defineProperty(exports, "requireApiKey", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function get() {
|
|
15
|
-
return _auth.requireApiKey;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
6
|
Object.defineProperty(exports, "useApitally", {
|
|
19
7
|
enumerable: true,
|
|
20
8
|
get: function get() {
|
|
21
9
|
return _middleware.useApitally;
|
|
22
10
|
}
|
|
23
11
|
});
|
|
24
|
-
var _keyRegistry = require("../common/keyRegistry.cjs");
|
|
25
|
-
var _auth = require("./auth.cjs");
|
|
26
12
|
var _middleware = require("./middleware.cjs");
|
|
27
13
|
//# sourceMappingURL=index.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","names":["
|
|
1
|
+
{"version":3,"file":"index.cjs","names":["_middleware","require"],"sources":["../../../src/koa/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA"}
|
|
@@ -8,7 +8,6 @@ exports.useApitally = void 0;
|
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _client = require("../common/client.cjs");
|
|
11
|
-
var _keyRegistry = require("../common/keyRegistry.cjs");
|
|
12
11
|
var _packageVersions = require("../common/packageVersions.cjs");
|
|
13
12
|
var useApitally = exports.useApitally = function useApitally(app, config) {
|
|
14
13
|
var client = new _client.ApitallyClient(config);
|
|
@@ -71,13 +70,7 @@ var getMiddleware = function getMiddleware(client) {
|
|
|
71
70
|
}();
|
|
72
71
|
};
|
|
73
72
|
var getConsumer = function getConsumer(ctx) {
|
|
74
|
-
|
|
75
|
-
return String(ctx.state.consumerIdentifier);
|
|
76
|
-
}
|
|
77
|
-
if (ctx.state.keyInfo && ctx.state.keyInfo instanceof _keyRegistry.KeyInfo) {
|
|
78
|
-
return "key:".concat(ctx.state.keyInfo.keyId);
|
|
79
|
-
}
|
|
80
|
-
return null;
|
|
73
|
+
return ctx.state.consumerIdentifier ? String(ctx.state.consumerIdentifier) : null;
|
|
81
74
|
};
|
|
82
75
|
var getAppInfo = function getAppInfo(app, appVersion) {
|
|
83
76
|
var versions = [["nodejs", process.version.replace(/^v/, "")]];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.cjs","names":["_client","require","
|
|
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","startTime","statusCode","wrap","_callee$","_context","prev","performance","now","t0","status","_matchedRoute","routePath","requestCounter","addRequest","consumer","getConsumer","method","request","path","response","responseTime","requestSize","length","responseSize","error","logger","context","finish","stop","_x","_x2","apply","arguments","state","consumerIdentifier","String","versions","process","version","replace","koaVersion","getPackageVersion","apitallyVersion","push","paths","listEndpoints","Object","fromEntries","isKoaRouterMiddleware","router","Array","isArray","stack","endpoints","forEach","layer","methods","includes","toUpperCase"],"sources":["../../../src/koa/middleware.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/lib/cjs/nestjs/index.cjs
CHANGED
|
@@ -3,37 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
Object.defineProperty(exports, "ApitallyApiKeyGuard", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _auth.ApitallyApiKeyGuard;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
Object.defineProperty(exports, "GetKeyInfo", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function get() {
|
|
15
|
-
return _auth.GetKeyInfo;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
|
-
Object.defineProperty(exports, "KeyInfo", {
|
|
19
|
-
enumerable: true,
|
|
20
|
-
get: function get() {
|
|
21
|
-
return _keyRegistry.KeyInfo;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
Object.defineProperty(exports, "Scopes", {
|
|
25
|
-
enumerable: true,
|
|
26
|
-
get: function get() {
|
|
27
|
-
return _auth.Scopes;
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
6
|
Object.defineProperty(exports, "useApitally", {
|
|
31
7
|
enumerable: true,
|
|
32
8
|
get: function get() {
|
|
33
9
|
return _index.useApitally;
|
|
34
10
|
}
|
|
35
11
|
});
|
|
36
|
-
var _keyRegistry = require("../common/keyRegistry.cjs");
|
|
37
12
|
var _index = require("../express/index.cjs");
|
|
38
|
-
var _auth = require("./auth.cjs");
|
|
39
13
|
//# sourceMappingURL=index.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","names":["
|
|
1
|
+
{"version":3,"file":"index.cjs","names":["_index","require"],"sources":["../../../src/nestjs/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA"}
|
package/lib/esm/common/client.js
CHANGED
|
@@ -9,12 +9,13 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
|
9
9
|
import axios, { AxiosError } from "axios";
|
|
10
10
|
import axiosRetry from "axios-retry";
|
|
11
11
|
import { randomUUID } from "crypto";
|
|
12
|
-
import { KeyRegistry } from "./keyRegistry.js";
|
|
13
12
|
import { getLogger } from "./logging.js";
|
|
14
13
|
import { isValidClientId, isValidEnv } from "./paramValidation.js";
|
|
15
14
|
import RequestCounter from "./requestCounter.js";
|
|
16
15
|
import ValidationErrorCounter from "./validationErrorCounter.js";
|
|
17
16
|
var SYNC_INTERVAL = 60000; // 60 seconds
|
|
17
|
+
var INITIAL_SYNC_INTERVAL = 10000; // 10 seconds
|
|
18
|
+
var INITIAL_SYNC_INTERVAL_DURATION = 3600000; // 1 hour
|
|
18
19
|
var REQUEST_TIMEOUT = 10000; // 10 seconds
|
|
19
20
|
var MAX_QUEUE_TIME = 3.6e6; // 1 hour
|
|
20
21
|
export var ApitallyClient = /*#__PURE__*/function () {
|
|
@@ -22,26 +23,18 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
22
23
|
var clientId = _ref.clientId,
|
|
23
24
|
_ref$env = _ref.env,
|
|
24
25
|
env = _ref$env === void 0 ? "dev" : _ref$env,
|
|
25
|
-
|
|
26
|
-
syncApiKeys = _ref$syncApiKeys === void 0 ? false : _ref$syncApiKeys,
|
|
27
|
-
logger = _ref.logger,
|
|
28
|
-
keyCacheClass = _ref.keyCacheClass;
|
|
26
|
+
logger = _ref.logger;
|
|
29
27
|
_classCallCheck(this, ApitallyClient);
|
|
30
28
|
_defineProperty(this, "clientId", void 0);
|
|
31
29
|
_defineProperty(this, "env", void 0);
|
|
32
|
-
_defineProperty(this, "syncApiKeys", void 0);
|
|
33
30
|
_defineProperty(this, "instanceUuid", void 0);
|
|
34
31
|
_defineProperty(this, "requestsDataQueue", void 0);
|
|
35
32
|
_defineProperty(this, "axiosClient", void 0);
|
|
36
33
|
_defineProperty(this, "syncIntervalId", void 0);
|
|
37
34
|
_defineProperty(this, "appInfo", void 0);
|
|
38
35
|
_defineProperty(this, "appInfoSent", false);
|
|
39
|
-
_defineProperty(this, "startedAt", void 0);
|
|
40
|
-
_defineProperty(this, "keysUpdated", void 0);
|
|
41
36
|
_defineProperty(this, "requestCounter", void 0);
|
|
42
37
|
_defineProperty(this, "validationErrorCounter", void 0);
|
|
43
|
-
_defineProperty(this, "keyRegistry", void 0);
|
|
44
|
-
_defineProperty(this, "keyCache", void 0);
|
|
45
38
|
_defineProperty(this, "logger", void 0);
|
|
46
39
|
if (ApitallyClient.instance) {
|
|
47
40
|
throw new Error("Apitally client is already initialized");
|
|
@@ -55,14 +48,10 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
55
48
|
ApitallyClient.instance = this;
|
|
56
49
|
this.clientId = clientId;
|
|
57
50
|
this.env = env;
|
|
58
|
-
this.syncApiKeys = syncApiKeys;
|
|
59
51
|
this.instanceUuid = randomUUID();
|
|
60
52
|
this.requestsDataQueue = [];
|
|
61
|
-
this.startedAt = Date.now();
|
|
62
53
|
this.requestCounter = new RequestCounter();
|
|
63
54
|
this.validationErrorCounter = new ValidationErrorCounter();
|
|
64
|
-
this.keyRegistry = new KeyRegistry();
|
|
65
|
-
this.keyCache = keyCacheClass ? new keyCacheClass(clientId, env) : undefined;
|
|
66
55
|
this.logger = logger || getLogger();
|
|
67
56
|
this.axiosClient = axios.create({
|
|
68
57
|
baseURL: this.getHubUrl(),
|
|
@@ -74,19 +63,6 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
74
63
|
return axiosRetry.exponentialDelay(retryCount, error, 1000);
|
|
75
64
|
}
|
|
76
65
|
});
|
|
77
|
-
if (this.keyCache) {
|
|
78
|
-
var keyDataString = this.keyCache.retrieve();
|
|
79
|
-
if (keyDataString) {
|
|
80
|
-
try {
|
|
81
|
-
var keyData = JSON.parse(keyDataString);
|
|
82
|
-
this.updateKeyRegistry(keyData, false);
|
|
83
|
-
} catch (error) {
|
|
84
|
-
this.logger.error("Failed to load API keys from cache.", {
|
|
85
|
-
error: error
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
66
|
this.startSync();
|
|
91
67
|
this.handleShutdown = this.handleShutdown.bind(this);
|
|
92
68
|
}
|
|
@@ -127,7 +103,13 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
127
103
|
this.sync();
|
|
128
104
|
this.syncIntervalId = setInterval(function () {
|
|
129
105
|
_this.sync();
|
|
130
|
-
},
|
|
106
|
+
}, INITIAL_SYNC_INTERVAL);
|
|
107
|
+
setTimeout(function () {
|
|
108
|
+
clearInterval(_this.syncIntervalId);
|
|
109
|
+
_this.syncIntervalId = setInterval(function () {
|
|
110
|
+
_this.sync();
|
|
111
|
+
}, SYNC_INTERVAL);
|
|
112
|
+
}, INITIAL_SYNC_INTERVAL_DURATION);
|
|
131
113
|
}
|
|
132
114
|
}, {
|
|
133
115
|
key: "sync",
|
|
@@ -139,28 +121,25 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
139
121
|
case 0:
|
|
140
122
|
_context2.prev = 0;
|
|
141
123
|
promises = [this.sendRequestsData()];
|
|
142
|
-
if (this.syncApiKeys) {
|
|
143
|
-
promises.push(this.getKeys());
|
|
144
|
-
}
|
|
145
124
|
if (!this.appInfoSent) {
|
|
146
125
|
promises.push(this.sendAppInfo());
|
|
147
126
|
}
|
|
148
|
-
_context2.next =
|
|
127
|
+
_context2.next = 5;
|
|
149
128
|
return Promise.all(promises);
|
|
150
|
-
case
|
|
151
|
-
_context2.next =
|
|
129
|
+
case 5:
|
|
130
|
+
_context2.next = 10;
|
|
152
131
|
break;
|
|
153
|
-
case
|
|
154
|
-
_context2.prev =
|
|
132
|
+
case 7:
|
|
133
|
+
_context2.prev = 7;
|
|
155
134
|
_context2.t0 = _context2["catch"](0);
|
|
156
135
|
this.logger.error("Error while syncing with Apitally Hub.", {
|
|
157
136
|
error: _context2.t0
|
|
158
137
|
});
|
|
159
|
-
case
|
|
138
|
+
case 10:
|
|
160
139
|
case "end":
|
|
161
140
|
return _context2.stop();
|
|
162
141
|
}
|
|
163
|
-
}, _callee2, this, [[0,
|
|
142
|
+
}, _callee2, this, [[0, 7]]);
|
|
164
143
|
}));
|
|
165
144
|
function sync() {
|
|
166
145
|
return _sync.apply(this, arguments);
|
|
@@ -242,8 +221,7 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
242
221
|
instance_uuid: this.instanceUuid,
|
|
243
222
|
message_uuid: randomUUID(),
|
|
244
223
|
requests: this.requestCounter.getAndResetRequests(),
|
|
245
|
-
validation_errors: this.validationErrorCounter.getAndResetValidationErrors()
|
|
246
|
-
api_key_usage: this.keyRegistry.getAndResetUsageCounts()
|
|
224
|
+
validation_errors: this.validationErrorCounter.getAndResetValidationErrors()
|
|
247
225
|
};
|
|
248
226
|
this.requestsDataQueue.push([Date.now(), newPayload]);
|
|
249
227
|
failedItems = [];
|
|
@@ -293,59 +271,6 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
293
271
|
}
|
|
294
272
|
return sendRequestsData;
|
|
295
273
|
}()
|
|
296
|
-
}, {
|
|
297
|
-
key: "getKeys",
|
|
298
|
-
value: function () {
|
|
299
|
-
var _getKeys = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
|
|
300
|
-
var response, now;
|
|
301
|
-
return _regeneratorRuntime.wrap(function _callee5$(_context5) {
|
|
302
|
-
while (1) switch (_context5.prev = _context5.next) {
|
|
303
|
-
case 0:
|
|
304
|
-
_context5.prev = 0;
|
|
305
|
-
this.logger.debug("Getting API keys from Apitally Hub.");
|
|
306
|
-
_context5.next = 4;
|
|
307
|
-
return this.axiosClient.get("/keys");
|
|
308
|
-
case 4:
|
|
309
|
-
response = _context5.sent;
|
|
310
|
-
this.updateKeyRegistry(response.data);
|
|
311
|
-
this.keysUpdated = Date.now();
|
|
312
|
-
_context5.next = 14;
|
|
313
|
-
break;
|
|
314
|
-
case 9:
|
|
315
|
-
_context5.prev = 9;
|
|
316
|
-
_context5.t0 = _context5["catch"](0);
|
|
317
|
-
this.logger.debug("Error while getting API keys from Apitally Hub (".concat(_context5.t0.code, "). Will retry."), {
|
|
318
|
-
error: _context5.t0
|
|
319
|
-
});
|
|
320
|
-
now = Date.now();
|
|
321
|
-
if (!this.keyRegistry.salt) {
|
|
322
|
-
// Exit because application won't be able to authenticate requests
|
|
323
|
-
this.logger.error("Initial Apitally API key sync failed.");
|
|
324
|
-
process.exit(1);
|
|
325
|
-
} else if (this.keysUpdated && now - this.keysUpdated > MAX_QUEUE_TIME || !this.keysUpdated && now - this.startedAt > MAX_QUEUE_TIME) {
|
|
326
|
-
this.logger.warn("Apitally API key sync has been failing for more than 1 hour.");
|
|
327
|
-
}
|
|
328
|
-
case 14:
|
|
329
|
-
case "end":
|
|
330
|
-
return _context5.stop();
|
|
331
|
-
}
|
|
332
|
-
}, _callee5, this, [[0, 9]]);
|
|
333
|
-
}));
|
|
334
|
-
function getKeys() {
|
|
335
|
-
return _getKeys.apply(this, arguments);
|
|
336
|
-
}
|
|
337
|
-
return getKeys;
|
|
338
|
-
}()
|
|
339
|
-
}, {
|
|
340
|
-
key: "updateKeyRegistry",
|
|
341
|
-
value: function updateKeyRegistry(data) {
|
|
342
|
-
var cache = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
343
|
-
this.keyRegistry.salt = data.salt || null;
|
|
344
|
-
this.keyRegistry.update(data.keys || {});
|
|
345
|
-
if (cache && this.keyCache) {
|
|
346
|
-
this.keyCache.store(JSON.stringify(data));
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
274
|
}], [{
|
|
350
275
|
key: "getInstance",
|
|
351
276
|
value: function getInstance() {
|
|
@@ -357,21 +282,21 @@ export var ApitallyClient = /*#__PURE__*/function () {
|
|
|
357
282
|
}, {
|
|
358
283
|
key: "shutdown",
|
|
359
284
|
value: function () {
|
|
360
|
-
var _shutdown = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function
|
|
361
|
-
return _regeneratorRuntime.wrap(function
|
|
362
|
-
while (1) switch (
|
|
285
|
+
var _shutdown = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
|
|
286
|
+
return _regeneratorRuntime.wrap(function _callee5$(_context5) {
|
|
287
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
363
288
|
case 0:
|
|
364
289
|
if (!ApitallyClient.instance) {
|
|
365
|
-
|
|
290
|
+
_context5.next = 3;
|
|
366
291
|
break;
|
|
367
292
|
}
|
|
368
|
-
|
|
293
|
+
_context5.next = 3;
|
|
369
294
|
return ApitallyClient.instance.handleShutdown();
|
|
370
295
|
case 3:
|
|
371
296
|
case "end":
|
|
372
|
-
return
|
|
297
|
+
return _context5.stop();
|
|
373
298
|
}
|
|
374
|
-
},
|
|
299
|
+
}, _callee5);
|
|
375
300
|
}));
|
|
376
301
|
function shutdown() {
|
|
377
302
|
return _shutdown.apply(this, arguments);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","names":["axios","AxiosError","axiosRetry","randomUUID","KeyRegistry","getLogger","isValidClientId","isValidEnv","RequestCounter","ValidationErrorCounter","SYNC_INTERVAL","REQUEST_TIMEOUT","MAX_QUEUE_TIME","ApitallyClient","_ref","clientId","_ref$env","env","_ref$syncApiKeys","syncApiKeys","logger","keyCacheClass","_classCallCheck","_defineProperty","instance","Error","concat","instanceUuid","requestsDataQueue","startedAt","Date","now","requestCounter","validationErrorCounter","keyRegistry","keyCache","undefined","axiosClient","create","baseURL","getHubUrl","timeout","retries","retryDelay","retryCount","error","exponentialDelay","keyDataString","retrieve","keyData","JSON","parse","updateKeyRegistry","startSync","handleShutdown","bind","_createClass","key","value","_handleShutdown","_asyncToGenerator","_regeneratorRuntime","mark","_callee","wrap","_callee$","_context","prev","next","stopSync","sendRequestsData","stop","apply","arguments","process","APITALLY_HUB_BASE_URL","version","_this","sync","syncIntervalId","setInterval","_sync","_callee2","promises","_callee2$","_context2","push","getKeys","appInfoSent","sendAppInfo","Promise","all","t0","clearInterval","setAppInfo","appInfo","_sendAppInfo","_callee3","payload","_callee3$","_context3","debug","_objectSpread","instance_uuid","message_uuid","post","response","status","data","includes","code","_sendRequestsData","_callee4","newPayload","failedItems","queueItem","_queueItem","time","timeOffset","_callee4$","_context4","time_offset","requests","getAndResetRequests","validation_errors","getAndResetValidationErrors","api_key_usage","getAndResetUsageCounts","length","shift","_slicedToArray","_getKeys","_callee5","_callee5$","_context5","get","sent","keysUpdated","salt","exit","warn","cache","update","keys","store","stringify","getInstance","_shutdown","_callee6","_callee6$","_context6","shutdown"],"sources":["../../../src/common/client.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAuB,OAAO;AACxD,OAAOC,UAAU,MAAM,aAAa;AACpC,SAASC,UAAU,QAAQ,QAAQ;AAEnC,SAAuBC,WAAW,QAAQ,kBAAkB;AAC5D,SAAiBC,SAAS,QAAQ,cAAc;AAChD,SAASC,eAAe,EAAEC,UAAU,QAAQ,sBAAsB;AAClE,OAAOC,cAAc,MAAM,qBAAqB;AAOhD,OAAOC,sBAAsB,MAAM,6BAA6B;AAEhE,IAAMC,aAAa,GAAG,KAAK,CAAC,CAAC;AAC7B,IAAMC,eAAe,GAAG,KAAK,CAAC,CAAC;AAC/B,IAAMC,cAAc,GAAG,KAAK,CAAC,CAAC;AAE9B,WAAaC,cAAc;EAqBzB,SAAAA,eAAAC,IAAA,EAMiB;IAAA,IALfC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;MAAAC,QAAA,GAAAF,IAAA,CACRG,GAAG;MAAHA,GAAG,GAAAD,QAAA,cAAG,KAAK,GAAAA,QAAA;MAAAE,gBAAA,GAAAJ,IAAA,CACXK,WAAW;MAAXA,WAAW,GAAAD,gBAAA,cAAG,KAAK,GAAAA,gBAAA;MACnBE,MAAM,GAAAN,IAAA,CAANM,MAAM;MACNC,aAAa,GAAAP,IAAA,CAAbO,aAAa;IAAAC,eAAA,OAAAT,cAAA;IAAAU,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA,sBAfgB,KAAK;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAiBlC,IAAIV,cAAc,CAACW,QAAQ,EAAE;MAC3B,MAAM,IAAIC,KAAK,CAAC,wCAAwC,CAAC;IAC3D;IACA,IAAI,CAACnB,eAAe,CAACS,QAAQ,CAAC,EAAE;MAC9B,MAAM,IAAIU,KAAK,uBAAAC,MAAA,CACSX,QAAQ,0CAAuC,CACtE;IACH;IACA,IAAI,CAACR,UAAU,CAACU,GAAG,CAAC,EAAE;MACpB,MAAM,IAAIQ,KAAK,iBAAAC,MAAA,CACGT,GAAG,0EAAuE,CAC3F;IACH;IAEAJ,cAAc,CAACW,QAAQ,GAAG,IAAI;IAC9B,IAAI,CAACT,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACE,GAAG,GAAGA,GAAG;IACd,IAAI,CAACE,WAAW,GAAGA,WAAW;IAC9B,IAAI,CAACQ,YAAY,GAAGxB,UAAU,EAAE;IAChC,IAAI,CAACyB,iBAAiB,GAAG,EAAE;IAC3B,IAAI,CAACC,SAAS,GAAGC,IAAI,CAACC,GAAG,EAAE;IAC3B,IAAI,CAACC,cAAc,GAAG,IAAIxB,cAAc,EAAE;IAC1C,IAAI,CAACyB,sBAAsB,GAAG,IAAIxB,sBAAsB,EAAE;IAC1D,IAAI,CAACyB,WAAW,GAAG,IAAI9B,WAAW,EAAE;IACpC,IAAI,CAAC+B,QAAQ,GAAGd,aAAa,GACzB,IAAIA,aAAa,CAACN,QAAQ,EAAEE,GAAG,CAAC,GAChCmB,SAAS;IACb,IAAI,CAAChB,MAAM,GAAGA,MAAM,IAAIf,SAAS,EAAE;IAEnC,IAAI,CAACgC,WAAW,GAAGrC,KAAK,CAACsC,MAAM,CAAC;MAC9BC,OAAO,EAAE,IAAI,CAACC,SAAS,EAAE;MACzBC,OAAO,EAAE9B;KACV,CAAC;IACFT,UAAU,CAAC,IAAI,CAACmC,WAAW,EAAE;MAC3BK,OAAO,EAAE,CAAC;MACVC,UAAU,EAAE,SAAAA,WAACC,UAAU,EAAEC,KAAK;QAAA,OAC5B3C,UAAU,CAAC4C,gBAAgB,CAACF,UAAU,EAAEC,KAAK,EAAE,IAAI,CAAC;MAAA;KACvD,CAAC;IAEF,IAAI,IAAI,CAACV,QAAQ,EAAE;MACjB,IAAMY,aAAa,GAAG,IAAI,CAACZ,QAAQ,CAACa,QAAQ,EAAE;MAC9C,IAAID,aAAa,EAAE;QACjB,IAAI;UACF,IAAME,OAAO,GAAGC,IAAI,CAACC,KAAK,CAACJ,aAAa,CAAC;UACzC,IAAI,CAACK,iBAAiB,CAACH,OAAO,EAAE,KAAK,CAAC;QACxC,CAAC,CAAC,OAAOJ,KAAK,EAAE;UACd,IAAI,CAACzB,MAAM,CAACyB,KAAK,CAAC,qCAAqC,EAAE;YAAEA,KAAK,EAALA;UAAK,CAAE,CAAC;QACrE;MACF;IACF;IAEA,IAAI,CAACQ,SAAS,EAAE;IAChB,IAAI,CAACC,cAAc,GAAG,IAAI,CAACA,cAAc,CAACC,IAAI,CAAC,IAAI,CAAC;EACtD;EAACC,YAAA,CAAA3C,cAAA;IAAA4C,GAAA;IAAAC,KAAA;MAAA,IAAAC,eAAA,GAAAC,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAeM,SAAAC,QAAA;QAAA,OAAAF,mBAAA,CAAAG,IAAA,UAAAC,SAAAC,QAAA;UAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;YAAA;cACL,IAAI,CAACC,QAAQ,EAAE;cAACH,QAAA,CAAAE,IAAA;cAAA,OACV,IAAI,CAACE,gBAAgB,EAAE;YAAA;cAC7BzD,cAAc,CAACW,QAAQ,GAAGY,SAAS;YAAC;YAAA;cAAA,OAAA8B,QAAA,CAAAK,IAAA;UAAA;QAAA,GAAAR,OAAA;MAAA,CACrC;MAAA,SAAAT,eAAA;QAAA,OAAAK,eAAA,CAAAa,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAnB,cAAA;IAAA;EAAA;IAAAG,GAAA;IAAAC,KAAA,EAEO,SAAAlB,UAAA,EAAS;MACf,IAAMD,OAAO,GACXmC,OAAO,CAACzD,GAAG,CAAC0D,qBAAqB,IAAI,yBAAyB;MAChE,IAAMC,OAAO,GAAG,IAAI;MACpB,UAAAlD,MAAA,CAAUa,OAAO,OAAAb,MAAA,CAAIkD,OAAO,OAAAlD,MAAA,CAAI,IAAI,CAACX,QAAQ,OAAAW,MAAA,CAAI,IAAI,CAACT,GAAG;IAC3D;EAAC;IAAAwC,GAAA;IAAAC,KAAA,EAEO,SAAAL,UAAA,EAAS;MAAA,IAAAwB,KAAA;MACf,IAAI,CAACC,IAAI,EAAE;MACX,IAAI,CAACC,cAAc,GAAGC,WAAW,CAAC,YAAK;QACrCH,KAAI,CAACC,IAAI,EAAE;MACb,CAAC,EAAEpE,aAAa,CAAC;IACnB;EAAC;IAAA+C,GAAA;IAAAC,KAAA;MAAA,IAAAuB,KAAA,GAAArB,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAoB,SAAA;QAAA,IAAAC,QAAA;QAAA,OAAAtB,mBAAA,CAAAG,IAAA,UAAAoB,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAlB,IAAA,GAAAkB,SAAA,CAAAjB,IAAA;YAAA;cAAAiB,SAAA,CAAAlB,IAAA;cAEEgB,QAAQ,GAAG,CAAC,IAAI,CAACb,gBAAgB,EAAE,CAAC;cAC1C,IAAI,IAAI,CAACnD,WAAW,EAAE;gBACpBgE,QAAQ,CAACG,IAAI,CAAC,IAAI,CAACC,OAAO,EAAE,CAAC;cAC/B;cACA,IAAI,CAAC,IAAI,CAACC,WAAW,EAAE;gBACrBL,QAAQ,CAACG,IAAI,CAAC,IAAI,CAACG,WAAW,EAAE,CAAC;cACnC;cAACJ,SAAA,CAAAjB,IAAA;cAAA,OACKsB,OAAO,CAACC,GAAG,CAACR,QAAQ,CAAC;YAAA;cAAAE,SAAA,CAAAjB,IAAA;cAAA;YAAA;cAAAiB,SAAA,CAAAlB,IAAA;cAAAkB,SAAA,CAAAO,EAAA,GAAAP,SAAA;cAE3B,IAAI,CAACjE,MAAM,CAACyB,KAAK,CAAC,wCAAwC,EAAE;gBAC1DA,KAAK,EAAAwC,SAAA,CAAAO;eACN,CAAC;YAAC;YAAA;cAAA,OAAAP,SAAA,CAAAd,IAAA;UAAA;QAAA,GAAAW,QAAA;MAAA,CAEN;MAAA,SAAAJ,KAAA;QAAA,OAAAG,KAAA,CAAAT,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAK,IAAA;IAAA;EAAA;IAAArB,GAAA;IAAAC,KAAA,EAEO,SAAAW,SAAA,EAAQ;MACd,IAAI,IAAI,CAACU,cAAc,EAAE;QACvBc,aAAa,CAAC,IAAI,CAACd,cAAc,CAAC;QAClC,IAAI,CAACA,cAAc,GAAG3C,SAAS;MACjC;IACF;EAAC;IAAAqB,GAAA;IAAAC,KAAA,EAEM,SAAAoC,WAAWC,OAAgB;MAChC,IAAI,CAACA,OAAO,GAAGA,OAAO;MACtB,IAAI,CAACP,WAAW,GAAG,KAAK;MACxB,IAAI,CAACC,WAAW,EAAE;IACpB;EAAC;IAAAhC,GAAA;IAAAC,KAAA;MAAA,IAAAsC,YAAA,GAAApC,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAmC,SAAA;QAAA,IAAAC,OAAA;QAAA,OAAArC,mBAAA,CAAAG,IAAA,UAAAmC,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAjC,IAAA,GAAAiC,SAAA,CAAAhC,IAAA;YAAA;cAAA,KACF,IAAI,CAAC2B,OAAO;gBAAAK,SAAA,CAAAhC,IAAA;gBAAA;cAAA;cACd,IAAI,CAAChD,MAAM,CAACiF,KAAK,CAAC,mCAAmC,CAAC;cAChDH,OAAO,GAAAI,aAAA;gBACXC,aAAa,EAAE,IAAI,CAAC5E,YAAY;gBAChC6E,YAAY,EAAErG,UAAU;cAAE,GACvB,IAAI,CAAC4F,OAAO;cAAAK,SAAA,CAAAjC,IAAA;cAAAiC,SAAA,CAAAhC,IAAA;cAAA,OAGT,IAAI,CAAC/B,WAAW,CAACoE,IAAI,CAAC,OAAO,EAAEP,OAAO,CAAC;YAAA;cAC7C,IAAI,CAACV,WAAW,GAAG,IAAI;cAACY,SAAA,CAAAhC,IAAA;cAAA;YAAA;cAAAgC,SAAA,CAAAjC,IAAA;cAAAiC,SAAA,CAAAR,EAAA,GAAAQ,SAAA;cAExB,IACEA,SAAA,CAAAR,EAAA,YAAiB3F,UAAU,IAC3BmG,SAAA,CAAAR,EAAA,CAAMc,QAAQ,IACdN,SAAA,CAAAR,EAAA,CAAMc,QAAQ,CAACC,MAAM,KAAK,GAAG,IAC7BP,SAAA,CAAAR,EAAA,CAAMc,QAAQ,CAACE,IAAI,IACnB,OAAOR,SAAA,CAAAR,EAAA,CAAMc,QAAQ,CAACE,IAAI,KAAK,QAAQ,IACvCR,SAAA,CAAAR,EAAA,CAAMc,QAAQ,CAACE,IAAI,CAACC,QAAQ,CAAC,WAAW,CAAC,EACzC;gBACA,IAAI,CAACzF,MAAM,CAACyB,KAAK,gCAAAnB,MAAA,CAAgC,IAAI,CAACX,QAAQ,OAAI,CAAC;gBACnE,IAAI,CAACsD,QAAQ,EAAE;cACjB,CAAC,MAAM;gBACL,IAAI,CAACjD,MAAM,CAACiF,KAAK,kDAAA3E,MAAA,CAEZ0E,SAAA,CAAAR,EAAA,CAAqBkB,IACxB,qBACA;kBAAEjE,KAAK,EAAAuD,SAAA,CAAAR;gBAAA,CAAE,CACV;cACH;YAAC;YAAA;cAAA,OAAAQ,SAAA,CAAA7B,IAAA;UAAA;QAAA,GAAA0B,QAAA;MAAA,CAGN;MAAA,SAAAR,YAAA;QAAA,OAAAO,YAAA,CAAAxB,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAgB,WAAA;IAAA;EAAA;IAAAhC,GAAA;IAAAC,KAAA;MAAA,IAAAqD,iBAAA,GAAAnD,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAkD,SAAA;QAAA,IAAAC,UAAA,EAAAC,WAAA,EAAAC,SAAA,EAAAC,UAAA,EAAAC,IAAA,EAAAnB,OAAA,EAAAoB,UAAA;QAAA,OAAAzD,mBAAA,CAAAG,IAAA,UAAAuD,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAArD,IAAA,GAAAqD,SAAA,CAAApD,IAAA;YAAA;cACN,IAAI,CAAChD,MAAM,CAACiF,KAAK,CAAC,wCAAwC,CAAC;cACrDY,UAAU,GAAwB;gBACtCQ,WAAW,EAAE,CAAC;gBACdlB,aAAa,EAAE,IAAI,CAAC5E,YAAY;gBAChC6E,YAAY,EAAErG,UAAU,EAAE;gBAC1BuH,QAAQ,EAAE,IAAI,CAAC1F,cAAc,CAAC2F,mBAAmB,EAAE;gBACnDC,iBAAiB,EACf,IAAI,CAAC3F,sBAAsB,CAAC4F,2BAA2B,EAAE;gBAC3DC,aAAa,EAAE,IAAI,CAAC5F,WAAW,CAAC6F,sBAAsB;eACvD;cACD,IAAI,CAACnG,iBAAiB,CAAC0D,IAAI,CAAC,CAACxD,IAAI,CAACC,GAAG,EAAE,EAAEkF,UAAU,CAAC,CAAC;cAE/CC,WAAW,GAAoC,EAAE;YAAA;cAAA,MAChD,IAAI,CAACtF,iBAAiB,CAACoG,MAAM,GAAG,CAAC;gBAAAR,SAAA,CAAApD,IAAA;gBAAA;cAAA;cAChC+C,SAAS,GAAG,IAAI,CAACvF,iBAAiB,CAACqG,KAAK,EAAE;cAAA,KAC5Cd,SAAS;gBAAAK,SAAA,CAAApD,IAAA;gBAAA;cAAA;cAAAgD,UAAA,GAAAc,cAAA,CACaf,SAAS,MAA1BE,IAAI,GAAAD,UAAA,KAAElB,OAAO,GAAAkB,UAAA;cAAAI,SAAA,CAAArD,IAAA;cAEZmD,UAAU,GAAGxF,IAAI,CAACC,GAAG,EAAE,GAAGsF,IAAI;cAAA,MAChCC,UAAU,IAAI1G,cAAc;gBAAA4G,SAAA,CAAApD,IAAA;gBAAA;cAAA;cAC9B8B,OAAO,CAACuB,WAAW,GAAGH,UAAU,GAAG,MAAM,CAAC,CAAC;cAAAE,SAAA,CAAApD,IAAA;cAAA,OACrC,IAAI,CAAC/B,WAAW,CAACoE,IAAI,CAAC,WAAW,EAAEP,OAAO,CAAC;YAAA;cAAAsB,SAAA,CAAApD,IAAA;cAAA;YAAA;cAAAoD,SAAA,CAAArD,IAAA;cAAAqD,SAAA,CAAA5B,EAAA,GAAA4B,SAAA;cAGnD,IAAI,CAACpG,MAAM,CAACiF,KAAK,uDAAA3E,MAAA,CAEZ8F,SAAA,CAAA5B,EAAA,CAAqBkB,IACxB,qBACA;gBAAEjE,KAAK,EAAA2E,SAAA,CAAA5B;cAAA,CAAE,CACV;cACDsB,WAAW,CAAC5B,IAAI,CAAC6B,SAAS,CAAC;YAAC;cAAAK,SAAA,CAAApD,IAAA;cAAA;YAAA;cAIlC,IAAI,CAACxC,iBAAiB,GAAGsF,WAAW;YAAC;YAAA;cAAA,OAAAM,SAAA,CAAAjD,IAAA;UAAA;QAAA,GAAAyC,QAAA;MAAA,CACtC;MAAA,SAAA1C,iBAAA;QAAA,OAAAyC,iBAAA,CAAAvC,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAH,gBAAA;IAAA;EAAA;IAAAb,GAAA;IAAAC,KAAA;MAAA,IAAAyE,QAAA,GAAAvE,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAsE,SAAA;QAAA,IAAA1B,QAAA,EAAA3E,GAAA;QAAA,OAAA8B,mBAAA,CAAAG,IAAA,UAAAqE,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAnE,IAAA,GAAAmE,SAAA,CAAAlE,IAAA;YAAA;cAAAkE,SAAA,CAAAnE,IAAA;cAEJ,IAAI,CAAC/C,MAAM,CAACiF,KAAK,CAAC,qCAAqC,CAAC;cAACiC,SAAA,CAAAlE,IAAA;cAAA,OAClC,IAAI,CAAC/B,WAAW,CAACkG,GAAG,CAAC,OAAO,CAAC;YAAA;cAA9C7B,QAAQ,GAAA4B,SAAA,CAAAE,IAAA;cACd,IAAI,CAACpF,iBAAiB,CAACsD,QAAQ,CAACE,IAAI,CAAC;cACrC,IAAI,CAAC6B,WAAW,GAAG3G,IAAI,CAACC,GAAG,EAAE;cAACuG,SAAA,CAAAlE,IAAA;cAAA;YAAA;cAAAkE,SAAA,CAAAnE,IAAA;cAAAmE,SAAA,CAAA1C,EAAA,GAAA0C,SAAA;cAE9B,IAAI,CAAClH,MAAM,CAACiF,KAAK,oDAAA3E,MAAA,CAEZ4G,SAAA,CAAA1C,EAAA,CAAqBkB,IACxB,qBACA;gBAAEjE,KAAK,EAAAyF,SAAA,CAAA1C;cAAA,CAAE,CACV;cACK7D,GAAG,GAAGD,IAAI,CAACC,GAAG,EAAE;cACtB,IAAI,CAAC,IAAI,CAACG,WAAW,CAACwG,IAAI,EAAE;gBAC1B;gBACA,IAAI,CAACtH,MAAM,CAACyB,KAAK,CAAC,uCAAuC,CAAC;gBAC1D6B,OAAO,CAACiE,IAAI,CAAC,CAAC,CAAC;cACjB,CAAC,MAAM,IACJ,IAAI,CAACF,WAAW,IAAI1G,GAAG,GAAG,IAAI,CAAC0G,WAAW,GAAG7H,cAAc,IAC3D,CAAC,IAAI,CAAC6H,WAAW,IAAI1G,GAAG,GAAG,IAAI,CAACF,SAAS,GAAGjB,cAAe,EAC5D;gBACA,IAAI,CAACQ,MAAM,CAACwH,IAAI,CACd,8DAA8D,CAC/D;cACH;YAAC;YAAA;cAAA,OAAAN,SAAA,CAAA/D,IAAA;UAAA;QAAA,GAAA6D,QAAA;MAAA,CAEJ;MAAA,SAAA7C,QAAA;QAAA,OAAA4C,QAAA,CAAA3D,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAc,OAAA;IAAA;EAAA;IAAA9B,GAAA;IAAAC,KAAA,EAEO,SAAAN,kBAAkBwD,IAAS,EAAuB;MAAA,IAArBiC,KAAA,GAAApE,SAAA,CAAAuD,MAAA,QAAAvD,SAAA,QAAArC,SAAA,GAAAqC,SAAA,MAAiB,IAAI;MACxD,IAAI,CAACvC,WAAW,CAACwG,IAAI,GAAG9B,IAAI,CAAC8B,IAAI,IAAI,IAAI;MACzC,IAAI,CAACxG,WAAW,CAAC4G,MAAM,CAAClC,IAAI,CAACmC,IAAI,IAAI,EAAE,CAAC;MAExC,IAAIF,KAAK,IAAI,IAAI,CAAC1G,QAAQ,EAAE;QAC1B,IAAI,CAACA,QAAQ,CAAC6G,KAAK,CAAC9F,IAAI,CAAC+F,SAAS,CAACrC,IAAI,CAAC,CAAC;MAC3C;IACF;EAAC;IAAAnD,GAAA;IAAAC,KAAA,EA3KM,SAAAwF,YAAA,EAAkB;MACvB,IAAI,CAACrI,cAAc,CAACW,QAAQ,EAAE;QAC5B,MAAM,IAAIC,KAAK,CAAC,oCAAoC,CAAC;MACvD;MACA,OAAOZ,cAAc,CAACW,QAAQ;IAChC;EAAC;IAAAiC,GAAA;IAAAC,KAAA;MAAA,IAAAyF,SAAA,GAAAvF,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEM,SAAAsF,SAAA;QAAA,OAAAvF,mBAAA,CAAAG,IAAA,UAAAqF,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAnF,IAAA,GAAAmF,SAAA,CAAAlF,IAAA;YAAA;cAAA,KACDvD,cAAc,CAACW,QAAQ;gBAAA8H,SAAA,CAAAlF,IAAA;gBAAA;cAAA;cAAAkF,SAAA,CAAAlF,IAAA;cAAA,OACnBvD,cAAc,CAACW,QAAQ,CAAC8B,cAAc,EAAE;YAAA;YAAA;cAAA,OAAAgG,SAAA,CAAA/E,IAAA;UAAA;QAAA,GAAA6E,QAAA;MAAA,CAEjD;MAAA,SAAAG,SAAA;QAAA,OAAAJ,SAAA,CAAA3E,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAA8E,QAAA;IAAA;EAAA;EAAA,OAAA1I,cAAA;AAAA;AAiKFU,eAAA,CA/PYV,cAAc"}
|
|
1
|
+
{"version":3,"file":"client.js","names":["axios","AxiosError","axiosRetry","randomUUID","getLogger","isValidClientId","isValidEnv","RequestCounter","ValidationErrorCounter","SYNC_INTERVAL","INITIAL_SYNC_INTERVAL","INITIAL_SYNC_INTERVAL_DURATION","REQUEST_TIMEOUT","MAX_QUEUE_TIME","ApitallyClient","_ref","clientId","_ref$env","env","logger","_classCallCheck","_defineProperty","instance","Error","concat","instanceUuid","requestsDataQueue","requestCounter","validationErrorCounter","axiosClient","create","baseURL","getHubUrl","timeout","retries","retryDelay","retryCount","error","exponentialDelay","startSync","handleShutdown","bind","_createClass","key","value","_handleShutdown","_asyncToGenerator","_regeneratorRuntime","mark","_callee","wrap","_callee$","_context","prev","next","stopSync","sendRequestsData","undefined","stop","apply","arguments","process","APITALLY_HUB_BASE_URL","version","_this","sync","syncIntervalId","setInterval","setTimeout","clearInterval","_sync","_callee2","promises","_callee2$","_context2","appInfoSent","push","sendAppInfo","Promise","all","t0","setAppInfo","appInfo","_sendAppInfo","_callee3","payload","_callee3$","_context3","debug","_objectSpread","instance_uuid","message_uuid","post","response","status","data","includes","code","_sendRequestsData","_callee4","newPayload","failedItems","queueItem","_queueItem","time","timeOffset","_callee4$","_context4","time_offset","requests","getAndResetRequests","validation_errors","getAndResetValidationErrors","Date","now","length","shift","_slicedToArray","getInstance","_shutdown","_callee5","_callee5$","_context5","shutdown"],"sources":["../../../src/common/client.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/lib/esm/express/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["
|
|
1
|
+
{"version":3,"file":"index.js","names":["useApitally"],"sources":["../../../src/express/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,iBAAiB"}
|
|
@@ -4,7 +4,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
4
4
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
5
5
|
import { performance } from "perf_hooks";
|
|
6
6
|
import { ApitallyClient } from "../common/client.js";
|
|
7
|
-
import { KeyInfo } from "../common/keyRegistry.js";
|
|
8
7
|
import { getPackageVersion } from "../common/packageVersions.js";
|
|
9
8
|
import listEndpoints from "./listEndpoints.js";
|
|
10
9
|
export var useApitally = function useApitally(app, config) {
|
|
@@ -81,13 +80,7 @@ var getMiddleware = function getMiddleware(client) {
|
|
|
81
80
|
};
|
|
82
81
|
};
|
|
83
82
|
var getConsumer = function getConsumer(req) {
|
|
84
|
-
|
|
85
|
-
return String(req.consumerIdentifier);
|
|
86
|
-
}
|
|
87
|
-
if (req.keyInfo && req.keyInfo instanceof KeyInfo) {
|
|
88
|
-
return "key:".concat(req.keyInfo.keyId);
|
|
89
|
-
}
|
|
90
|
-
return null;
|
|
83
|
+
return req.consumerIdentifier ? String(req.consumerIdentifier) : null;
|
|
91
84
|
};
|
|
92
85
|
var extractExpressValidatorErrors = function extractExpressValidatorErrors(responseBody) {
|
|
93
86
|
var errors = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","names":["performance","ApitallyClient","
|
|
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","locals","call","on","route","responseTime","requestCounter","addRequest","consumer","getConsumer","method","path","statusCode","requestSize","get","responseSize","validationErrors","push","apply","_toConsumableArray","extractExpressValidatorErrors","extractCelebrateErrors","extractNestValidationErrors","forEach","error","validationErrorCounter","addValidationError","_objectSpread","logger","request","response","consumerIdentifier","String","responseBody","errors","Array","isArray","location","msg","type","loc","concat","validation","Object","values","source","keys","message","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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"}
|
package/lib/esm/fastify/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["
|
|
1
|
+
{"version":3,"file":"index.js","names":["default","apitallyPlugin"],"sources":["../../../src/fastify/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAO,IAAIC,cAAc,QAAQ,aAAa"}
|
|
@@ -5,7 +5,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
5
5
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
6
6
|
import fp from "fastify-plugin";
|
|
7
7
|
import { ApitallyClient } from "../common/client.js";
|
|
8
|
-
import { KeyInfo } from "../common/keyRegistry.js";
|
|
9
8
|
import { getPackageVersion } from "../common/packageVersions.js";
|
|
10
9
|
var apitallyPlugin = /*#__PURE__*/function () {
|
|
11
10
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(fastify, config) {
|
|
@@ -16,7 +15,6 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
16
15
|
client = new ApitallyClient(config);
|
|
17
16
|
routes = [];
|
|
18
17
|
fastify.decorateRequest("consumerIdentifier", null);
|
|
19
|
-
fastify.decorateRequest("keyInfo", null);
|
|
20
18
|
fastify.decorateReply("payload", null);
|
|
21
19
|
fastify.addHook("onRoute", function (routeOptions) {
|
|
22
20
|
var methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method];
|
|
@@ -51,35 +49,37 @@ var apitallyPlugin = /*#__PURE__*/function () {
|
|
|
51
49
|
done();
|
|
52
50
|
});
|
|
53
51
|
fastify.addHook("onResponse", function (request, reply, done) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
responseSize
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
if ((reply.statusCode === 400 || reply.statusCode === 422) && reply.payload && (!reply.payload.code || reply.payload.code === "FST_ERR_VALIDATION") && typeof reply.payload.message === "string") {
|
|
71
|
-
var validationErrors = extractAjvErrors(reply.payload.message);
|
|
72
|
-
validationErrors.forEach(function (error) {
|
|
73
|
-
client.validationErrorCounter.addValidationError(_objectSpread({
|
|
74
|
-
consumer: getConsumer(request),
|
|
75
|
-
method: request.method,
|
|
76
|
-
path: path
|
|
77
|
-
}, error));
|
|
52
|
+
if (request.method.toUpperCase() !== "OPTIONS") {
|
|
53
|
+
// Get path from routeOptions if available (from v4), otherwise fallback to deprecated routerPath
|
|
54
|
+
var path = "routeOptions" in request ? request.routeOptions.url : request.routerPath;
|
|
55
|
+
var requestSize = request.headers["content-length"];
|
|
56
|
+
var responseSize = reply.getHeader("content-length");
|
|
57
|
+
if (Array.isArray(responseSize)) {
|
|
58
|
+
responseSize = responseSize[0];
|
|
59
|
+
}
|
|
60
|
+
client.requestCounter.addRequest({
|
|
61
|
+
consumer: getConsumer(request),
|
|
62
|
+
method: request.method,
|
|
63
|
+
path: path,
|
|
64
|
+
statusCode: reply.statusCode,
|
|
65
|
+
responseTime: reply.getResponseTime(),
|
|
66
|
+
requestSize: requestSize,
|
|
67
|
+
responseSize: responseSize
|
|
78
68
|
});
|
|
69
|
+
if ((reply.statusCode === 400 || reply.statusCode === 422) && reply.payload && (!reply.payload.code || reply.payload.code === "FST_ERR_VALIDATION") && typeof reply.payload.message === "string") {
|
|
70
|
+
var validationErrors = extractAjvErrors(reply.payload.message);
|
|
71
|
+
validationErrors.forEach(function (error) {
|
|
72
|
+
client.validationErrorCounter.addValidationError(_objectSpread({
|
|
73
|
+
consumer: getConsumer(request),
|
|
74
|
+
method: request.method,
|
|
75
|
+
path: path
|
|
76
|
+
}, error));
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
79
|
}
|
|
80
80
|
done();
|
|
81
81
|
});
|
|
82
|
-
case
|
|
82
|
+
case 9:
|
|
83
83
|
case "end":
|
|
84
84
|
return _context2.stop();
|
|
85
85
|
}
|
|
@@ -109,13 +109,7 @@ var getAppInfo = function getAppInfo(routes, appVersion) {
|
|
|
109
109
|
};
|
|
110
110
|
};
|
|
111
111
|
var getConsumer = function getConsumer(request) {
|
|
112
|
-
|
|
113
|
-
return String(request.consumerIdentifier);
|
|
114
|
-
}
|
|
115
|
-
if (request.keyInfo && request.keyInfo instanceof KeyInfo) {
|
|
116
|
-
return "key:".concat(request.keyInfo.keyId);
|
|
117
|
-
}
|
|
118
|
-
return null;
|
|
112
|
+
return request.consumerIdentifier ? String(request.consumerIdentifier) : null;
|
|
119
113
|
};
|
|
120
114
|
var extractAjvErrors = function extractAjvErrors(message) {
|
|
121
115
|
var regex = /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;
|