static fixes

Author: georgeboot

package.json

@@ -18,14 +18,14 @@
         "name": "George Boot"
     },
     "license": "MIT",
-    "main": "dist/laravel-echo-api-gateway-connector.common.js",
-    "module": "dist/laravel-echo-api-gateway-connector.js",
-    "types": "dist/laravel-echo-api-gateway-connector.d.ts",
+    "main": "dist/laravel-echo-api-gateway.common.js",
+    "module": "dist/laravel-echo-api-gateway.js",
+    "types": "dist/laravel-echo-api-gateway.d.ts",
     "scripts": {
         "build": "npm run compile && npm run declarations",
         "compile": "./node_modules/.bin/rollup -c",
         "declarations": "./node_modules/.bin/tsc --emitDeclarationOnly",
-        "lint": "eslint --ext .js,.ts ./src ./tests",
+        "lint": "eslint --ext .js,.ts ./src",
         "prepublish": "npm run build",
         "release": "npm run test && standard-version && git push --follow-tags && npm publish",
         "test": "jest"

rollup.config.js

@@ -2,11 +2,11 @@ import babel from '@rollup/plugin-babel';
 import typescript from 'rollup-plugin-typescript2';
 
 export default {
-    input: './src/LaravelEchoApiGatewayConnector.ts',
+    input: './src/Connector.ts',
     output: [
-        { file: './dist/laravel-echo-api-gateway-connector.js', format: 'esm' },
-        { file: './dist/laravel-echo-api-gateway-connector.common.js', format: 'cjs' },
-        { file: './dist/laravel-echo-api-gateway-connector.iife.js', format: 'iife', name: 'LaravelEchoApiGatewayConnector' },
+        { file: './dist/laravel-echo-api-gateway.js', format: 'esm' },
+        { file: './dist/laravel-echo-api-gateway.common.js', format: 'cjs' },
+        { file: './dist/laravel-echo-api-gateway.iife.js', format: 'iife', name: 'LaravelEchoApiGateway' },
     ],
     plugins: [
         typescript(),

src/ApiGatewayChannel.ts renamed to src/Channel.ts

@@ -1,26 +1,26 @@
 import {EventFormatter} from 'laravel-echo/src/util';
-import {Channel} from 'laravel-echo/src/channel/channel';
+import {Channel as BaseChannel} from 'laravel-echo/src/channel/channel';
 import {PresenceChannel} from "laravel-echo/src/channel";
-import {LaravelEchoApiGatewayWebsocket} from "./LaravelEchoApiGatewayWebsocket";
+import {Websocket} from "./Websocket";
 
 /**
  * This class represents a Pusher channel.
  */
-export class ApiGatewayChannel extends Channel implements PresenceChannel {
+export class Channel extends BaseChannel implements PresenceChannel {
     /**
      * The Pusher client instance.
      */
-    socket: LaravelEchoApiGatewayWebsocket;
+    socket: Websocket;
 
     /**
      * The name of the channel.
      */
-    name: any;
+    name: string;
 
     /**
      * Channel options.
      */
-    options: any;
+    options: object;
 
     /**
      * The event formatter.
@@ -32,13 +32,13 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
     /**
      * Create a new class instance.
      */
-    constructor(socket: LaravelEchoApiGatewayWebsocket, name: any, options: any) {
+    constructor(socket: Websocket, name: string, options: object) {
         super();
 
         this.name = name;
         this.socket = socket;
         this.options = options;
-        this.eventFormatter = new EventFormatter(this.options.namespace);
+        this.eventFormatter = new EventFormatter(this.options["namespace"]);
 
         this.subscribe();
     }
@@ -54,13 +54,13 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
      * Unsubscribe from a Pusher channel.
      */
     unsubscribe(): void {
-        this.socket.unsubscribe(this.name);
+        this.socket.unsubscribe(this);
     }
 
     /**
      * Listen for an event on the channel instance.
      */
-    listen(event: string, callback: Function): ApiGatewayChannel {
+    listen(event: string, callback: Function): Channel {
         this.on(this.eventFormatter.format(event), callback);
 
         return this;
@@ -69,7 +69,7 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
     /**
      * Stop listening for an event on the channel instance.
      */
-    stopListening(event: string, callback?: Function): ApiGatewayChannel {
+    stopListening(event: string, callback?: Function): Channel {
         if (this.listeners[event] && (!callback || this.listeners[event] === callback)) {
             delete this.listeners[event]
         }
@@ -80,7 +80,7 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
     /**
      * Register a callback to be called anytime a subscription succeeds.
      */
-    subscribed(callback: Function): ApiGatewayChannel {
+    subscribed(callback: Function): Channel {
         this.on('subscription_succeeded', () => {
             callback();
         });
@@ -91,7 +91,7 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
     /**
      * Register a callback to be called anytime a subscription error occurs.
      */
-    error(callback: Function): ApiGatewayChannel {
+    error(callback: Function): Channel {
         this.on('error', (status) => {
             callback(status);
         });
@@ -102,19 +102,19 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
     /**
      * Bind a channel to an event.
      */
-    on(event: string, callback: Function): ApiGatewayChannel {
+    on(event: string, callback: Function): Channel {
         this.listeners[event] = callback
 
         return this;
     }
 
-    handleEvent(event: string, data: object) {
+    handleEvent(event: string, data: object): void {
         if (this.listeners[event]) {
             this.listeners[event](event, data)
         }
     }
 
-    whisper(event: string, data: object): ApiGatewayChannel {
+    whisper(event: string, data: object): Channel {
         this.socket.send({
             event,
             data,
@@ -123,21 +123,27 @@ export class ApiGatewayChannel extends Channel implements PresenceChannel {
         return this;
     }
 
-    here(callback: Function): ApiGatewayChannel {
+    here(callback: Function): Channel {
+        // TODO: implement
+
         return this
     }
 
     /**
      * Listen for someone joining the channel.
      */
-    joining(callback: Function): ApiGatewayChannel {
+    joining(callback: Function): Channel {
+        // TODO: implement
+
         return this
     }
 
     /**
      * Listen for someone leaving the channel.
      */
-    leaving(callback: Function): ApiGatewayChannel {
+    leaving(callback: Function): Channel {
+        // TODO: implement
+
         return this
     }
 }

src/ApiGatewayConnector.ts renamed to src/Connector.ts

@@ -1,24 +1,25 @@
-import {Connector} from "laravel-echo/src/connector/connector";
-import {ApiGatewayChannel} from "./ApiGatewayChannel";
-import {LaravelEchoApiGatewayWebsocket} from "./LaravelEchoApiGatewayWebsocket";
+import {Connector as BaseConnector} from "laravel-echo/src/connector/connector";
+import {Websocket} from "./Websocket";
+import {Channel} from "./Channel";
 
-export class ApiGatewayConnector extends Connector
-{
+export const broadcaster = (options: object): Connector => new Connector(options);
+
+export class Connector extends BaseConnector {
     /**
      * The Socket.io connection instance.
      */
-    socket: LaravelEchoApiGatewayWebsocket;
+    socket: Websocket;
 
     /**
      * All of the subscribed channel names.
      */
-    channels: { [name: string]: ApiGatewayChannel } = {};
+    channels: { [name: string]: Channel } = {};
 
     /**
      * Create a fresh Socket.io connection.
      */
     connect(): void {
-        this.socket = new LaravelEchoApiGatewayWebsocket(this.options);
+        this.socket = new Websocket(this.options);
 
         return null;
 
@@ -35,9 +36,9 @@ export class ApiGatewayConnector extends Connector
     /**
      * Get a channel instance by name.
      */
-    channel(name: string): ApiGatewayChannel {
+    channel(name: string): Channel {
         if (!this.channels[name]) {
-            this.channels[name] = new ApiGatewayChannel(this.socket, name, this.options);
+            this.channels[name] = new Channel(this.socket, name, this.options);
         }
 
         return this.channels[name];
@@ -46,27 +47,27 @@ export class ApiGatewayConnector extends Connector
     /**
      * Get a private channel instance by name.
      */
-    privateChannel(name: string): ApiGatewayChannel {
+    privateChannel(name: string): Channel {
         if (!this.channels['private-' + name]) {
-            this.channels['private-' + name] = new ApiGatewayChannel(this.socket, 'private-' + name, this.options);
+            this.channels['private-' + name] = new Channel(this.socket, 'private-' + name, this.options);
         }
 
-        return this.channels['private-' + name] as ApiGatewayChannel;
+        return this.channels['private-' + name] as Channel;
     }
 
     /**
      * Get a presence channel instance by name.
      */
-    presenceChannel(name: string): ApiGatewayChannel {
+    presenceChannel(name: string): Channel {
         if (!this.channels['presence-' + name]) {
-            this.channels['presence-' + name] = new ApiGatewayChannel(
+            this.channels['presence-' + name] = new Channel(
                 this.socket,
                 'presence-' + name,
                 this.options
             );
         }
 
-        return this.channels['presence-' + name] as ApiGatewayChannel;
+        return this.channels['presence-' + name] as Channel;
     }
 
     /**