@eleven-am/pondsocket 0.1.18 → 0.1.20

package/express.js

@@ -11,6 +11,7 @@ const PondSocket = (app) => {
     const server = (0, http_1.createServer)(app);
     const pondSocket = new pondSocket_1.PondSocket(server);
     app.upgrade = (path, handler) => pondSocket.createEndpoint(path, handler);
+    app.listen = (...args) => server.listen(...args);
     return app;
 };
 exports.default = PondSocket;

package/index.d.ts

@@ -1,3 +1,3 @@
-import { PondSocket } from './types';
-
+import { PondSocket, PondChannel as Channel } from './types';
 export default PondSocket;
+export { Channel };

package/index.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Channel = void 0;
+const pondChannel_1 = require("./server/pondChannel/pondChannel");
+Object.defineProperty(exports, "Channel", { enumerable: true, get: function () { return pondChannel_1.PondChannel; } });
 const pondSocket_1 = require("./server/server/pondSocket");
 exports.default = pondSocket_1.PondSocket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",

package/server/endpoint/endpoint.js

@@ -80,7 +80,7 @@ class Endpoint {
      * @param handler - The handler to use to authenticate the client
      */
     _authoriseConnection(request, socket, head, data, handler) {
-        const clientId = this._generateClientId();
+        const clientId = request.headers['sec-websocket-key'];
         const req = Object.assign(Object.assign({ headers: request.headers }, data), { id: clientId });
         const resolver = (assigns, data) => {
             if (data.error) {
@@ -253,17 +253,5 @@ class Endpoint {
     _isObjectEmpty(obj) {
         return Object.keys(obj).length === 0;
     }
-    /**
-     * @desc Generates a new client ID
-     * @private
-     */
-    _generateClientId() {
-        let id = '';
-        const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        for (let i = 0; i < 21; i++) {
-            id += chars.charAt(Math.floor(Math.random() * chars.length));
-        }
-        return id;
-    }
 }
 exports.Endpoint = Endpoint;

package/server/server/pondSocket.js

@@ -9,8 +9,8 @@ class PondSocket {
     constructor(server, socketServer) {
         this._middleware = [];
         this._matcher = new matchPattern_1.MatchPattern();
-        this._server = server || new http_1.Server();
-        this._socketServer = socketServer || new ws_1.WebSocketServer({ noServer: true });
+        this._server = server !== null && server !== void 0 ? server : new http_1.Server();
+        this._socketServer = socketServer !== null && socketServer !== void 0 ? socketServer : new ws_1.WebSocketServer({ noServer: true });
         this._init();
     }
     /**

package/server/server/server.test.js

@@ -61,9 +61,7 @@ describe('server', () => {
             write: jest.fn(),
             destroy: jest.fn(),
         };
-        socket.listen(3001, () => {
-            console.log('server listening');
-        });
+        socket.listen(3001);
         server.emit('upgrade', {}, socketClient);
         server.close();
         // these functions are called because there is no endpoint to accept the socket
@@ -72,13 +70,8 @@ describe('server', () => {
     });
     it('should be able to accept a socket if a handler is provided', () => __awaiter(void 0, void 0, void 0, function* () {
         const socket = new pondSocket_1.PondSocket();
-        const server = socket.listen(3001, () => {
-            console.log('server listening');
-        });
+        const server = socket.listen(3001);
         expect(server).toBeDefined();
-        socket.createEndpoint('/api/hello', () => {
-            console.log('server listening');
-        });
         socket.createEndpoint('/api/:path', (req, res) => {
             expect(req.params.path).toBe('socket');
             res.accept();
@@ -92,9 +85,7 @@ describe('server', () => {
     }));
     it('should be able to reject a socket if the handler rejects', () => __awaiter(void 0, void 0, void 0, function* () {
         const socket = new pondSocket_1.PondSocket();
-        const server = socket.listen(3001, () => {
-            console.log('server listening');
-        });
+        const server = socket.listen(3001);
         expect(server).toBeDefined();
         socket.createEndpoint('/api/:path', (req, res) => {
             expect(req.params.path).toBe('socket');
@@ -107,9 +98,7 @@ describe('server', () => {
     }));
     it('should be able to send a message after connection', () => __awaiter(void 0, void 0, void 0, function* () {
         const socket = new pondSocket_1.PondSocket();
-        const server = socket.listen(3001, () => {
-            console.log('server listening');
-        });
+        const server = socket.listen(3001);
         expect(server).toBeDefined();
         socket.createEndpoint('/api/:path', (req, res) => {
             expect(req.params.path).toBe('socket');