Add static shutdown() method to ApitallyClient

apitally · Nov 24, 2023 · fdc2711 · fdc2711
1 parent a98155f
commit fdc2711
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/common/client.ts b/src/common/client.ts
@@ -108,6 +108,18 @@ export class ApitallyClient {
     return ApitallyClient.instance;
   }
 
+  public static async shutdown() {
+    if (ApitallyClient.instance) {
+      await ApitallyClient.instance.handleShutdown();
+    }
+  }
+
+  public async handleShutdown() {
+    this.stopSync();
+    await this.sendRequestsData();
+    ApitallyClient.instance = undefined;
+  }
+
   private getHubUrl() {
     const baseURL =
       process.env.APITALLY_HUB_BASE_URL || "https://hub.apitally.io";
@@ -146,12 +158,6 @@ export class ApitallyClient {
     }
   }
 
-  public async handleShutdown() {
-    this.stopSync();
-    await this.sendRequestsData();
-    ApitallyClient.instance = undefined;
-  }
-
   public setAppInfo(appInfo: AppInfo) {
     this.appInfo = appInfo;
     this.appInfoSent = false;

diff --git a/tests/common/client.test.ts b/tests/common/client.test.ts
@@ -68,8 +68,6 @@ describe("Client", () => {
   });
 
   afterEach(async () => {
-    try {
-      await ApitallyClient.getInstance().handleShutdown();
-    } catch (error) {} // eslint-disable-line no-empty
+    await ApitallyClient.shutdown();
   });
 });