apitally 0.21.2 → 0.21.3

package/dist/elysia/plugin.cjs

@@ -886,11 +886,14 @@ var _ApitallyClient = class _ApitallyClient {
     if (_ApitallyClient.instance) {
       throw new Error("Apitally client is already initialized");
     }
+    this.logger = logger ?? getLogger();
     if (!isValidClientId(clientId)) {
-      throw new Error(`Invalid Apitally client ID '${clientId}' (expecting hexadecimal UUID format)`);
+      this.logger.error(`Invalid Apitally client ID '${clientId}' (expecting hexadecimal UUID format)`);
+      this.enabled = false;
     }
     if (!isValidEnv(env)) {
-      throw new Error(`Invalid env '${env}' (expecting 1-32 alphanumeric lowercase characters and hyphens only)`);
+      this.logger.error(`Invalid Apitally env '${env}' (expecting 1-32 alphanumeric characters and hyphens only)`);
+      this.enabled = false;
     }
     if (requestLoggingConfig && !requestLogging) {
       console.warn("requestLoggingConfig is deprecated, use requestLogging instead.");
@@ -905,8 +908,6 @@ var _ApitallyClient = class _ApitallyClient {
     this.validationErrorCounter = new ValidationErrorCounter();
     this.serverErrorCounter = new ServerErrorCounter();
     this.consumerRegistry = new ConsumerRegistry();
-    this.logger = logger ?? getLogger();
-    this.startSync();
     this.handleShutdown = this.handleShutdown.bind(this);
   }
   static getInstance() {
@@ -961,15 +962,20 @@ var _ApitallyClient = class _ApitallyClient {
     }
   }
   startSync() {
+    if (!this.enabled) {
+      return;
+    }
     this.sync();
     this.syncIntervalId = setInterval(() => {
       this.sync();
     }, INITIAL_SYNC_INTERVAL);
     setTimeout(() => {
-      clearInterval(this.syncIntervalId);
-      this.syncIntervalId = setInterval(() => {
-        this.sync();
-      }, SYNC_INTERVAL);
+      if (this.syncIntervalId) {
+        clearInterval(this.syncIntervalId);
+        this.syncIntervalId = setInterval(() => {
+          this.sync();
+        }, SYNC_INTERVAL);
+      }
     }, INITIAL_SYNC_INTERVAL_DURATION);
   }
   async sync() {
@@ -997,7 +1003,6 @@ var _ApitallyClient = class _ApitallyClient {
   setStartupData(data) {
     this.startupData = data;
     this.startupDataSent = false;
-    this.sendStartupData();
   }
   async sendStartupData() {
     if (this.startupData) {
@@ -1207,6 +1212,23 @@ function teeResponse(response) {
   ];
 }
 __name(teeResponse, "teeResponse");
+function teeResponseBlob(response, blob) {
+  const newResponse1 = new Response(blob, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers
+  });
+  const newResponse2 = new Response(blob, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers
+  });
+  return [
+    newResponse1,
+    newResponse2
+  ];
+}
+__name(teeResponseBlob, "teeResponseBlob");
 
 // src/loggers/console.ts
 var import_node_util = require("util");
@@ -1432,33 +1454,35 @@ function apitallyPlugin(config) {
     const originalMapResponse = handler.mapResponse;
     const originalMapCompactResponse = handler.mapCompactResponse;
     const originalMapEarlyResponse = handler.mapEarlyResponse;
-    const captureResponse = /* @__PURE__ */ __name((response, request) => {
-      if (request instanceof Request && response instanceof Response) {
-        const [newResponse1, newResponse2] = teeResponse(response);
+    const captureResponse = /* @__PURE__ */ __name((originalResponse, mappedResponse, request) => {
+      var _a2;
+      if (request instanceof Request && mappedResponse instanceof Response && !(RESPONSE_SYMBOL in request)) {
+        const [newResponse1, newResponse2] = ((_a2 = originalResponse == null ? void 0 : originalResponse.constructor) == null ? void 0 : _a2.name) === "String" ? teeResponseBlob(mappedResponse, originalResponse) : teeResponse(mappedResponse);
         request[RESPONSE_SYMBOL] = newResponse2;
         return newResponse1;
       } else {
-        return response;
+        return mappedResponse;
       }
     }, "captureResponse");
     handler.mapResponse = /* @__PURE__ */ __name(function wrappedMapResponse(response, set, request) {
       const mappedResponse = originalMapResponse(response, set, request);
-      const newResponse = captureResponse(mappedResponse, request);
+      const newResponse = captureResponse(response, mappedResponse, request);
       return newResponse;
     }, "wrappedMapResponse");
     handler.mapCompactResponse = /* @__PURE__ */ __name(function wrappedMapCompactResponse(response, request) {
       const mappedResponse = originalMapCompactResponse(response, request);
-      const newResponse = captureResponse(mappedResponse, request);
+      const newResponse = captureResponse(response, mappedResponse, request);
       return newResponse;
     }, "wrappedMapCompactResponse");
     handler.mapEarlyResponse = /* @__PURE__ */ __name(function wrappedMapEarlyResponse(response, set, request) {
       const mappedResponse = originalMapEarlyResponse(response, set, request);
-      const newResponse = captureResponse(mappedResponse, request);
+      const newResponse = captureResponse(response, mappedResponse, request);
       return newResponse;
     }, "wrappedMapEarlyResponse");
     return app.decorate("apitally", {}).onStart(() => {
       const appInfo = getAppInfo(app, config.appVersion);
       client.setStartupData(appInfo);
+      client.startSync();
     }).onStop(async () => {
       await client.handleShutdown();
     }).onRequest(async ({ request }) => {