apitally 0.5.0 → 0.6.1

package/README.md

@@ -2,13 +2,13 @@
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://assets.apitally.io/logos/logo-vertical-dark.png">
     <source media="(prefers-color-scheme: light)" srcset="https://assets.apitally.io/logos/logo-vertical-light.png">
-    <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png">
+    <img alt="Apitally logo" src="https://assets.apitally.io/logos/logo-vertical-light.png" width="150">
   </picture>
 </p>
 
 <p align="center"><b>API monitoring made easy.</b></p>
 
-<p align="center"><i>Apitally is a simple and affordable API monitoring tool with a focus on data privacy.<br>It is super easy to use for API projects in Python or Node.js and never collects sensitive data.</i></p>
+<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>
 
 <p align="center">🔗 <b><a href="https://apitally.io" target="_blank">apitally.io</a></b></p>
 
@@ -18,8 +18,8 @@
 
 # Apitally client library for Node.js
 
-[![Tests](https://github.com/apitally/nodejs-client/actions/workflows/tests.yaml/badge.svg?event=push)](https://github.com/apitally/nodejs-client/actions)
-[![Codecov](https://codecov.io/gh/apitally/nodejs-client/graph/badge.svg?token=j5jqlrL7Pd)](https://codecov.io/gh/apitally/nodejs-client)
+[![Tests](https://github.com/apitally/apitally-js/actions/workflows/tests.yaml/badge.svg?event=push)](https://github.com/apitally/apitally-js/actions)
+[![Codecov](https://codecov.io/gh/apitally/apitally-js/graph/badge.svg?token=j5jqlrL7Pd)](https://codecov.io/gh/apitally/apitally-js)
 [![npm](https://img.shields.io/npm/v/apitally?logo=npm&color=%23cb0000)](https://www.npmjs.com/package/apitally)
 
 This client library for Apitally currently supports the following Node.js web

package/lib/cjs/common/client.cjs

@@ -178,12 +178,12 @@ var ApitallyClient = exports.ApitallyClient = /*#__PURE__*/function () {
     key: "sendAppInfo",
     value: function () {
       var _sendAppInfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        var payload;
+        var payload, handled;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!this.appInfo) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               this.logger.debug("Sending app info to Apitally Hub.");
@@ -196,20 +196,18 @@ var ApitallyClient = exports.ApitallyClient = /*#__PURE__*/function () {
               return this.axiosClient.post("/info", payload);
             case 6:
               this.appInfoSent = true;
-              _context3.next = 12;
+              _context3.next = 13;
               break;
             case 9:
               _context3.prev = 9;
               _context3.t0 = _context3["catch"](3);
-              if (_context3.t0 instanceof _axios.AxiosError && _context3.t0.response && _context3.t0.response.status === 404 && _context3.t0.response.data && typeof _context3.t0.response.data === "string" && _context3.t0.response.data.includes("Client ID")) {
-                this.logger.error("Invalid Apitally client ID '".concat(this.clientId, "'."));
-                this.stopSync();
-              } else {
+              handled = this.handleHubError(_context3.t0);
+              if (!handled) {
                 this.logger.debug("Error while sending app info to Apitally Hub (".concat(_context3.t0.code, "). Will retry."), {
                   error: _context3.t0
                 });
               }
-            case 12:
+            case 13:
             case "end":
               return _context3.stop();
           }
@@ -224,7 +222,7 @@ var ApitallyClient = exports.ApitallyClient = /*#__PURE__*/function () {
     key: "sendRequestsData",
     value: function () {
       var _sendRequestsData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var newPayload, failedItems, queueItem, _queueItem, time, payload, timeOffset;
+        var newPayload, failedItems, queueItem, _queueItem, time, payload, timeOffset, handled;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -265,10 +263,13 @@ var ApitallyClient = exports.ApitallyClient = /*#__PURE__*/function () {
             case 16:
               _context4.prev = 16;
               _context4.t0 = _context4["catch"](8);
-              this.logger.debug("Error while sending requests data to Apitally Hub (".concat(_context4.t0.code, "). Will retry."), {
-                error: _context4.t0
-              });
-              failedItems.push(queueItem);
+              handled = this.handleHubError(_context4.t0);
+              if (!handled) {
+                this.logger.debug("Error while sending requests data to Apitally Hub (".concat(_context4.t0.code, "). Will retry."), {
+                  error: _context4.t0
+                });
+                failedItems.push(queueItem);
+              }
             case 20:
               _context4.next = 4;
               break;
@@ -285,6 +286,16 @@ var ApitallyClient = exports.ApitallyClient = /*#__PURE__*/function () {
       }
       return sendRequestsData;
     }()
+  }, {
+    key: "handleHubError",
+    value: function handleHubError(error) {
+      if (error instanceof _axios.AxiosError && error.response && error.response.status === 404) {
+        this.logger.error("Invalid Apitally client ID '".concat(this.clientId, "'."));
+        this.stopSync();
+        return true;
+      }
+      return false;
+    }
   }], [{
     key: "getInstance",
     value: function getInstance() {

package/lib/cjs/common/client.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"client.cjs","names":["_axios","_interopRequireWildcard","require","_axiosRetry","_interopRequireDefault","_crypto","_logging","_paramValidation","_requestCounter","_serverErrorCounter","_validationErrorCounter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","SYNC_INTERVAL","INITIAL_SYNC_INTERVAL","INITIAL_SYNC_INTERVAL_DURATION","REQUEST_TIMEOUT","MAX_QUEUE_TIME","ApitallyClient","exports","_ref","clientId","_ref$env","env","logger","_classCallCheck2","instance","Error","isValidClientId","concat","isValidEnv","instanceUuid","randomUUID","requestsDataQueue","requestCounter","RequestCounter","validationErrorCounter","ValidationErrorCounter","serverErrorCounter","ServerErrorCounter","getLogger","axiosClient","axios","create","baseURL","getHubUrl","timeout","axiosRetry","retries","retryDelay","retryCount","error","exponentialDelay","startSync","handleShutdown","bind","_createClass2","key","value","_handleShutdown","_asyncToGenerator2","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","stopSync","sendRequestsData","undefined","stop","process","APITALLY_HUB_BASE_URL","version","_this","sync","syncIntervalId","setInterval","setTimeout","clearInterval","_sync","_callee2","promises","_callee2$","_context2","appInfoSent","sendAppInfo","Promise","all","t0","setAppInfo","appInfo","_sendAppInfo","_callee3","payload","_callee3$","_context3","debug","instance_uuid","message_uuid","post","AxiosError","response","status","data","includes","code","_sendRequestsData","_callee4","newPayload","failedItems","queueItem","_queueItem","time","timeOffset","_callee4$","_context4","time_offset","requests","getAndResetRequests","validation_errors","getAndResetValidationErrors","server_errors","getAndResetServerErrors","Date","now","shift","_slicedToArray2","getInstance","_shutdown","_callee5","_callee5$","_context5","shutdown"],"sources":["../../../src/common/client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"client.cjs","names":["_axios","_interopRequireWildcard","require","_axiosRetry","_interopRequireDefault","_crypto","_logging","_paramValidation","_requestCounter","_serverErrorCounter","_validationErrorCounter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ownKeys","keys","getOwnPropertySymbols","o","filter","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","SYNC_INTERVAL","INITIAL_SYNC_INTERVAL","INITIAL_SYNC_INTERVAL_DURATION","REQUEST_TIMEOUT","MAX_QUEUE_TIME","ApitallyClient","exports","_ref","clientId","_ref$env","env","logger","_classCallCheck2","instance","Error","isValidClientId","concat","isValidEnv","instanceUuid","randomUUID","requestsDataQueue","requestCounter","RequestCounter","validationErrorCounter","ValidationErrorCounter","serverErrorCounter","ServerErrorCounter","getLogger","axiosClient","axios","create","baseURL","getHubUrl","timeout","axiosRetry","retries","retryDelay","retryCount","error","exponentialDelay","startSync","handleShutdown","bind","_createClass2","key","value","_handleShutdown","_asyncToGenerator2","_regenerator","mark","_callee","wrap","_callee$","_context","prev","next","stopSync","sendRequestsData","undefined","stop","process","APITALLY_HUB_BASE_URL","version","_this","sync","syncIntervalId","setInterval","setTimeout","clearInterval","_sync","_callee2","promises","_callee2$","_context2","appInfoSent","sendAppInfo","Promise","all","t0","setAppInfo","appInfo","_sendAppInfo","_callee3","payload","handled","_callee3$","_context3","debug","instance_uuid","message_uuid","post","handleHubError","code","_sendRequestsData","_callee4","newPayload","failedItems","queueItem","_queueItem","time","timeOffset","_callee4$","_context4","time_offset","requests","getAndResetRequests","validation_errors","getAndResetValidationErrors","server_errors","getAndResetServerErrors","Date","now","shift","_slicedToArray2","AxiosError","response","status","getInstance","_shutdown","_callee5","_callee5$","_context5","shutdown"],"sources":["../../../src/common/client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/lib/cjs/express/middleware.cjs

@@ -108,7 +108,13 @@ var getMiddleware = function getMiddleware(app, client) {
   };
 };
 var getConsumer = function getConsumer(req) {
-  return req.consumerIdentifier ? String(req.consumerIdentifier) : null;
+  if (req.apitallyConsumer) {
+    return String(req.apitallyConsumer);
+  } else if (req.consumerIdentifier) {
+    // For backwards compatibility
+    return String(req.consumerIdentifier);
+  }
+  return null;
 };
 var extractExpressValidatorErrors = function extractExpressValidatorErrors(responseBody) {
   var errors = [];

package/lib/cjs/express/middleware.cjs.map

@@ -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","consumerIdentifier","String","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":";;;;;;;;;AACA,IAAAA,WAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AAEA,IAAAG,cAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAA+C,SAAAK,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,QAAAe,gBAAA,aAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAQxC,IAAMoB,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG,SAAdA,WAAWA,CAAIE,GAAY,EAAEC,MAAsB,EAAI;EAClE,IAAMC,MAAM,GAAG,IAAIC,sBAAc,CAACF,MAAM,CAAC;EACzC,IAAMG,UAAU,GAAGC,aAAa,CAACL,GAAG,EAAEE,MAAM,CAAC;EAC7CF,GAAG,CAACM,GAAG,CAACF,UAAU,CAAC;EACnBG,UAAU,CAAC,YAAK;IACdL,MAAM,CAACM,UAAU,CAACC,UAAU,CAACT,GAAG,EAAEC,MAAM,CAACS,UAAU,CAAC,CAAC;EACvD,CAAC,EAAE,GAAG,CAAC;AACT,CAAC;AAED,IAAML,aAAa,GAAG,SAAhBA,aAAaA,CAAIL,GAAY,EAAEE,MAAsB,EAAI;EAC7D,IAAMS,kBAAkB,GAAG,IAAAC,kCAAiB,EAAC,mBAAmB,CAAC,KAAK,IAAI;EAC1E,IAAMC,kBAAkB,GAAG,IAAAD,kCAAiB,EAAC,WAAW,CAAC,KAAK,IAAI;EAClE,IAAME,aAAa,GAAG,IAAAF,kCAAiB,EAAC,cAAc,CAAC,KAAK,IAAI;EAChE,IAAMG,uBAAuB,GAAG,IAAAH,kCAAiB,EAAC,iBAAiB,CAAC,KAAK,IAAI;EAC7E,IAAII,sBAAsB,GAAG,KAAK;EAElC,OAAO,UAACC,GAAY,EAAEC,GAAa,EAAEC,IAAkB,EAAI;IACzD,IAAI,CAACH,sBAAsB,EAAE;MAC3B;MACAhB,GAAG,CAACM,GAAG,CACL,UAACc,GAAU,EAAEH,GAAY,EAAEC,GAAa,EAAEC,IAAkB,EAAU;QACpED,GAAG,CAACG,MAAM,CAACC,WAAW,GAAGF,GAAG;QAC5BD,IAAI,CAACC,GAAG,CAAC;MACX,CAAC,CACF;MACDJ,sBAAsB,GAAG,IAAI;IAC/B;IACA,IAAI;MACF,IAAMO,SAAS,GAAGC,uBAAW,CAACC,GAAG,EAAE;MACnC,IAAMC,YAAY,GAAGR,GAAG,CAACS,IAAI;MAC7BT,GAAG,CAACS,IAAI,GAAG,UAACC,IAAI,EAAI;QAClBV,GAAG,CAACG,MAAM,CAACO,IAAI,GAAGA,IAAI;QACtB,OAAOF,YAAY,CAACG,IAAI,CAACX,GAAG,EAAEU,IAAI,CAAC;MACrC,CAAC;MACDV,GAAG,CAACY,EAAE,CAAC,QAAQ,EAAE,YAAK;QACpB,IAAI;UACF,IAAIb,GAAG,CAACc,KAAK,EAAE;YACb,IAAMC,YAAY,GAAGR,uBAAW,CAACC,GAAG,EAAE,GAAGF,SAAS;YAClD,IAAMU,QAAQ,GAAGC,WAAW,CAACjB,GAAG,CAAC;YACjCf,MAAM,CAACiC,cAAc,CAACC,UAAU,CAAC;cAC/BH,QAAQ,EAAEA,QAAQ;cAClBI,MAAM,EAAEpB,GAAG,CAACoB,MAAM;cAClBC,IAAI,EAAErB,GAAG,CAACc,KAAK,CAACO,IAAI;cACpBC,UAAU,EAAErB,GAAG,CAACqB,UAAU;cAC1BP,YAAY,EAAEA,YAAY;cAC1BQ,WAAW,EAAEvB,GAAG,CAACwB,GAAG,CAAC,gBAAgB,CAAC;cACtCC,YAAY,EAAExB,GAAG,CAACuB,GAAG,CAAC,gBAAgB;aACvC,CAAC;YACF,IACE,CAACvB,GAAG,CAACqB,UAAU,KAAK,GAAG,IAAIrB,GAAG,CAACqB,UAAU,KAAK,GAAG,KACjDrB,GAAG,CAACG,MAAM,CAACO,IAAI,EACf;cACA,IAAMe,gBAAgB,GAAsB,EAAE;cAC9C,IAAIhC,kBAAkB,EAAE;gBACtBgC,gBAAgB,CAACvD,IAAI,CAAAC,KAAA,CAArBsD,gBAAgB,MAAAC,mBAAA,aACXC,6BAA6B,CAAC3B,GAAG,CAACG,MAAM,CAACO,IAAI,CAAC,EAClD;cACH;cACA,IAAIf,kBAAkB,EAAE;gBACtB8B,gBAAgB,CAACvD,IAAI,CAAAC,KAAA,CAArBsD,gBAAgB,MAAAC,mBAAA,aACXE,sBAAsB,CAAC5B,GAAG,CAACG,MAAM,CAACO,IAAI,CAAC,EAC3C;cACH;cACA,IAAId,aAAa,IAAIC,uBAAuB,EAAE;gBAC5C4B,gBAAgB,CAACvD,IAAI,CAAAC,KAAA,CAArBsD,gBAAgB,MAAAC,mBAAA,aACXG,2BAA2B,CAAC7B,GAAG,CAACG,MAAM,CAACO,IAAI,CAAC,EAChD;cACH;cACAe,gBAAgB,CAAClD,OAAO,CAAC,UAACuD,KAAK,EAAI;gBACjC9C,MAAM,CAAC+C,sBAAsB,CAACC,kBAAkB,CAAA5D,aAAA;kBAC9C2C,QAAQ,EAAEA,QAAQ;kBAClBI,MAAM,EAAEpB,GAAG,CAACoB,MAAM;kBAClBC,IAAI,EAAErB,GAAG,CAACc,KAAK,CAACO;gBAAI,GACjBU,KAAK,CACT,CAAC;cACJ,CAAC,CAAC;YACJ;YACA,IAAI9B,GAAG,CAACqB,UAAU,KAAK,GAAG,IAAIrB,GAAG,CAACG,MAAM,CAACC,WAAW,EAAE;cACpD,IAAMA,WAAW,GAAGJ,GAAG,CAACG,MAAM,CAACC,WAAoB;cACnDpB,MAAM,CAACiD,kBAAkB,CAACC,cAAc,CAAC;gBACvCnB,QAAQ,EAAEA,QAAQ;gBAClBI,MAAM,EAAEpB,GAAG,CAACoB,MAAM;gBAClBC,IAAI,EAAErB,GAAG,CAACc,KAAK,CAACO,IAAI;gBACpBe,IAAI,EAAE/B,WAAW,CAACgC,IAAI;gBACtBC,GAAG,EAAEjC,WAAW,CAACkC,OAAO;gBACxBC,SAAS,EAAEnC,WAAW,CAACoC,KAAK,IAAI;eACjC,CAAC;YACJ;UACF;QACF,CAAC,CAAC,OAAOV,KAAK,EAAE;UACd9C,MAAM,CAACyD,MAAM,CAACX,KAAK,CACjB,qDAAqD,EACrD;YAAEY,OAAO,EAAE3C,GAAG;YAAE4C,QAAQ,EAAE3C,GAAG;YAAE8B,KAAK,EAALA;UAAK,CAAE,CACvC;QACH;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOA,KAAK,EAAE;MACd9C,MAAM,CAACyD,MAAM,CAACX,KAAK,CAAC,+BAA+B,EAAE;QACnDY,OAAO,EAAE3C,GAAG;QACZ4C,QAAQ,EAAE3C,GAAG;QACb8B,KAAK,EAALA;OACD,CAAC;IACJ,CAAC,SAAS;MACR7B,IAAI,EAAE;IACR;EACF,CAAC;AACH,CAAC;AAED,IAAMe,WAAW,GAAG,SAAdA,WAAWA,CAAIjB,GAAY,EAAI;EACnC,OAAOA,GAAG,CAAC6C,kBAAkB,GAAGC,MAAM,CAAC9C,GAAG,CAAC6C,kBAAkB,CAAC,GAAG,IAAI;AACvE,CAAC;AAED,IAAMjB,6BAA6B,GAAG,SAAhCA,6BAA6BA,CAAImB,YAAiB,EAAI;EAC1D,IAAMC,MAAM,GAAsB,EAAE;EACpC,IACED,YAAY,IACZA,YAAY,CAACC,MAAM,IACnBC,KAAK,CAACC,OAAO,CAACH,YAAY,CAACC,MAAM,CAAC,EAClC;IACAD,YAAY,CAACC,MAAM,CAACxE,OAAO,CAAC,UAACuD,KAAU,EAAI;MACzC,IAAIA,KAAK,CAACoB,QAAQ,IAAIpB,KAAK,CAACV,IAAI,IAAIU,KAAK,CAACO,GAAG,IAAIP,KAAK,CAACK,IAAI,EAAE;QAC3DY,MAAM,CAAC7E,IAAI,CAAC;UACViF,GAAG,KAAAC,MAAA,CAAKtB,KAAK,CAACoB,QAAQ,OAAAE,MAAA,CAAItB,KAAK,CAACV,IAAI,CAAE;UACtCiB,GAAG,EAAEP,KAAK,CAACO,GAAG;UACdF,IAAI,EAAEL,KAAK,CAACK;SACb,CAAC;MACJ;IACF,CAAC,CAAC;EACJ;EACA,OAAOY,MAAM;AACf,CAAC;AAED,IAAMnB,sBAAsB,GAAG,SAAzBA,sBAAsBA,CAAIkB,YAAiB,EAAI;EACnD,IAAMC,MAAM,GAAsB,EAAE;EACpC,IAAID,YAAY,IAAIA,YAAY,CAACO,UAAU,EAAE;IAC3C1F,MAAM,CAAC2F,MAAM,CAACR,YAAY,CAACO,UAAU,CAAC,CAAC9E,OAAO,CAAC,UAACuD,KAAU,EAAI;MAC5D,IACEA,KAAK,CAACyB,MAAM,IACZzB,KAAK,CAAClE,IAAI,IACVoF,KAAK,CAACC,OAAO,CAACnB,KAAK,CAAClE,IAAI,CAAC,IACzBkE,KAAK,CAACQ,OAAO,EACb;QACAR,KAAK,CAAClE,IAAI,CAACW,OAAO,CAAC,UAACiF,GAAW,EAAI;UACjCT,MAAM,CAAC7E,IAAI,CAAC;YACViF,GAAG,KAAAC,MAAA,CAAKtB,KAAK,CAACyB,MAAM,OAAAH,MAAA,CAAII,GAAG,CAAE;YAC7BnB,GAAG,EAAEoB,gBAAgB,CAAC3B,KAAK,CAACQ,OAAO,EAAEkB,GAAG,CAAC;YACzCrB,IAAI,EAAE;WACP,CAAC;QACJ,CAAC,CAAC;MACJ;IACF,CAAC,CAAC;EACJ;EACA,OAAOY,MAAM;AACf,CAAC;AAED,IAAMlB,2BAA2B,GAAG,SAA9BA,2BAA2BA,CAAIiB,YAAiB,EAAI;EACxD,IAAMC,MAAM,GAAsB,EAAE;EACpC,IAAID,YAAY,IAAIE,KAAK,CAACC,OAAO,CAACH,YAAY,CAACR,OAAO,CAAC,EAAE;IACvDQ,YAAY,CAACR,OAAO,CAAC/D,OAAO,CAAC,UAAC+D,OAAY,EAAI;MAC5CS,MAAM,CAAC7E,IAAI,CAAC;QACViF,GAAG,EAAE,EAAE;QACPd,GAAG,EAAEC,OAAO;QACZH,IAAI,EAAE;OACP,CAAC;IACJ,CAAC,CAAC;EACJ;EACA,OAAOY,MAAM;AACf,CAAC;AAED,IAAMU,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAInB,OAAe,EAAEkB,GAAW,EAAI;EACxD,IAAME,cAAc,GAAGpB,OAAO,CAC3BqB,KAAK,CAAC,IAAI,CAAC,CACXC,IAAI,CAAC,UAACtB,OAAO;IAAA,OAAKA,OAAO,CAACuB,QAAQ,MAAAT,MAAA,CAAKI,GAAG,OAAG,CAAC;EAAA,EAAC;EAClD,OAAOE,cAAc,GAAGA,cAAc,GAAGpB,OAAO;AAClD,CAAC;AAED,IAAM/C,UAAU,GAAG,SAAbA,UAAUA,CAAIT,GAAY,EAAEU,UAAmB,EAAa;EAChE,IAAMsE,QAAQ,GAA4B,CACxC,CAAC,QAAQ,EAAEC,OAAO,CAACC,OAAO,CAACC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAC9C;EACD,IAAMC,cAAc,GAAG,IAAAxE,kCAAiB,EAAC,SAAS,CAAC;EACnD,IAAMyE,eAAe,GAAG,IAAAzE,kCAAiB,EAAC,OAAO,CAAC;EAClD,IAAIwE,cAAc,EAAE;IAClBJ,QAAQ,CAAC5F,IAAI,CAAC,CAAC,SAAS,EAAEgG,cAAc,CAAC,CAAC;EAC5C;EACA,IAAIC,eAAe,EAAE;IACnBL,QAAQ,CAAC5F,IAAI,CAAC,CAAC,UAAU,EAAEiG,eAAe,CAAC,CAAC;EAC9C;EACA,IAAI3E,UAAU,EAAE;IACdsE,QAAQ,CAAC5F,IAAI,CAAC,CAAC,KAAK,EAAEsB,UAAU,CAAC,CAAC;EACpC;EACA,OAAO;IACL4E,KAAK,EAAE,IAAAC,yBAAa,EAACvF,GAAG,CAAC;IACzBgF,QAAQ,EAAEnG,MAAM,CAAC2G,WAAW,CAACR,QAAQ,CAAC;IACtC9E,MAAM,EAAE;GACT;AACH,CAAC","ignoreList":[]}
+{"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":[]}

package/lib/cjs/fastify/plugin.cjs

@@ -21,7 +21,8 @@ var apitallyPlugin = /*#__PURE__*/function () {
         case 0:
           client = new _client.ApitallyClient(config);
           routes = [];
-          fastify.decorateRequest("consumerIdentifier", null);
+          fastify.decorateRequest("apitallyConsumer", null);
+          fastify.decorateRequest("consumerIdentifier", null); // For backwards compatibility
           fastify.decorateReply("payload", null);
           fastify.addHook("onRoute", function (routeOptions) {
             var methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method];
@@ -103,7 +104,7 @@ var apitallyPlugin = /*#__PURE__*/function () {
             }
             done();
           });
-        case 10:
+        case 11:
         case "end":
           return _context2.stop();
       }
@@ -133,7 +134,13 @@ var getAppInfo = function getAppInfo(routes, appVersion) {
   };
 };
 var getConsumer = function getConsumer(request) {
-  return request.consumerIdentifier ? String(request.consumerIdentifier) : null;
+  if (request.apitallyConsumer) {
+    return String(request.apitallyConsumer);
+  } else if (request.consumerIdentifier) {
+    // For backwards compatibility
+    return String(request.consumerIdentifier);
+  }
+  return null;
 };
 var extractAjvErrors = function extractAjvErrors(message) {
   var regex = /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;

package/lib/cjs/fastify/plugin.cjs.map

@@ -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","consumerIdentifier","String","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":[]}
+{"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":[]}

package/lib/cjs/koa/middleware.cjs

@@ -86,7 +86,13 @@ var getPath = function getPath(ctx) {
   return ctx._matchedRoute || ctx.routePath; // _matchedRoute is set by koa-router, routePath is set by koa-route
 };
 var getConsumer = function getConsumer(ctx) {
-  return ctx.state.consumerIdentifier ? String(ctx.state.consumerIdentifier) : null;
+  if (ctx.state.apitallyConsumer) {
+    return String(ctx.state.apitallyConsumer);
+  } else if (ctx.state.consumerIdentifier) {
+    // For backwards compatibility
+    return String(ctx.state.consumerIdentifier);
+  }
+  return null;
 };
 var getAppInfo = function getAppInfo(app, appVersion) {
   var versions = [["nodejs", process.version.replace(/^v/, "")]];

package/lib/cjs/koa/middleware.cjs.map

@@ -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","consumerIdentifier","String","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":[]}
+{"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":[]}

package/lib/esm/common/client.js

@@ -168,12 +168,12 @@ export var ApitallyClient = /*#__PURE__*/function () {
     key: "sendAppInfo",
     value: function () {
       var _sendAppInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        var payload;
+        var payload, handled;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!this.appInfo) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               this.logger.debug("Sending app info to Apitally Hub.");
@@ -186,20 +186,18 @@ export var ApitallyClient = /*#__PURE__*/function () {
               return this.axiosClient.post("/info", payload);
             case 6:
               this.appInfoSent = true;
-              _context3.next = 12;
+              _context3.next = 13;
               break;
             case 9:
               _context3.prev = 9;
               _context3.t0 = _context3["catch"](3);
-              if (_context3.t0 instanceof AxiosError && _context3.t0.response && _context3.t0.response.status === 404 && _context3.t0.response.data && typeof _context3.t0.response.data === "string" && _context3.t0.response.data.includes("Client ID")) {
-                this.logger.error("Invalid Apitally client ID '".concat(this.clientId, "'."));
-                this.stopSync();
-              } else {
+              handled = this.handleHubError(_context3.t0);
+              if (!handled) {
                 this.logger.debug("Error while sending app info to Apitally Hub (".concat(_context3.t0.code, "). Will retry."), {
                   error: _context3.t0
                 });
               }
-            case 12:
+            case 13:
             case "end":
               return _context3.stop();
           }
@@ -214,7 +212,7 @@ export var ApitallyClient = /*#__PURE__*/function () {
     key: "sendRequestsData",
     value: function () {
       var _sendRequestsData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var newPayload, failedItems, queueItem, _queueItem, time, payload, timeOffset;
+        var newPayload, failedItems, queueItem, _queueItem, time, payload, timeOffset, handled;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -255,10 +253,13 @@ export var ApitallyClient = /*#__PURE__*/function () {
             case 16:
               _context4.prev = 16;
               _context4.t0 = _context4["catch"](8);
-              this.logger.debug("Error while sending requests data to Apitally Hub (".concat(_context4.t0.code, "). Will retry."), {
-                error: _context4.t0
-              });
-              failedItems.push(queueItem);
+              handled = this.handleHubError(_context4.t0);
+              if (!handled) {
+                this.logger.debug("Error while sending requests data to Apitally Hub (".concat(_context4.t0.code, "). Will retry."), {
+                  error: _context4.t0
+                });
+                failedItems.push(queueItem);
+              }
             case 20:
               _context4.next = 4;
               break;
@@ -275,6 +276,16 @@ export var ApitallyClient = /*#__PURE__*/function () {
       }
       return sendRequestsData;
     }()
+  }, {
+    key: "handleHubError",
+    value: function handleHubError(error) {
+      if (error instanceof AxiosError && error.response && error.response.status === 404) {
+        this.logger.error("Invalid Apitally client ID '".concat(this.clientId, "'."));
+        this.stopSync();
+        return true;
+      }
+      return false;
+    }
   }], [{
     key: "getInstance",
     value: function getInstance() {

package/lib/esm/common/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":["axios","AxiosError","axiosRetry","randomUUID","getLogger","isValidClientId","isValidEnv","RequestCounter","ServerErrorCounter","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","serverErrorCounter","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","server_errors","getAndResetServerErrors","Date","now","length","shift","_slicedToArray","getInstance","_shutdown","_callee5","_callee5$","_context5","shutdown"],"sources":["../../../src/common/client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"client.js","names":["axios","AxiosError","axiosRetry","randomUUID","getLogger","isValidClientId","isValidEnv","RequestCounter","ServerErrorCounter","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","serverErrorCounter","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","handled","_callee3$","_context3","debug","_objectSpread","instance_uuid","message_uuid","post","handleHubError","code","_sendRequestsData","_callee4","newPayload","failedItems","queueItem","_queueItem","time","timeOffset","_callee4$","_context4","time_offset","requests","getAndResetRequests","validation_errors","getAndResetValidationErrors","server_errors","getAndResetServerErrors","Date","now","length","shift","_slicedToArray","response","status","getInstance","_shutdown","_callee5","_callee5$","_context5","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,SAAiBC,SAAS,QAAQ,cAAc;AAChD,SAASC,eAAe,EAAEC,UAAU,QAAQ,sBAAsB;AAClE,OAAOC,cAAc,MAAM,qBAAqB;AAChD,OAAOC,kBAAkB,MAAM,yBAAyB;AAOxD,OAAOC,sBAAsB,MAAM,6BAA6B;AAEhE,IAAMC,aAAa,GAAG,KAAK,CAAC,CAAC;AAC7B,IAAMC,qBAAqB,GAAG,KAAK,CAAC,CAAC;AACrC,IAAMC,8BAA8B,GAAG,OAAO,CAAC,CAAC;AAChD,IAAMC,eAAe,GAAG,KAAK,CAAC,CAAC;AAC/B,IAAMC,cAAc,GAAG,KAAK,CAAC,CAAC;AAE9B,WAAaC,cAAc;EAiBzB,SAAAA,eAAAC,IAAA,EAA6D;IAAA,IAA/CC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;MAAAC,QAAA,GAAAF,IAAA,CAAEG,GAAG;MAAHA,GAAG,GAAAD,QAAA,cAAG,KAAK,GAAAA,QAAA;MAAEE,MAAM,GAAAJ,IAAA,CAANI,MAAM;IAAAC,eAAA,OAAAN,cAAA;IAAAO,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA,sBAPZ,KAAK;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAQlC,IAAIP,cAAc,CAACQ,QAAQ,EAAE;MAC3B,MAAM,IAAIC,KAAK,CAAC,wCAAwC,CAAC;IAC3D;IACA,IAAI,CAACnB,eAAe,CAACY,QAAQ,CAAC,EAAE;MAC9B,MAAM,IAAIO,KAAK,uBAAAC,MAAA,CACSR,QAAQ,0CAAuC,CACtE;IACH;IACA,IAAI,CAACX,UAAU,CAACa,GAAG,CAAC,EAAE;MACpB,MAAM,IAAIK,KAAK,iBAAAC,MAAA,CACGN,GAAG,0EAAuE,CAC3F;IACH;IAEAJ,cAAc,CAACQ,QAAQ,GAAG,IAAI;IAC9B,IAAI,CAACN,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACE,GAAG,GAAGA,GAAG;IACd,IAAI,CAACO,YAAY,GAAGvB,UAAU,EAAE;IAChC,IAAI,CAACwB,iBAAiB,GAAG,EAAE;IAC3B,IAAI,CAACC,cAAc,GAAG,IAAIrB,cAAc,EAAE;IAC1C,IAAI,CAACsB,sBAAsB,GAAG,IAAIpB,sBAAsB,EAAE;IAC1D,IAAI,CAACqB,kBAAkB,GAAG,IAAItB,kBAAkB,EAAE;IAClD,IAAI,CAACY,MAAM,GAAGA,MAAM,IAAIhB,SAAS,EAAE;IAEnC,IAAI,CAAC2B,WAAW,GAAG/B,KAAK,CAACgC,MAAM,CAAC;MAC9BC,OAAO,EAAE,IAAI,CAACC,SAAS,EAAE;MACzBC,OAAO,EAAEtB;KACV,CAAC;IACFX,UAAU,CAAC,IAAI,CAAC6B,WAAW,EAAE;MAC3BK,OAAO,EAAE,CAAC;MACVC,UAAU,EAAE,SAAAA,WAACC,UAAU,EAAEC,KAAK;QAAA,OAC5BrC,UAAU,CAACsC,gBAAgB,CAACF,UAAU,EAAEC,KAAK,EAAE,IAAI,CAAC;MAAA;KACvD,CAAC;IAEF,IAAI,CAACE,SAAS,EAAE;IAChB,IAAI,CAACC,cAAc,GAAG,IAAI,CAACA,cAAc,CAACC,IAAI,CAAC,IAAI,CAAC;EACtD;EAAC,OAAAC,YAAA,CAAA7B,cAAA;IAAA8B,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;cAC7B3C,cAAc,CAACQ,QAAQ,GAAGoC,SAAS;YAAC;YAAA;cAAA,OAAAL,QAAA,CAAAM,IAAA;UAAA;QAAA,GAAAT,OAAA;MAAA,CACrC;MAAA,SAAAT,eAAA;QAAA,OAAAK,eAAA,CAAAc,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAApB,cAAA;IAAA;EAAA;IAAAG,GAAA;IAAAC,KAAA,EAEO,SAAAZ,UAAA,EAAS;MACf,IAAMD,OAAO,GACX8B,OAAO,CAAC5C,GAAG,CAAC6C,qBAAqB,IAAI,yBAAyB;MAChE,IAAMC,OAAO,GAAG,IAAI;MACpB,UAAAxC,MAAA,CAAUQ,OAAO,OAAAR,MAAA,CAAIwC,OAAO,OAAAxC,MAAA,CAAI,IAAI,CAACR,QAAQ,OAAAQ,MAAA,CAAI,IAAI,CAACN,GAAG;IAC3D;EAAC;IAAA0B,GAAA;IAAAC,KAAA,EAEO,SAAAL,UAAA,EAAS;MAAA,IAAAyB,KAAA;MACf,IAAI,CAACC,IAAI,EAAE;MACX,IAAI,CAACC,cAAc,GAAGC,WAAW,CAAC,YAAK;QACrCH,KAAI,CAACC,IAAI,EAAE;MACb,CAAC,EAAExD,qBAAqB,CAAC;MACzB2D,UAAU,CAAC,YAAK;QACdC,aAAa,CAACL,KAAI,CAACE,cAAc,CAAC;QAClCF,KAAI,CAACE,cAAc,GAAGC,WAAW,CAAC,YAAK;UACrCH,KAAI,CAACC,IAAI,EAAE;QACb,CAAC,EAAEzD,aAAa,CAAC;MACnB,CAAC,EAAEE,8BAA8B,CAAC;IACpC;EAAC;IAAAiC,GAAA;IAAAC,KAAA;MAAA,IAAA0B,KAAA,GAAAxB,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAuB,SAAA;QAAA,IAAAC,QAAA;QAAA,OAAAzB,mBAAA,CAAAG,IAAA,UAAAuB,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAArB,IAAA,GAAAqB,SAAA,CAAApB,IAAA;YAAA;cAAAoB,SAAA,CAAArB,IAAA;cAEEmB,QAAQ,GAAG,CAAC,IAAI,CAAChB,gBAAgB,EAAE,CAAC;cAC1C,IAAI,CAAC,IAAI,CAACmB,WAAW,EAAE;gBACrBH,QAAQ,CAACI,IAAI,CAAC,IAAI,CAACC,WAAW,EAAE,CAAC;cACnC;cAACH,SAAA,CAAApB,IAAA;cAAA,OACKwB,OAAO,CAACC,GAAG,CAACP,QAAQ,CAAC;YAAA;cAAAE,SAAA,CAAApB,IAAA;cAAA;YAAA;cAAAoB,SAAA,CAAArB,IAAA;cAAAqB,SAAA,CAAAM,EAAA,GAAAN,SAAA;cAE3B,IAAI,CAACxD,MAAM,CAACmB,KAAK,CAAC,wCAAwC,EAAE;gBAC1DA,KAAK,EAAAqC,SAAA,CAAAM;eACN,CAAC;YAAC;YAAA;cAAA,OAAAN,SAAA,CAAAhB,IAAA;UAAA;QAAA,GAAAa,QAAA;MAAA,CAEN;MAAA,SAAAN,KAAA;QAAA,OAAAK,KAAA,CAAAX,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAK,IAAA;IAAA;EAAA;IAAAtB,GAAA;IAAAC,KAAA,EAEO,SAAAW,SAAA,EAAQ;MACd,IAAI,IAAI,CAACW,cAAc,EAAE;QACvBG,aAAa,CAAC,IAAI,CAACH,cAAc,CAAC;QAClC,IAAI,CAACA,cAAc,GAAGT,SAAS;MACjC;IACF;EAAC;IAAAd,GAAA;IAAAC,KAAA,EAEM,SAAAqC,WAAWC,OAAgB;MAChC,IAAI,CAACA,OAAO,GAAGA,OAAO;MACtB,IAAI,CAACP,WAAW,GAAG,KAAK;MACxB,IAAI,CAACE,WAAW,EAAE;IACpB;EAAC;IAAAlC,GAAA;IAAAC,KAAA;MAAA,IAAAuC,YAAA,GAAArC,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAoC,SAAA;QAAA,IAAAC,OAAA,EAAAC,OAAA;QAAA,OAAAvC,mBAAA,CAAAG,IAAA,UAAAqC,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAnC,IAAA,GAAAmC,SAAA,CAAAlC,IAAA;YAAA;cAAA,KACF,IAAI,CAAC4B,OAAO;gBAAAM,SAAA,CAAAlC,IAAA;gBAAA;cAAA;cACd,IAAI,CAACpC,MAAM,CAACuE,KAAK,CAAC,mCAAmC,CAAC;cAChDJ,OAAO,GAAAK,aAAA;gBACXC,aAAa,EAAE,IAAI,CAACnE,YAAY;gBAChCoE,YAAY,EAAE3F,UAAU;cAAE,GACvB,IAAI,CAACiF,OAAO;cAAAM,SAAA,CAAAnC,IAAA;cAAAmC,SAAA,CAAAlC,IAAA;cAAA,OAGT,IAAI,CAACzB,WAAW,CAACgE,IAAI,CAAC,OAAO,EAAER,OAAO,CAAC;YAAA;cAC7C,IAAI,CAACV,WAAW,GAAG,IAAI;cAACa,SAAA,CAAAlC,IAAA;cAAA;YAAA;cAAAkC,SAAA,CAAAnC,IAAA;cAAAmC,SAAA,CAAAR,EAAA,GAAAQ,SAAA;cAElBF,OAAO,GAAG,IAAI,CAACQ,cAAc,CAAAN,SAAA,CAAAR,EAAM,CAAC;cAC1C,IAAI,CAACM,OAAO,EAAE;gBACZ,IAAI,CAACpE,MAAM,CAACuE,KAAK,kDAAAlE,MAAA,CAEZiE,SAAA,CAAAR,EAAA,CAAqBe,IACxB,qBACA;kBAAE1D,KAAK,EAAAmD,SAAA,CAAAR;gBAAA,CAAE,CACV;cACH;YAAC;YAAA;cAAA,OAAAQ,SAAA,CAAA9B,IAAA;UAAA;QAAA,GAAA0B,QAAA;MAAA,CAGN;MAAA,SAAAP,YAAA;QAAA,OAAAM,YAAA,CAAAxB,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAiB,WAAA;IAAA;EAAA;IAAAlC,GAAA;IAAAC,KAAA;MAAA,IAAAoD,iBAAA,GAAAlD,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEO,SAAAiD,SAAA;QAAA,IAAAC,UAAA,EAAAC,WAAA,EAAAC,SAAA,EAAAC,UAAA,EAAAC,IAAA,EAAAjB,OAAA,EAAAkB,UAAA,EAAAjB,OAAA;QAAA,OAAAvC,mBAAA,CAAAG,IAAA,UAAAsD,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAApD,IAAA,GAAAoD,SAAA,CAAAnD,IAAA;YAAA;cACN,IAAI,CAACpC,MAAM,CAACuE,KAAK,CAAC,wCAAwC,CAAC;cACrDS,UAAU,GAAwB;gBACtCQ,WAAW,EAAE,CAAC;gBACdf,aAAa,EAAE,IAAI,CAACnE,YAAY;gBAChCoE,YAAY,EAAE3F,UAAU,EAAE;gBAC1B0G,QAAQ,EAAE,IAAI,CAACjF,cAAc,CAACkF,mBAAmB,EAAE;gBACnDC,iBAAiB,EACf,IAAI,CAAClF,sBAAsB,CAACmF,2BAA2B,EAAE;gBAC3DC,aAAa,EAAE,IAAI,CAACnF,kBAAkB,CAACoF,uBAAuB;eAC/D;cACD,IAAI,CAACvF,iBAAiB,CAACmD,IAAI,CAAC,CAACqC,IAAI,CAACC,GAAG,EAAE,EAAEhB,UAAU,CAAC,CAAC;cAE/CC,WAAW,GAAoC,EAAE;YAAA;cAAA,MAChD,IAAI,CAAC1E,iBAAiB,CAAC0F,MAAM,GAAG,CAAC;gBAAAV,SAAA,CAAAnD,IAAA;gBAAA;cAAA;cAChC8C,SAAS,GAAG,IAAI,CAAC3E,iBAAiB,CAAC2F,KAAK,EAAE;cAAA,KAC5ChB,SAAS;gBAAAK,SAAA,CAAAnD,IAAA;gBAAA;cAAA;cAAA+C,UAAA,GAAAgB,cAAA,CACajB,SAAS,MAA1BE,IAAI,GAAAD,UAAA,KAAEhB,OAAO,GAAAgB,UAAA;cAAAI,SAAA,CAAApD,IAAA;cAEZkD,UAAU,GAAGU,IAAI,CAACC,GAAG,EAAE,GAAGZ,IAAI;cAAA,MAChCC,UAAU,IAAI3F,cAAc;gBAAA6F,SAAA,CAAAnD,IAAA;gBAAA;cAAA;cAC9B+B,OAAO,CAACqB,WAAW,GAAGH,UAAU,GAAG,MAAM,CAAC,CAAC;cAAAE,SAAA,CAAAnD,IAAA;cAAA,OACrC,IAAI,CAACzB,WAAW,CAACgE,IAAI,CAAC,WAAW,EAAER,OAAO,CAAC;YAAA;cAAAoB,SAAA,CAAAnD,IAAA;cAAA;YAAA;cAAAmD,SAAA,CAAApD,IAAA;cAAAoD,SAAA,CAAAzB,EAAA,GAAAyB,SAAA;cAG7CnB,OAAO,GAAG,IAAI,CAACQ,cAAc,CAAAW,SAAA,CAAAzB,EAAM,CAAC;cAC1C,IAAI,CAACM,OAAO,EAAE;gBACZ,IAAI,CAACpE,MAAM,CAACuE,KAAK,uDAAAlE,MAAA,CAEZkF,SAAA,CAAAzB,EAAA,CAAqBe,IACxB,qBACA;kBAAE1D,KAAK,EAAAoE,SAAA,CAAAzB;gBAAA,CAAE,CACV;gBACDmB,WAAW,CAACvB,IAAI,CAACwB,SAAS,CAAC;cAC7B;YAAC;cAAAK,SAAA,CAAAnD,IAAA;cAAA;YAAA;cAIP,IAAI,CAAC7B,iBAAiB,GAAG0E,WAAW;YAAC;YAAA;cAAA,OAAAM,SAAA,CAAA/C,IAAA;UAAA;QAAA,GAAAuC,QAAA;MAAA,CACtC;MAAA,SAAAzC,iBAAA;QAAA,OAAAwC,iBAAA,CAAArC,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAJ,gBAAA;IAAA;EAAA;IAAAb,GAAA;IAAAC,KAAA,EAEO,SAAAkD,eAAezD,KAAc;MACnC,IACEA,KAAK,YAAYtC,UAAU,IAC3BsC,KAAK,CAACiF,QAAQ,IACdjF,KAAK,CAACiF,QAAQ,CAACC,MAAM,KAAK,GAAG,EAC7B;QACA,IAAI,CAACrG,MAAM,CAACmB,KAAK,gCAAAd,MAAA,CAAgC,IAAI,CAACR,QAAQ,OAAI,CAAC;QACnE,IAAI,CAACwC,QAAQ,EAAE;QACf,OAAO,IAAI;MACb;MACA,OAAO,KAAK;IACd;EAAC;IAAAZ,GAAA;IAAAC,KAAA,EA/IM,SAAA4E,YAAA,EAAkB;MACvB,IAAI,CAAC3G,cAAc,CAACQ,QAAQ,EAAE;QAC5B,MAAM,IAAIC,KAAK,CAAC,oCAAoC,CAAC;MACvD;MACA,OAAOT,cAAc,CAACQ,QAAQ;IAChC;EAAC;IAAAsB,GAAA;IAAAC,KAAA;MAAA,IAAA6E,SAAA,GAAA3E,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAEM,SAAA0E,SAAA;QAAA,OAAA3E,mBAAA,CAAAG,IAAA,UAAAyE,UAAAC,SAAA;UAAA,kBAAAA,SAAA,CAAAvE,IAAA,GAAAuE,SAAA,CAAAtE,IAAA;YAAA;cAAA,KACDzC,cAAc,CAACQ,QAAQ;gBAAAuG,SAAA,CAAAtE,IAAA;gBAAA;cAAA;cAAAsE,SAAA,CAAAtE,IAAA;cAAA,OACnBzC,cAAc,CAACQ,QAAQ,CAACmB,cAAc,EAAE;YAAA;YAAA;cAAA,OAAAoF,SAAA,CAAAlE,IAAA;UAAA;QAAA,GAAAgE,QAAA;MAAA,CAEjD;MAAA,SAAAG,SAAA;QAAA,OAAAJ,SAAA,CAAA9D,KAAA,OAAAC,SAAA;MAAA;MAAA,OAAAiE,QAAA;IAAA;EAAA;AAAA;AAqIFzG,eAAA,CAxMYP,cAAc","ignoreList":[]}

package/lib/esm/express/middleware.js

@@ -101,7 +101,13 @@ var getMiddleware = function getMiddleware(app, client) {
   };
 };
 var getConsumer = function getConsumer(req) {
-  return req.consumerIdentifier ? String(req.consumerIdentifier) : null;
+  if (req.apitallyConsumer) {
+    return String(req.apitallyConsumer);
+  } else if (req.consumerIdentifier) {
+    // For backwards compatibility
+    return String(req.consumerIdentifier);
+  }
+  return null;
 };
 var extractExpressValidatorErrors = function extractExpressValidatorErrors(responseBody) {
   var errors = [];

package/lib/esm/express/middleware.js.map

@@ -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","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":[]}
+{"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":[]}

package/lib/esm/fastify/plugin.js

@@ -14,7 +14,8 @@ var apitallyPlugin = /*#__PURE__*/function () {
         case 0:
           client = new ApitallyClient(config);
           routes = [];
-          fastify.decorateRequest("consumerIdentifier", null);
+          fastify.decorateRequest("apitallyConsumer", null);
+          fastify.decorateRequest("consumerIdentifier", null); // For backwards compatibility
           fastify.decorateReply("payload", null);
           fastify.addHook("onRoute", function (routeOptions) {
             var methods = Array.isArray(routeOptions.method) ? routeOptions.method : [routeOptions.method];
@@ -96,7 +97,7 @@ var apitallyPlugin = /*#__PURE__*/function () {
             }
             done();
           });
-        case 10:
+        case 11:
         case "end":
           return _context2.stop();
       }
@@ -126,7 +127,13 @@ var getAppInfo = function getAppInfo(routes, appVersion) {
   };
 };
 var getConsumer = function getConsumer(request) {
-  return request.consumerIdentifier ? String(request.consumerIdentifier) : null;
+  if (request.apitallyConsumer) {
+    return String(request.apitallyConsumer);
+  } else if (request.consumerIdentifier) {
+    // For backwards compatibility
+    return String(request.consumerIdentifier);
+  }
+  return null;
 };
 var extractAjvErrors = function extractAjvErrors(message) {
   var regex = /(?<=^|, )((?:headers|params|query|querystring|body)[/.][^ ]+)(?= )/g;

package/lib/esm/fastify/plugin.js.map

@@ -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","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":";;;;;AACA,OAAOA,EAAE,MAAM,gBAAgB;AAE/B,SAASC,cAAc,QAAQ,qBAAqB;AACpD,SAASC,iBAAiB,QAAQ,8BAA8B;AAchE,IAAMC,cAAc;EAAA,IAAAC,IAAA,GAAAC,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAAuC,SAAAC,SACzDC,OAAO,EACPC,MAAM;IAAA,IAAAC,MAAA,EAAAC,MAAA;IAAA,OAAAN,mBAAA,CAAAO,IAAA,UAAAC,UAAAC,SAAA;MAAA,kBAAAA,SAAA,CAAAC,IAAA,GAAAD,SAAA,CAAAE,IAAA;QAAA;UAEAN,MAAM,GAAG,IAAIV,cAAc,CAACS,MAAM,CAAC;UACnCE,MAAM,GAAe,EAAE;UAE7BH,OAAO,CAACS,eAAe,CAAC,oBAAoB,EAAE,IAAI,CAAC;UACnDT,OAAO,CAACU,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC;UAEtCV,OAAO,CAACW,OAAO,CAAC,SAAS,EAAE,UAACC,YAAY,EAAI;YAC1C,IAAMC,OAAO,GAAGC,KAAK,CAACC,OAAO,CAACH,YAAY,CAACI,MAAM,CAAC,GAC9CJ,YAAY,CAACI,MAAM,GACnB,CAACJ,YAAY,CAACI,MAAM,CAAC;YACzBH,OAAO,CAACI,OAAO,CAAC,UAACD,MAAM,EAAI;cACzB,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAACE,QAAQ,CAACF,MAAM,CAACG,WAAW,EAAE,CAAC,EAAE;gBACvDhB,MAAM,CAACiB,IAAI,CAAC;kBACVJ,MAAM,EAAEA,MAAM,CAACG,WAAW,EAAE;kBAC5BE,IAAI,EAAET,YAAY,CAACU;iBACpB,CAAC;cACJ;YACF,CAAC,CAAC;UACJ,CAAC,CAAC;UAEFtB,OAAO,CAACW,OAAO,CAAC,SAAS,EAAE,YAAK;YAC9BT,MAAM,CAACqB,UAAU,CAACC,UAAU,CAACrB,MAAM,EAAEF,MAAM,CAACwB,UAAU,CAAC,CAAC;UAC1D,CAAC,CAAC;UAEFzB,OAAO,CAACW,OAAO,CAAC,SAAS,eAAAf,iBAAA,eAAAC,mBAAA,CAAAC,IAAA,CAAE,SAAA4B,QAAA;YAAA,OAAA7B,mBAAA,CAAAO,IAAA,UAAAuB,SAAAC,QAAA;cAAA,kBAAAA,QAAA,CAAArB,IAAA,GAAAqB,QAAA,CAAApB,IAAA;gBAAA;kBAAAoB,QAAA,CAAApB,IAAA;kBAAA,OACnBN,MAAM,CAAC2B,cAAc,EAAE;gBAAA;gBAAA;kBAAA,OAAAD,QAAA,CAAAE,IAAA;cAAA;YAAA,GAAAJ,OAAA;UAAA,CAC9B,GAAC;UAEF1B,OAAO,CAACW,OAAO,CAAC,QAAQ,EAAE,UAACoB,OAAO,EAAEC,KAAK,EAAEC,OAAY,EAAEC,IAAI,EAAI;YAC/D,IAAI;cACFF,KAAK,CAACC,OAAO,GAAGE,IAAI,CAACC,KAAK,CAACH,OAAO,CAAC;YACrC,CAAC,CAAC,OAAOI,KAAK,EAAE,CAAC,CAAC,CAAC;YACnBH,IAAI,EAAE;UACR,CAAC,CAAC;UAEFlC,OAAO,CAACW,OAAO,CAAC,SAAS,EAAE,UAACoB,OAAO,EAAEC,KAAK,EAAEK,KAAK,EAAEH,IAAI,EAAI;YACzD,IAAI,CAACG,KAAK,CAACC,UAAU,IAAID,KAAK,CAACC,UAAU,KAAK,GAAG,EAAE;cACjDN,KAAK,CAACO,WAAW,GAAGF,KAAK;YAC3B;YACAH,IAAI,EAAE;UACR,CAAC,CAAC;UAEFlC,OAAO,CAACW,OAAO,CAAC,YAAY,EAAE,UAACoB,OAAO,EAAEC,KAAK,EAAEE,IAAI,EAAI;YACrD,IAAIH,OAAO,CAACf,MAAM,CAACG,WAAW,EAAE,KAAK,SAAS,EAAE;cAC9C;cACA,IAAMqB,QAAQ,GAAGC,WAAW,CAACV,OAAO,CAAC;cACrC,IAAMV,IAAI,GACR,cAAc,IAAIU,OAAO,GACpBA,OAAe,CAACnB,YAAY,CAACU,GAAG,GAChCS,OAAe,CAACW,UAAU;cACjC,IAAMC,WAAW,GAAGZ,OAAO,CAACa,OAAO,CAAC,gBAAgB,CAAC;cACrD,IAAIC,YAAY,GAAGb,KAAK,CAACc,SAAS,CAAC,gBAAgB,CAAC;cACpD,IAAIhC,KAAK,CAACC,OAAO,CAAC8B,YAAY,CAAC,EAAE;gBAC/BA,YAAY,GAAGA,YAAY,CAAC,CAAC,CAAC;cAChC;cACA3C,MAAM,CAAC6C,cAAc,CAACC,UAAU,CAAC;gBAC/BR,QAAQ,EAAEA,QAAQ;gBAClBxB,MAAM,EAAEe,OAAO,CAACf,MAAM;gBACtBK,IAAI,EAAEA,IAAI;gBACViB,UAAU,EAAEN,KAAK,CAACM,UAAU;gBAC5BW,YAAY,EAAEjB,KAAK,CAACkB,eAAe,EAAE;gBACrCP,WAAW,EAAEA,WAAW;gBACxBE,YAAY,EAAEA;eACf,CAAC;cACF,IACE,CAACb,KAAK,CAACM,UAAU,KAAK,GAAG,IAAIN,KAAK,CAACM,UAAU,KAAK,GAAG,KACrDN,KAAK,CAACC,OAAO,KACZ,CAACD,KAAK,CAACC,OAAO,CAACkB,IAAI,IAAInB,KAAK,CAACC,OAAO,CAACkB,IAAI,KAAK,oBAAoB,CAAC,IACpE,OAAOnB,KAAK,CAACC,OAAO,CAACmB,OAAO,KAAK,QAAQ,EACzC;gBACA,IAAMC,gBAAgB,GAAGC,gBAAgB,CAACtB,KAAK,CAACC,OAAO,CAACmB,OAAO,CAAC;gBAChEC,gBAAgB,CAACpC,OAAO,CAAC,UAACoB,KAAK,EAAI;kBACjCnC,MAAM,CAACqD,sBAAsB,CAACC,kBAAkB,CAAAC,aAAA;oBAC9CjB,QAAQ,EAAEA,QAAQ;oBAClBxB,MAAM,EAAEe,OAAO,CAACf,MAAM;oBACtBK,IAAI,EAAEA;kBAAI,GACPgB,KAAK,CACT,CAAC;gBACJ,CAAC,CAAC;cACJ;cACA,IAAIL,KAAK,CAACM,UAAU,KAAK,GAAG,IAAIN,KAAK,CAACO,WAAW,EAAE;gBACjDrC,MAAM,CAACwD,kBAAkB,CAACC,cAAc,CAAC;kBACvCnB,QAAQ,EAAEA,QAAQ;kBAClBxB,MAAM,EAAEe,OAAO,CAACf,MAAM;kBACtBK,IAAI,EAAEA,IAAI;kBACVuC,IAAI,EAAE5B,KAAK,CAACO,WAAW,CAACsB,IAAI;kBAC5BC,GAAG,EAAE9B,KAAK,CAACO,WAAW,CAACa,OAAO;kBAC9BW,SAAS,EAAE/B,KAAK,CAACO,WAAW,CAACyB,KAAK,IAAI;iBACvC,CAAC;cACJ;YACF;YACA9B,IAAI,EAAE;UACR,CAAC,CAAC;QAAC;QAAA;UAAA,OAAA5B,SAAA,CAAAwB,IAAA;MAAA;IAAA,GAAA/B,QAAA;EAAA,CACJ;EAAA,gBAjGKL,cAAcA,CAAAuE,EAAA,EAAAC,GAAA;IAAA,OAAAvE,IAAA,CAAAwE,KAAA,OAAAC,SAAA;EAAA;AAAA,GAiGnB;AAED,IAAM5C,UAAU,GAAG,SAAbA,UAAUA,CAAIrB,MAAkB,EAAEsB,UAAmB,EAAI;EAC7D,IAAM4C,QAAQ,GAA4B,CACxC,CAAC,QAAQ,EAAEC,OAAO,CAACC,OAAO,CAACC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAC9C;EACD,IAAMC,cAAc,GAAGhF,iBAAiB,CAAC,SAAS,CAAC;EACnD,IAAMiF,eAAe,GAAGjF,iBAAiB,CAAC,OAAO,CAAC;EAClD,IAAIgF,cAAc,EAAE;IAClBJ,QAAQ,CAACjD,IAAI,CAAC,CAAC,SAAS,EAAEqD,cAAc,CAAC,CAAC;EAC5C;EACA,IAAIC,eAAe,EAAE;IACnBL,QAAQ,CAACjD,IAAI,CAAC,CAAC,UAAU,EAAEsD,eAAe,CAAC,CAAC;EAC9C;EACA,IAAIjD,UAAU,EAAE;IACd4C,QAAQ,CAACjD,IAAI,CAAC,CAAC,KAAK,EAAEK,UAAU,CAAC,CAAC;EACpC;EACA,OAAO;IACLkD,KAAK,EAAExE,MAAM;IACbkE,QAAQ,EAAEO,MAAM,CAACC,WAAW,CAACR,QAAQ,CAAC;IACtCnE,MAAM,EAAE;GACT;AACH,CAAC;AAED,IAAMuC,WAAW,GAAG,SAAdA,WAAWA,CAAIV,OAAuB,EAAI;EAC9C,OAAOA,OAAO,CAAC+C,kBAAkB,GAAGC,MAAM,CAAChD,OAAO,CAAC+C,kBAAkB,CAAC,GAAG,IAAI;AAC/E,CAAC;AAED,IAAMxB,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAIF,OAAe,EAAuB;EAC9D,IAAM4B,KAAK,GACT,qEAAqE;EACvE,IAAMC,OAAO,GAAuC,EAAE;EACtD,IAAIC,KAA6B;EACjC,OAAO,CAACA,KAAK,GAAGF,KAAK,CAACG,IAAI,CAAC/B,OAAO,CAAC,MAAM,IAAI,EAAE;IAC7C6B,OAAO,CAAC7D,IAAI,CAAC;MAAE8D,KAAK,EAAEA,KAAK,CAAC,CAAC,CAAC;MAAEE,KAAK,EAAEF,KAAK,CAACE;IAAK,CAAE,CAAC;EACvD;EAEA,OAAOH,OAAO,CAACI,GAAG,CAAC,UAACC,CAAC,EAAEC,CAAC,EAAI;IAC1B,IAAMC,QAAQ,GACZD,CAAC,GAAG,CAAC,GAAGN,OAAO,CAACQ,MAAM,GAAGR,OAAO,CAACM,CAAC,GAAG,CAAC,CAAC,CAACH,KAAK,GAAG,CAAC,GAAGhC,OAAO,CAACqC,MAAM;IACpE,IAAMC,UAAU,GAAGJ,CAAC,CAACJ,KAAK,CAACS,KAAK,CAAC,MAAM,CAAC;IACxC,IAAID,UAAU,CAAC,CAAC,CAAC,KAAK,aAAa,EAAE;MACnCA,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;IACzB;IACA,OAAO;MACLE,GAAG,EAAEF,UAAU,CAACG,IAAI,CAAC,GAAG,CAAC;MACzB/B,GAAG,EAAEV,OAAO,CAAC0C,SAAS,CAACR,CAAC,CAACF,KAAK,EAAEI,QAAQ,CAAC;MACzC5B,IAAI,EAAE;KACP;EACH,CAAC,CAAC;AACJ,CAAC;AAED,eAAerE,EAAE,CAACG,cAAc,EAAE;EAChCmE,IAAI,EAAE;CACP,CAAC","ignoreList":[]}
+{"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":[]}

package/lib/esm/koa/middleware.js

@@ -79,7 +79,13 @@ var getPath = function getPath(ctx) {
   return ctx._matchedRoute || ctx.routePath; // _matchedRoute is set by koa-router, routePath is set by koa-route
 };
 var getConsumer = function getConsumer(ctx) {
-  return ctx.state.consumerIdentifier ? String(ctx.state.consumerIdentifier) : null;
+  if (ctx.state.apitallyConsumer) {
+    return String(ctx.state.apitallyConsumer);
+  } else if (ctx.state.consumerIdentifier) {
+    // For backwards compatibility
+    return String(ctx.state.consumerIdentifier);
+  }
+  return null;
 };
 var getAppInfo = function getAppInfo(app, appVersion) {
   var versions = [["nodejs", process.version.replace(/^v/, "")]];

package/lib/esm/koa/middleware.js.map

@@ -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","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":[]}
+{"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":[]}

package/lib/types/common/client.d.ts

@@ -28,5 +28,6 @@ export declare class ApitallyClient {
     setAppInfo(appInfo: AppInfo): void;
     private sendAppInfo;
     private sendRequestsData;
+    private handleHubError;
 }
 //# sourceMappingURL=client.d.ts.map

package/lib/types/common/client.d.ts.map

@@ -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,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"}
+{"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;YAyBX,gBAAgB;IAyC9B,OAAO,CAAC,cAAc;CAYvB"}

package/lib/types/express/middleware.d.ts

@@ -2,6 +2,7 @@ import type { Express } from "express";
 import { ApitallyConfig } from "../common/types.js";
 declare module "express" {
     interface Request {
+        apitallyConsumer?: string;
         consumerIdentifier?: string;
     }
 }

package/lib/types/express/middleware.d.ts.map

@@ -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"}
+{"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"}

package/lib/types/fastify/plugin.d.ts

@@ -6,6 +6,7 @@ declare module "fastify" {
         serverError?: FastifyError;
     }
     interface FastifyRequest {
+        apitallyConsumer?: string;
         consumerIdentifier?: string;
     }
 }

package/lib/types/fastify/plugin.d.ts.map

@@ -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;;AAuJD,wBAEG"}
+{"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

@@ -1,7 +1,7 @@
 {
   "name": "apitally",
-  "version": "0.5.0",
-  "description": "API monitoring for REST APIs built with Express, Fastify, Koa, and NestJS.",
+  "version": "0.6.1",
+  "description": "Simple API monitoring & analytics for REST APIs built with Express, Fastify, Koa, and NestJS.",
   "author": "Apitally <hello@apitally.io>",
   "license": "MIT",
   "keywords": [
@@ -12,6 +12,7 @@
     "fastify",
     "koa",
     "logging",
+    "metrics",
     "middleware",
     "monitor",
     "monitoring",
@@ -24,10 +25,10 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/apitally/nodejs-client.git"
+    "url": "git+ssh://git@github.com/apitally/apitally-js.git"
   },
   "bugs": {
-    "url": "https://github.com/apitally/nodejs-client/issues"
+    "url": "https://github.com/apitally/apitally-js/issues"
   },
   "homepage": "https://apitally.io",
   "type": "module",
@@ -211,9 +212,9 @@
     "@types/koa-bodyparser": "^4.3.12",
     "@types/koa-route": "^3.2.8",
     "@types/node": "^20.9.0",
-    "@types/supertest": "^2.0.16",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@types/supertest": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
     "@vitest/coverage-v8": "^1.5.0",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "babel-plugin-transform-require-extensions": "^2.0.1",
@@ -228,11 +229,11 @@
     "install": "^0.13.0",
     "koa": "^2.14.2",
     "koa-bodyparser": "^4.4.1",
-    "koa-route": "^3.2.0",
+    "koa-route": "^4.0.0",
     "nock": "^13.3.8",
     "npm": "^10.2.4",
     "prettier": "^3.1.0",
-    "supertest": "^6.3.3",
+    "supertest": "^7.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "unplugin-swc": "^1.4.4",