Update cross-region tests, await socket close on close()

Author: dforsber

src/boilingdata/boilingdata.ts

@@ -132,6 +132,7 @@ export class BoilingData {
   private creds?: BDCredentials;
   private socketInstance: ISocketInstance;
   private logger: Console;
+  private closedPromise?: Promise<void>;
 
   constructor(public props: IBoilingData) {
     this.logger = createLogger({ name: "boilingdata", logLevel: this.props.logLevel ?? "info" });
@@ -173,43 +174,47 @@ export class BoilingData {
 
   public async close(): Promise<void> {
     this.socketInstance.socket?.close(1000);
+    if (this.closedPromise) await this.closedPromise;
   }
 
   public async connect(): Promise<void> {
     return new Promise((resolve, reject) => {
       const sock = this.socketInstance;
       const cbs = this.props.globalCallbacks;
-      getBoilingDataCredentials(
-        this.props.username,
-        this.props.password,
-        this.region,
-        this.props.endpointUrl,
-        this.props.mfa,
-        this.props.authcontext,
-        this.logger,
-      )
-        .then(creds => {
-          this.creds = creds;
-          sock.socket = new WebSocket(this.creds.signedWebsocketUrl);
-          sock.socket!.onclose = () => {
-            if (cbs?.onSocketClose) cbs.onSocketClose();
-          };
-          sock.socket!.onopen = () => {
-            if (cbs?.onSocketOpen) cbs.onSocketOpen();
-            resolve();
-          };
-          sock.socket!.onerror = (err: any) => {
-            this.logger.error(err);
+      this.closedPromise = new Promise<void>(closeResolve => {
+        getBoilingDataCredentials(
+          this.props.username,
+          this.props.password,
+          this.region,
+          this.props.endpointUrl,
+          this.props.mfa,
+          this.props.authcontext,
+          this.logger,
+        )
+          .then(creds => {
+            this.creds = creds;
+            sock.socket = new WebSocket(this.creds.signedWebsocketUrl);
+            sock.socket!.onclose = () => {
+              if (cbs?.onSocketClose) cbs.onSocketClose();
+              closeResolve();
+            };
+            sock.socket!.onopen = () => {
+              if (cbs?.onSocketOpen) cbs.onSocketOpen();
+              resolve();
+            };
+            sock.socket!.onerror = (err: any) => {
+              this.logger.error(err);
+              reject(err);
+            };
+            sock.socket!.onmessage = (msg: MessageEvent) => {
+              return this.handleSocketMessage(msg);
+            };
+          })
+          .catch(err => {
+            console.error(err);
             reject(err);
-          };
-          sock.socket!.onmessage = (msg: MessageEvent) => {
-            return this.handleSocketMessage(msg);
-          };
-        })
-        .catch(err => {
-          console.error(err);
-          reject(err);
-        });
+          });
+      });
     });
   }
 

src/tests/__snapshots__/query-cross-region.test.ts.snap

@@ -0,0 +1,67 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BoilingData in all North-America and Europe AWS Regions runs query succesfully in other regions too 1`] = `
+Array [
+  Array [
+    Object {
+      "birthdate": "3/8/1971",
+      "cc": "6759521864920116",
+      "comments": "1E+02",
+      "country": "Indonesia",
+      "email": "[email protected]",
+      "first_name": "Amanda",
+      "gender": "Female",
+      "id": 1,
+      "ip_address": "1.197.201.2",
+      "last_name": "Jordan",
+      "registration_dttm": "2016-02-03 07:55:29+00",
+      "salary": 49756.53,
+      "title": "Internal Auditor",
+    },
+  ],
+]
+`;
+
+exports[`BoilingData in all North-America and Europe AWS Regions runs query succesfully in other regions too 2`] = `
+Array [
+  Array [
+    Object {
+      "birthdate": "3/8/1971",
+      "cc": "6759521864920116",
+      "comments": "1E+02",
+      "country": "Indonesia",
+      "email": "[email protected]",
+      "first_name": "Amanda",
+      "gender": "Female",
+      "id": 1,
+      "ip_address": "1.197.201.2",
+      "last_name": "Jordan",
+      "registration_dttm": "2016-02-03 07:55:29+00",
+      "salary": 49756.53,
+      "title": "Internal Auditor",
+    },
+  ],
+]
+`;
+
+exports[`BoilingData in all North-America and Europe AWS Regions runs query succesfully in other regions too 3`] = `
+Array [
+  Array [
+    Object {
+      "birthdate": "3/8/1971",
+      "cc": "6759521864920116",
+      "comments": "1E+02",
+      "country": "Indonesia",
+      "email": "[email protected]",
+      "first_name": "Amanda",
+      "gender": "Female",
+      "id": 1,
+      "ip_address": "1.197.201.2",
+      "last_name": "Jordan",
+      "registration_dttm": "2016-02-03 07:55:29+00",
+      "salary": 49756.53,
+      "title": "Internal Auditor",
+    },
+  ],
+]
+`;