laravel-echo-api-gateway 0.1.2 → 0.5.2

package/dist/laravel-echo-api-gateway.js

@@ -17,20 +17,44 @@ function _defineProperties(target, props) {
 function _createClass(Constructor, protoProps, staticProps) {
   if (protoProps) _defineProperties(Constructor.prototype, protoProps);
   if (staticProps) _defineProperties(Constructor, staticProps);
+  Object.defineProperty(Constructor, "prototype", {
+    writable: false
+  });
   return Constructor;
 }
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _inherits(subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function");
   }
 
-  subClass.prototype = Object.create(superClass && superClass.prototype, {
-    constructor: {
-      value: subClass,
-      writable: true,
-      configurable: true
-    }
+  Object.defineProperty(subClass, "prototype", {
+    value: Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    }),
+    writable: false
   });
   if (superClass) _setPrototypeOf(subClass, superClass);
 }
@@ -57,7 +81,7 @@ function _isNativeReflectConstruct() {
   if (typeof Proxy === "function") return true;
 
   try {
-    Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
+    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
     return true;
   } catch (e) {
     return false;
@@ -75,6 +99,8 @@ function _assertThisInitialized(self) {
 function _possibleConstructorReturn(self, call) {
   if (call && (typeof call === "object" || typeof call === "function")) {
     return call;
+  } else if (call !== void 0) {
+    throw new TypeError("Derived constructors may only return object or undefined");
   }
 
   return _assertThisInitialized(self);
@@ -99,6 +125,80 @@ function _createSuper(Derived) {
   };
 }
 
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(o);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+  return arr2;
+}
+
+function _createForOfIteratorHelper(o, allowArrayLike) {
+  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+
+  if (!it) {
+    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+      if (it) o = it;
+      var i = 0;
+
+      var F = function () {};
+
+      return {
+        s: F,
+        n: function () {
+          if (i >= o.length) return {
+            done: true
+          };
+          return {
+            done: false,
+            value: o[i++]
+          };
+        },
+        e: function (e) {
+          throw e;
+        },
+        f: F
+      };
+    }
+
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+
+  var normalCompletion = true,
+      didErr = false,
+      err;
+  return {
+    s: function () {
+      it = it.call(o);
+    },
+    n: function () {
+      var step = it.next();
+      normalCompletion = step.done;
+      return step;
+    },
+    e: function (e) {
+      didErr = true;
+      err = e;
+    },
+    f: function () {
+      try {
+        if (!normalCompletion && it.return != null) it.return();
+      } finally {
+        if (didErr) throw err;
+      }
+    }
+  };
+}
+
 class Connector {
     /**
      * Create a new class instance.
@@ -153,83 +253,136 @@ class Connector {
 
 var Websocket = /*#__PURE__*/function () {
   function Websocket(options) {
-    var _this = this;
-
     _classCallCheck(this, Websocket);
 
     this.buffer = [];
     this.listeners = {};
     this.internalListeners = {};
     this.channelBacklog = [];
+    this.closing = false;
+    this.hasConnected = false;
     this.options = options;
-    this.websocket = new WebSocket(options.host);
+    this.connect(this.options.host);
+    return this;
+  }
 
-    this.websocket.onopen = function () {
-      while (_this.buffer.length) {
-        var message = _this.buffer[0];
+  _createClass(Websocket, [{
+    key: "connect",
+    value: function connect(host) {
+      var _this = this;
 
-        _this.send(message);
+      this.options.debug && console.log('Trying to connect...');
+      this.websocket = new WebSocket(host);
 
-        _this.buffer.splice(0, 1);
-      }
-    };
+      this.websocket.onerror = function () {
+        if (!_this.hasConnected) {
+          setTimeout(function () {
+            _this.socketId = undefined;
 
-    this.websocket.onmessage = function (messageEvent) {
-      var message = _this.parseMessage(messageEvent.data);
+            _this.connect(host);
+          }, 3000);
+        }
+      };
 
-      if (!message) {
-        return;
-      }
+      this.websocket.onopen = function () {
+        _this.options.debug && console.log('Connected !');
+        _this.hasConnected = true;
 
-      if (message.channel) {
-        console.log("Received event ".concat(message.event, " on channel ").concat(message.channel));
+        _this.send({
+          event: 'whoami'
+        });
 
-        if (_this.listeners[message.channel] && _this.listeners[message.channel][message.event]) {
-          _this.listeners[message.channel][message.event](message.data);
-        }
+        while (_this.buffer.length) {
+          var message = _this.buffer[0];
 
-        return;
-      }
+          _this.send(message);
 
-      if (_this.internalListeners[message.event]) {
-        _this.internalListeners[message.event](message.data);
-      }
-    };
+          _this.buffer.splice(0, 1);
+        } // Register events only once connected, or they won't be registered if connection failed/lost
 
-    this.on('whoami', function (_ref) {
-      var socketId = _ref.socket_id;
-      _this.socketId = socketId;
-      console.log("just set socketId to ".concat(socketId));
 
-      while (_this.channelBacklog.length) {
-        var channel = _this.channelBacklog[0];
+        _this.websocket.onmessage = function (messageEvent) {
+          var message = _this.parseMessage(messageEvent.data);
 
-        _this.actuallySubscribe(channel);
+          _this.options.debug && console.log('onmessage', messageEvent.data);
 
-        _this.channelBacklog.splice(0, 1);
-      }
-    });
-    this.send({
-      event: 'whoami'
-    }); // send ping every 60 seconds to keep connection alive
+          if (!message) {
+            return;
+          }
 
-    this.pingInterval = setInterval(function () {
-      console.log('Sending ping');
+          if (message.channel) {
+            _this.options.debug && console.log("Received event ".concat(message.event, " on channel ").concat(message.channel));
 
-      _this.send({
-        event: 'ping'
-      });
-    }, 60 * 1000);
-    return this;
-  }
+            if (_this.listeners[message.channel] && _this.listeners[message.channel][message.event]) {
+              _this.listeners[message.channel][message.event](message.data);
+            }
 
-  _createClass(Websocket, [{
+            return;
+          }
+
+          if (_this.internalListeners[message.event]) {
+            _this.internalListeners[message.event](message.data);
+          }
+        }; // send ping every 60 seconds to keep connection alive
+
+
+        _this.pingInterval = setInterval(function () {
+          if (_this.websocket.readyState === _this.websocket.OPEN) {
+            _this.options.debug && console.log('Sending ping');
+
+            _this.send({
+              event: 'ping'
+            });
+          }
+        }, 60 * 1000);
+      };
+
+      this.websocket.onclose = function () {
+        _this.options.debug && console.info('Connection closed.');
+
+        if (_this.closing) {
+          return;
+        }
+
+        _this.hasConnected = false;
+        _this.options.debug && console.info('Connection lost, reconnecting...');
+        setTimeout(function () {
+          _this.socketId = undefined;
+
+          _this.connect(host);
+        }, 1000);
+      };
+
+      this.on('whoami', function (_ref) {
+        var socketId = _ref.socket_id;
+        _this.socketId = socketId;
+        _this.options.debug && console.log("just set socketId to ".concat(socketId)); // Handle the backlog and don't empty it, we'll need it if we lose connection
+
+        var channel;
+
+        var _iterator = _createForOfIteratorHelper(_this.channelBacklog),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            channel = _step.value;
+
+            _this.actuallySubscribe(channel);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      });
+    }
+  }, {
     key: "parseMessage",
     value: function parseMessage(body) {
       try {
         return JSON.parse(body);
       } catch (error) {
-        console.error(error);
+        this.options.debug && console.error(error);
         return undefined;
       }
     }
@@ -256,6 +409,7 @@ var Websocket = /*#__PURE__*/function () {
   }, {
     key: "close",
     value: function close() {
+      this.closing = true;
       this.internalListeners = {};
       clearInterval(this.pingInterval);
       this.pingInterval = undefined;
@@ -276,26 +430,32 @@ var Websocket = /*#__PURE__*/function () {
       var _this2 = this;
 
       if (channel.name.startsWith('private-') || channel.name.startsWith('presence-')) {
-        console.log("Sending auth request for channel ".concat(channel.name));
+        this.options.debug && console.log("Sending auth request for channel ".concat(channel.name));
+
+        if (this.options.bearerToken) {
+          this.options.auth.headers['Authorization'] = 'Bearer ' + this.options.bearerToken;
+        }
+
         axios.post(this.options.authEndpoint, {
           socket_id: this.getSocketId(),
           channel_name: channel.name
+        }, {
+          headers: this.options.auth.headers || {}
         }).then(function (response) {
-          console.log("Subscribing to channels ".concat(channel.name));
+          _this2.options.debug && console.log("Subscribing to channels ".concat(channel.name));
 
           _this2.send({
             event: 'subscribe',
-            data: {
-              channel: channel.name,
-              auth: response.data.auth
-            }
+            data: _extends({
+              channel: channel.name
+            }, response.data)
           });
         })["catch"](function (error) {
-          console.log("Auth request for channel ".concat(channel.name, " failed"));
-          console.error(error);
+          _this2.options.debug && console.log("Auth request for channel ".concat(channel.name, " failed"));
+          _this2.options.debug && console.error(error);
         });
       } else {
-        console.log("Subscribing to channels ".concat(channel.name));
+        this.options.debug && console.log("Subscribing to channels ".concat(channel.name));
         this.send({
           event: 'subscribe',
           data: {
@@ -504,9 +664,12 @@ var Channel$1 = /*#__PURE__*/function (_BaseChannel) {
   }, {
     key: "whisper",
     value: function whisper(event, data) {
+      var channel = this.name;
+      var formattedEvent = "client-" + event;
       this.socket.send({
-        event: event,
-        data: data
+        "event": formattedEvent,
+        data: data,
+        channel: channel
       });
       return this;
     }

package/js-src/Channel.ts

@@ -1,7 +1,7 @@
-import {EventFormatter} from 'laravel-echo/src/util';
-import {Channel as BaseChannel} from 'laravel-echo/src/channel/channel';
-import {PresenceChannel} from "laravel-echo/src/channel";
-import {Websocket} from "./Websocket";
+import { EventFormatter } from 'laravel-echo/src/util';
+import { Channel as BaseChannel } from 'laravel-echo/src/channel/channel';
+import { PresenceChannel } from "laravel-echo/src/channel";
+import { Websocket } from "./Websocket";
 
 /**
  * This class represents a Pusher channel.
@@ -105,9 +105,12 @@ export class Channel extends BaseChannel implements PresenceChannel {
     }
 
     whisper(event: string, data: object): Channel {
+        let channel = this.name;
+        let formattedEvent = "client-" + event;
         this.socket.send({
-            event,
+            "event": formattedEvent,
             data,
+            channel,
         })
 
         return this;

package/js-src/Websocket.ts

@@ -1,7 +1,8 @@
-import {Channel} from "./Channel";
-import {AxiosResponse} from "axios";
+import { AxiosResponse } from "axios";
+import { Channel } from "./Channel";
+
+export type Options = { authEndpoint: string, host: string, bearerToken: string, auth: any, debug: boolean };
 
-export type Options = { authEndpoint: string, host: string };
 export type MessageBody = { event: string, channel?: string, data: object };
 
 export class Websocket {
@@ -19,14 +20,32 @@ export class Websocket {
 
     private socketId: string;
 
+    private closing = false;
+    private hasConnected = false;
+
     private pingInterval: NodeJS.Timeout;
 
-    constructor(options: Options) {
-        this.options = options;
+    private connect(host: string): void {
+        this.options.debug && console.log('Trying to connect...');
 
-        this.websocket = new WebSocket(options.host)
+        this.websocket = new WebSocket(host)
+
+        this.websocket.onerror = () => {
+            if (!this.hasConnected) {
+                setTimeout(() => {
+                    this.socketId = undefined
+                    this.connect(host)
+                }, 3000);
+            }
+        }
 
         this.websocket.onopen = () => {
+            this.options.debug && console.log('Connected !');
+            this.hasConnected = true;
+            this.send({
+                event: 'whoami',
+            })
+
             while (this.buffer.length) {
                 const message = this.buffer[0]
 
@@ -34,56 +53,78 @@ export class Websocket {
 
                 this.buffer.splice(0, 1)
             }
-        }
 
-        this.websocket.onmessage = (messageEvent: MessageEvent) => {
-            const message = this.parseMessage(messageEvent.data)
+            // Register events only once connected, or they won't be registered if connection failed/lost
 
-            if (!message) {
-                return
-            }
+            this.websocket.onmessage = (messageEvent: MessageEvent) => {
+                const message = this.parseMessage(messageEvent.data)
+                this.options.debug && console.log('onmessage', messageEvent.data)
+
+                if (!message) {
+                    return
+                }
 
-            if (message.channel) {
-                console.log(`Received event ${message.event} on channel ${message.channel}`)
+                if (message.channel) {
+                    this.options.debug && console.log(`Received event ${message.event} on channel ${message.channel}`)
 
-                if (this.listeners[message.channel] && this.listeners[message.channel][message.event]) {
-                    this.listeners[message.channel][message.event](message.data)
+                    if (this.listeners[message.channel] && this.listeners[message.channel][message.event]) {
+                        this.listeners[message.channel][message.event](message.data)
+                    }
+
+                    return
                 }
 
-                return
+                if (this.internalListeners[message.event]) {
+                    this.internalListeners[message.event](message.data)
+                }
             }
 
-            if (this.internalListeners[message.event]) {
-                this.internalListeners[message.event](message.data)
-            }
+
+            // send ping every 60 seconds to keep connection alive
+            this.pingInterval = setInterval(() => {
+                if (this.websocket.readyState === this.websocket.OPEN) {
+                    this.options.debug && console.log('Sending ping')
+                    this.send({
+                        event: 'ping',
+                    })
+                }
+            }, 60 * 1000)
         }
 
+
+        this.websocket.onclose = () => {
+            this.options.debug && console.info('Connection closed.');
+            if (this.closing){
+                return;
+            }
+            this.hasConnected = false
+            this.options.debug && console.info('Connection lost, reconnecting...');
+            setTimeout(() => {
+                this.socketId = undefined
+                this.connect(host)
+            }, 1000);
+        };
+
         this.on('whoami', ({ socket_id: socketId }) => {
             this.socketId = socketId
 
-            console.log(`just set socketId to ${socketId}`)
-
-            while (this.channelBacklog.length) {
-                const channel = this.channelBacklog[0]
+            this.options.debug && console.log(`just set socketId to ${socketId}`)
 
+            // Handle the backlog and don't empty it, we'll need it if we lose connection
+            let channel: Channel;
+            for(channel of this.channelBacklog){
                 this.actuallySubscribe(channel)
-
-                this.channelBacklog.splice(0, 1)
             }
-        })
 
-        this.send({
-            event: 'whoami',
         })
 
-        // send ping every 60 seconds to keep connection alive
-        this.pingInterval = setInterval(() => {
-            console.log('Sending ping')
 
-            this.send({
-                event: 'ping',
-            })
-        }, 60 * 1000)
+    }
+
+    constructor(options: Options) {
+        this.options = options;
+
+        this.connect(this.options.host);
 
         return this
     }
@@ -92,7 +133,7 @@ export class Websocket {
         try {
             return JSON.parse(body)
         } catch (error) {
-            console.error(error)
+            this.options.debug && console.error(error)
 
             return undefined
         }
@@ -115,7 +156,8 @@ export class Websocket {
         this.buffer.push(message)
     }
 
-    close (): void {
+    close(): void {
+        this.closing = true
         this.internalListeners = {}
 
         clearInterval(this.pingInterval)
@@ -134,27 +176,33 @@ export class Websocket {
 
     private actuallySubscribe(channel: Channel): void {
         if (channel.name.startsWith('private-') || channel.name.startsWith('presence-')) {
-            console.log(`Sending auth request for channel ${channel.name}`)
+            this.options.debug && console.log(`Sending auth request for channel ${channel.name}`)
+
+            if (this.options.bearerToken) {
+                this.options.auth.headers['Authorization'] = 'Bearer ' + this.options.bearerToken;
+            }
 
             axios.post(this.options.authEndpoint, {
                 socket_id: this.getSocketId(),
                 channel_name: channel.name,
+            }, {
+              headers: this.options.auth.headers || {}
             }).then((response: AxiosResponse) => {
-                console.log(`Subscribing to channels ${channel.name}`)
+                this.options.debug && console.log(`Subscribing to channels ${channel.name}`)
 
                 this.send({
                     event: 'subscribe',
                     data: {
                         channel: channel.name,
-                        auth: response.data.auth,
+                        ...response.data
                     },
                 })
             }).catch((error) => {
-                console.log(`Auth request for channel ${channel.name} failed`)
-                console.error(error)
+                this.options.debug && console.log(`Auth request for channel ${channel.name} failed`)
+                this.options.debug && console.error(error)
             })
         } else {
-            console.log(`Subscribing to channels ${channel.name}`)
+            this.options.debug && console.log(`Subscribing to channels ${channel.name}`)
 
             this.send({
                 event: 'subscribe',