Preparing release 1.1.11

Author: queue-it

android/src/main/java/com/reactnativequeueit/QueueItModule.kt

@@ -92,24 +92,52 @@ class QueueItModule(reactContext: ReactApplicationContext)
   @ReactMethod
   fun runAsync(customerId: String, eventAlias: String, layoutName: String?, language: String?, promise: Promise) {
     handler.post {
-      val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
-      queueEngine.run(context.currentActivity)
+      if (context.currentActivity == null) {
+        promise.reject("error", "Calling QueueItRun with a null activity/context")
+        return@post
+      }
+      try {
+        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
+        queueEngine.run(context.currentActivity)
+      } catch (e: Exception) {
+        promise.reject("error", e.message)
+        return@post
+      }
+
     }
   }
 
   @ReactMethod
   fun runWithEnqueueTokenAsync(customerId: String, eventAlias: String, enqueueToken: String, layoutName: String?, language: String?, promise: Promise) {
     handler.post {
-      val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
-      queueEngine.runWithEnqueueToken(context.currentActivity, enqueueToken)
+      if (context.currentActivity == null) {
+        promise.reject("error", "Calling QueueItRun with a null activity/context")
+        return@post
+      }
+      try {
+        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
+        queueEngine.runWithEnqueueToken(context.currentActivity, enqueueToken)
+      } catch (e: Exception) {
+        promise.reject("error", e.message)
+        return@post
+      }
     }
   }
 
   @ReactMethod
   fun runWithEnqueueKeyAsync(customerId: String, eventAlias: String, enqueueKey: String, layoutName: String?, language: String?, promise: Promise) {
     handler.post {
-      val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
-      queueEngine.runWithEnqueueKey(context.currentActivity, enqueueKey)
+      if (context.currentActivity == null) {
+        promise.reject("error", "Calling QueueItRun with a null activity/context")
+        return@post
+      }
+      try {
+        val queueEngine = QueueITEngine(context.currentActivity, customerId, eventAlias, layoutName, language, getQueueListener(promise))
+        queueEngine.runWithEnqueueKey(context.currentActivity, enqueueKey)
+      } catch (e: Exception) {
+        promise.reject("error", e.message)
+        return@post
+      }
     }
   }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-queue-it",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "React Native Module for integrating Queue-it's virtual waiting room into React Native apps.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package.json

@@ -59,17 +59,23 @@ class QueueItEngine {
     layoutName?: string,
     language?: string
   ): Promise<EnqueueResult> {
-    const result = await nativeQueueIt.runAsync(
-      customerId,
-      eventOrAliasId,
-      layoutName,
-      language
-    );
-
-    return {
-      QueueITToken: result.queueittoken,
-      State: result.state,
-    };
+    try {
+      const result = await nativeQueueIt.runAsync(
+        customerId,
+        eventOrAliasId,
+        layoutName,
+        language
+      );
+
+      return {
+        QueueITToken: result.queueittoken,
+        State: result.state,
+      };
+    } catch (error) {
+      this.offAll('openingQueueView');
+      this.offAll('webViewClosed');
+      throw error;
+    }
   }
 
   async runWithEnqueueToken(
@@ -79,18 +85,24 @@ class QueueItEngine {
     layoutName?: string,
     language?: string
   ): Promise<EnqueueResult> {
-    const result = await nativeQueueIt.runWithEnqueueTokenAsync(
-      customerId,
-      eventOrAliasId,
-      enqueueToken,
-      layoutName,
-      language
-    );
-
-    return {
-      QueueITToken: result.queueittoken,
-      State: result.state,
-    };
+    try {
+      const result = await nativeQueueIt.runWithEnqueueTokenAsync(
+        customerId,
+        eventOrAliasId,
+        enqueueToken,
+        layoutName,
+        language
+      );
+
+      return {
+        QueueITToken: result.queueittoken,
+        State: result.state,
+      };
+    } catch (error) {
+      this.offAll('openingQueueView');
+      this.offAll('webViewClosed');
+      throw error;
+    }
   }
 
   async runWithEnqueueKey(
@@ -100,18 +112,24 @@ class QueueItEngine {
     layoutName?: string,
     language?: string
   ): Promise<EnqueueResult> {
-    const result = await nativeQueueIt.runWithEnqueueKeyAsync(
-      customerId,
-      eventOrAliasId,
-      enqueuekey,
-      layoutName,
-      language
-    );
-
-    return {
-      QueueITToken: result.queueittoken,
-      State: result.state,
-    };
+    try {
+      const result = await nativeQueueIt.runWithEnqueueKeyAsync(
+        customerId,
+        eventOrAliasId,
+        enqueuekey,
+        layoutName,
+        language
+      );
+
+      return {
+        QueueITToken: result.queueittoken,
+        State: result.state,
+      };
+    } catch (error) {
+      this.offAll('openingQueueView');
+      this.offAll('webViewClosed');
+      throw error;
+    }
   }
 
   on(
@@ -127,6 +145,10 @@ class QueueItEngine {
       listener.apply(args);
     });
   }
+
+  offAll(eventType: string): void {
+    queueItEventEmitter.removeAllListeners(eventType);
+  }
 }
 
 export const QueueIt = new QueueItEngine();