@qikdev/sdk 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qikdev/sdk",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "type": "module",
   "description": "Promise based Javascript SDK",
   "main": "./dist/main.js",

package/src/api/qik.auth.js

@@ -607,7 +607,8 @@ var QikAuth = function(qik) {
 
         var currentUser = service.getCurrentUser();
         if (!currentUser) {
-            return Promise.reject('No user');
+            // Reject with an Error so uncaught rejections carry a stacktrace
+            return Promise.reject(new Error('No user'));
         }
 
         // Check if we're in cookie mode

package/src/api/qik.socket.js

@@ -141,6 +141,15 @@ const QikSocket = function(qik, mode) {
 
         dispatcher.dispatch('connected', event);
 
+        // Replay every recorded subscription — frames broadcast before the
+        // connection opened were dropped, and reconnects need them resent.
+        Object.keys(channels).forEach(function(channel) {
+            broadcast({
+                action: 'subscribe',
+                channel,
+            });
+        });
+
         // startHeartbeat();
     }
 
@@ -181,6 +190,14 @@ const QikSocket = function(qik, mode) {
     }
 
     async function broadcast(data) {
+        // A socket that exists but isn't OPEN (CONNECTING, CLOSING or CLOSED)
+        // throws InvalidStateError on send. Drop the frame instead — subscribe
+        // frames are replayed from `channels` when the connection opens.
+        if (!socket || socket.readyState !== WebSocket.OPEN) {
+            service.debug ? console.log('[socket] - frame dropped, socket not open', data) : null;
+            return;
+        }
+
         socket.send(JSON.stringify(data));
     }
 
@@ -251,17 +268,10 @@ const QikSocket = function(qik, mode) {
         }
         
         service.debug ? console.log(`[socket] reconnecting...`) : null;
-        
-        // Reconnect all listeners
-        const result = await service.connect();
-
-        // Resubscribe to all previously connected channels
-        const subscribedChannels = Object.keys(channels);
-        subscribedChannels.forEach(function(channel) {
-            service.subscribe(channel);
-        })
 
-        return result;
+        // Reconnect all listeners. Previously subscribed channels are replayed
+        // by socketOpened() the moment the connection opens.
+        return await service.connect();
     }
     
 

package/src/api/qik.utils.js

@@ -243,15 +243,49 @@ service.parseURL = function (string) {
   //TODO: test this more.
   string = string.replace(/\s/g, "");
 
-  var valid = RegExp(
-    "(https?:\\/\\/)?((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|((\\d{1,3}\\.){3}\\d{1,3}))(\\:\\d+)?(\\/[-a-z\\d%_.~+@]*)*(\\?[;&a-z\\d%_.~+=-@]*)?(\\#[-a-z\\d_@]*)?$",
-    "i",
-  ).test(string);
+  // Validate the host portion in linear time. The previous single-regex
+  // validation suffered catastrophic backtracking (40s+ freezing the main
+  // thread) on long URLs it couldn't match, and rejected legitimate URLs with
+  // hyphens in the query string. Anything after the host is accepted as-is.
+  var host = String(string)
+    .replace(/^https?:\/\//i, "")
+    .split(/[/?#]/)[0];
+
+  var portIndex = host.lastIndexOf(":");
+  if (portIndex !== -1) {
+    if (!/^\d+$/.test(host.slice(portIndex + 1))) {
+      return false;
+    }
+    host = host.slice(0, portIndex);
+  }
 
-  if (!valid) {
+  if (!host) {
     return false;
   }
 
+  var labels = host.split(".");
+  var isIPv4 =
+    labels.length === 4 &&
+    labels.every(function (label) {
+      return /^\d{1,3}$/.test(label);
+    });
+
+  if (!isIPv4) {
+    // Domains need at least two labels ("roger" is invalid, "www.roger" is
+    // allowed) and an alphabetic final label of 2+ characters
+    if (labels.length < 2) {
+      return false;
+    }
+
+    var validLabels = labels.every(function (label) {
+      return /^[a-z\d]([a-z\d-]*[a-z\d])?$/i.test(label);
+    });
+
+    if (!validLabels || !/^[a-z]{2,}$/i.test(labels[labels.length - 1])) {
+      return false;
+    }
+  }
+
   ///////////////////////////
 
   return withHttp(string);

package/src/version.js

@@ -1 +1 @@
-export const version = "1.0.6";
+export const version = "1.0.8";