@folklore/socket 0.4.19 → 0.4.21

package/dist/cjs.js

@@ -336,7 +336,7 @@ class SocketIOSocket extends EventEmitter {
 }
 
 const debug$1 = createDebug('folklore:socket:pusher');
-class PusherSocker extends EventEmitter {
+class PusherSocket extends EventEmitter {
   constructor(opts) {
     super();
     this.options = {
@@ -404,7 +404,7 @@ class PusherSocker extends EventEmitter {
     loadPusher.then(() => this.createPusher()).then(() => this.onReady());
   }
   loadPusher() {
-    debug$1('Load PusherJs');
+    debug$1('Load Pusher');
     return import('pusher-js').then(_ref => {
       let {
         default: Pusher
@@ -416,6 +416,7 @@ class PusherSocker extends EventEmitter {
     if (this.destroyed) {
       return;
     }
+    debug$1('Create Pusher appKey: %s', this.options.appKey);
     const {
       Pusher
     } = this;
@@ -442,7 +443,7 @@ class PusherSocker extends EventEmitter {
       debug$1('Skipping start: Already starting.');
       return;
     }
-    if (this.io === null) {
+    if (this.pusher === null) {
       debug$1('Socket.io not ready.');
       this.shouldStart = true;
       return;
@@ -506,7 +507,7 @@ class PusherSocker extends EventEmitter {
 var SocketAdapters = {
   PubNub: PubNubSocket,
   SocketIO: SocketIOSocket,
-  Pusher: PusherSocker
+  Pusher: PusherSocket
 };
 
 const normalize = str => str.replace(/[^a-z0-9]+/gi, '').toLowerCase();
@@ -883,7 +884,8 @@ const useSocket = function () {
   let channelNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   let {
     socket: customSocket = null,
-    onMessage: customOnMessage = null
+    onMessage: customOnMessage = null,
+    keepAlive = true
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const {
     socket: contextSocket,
@@ -918,11 +920,11 @@ const useSocket = function () {
       if (channels !== null) {
         unsubscribe(channels);
       }
-      if (!wasStarted) {
+      if (socket.isStarted() && !keepAlive) {
         socket.stop();
       }
     };
-  }, [channelsKey, customSocket]);
+  }, [channelsKey, customSocket, keepAlive]);
   React.useEffect(() => {
     if (socket === null) {
       return () => {};

package/dist/es.js

@@ -332,7 +332,7 @@ class SocketIOSocket extends EventEmitter {
 }
 
 const debug$1 = createDebug('folklore:socket:pusher');
-class PusherSocker extends EventEmitter {
+class PusherSocket extends EventEmitter {
   constructor(opts) {
     super();
     this.options = {
@@ -400,7 +400,7 @@ class PusherSocker extends EventEmitter {
     loadPusher.then(() => this.createPusher()).then(() => this.onReady());
   }
   loadPusher() {
-    debug$1('Load PusherJs');
+    debug$1('Load Pusher');
     return import('pusher-js').then(_ref => {
       let {
         default: Pusher
@@ -412,6 +412,7 @@ class PusherSocker extends EventEmitter {
     if (this.destroyed) {
       return;
     }
+    debug$1('Create Pusher appKey: %s', this.options.appKey);
     const {
       Pusher
     } = this;
@@ -438,7 +439,7 @@ class PusherSocker extends EventEmitter {
       debug$1('Skipping start: Already starting.');
       return;
     }
-    if (this.io === null) {
+    if (this.pusher === null) {
       debug$1('Socket.io not ready.');
       this.shouldStart = true;
       return;
@@ -502,7 +503,7 @@ class PusherSocker extends EventEmitter {
 var SocketAdapters = {
   PubNub: PubNubSocket,
   SocketIO: SocketIOSocket,
-  Pusher: PusherSocker
+  Pusher: PusherSocket
 };
 
 const normalize = str => str.replace(/[^a-z0-9]+/gi, '').toLowerCase();
@@ -879,7 +880,8 @@ const useSocket = function () {
   let channelNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   let {
     socket: customSocket = null,
-    onMessage: customOnMessage = null
+    onMessage: customOnMessage = null,
+    keepAlive = true
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   const {
     socket: contextSocket,
@@ -914,11 +916,11 @@ const useSocket = function () {
       if (channels !== null) {
         unsubscribe(channels);
       }
-      if (!wasStarted) {
+      if (socket.isStarted() && !keepAlive) {
         socket.stop();
       }
     };
-  }, [channelsKey, customSocket]);
+  }, [channelsKey, customSocket, keepAlive]);
   useEffect(() => {
     if (socket === null) {
       return () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/socket",
-    "version": "0.4.19",
+    "version": "0.4.21",
     "description": "Socket utilities",
     "keywords": [
         "javascript",
@@ -56,5 +56,5 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
-    "gitHead": "1f1b7ab751c4497df25a3dda97cd84f793ff720f"
+    "gitHead": "f18d843f3ea8b5a84672addc2fcb50dbf8994b58"
 }