@folklore/socket 0.4.18 → 0.4.20

package/dist/cjs.js

@@ -6,11 +6,11 @@ var createDebug = require('debug');
 var invariant = require('invariant');
 var isFunction = require('lodash/isFunction');
 var EventEmitter = require('wolfy87-eventemitter');
+var isString = require('lodash/isString');
 var isArray = require('lodash/isArray');
 var React = require('react');
 var PropTypes = require('prop-types');
 var jsxRuntime = require('react/jsx-runtime');
-var isString = require('lodash/isString');
 
 const debug$3 = createDebug('folklore:socket:pubnub');
 class PubNubSocket extends EventEmitter {
@@ -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();
@@ -668,7 +669,7 @@ class Socket extends EventEmitter {
       channels,
       ...adapterOptions
     } = this.options;
-    const SocketAdapter = Socket.getAdapter(adapterKey);
+    const SocketAdapter = isString(adapterKey) ? Socket.getAdapter(adapterKey) : adapterKey;
     this.adapter = new SocketAdapter(adapterOptions);
     const methods = ['start', 'stop', 'destroy', 'updateChannels', 'send'];
     methods.forEach(method => {

package/dist/es.js

@@ -2,11 +2,11 @@ import createDebug from 'debug';
 import invariant from 'invariant';
 import isFunction from 'lodash/isFunction';
 import EventEmitter from 'wolfy87-eventemitter';
+import isString from 'lodash/isString';
 import isArray from 'lodash/isArray';
 import React, { useMemo, useState, useRef, useCallback, useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import { jsx } from 'react/jsx-runtime';
-import isString from 'lodash/isString';
 
 const debug$3 = createDebug('folklore:socket:pubnub');
 class PubNubSocket extends EventEmitter {
@@ -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();
@@ -664,7 +665,7 @@ class Socket extends EventEmitter {
       channels,
       ...adapterOptions
     } = this.options;
-    const SocketAdapter = Socket.getAdapter(adapterKey);
+    const SocketAdapter = isString(adapterKey) ? Socket.getAdapter(adapterKey) : adapterKey;
     this.adapter = new SocketAdapter(adapterOptions);
     const methods = ['start', 'stop', 'destroy', 'updateChannels', 'send'];
     methods.forEach(method => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/socket",
-    "version": "0.4.18",
+    "version": "0.4.20",
     "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": "49ada31fdf59837a0cc47b0db69d9929515ae9aa"
+    "gitHead": "fdba71c923f438864575b8e7e7bac4178e8184f5"
 }