apitally 0.11.3 → 0.11.5

package/dist/express/middleware.cjs

@@ -238,9 +238,9 @@ var _TempGzipFile = class _TempGzipFile {
       this.writeStream.once("ready", resolve);
       this.writeStream.once("error", reject);
     });
-    this.closedPromise = new Promise((resolve) => {
+    this.closedPromise = new Promise((resolve, reject) => {
       this.writeStream.once("close", resolve);
-      this.writeStream.once("error", resolve);
+      this.writeStream.once("error", reject);
     });
     this.gzip = (0, import_zlib.createGzip)();
     this.gzip.pipe(this.writeStream);
@@ -390,7 +390,10 @@ var _RequestLogger = class _RequestLogger {
   hasSupportedContentType(headers) {
     var _a2;
     const contentType = (_a2 = headers.find(([k]) => k.toLowerCase() === "content-type")) == null ? void 0 : _a2[1];
-    return contentType !== void 0 && ALLOWED_CONTENT_TYPES.some((t) => contentType.startsWith(t));
+    return this.isSupportedContentType(contentType);
+  }
+  isSupportedContentType(contentType) {
+    return typeof contentType === "string" && ALLOWED_CONTENT_TYPES.some((t) => contentType.startsWith(t));
   }
   maskQueryParams(search) {
     const params = new URLSearchParams(search);
@@ -418,8 +421,6 @@ var _RequestLogger = class _RequestLogger {
     }
     url.search = this.config.logQueryParams ? this.maskQueryParams(url.search) : "";
     request.url = url.toString();
-    request.headers = this.config.logRequestHeaders ? this.maskHeaders(request.headers) : [];
-    response.headers = this.config.logResponseHeaders ? this.maskHeaders(response.headers) : [];
     if (!this.config.logRequestBody || !this.hasSupportedContentType(request.headers)) {
       request.body = void 0;
     } else if (request.body) {
@@ -452,6 +453,8 @@ var _RequestLogger = class _RequestLogger {
         }
       }
     }
+    request.headers = this.config.logRequestHeaders ? this.maskHeaders(request.headers) : [];
+    response.headers = this.config.logResponseHeaders ? this.maskHeaders(response.headers) : [];
     const item = {
       uuid: (0, import_crypto2.randomUUID)(),
       request: skipEmptyValues(request),
@@ -788,6 +791,7 @@ var _ApitallyClient = class _ApitallyClient {
   syncIntervalId;
   startupData;
   startupDataSent = false;
+  enabled = true;
   requestCounter;
   requestLogger;
   validationErrorCounter;
@@ -824,12 +828,16 @@ var _ApitallyClient = class _ApitallyClient {
     }
     return _ApitallyClient.instance;
   }
+  isEnabled() {
+    return this.enabled;
+  }
   static async shutdown() {
     if (_ApitallyClient.instance) {
       await _ApitallyClient.instance.handleShutdown();
     }
   }
   async handleShutdown() {
+    this.enabled = false;
     this.stopSync();
     await this.sendSyncData();
     await this.sendLogData();
@@ -929,7 +937,7 @@ var _ApitallyClient = class _ApitallyClient {
   async sendSyncData() {
     this.logger.debug("Synchronizing data with Apitally Hub");
     const newPayload = {
-      time_offset: 0,
+      timestamp: Date.now() / 1e3,
       instance_uuid: this.instanceUuid,
       message_uuid: (0, import_crypto5.randomUUID)(),
       requests: this.requestCounter.getAndResetRequests(),
@@ -937,22 +945,16 @@ var _ApitallyClient = class _ApitallyClient {
       server_errors: this.serverErrorCounter.getAndResetServerErrors(),
       consumers: this.consumerRegistry.getAndResetUpdatedConsumers()
     };
-    this.syncDataQueue.push([
-      Date.now(),
-      newPayload
-    ]);
+    this.syncDataQueue.push(newPayload);
     let i = 0;
     while (this.syncDataQueue.length > 0) {
-      const queueItem = this.syncDataQueue.shift();
-      if (queueItem) {
-        const [time, payload] = queueItem;
+      const payload = this.syncDataQueue.shift();
+      if (payload) {
         try {
-          const timeOffset = Date.now() - time;
-          if (timeOffset <= MAX_QUEUE_TIME) {
+          if (Date.now() - payload.timestamp * 1e3 <= MAX_QUEUE_TIME) {
             if (i > 0) {
               await this.randomDelay();
             }
-            payload.time_offset = timeOffset / 1e3;
             await this.sendData("sync", payload);
             i += 1;
           }
@@ -962,7 +964,7 @@ var _ApitallyClient = class _ApitallyClient {
             this.logger.debug("Error while synchronizing data with Apitally Hub (will retry)", {
               error
             });
-            this.syncDataQueue.push(queueItem);
+            this.syncDataQueue.push(payload);
             break;
           }
         }
@@ -1019,6 +1021,7 @@ var _ApitallyClient = class _ApitallyClient {
     if (error instanceof HTTPError) {
       if (error.response.status === 404) {
         this.logger.error(`Invalid Apitally client ID: '${this.clientId}'`);
+        this.enabled = false;
         this.stopSync();
         return true;
       }
@@ -1030,7 +1033,7 @@ var _ApitallyClient = class _ApitallyClient {
     return false;
   }
   async randomDelay() {
-    const delay = 100 + Math.random() * 200;
+    const delay = 100 + Math.random() * 400;
     await new Promise((resolve) => setTimeout(resolve, delay));
   }
 };
@@ -1194,6 +1197,10 @@ var useApitally = /* @__PURE__ */ __name((app, config) => {
 var getMiddleware = /* @__PURE__ */ __name((app, client) => {
   let errorHandlerConfigured = false;
   return (req, res, next) => {
+    if (!client.isEnabled()) {
+      next();
+      return;
+    }
     if (!errorHandlerConfigured) {
       app.use((err, req2, res2, next2) => {
         res2.locals.serverError = err;
@@ -1205,7 +1212,10 @@ var getMiddleware = /* @__PURE__ */ __name((app, client) => {
       const startTime = import_perf_hooks.performance.now();
       const originalSend = res.send;
       res.send = (body) => {
-        res.locals.body = body;
+        const contentType = res.get("content-type");
+        if (client.requestLogger.isSupportedContentType(contentType)) {
+          res.locals.body = body;
+        }
         return originalSend.call(res, body);
       };
       res.on("finish", () => {