@folklore/socket 0.4.12 → 0.4.14

package/dist/cjs.js

@@ -56,6 +56,7 @@ class PubNubSocket extends EventEmitter__default["default"] {
     this.onReady = this.onReady.bind(this);
     this.onStatus = this.onStatus.bind(this);
     this.onMessage = this.onMessage.bind(this);
+    this.destroyed = false;
     this.ready = false;
     this.shouldStart = false;
     this.started = false;
@@ -68,6 +69,10 @@ class PubNubSocket extends EventEmitter__default["default"] {
   }
 
   onReady() {
+    if (this.destroyed) {
+      return;
+    }
+
     this.ready = true;
     this.emit('ready');
   }
@@ -112,15 +117,31 @@ class PubNubSocket extends EventEmitter__default["default"] {
   }
 
   init() {
-    Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('pubnub')); }).then(_ref2 => {
+    if (this.pubnub !== null) {
+      return;
+    }
+
+    debug$2('Init');
+    this.destroyed = false;
+    const loadPubnub = this.PubNub !== null ? Promise.resolve() : this.loadPubNub();
+    loadPubnub.then(() => this.createPubNub()).then(() => this.onReady());
+  }
+
+  loadPubNub() {
+    debug$2('Load PubNub');
+    return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('pubnub')); }).then(_ref2 => {
       let {
         default: PubNub
       } = _ref2;
       this.PubNub = PubNub;
-    }).then(() => this.createPubNub()).then(() => this.onReady());
+    });
   }
 
   createPubNub() {
+    if (this.destroyed) {
+      return;
+    }
+
     const {
       PubNub
     } = this;
@@ -146,6 +167,7 @@ class PubNubSocket extends EventEmitter__default["default"] {
   }
 
   destroy() {
+    this.destroyed = true;
     this.stop();
 
     if (this.pubnubListener) {
@@ -153,6 +175,7 @@ class PubNubSocket extends EventEmitter__default["default"] {
       this.pubnubListener = null;
     }
 
+    this.pubnub = null;
     this.ready = false;
     debug$2('Destroyed.');
   }
@@ -581,6 +604,12 @@ class Socket extends EventEmitter__default["default"] {
   }
 
   init() {
+    if (this.adapter !== null) {
+      debug('Already initialized');
+      return;
+    }
+
+    debug('Init');
     const {
       adapter: adapterKey,
       channels,
@@ -765,6 +794,8 @@ const SocketContainer = function (_ref) {
     };
   }, [initialChannels, subscribe, unsubscribe]);
   React.useEffect(() => {
+    finalSocket.init();
+
     if (autoStart) {
       finalSocket.start();
     }

package/dist/es.js

@@ -23,6 +23,7 @@ class PubNubSocket extends EventEmitter {
     this.onReady = this.onReady.bind(this);
     this.onStatus = this.onStatus.bind(this);
     this.onMessage = this.onMessage.bind(this);
+    this.destroyed = false;
     this.ready = false;
     this.shouldStart = false;
     this.started = false;
@@ -35,6 +36,10 @@ class PubNubSocket extends EventEmitter {
   }
 
   onReady() {
+    if (this.destroyed) {
+      return;
+    }
+
     this.ready = true;
     this.emit('ready');
   }
@@ -79,15 +84,31 @@ class PubNubSocket extends EventEmitter {
   }
 
   init() {
-    import('pubnub').then(_ref2 => {
+    if (this.pubnub !== null) {
+      return;
+    }
+
+    debug$2('Init');
+    this.destroyed = false;
+    const loadPubnub = this.PubNub !== null ? Promise.resolve() : this.loadPubNub();
+    loadPubnub.then(() => this.createPubNub()).then(() => this.onReady());
+  }
+
+  loadPubNub() {
+    debug$2('Load PubNub');
+    return import('pubnub').then(_ref2 => {
       let {
         default: PubNub
       } = _ref2;
       this.PubNub = PubNub;
-    }).then(() => this.createPubNub()).then(() => this.onReady());
+    });
   }
 
   createPubNub() {
+    if (this.destroyed) {
+      return;
+    }
+
     const {
       PubNub
     } = this;
@@ -113,6 +134,7 @@ class PubNubSocket extends EventEmitter {
   }
 
   destroy() {
+    this.destroyed = true;
     this.stop();
 
     if (this.pubnubListener) {
@@ -120,6 +142,7 @@ class PubNubSocket extends EventEmitter {
       this.pubnubListener = null;
     }
 
+    this.pubnub = null;
     this.ready = false;
     debug$2('Destroyed.');
   }
@@ -548,6 +571,12 @@ class Socket extends EventEmitter {
   }
 
   init() {
+    if (this.adapter !== null) {
+      debug('Already initialized');
+      return;
+    }
+
+    debug('Init');
     const {
       adapter: adapterKey,
       channels,
@@ -732,6 +761,8 @@ const SocketContainer = function (_ref) {
     };
   }, [initialChannels, subscribe, unsubscribe]);
   useEffect(() => {
+    finalSocket.init();
+
     if (autoStart) {
       finalSocket.start();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/socket",
-    "version": "0.4.12",
+    "version": "0.4.14",
     "description": "Socket utilities",
     "keywords": [
         "javascript",
@@ -55,5 +55,5 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
-    "gitHead": "49ba685c19aa4e7e0a358eb8d7f04a285e5732a5"
+    "gitHead": "25ab3521653d3e6704e6e1b1b31c32410c2313cf"
 }