@polyguard/sdk 1.0.9 → 1.1.1

package/dist/sdk.js

@@ -11037,12 +11037,16 @@
       return new Promise(async (resolve, reject) => {
         let ws = null;
         let closed = false;
-        function showError(msg) {
+        function returnError(msg, score = "OFFLINE") {
           const errDiv = modal.querySelector("#polyguard-error");
           if (errDiv) {
             errDiv.textContent = msg;
             errDiv.style.display = "block";
           }
+          setTimeout(() => {
+            cleanup();
+            resolve({ presence: { score, msg } });
+          }, 1250);
         }
         function clearError() {
           const errDiv = modal.querySelector("#polyguard-error");
@@ -11065,17 +11069,24 @@
             body: JSON.stringify({ requiredProofs: this.requiredProofs, scanType: this.scanType })
           });
           if (!ticketRes.ok) {
-            showError("Failed to get ticket");
+            returnError("Failed to get ticket");
             return;
           }
           const ticketData = await ticketRes.json();
           const newTicket = ticketData.ticket;
           if (!newTicket) {
-            showError("No ticket returned from server");
+            returnError("No ticket returned from server");
             return;
           }
           const wsUrl = `${wsProtocol}://${this.apiServer}/v2/realtime/${newTicket}`;
-          ws = new reconnecting_websocket_mjs_default(wsUrl);
+          const options = {
+            maxRetries: 10,
+            minTimeout: 1e3,
+            maxTimeout: 1e4,
+            reconnectionDelay: 1e3,
+            reconnectionDelayGrowFactor: 1.5
+          };
+          ws = new reconnecting_websocket_mjs_default(wsUrl, options);
           ws.addEventListener("message", (event) => {
             try {
               const data = JSON.parse(event.data);
@@ -11118,32 +11129,36 @@
                 return;
               } else if (data && data.jwt) {
                 cleanup();
-                resolve(data.jwt);
                 ws.close();
+                resolve(data.jwt);
                 return;
               } else if (data && data.status) {
                 const qrDiv2 = modal.querySelector("#polyguard-qr");
                 if (!qrDiv2) return;
                 qrDiv2.innerHTML = LOADING_SPINNER;
                 return;
+              } else if (data && data.error) {
+                returnError(data.error);
+                ws.close();
+                return;
               } else {
                 console.error("Unknown message type from server", data);
-                showError(`Unknown message type from server`);
+                returnError(`Unknown message type from server`);
               }
             } catch (e) {
               console.error("Invalid message format from server", e);
-              showError("Invalid message format from server");
+              returnError("Invalid message format from server");
             }
           });
           ws.addEventListener("error", () => {
             console.error("WebSocket error");
-            showError("WebSocket error");
+            returnError("WebSocket error");
           });
           ws.addEventListener("close", () => {
             if (!closed) cleanup();
           });
         } catch (err) {
-          showError("Failed to connect to WebSocket");
+          returnError("Failed to connect to WebSocket");
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polyguard/sdk",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "main": "dist/sdk.js",
   "module": "dist/sdk.js",
   "browser": "dist/sdk.js",

package/src/PolyguardWebsocketClientImpl.js

@@ -106,12 +106,16 @@ export class PolyguardWebsocketClientImpl {
       let ws = null;
       let closed = false;
       
-      function showError(msg) {
-        const errDiv = modal.querySelector('#polyguard-error');
-        if (errDiv) {
-          errDiv.textContent = msg;
-          errDiv.style.display = 'block';
-        }
+      function returnError(msg, score = "OFFLINE") {
+          const errDiv = modal.querySelector('#polyguard-error');
+          if (errDiv) {
+            errDiv.textContent = msg;
+            errDiv.style.display = 'block';
+          }
+          setTimeout(() => {
+            cleanup();
+            resolve({presence: { score: score, msg: msg }});
+          }, 1250);
       }
       function clearError() {
         const errDiv = modal.querySelector('#polyguard-error');
@@ -139,17 +143,24 @@ export class PolyguardWebsocketClientImpl {
           body: JSON.stringify({ requiredProofs: this.requiredProofs, scanType: this.scanType }),
         });
         if (!ticketRes.ok) {
-          showError('Failed to get ticket');
+          returnError('Failed to get ticket');
           return;
         }
         const ticketData = await ticketRes.json();
         const newTicket = ticketData.ticket;
         if (!newTicket) {
-          showError('No ticket returned from server');
+          returnError('No ticket returned from server');
           return;
         }
         const wsUrl = `${wsProtocol}://${this.apiServer}/v2/realtime/${newTicket}`;
-        ws = new ReconnectingWebSocket(wsUrl);
+        const options = {
+          maxRetries: 10,
+          minTimeout: 1000,
+          maxTimeout: 10000,
+          reconnectionDelay: 1000,
+          reconnectionDelayGrowFactor: 1.5,
+        };
+        ws = new ReconnectingWebSocket(wsUrl, options);
         ws.addEventListener('message', (event) => {
           try {
             const data = JSON.parse(event.data);
@@ -203,8 +214,8 @@ export class PolyguardWebsocketClientImpl {
               return;
             } else if (data && data.jwt) {
               cleanup();
-              resolve(data.jwt);
               ws.close();
+              resolve(data.jwt);
               return;
             } else if (data && data.status) {
               // ignore
@@ -213,25 +224,30 @@ export class PolyguardWebsocketClientImpl {
               if (!qrDiv) return;
               qrDiv.innerHTML = LOADING_SPINNER;
               return;
+
+            } else if (data && data.error) {
+              returnError(data.error);
+              ws.close();
+              return;
             } else {
               console.error('Unknown message type from server', data);
-              showError(`Unknown message type from server`);
+              returnError(`Unknown message type from server`);
             }
           } catch (e) {
             console.error('Invalid message format from server', e);
-            showError('Invalid message format from server');
+            returnError('Invalid message format from server');
             // ws.close();
           }
         });
         ws.addEventListener('error', () => {
           console.error('WebSocket error');
-          showError('WebSocket error');
+          returnError('WebSocket error');
         });
         ws.addEventListener('close', () => {
           if (!closed) cleanup();
         });
       } catch (err) {
-        showError('Failed to connect to WebSocket');
+        returnError('Failed to connect to WebSocket');
       }
     });
   }