@eleven-am/pondsocket 0.1.16 → 0.1.18

package/{dist/client → client}/channel.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channel = void 0;
-const channelEngine_1 = require("../server/channel/channelEngine");
-const endpoint_1 = require("../server/endpoint/endpoint");
-const presenceEngine_1 = require("../server/presence/presenceEngine");
+const enums_1 = require("../enums");
 const subjectUtils_1 = require("../server/utils/subjectUtils");
 class Channel {
     constructor(publisher, clientState, name, receiver, params = {}) {
@@ -26,9 +24,9 @@ class Channel {
             throw new Error('This channel has been closed');
         }
         const joinMessage = {
-            action: endpoint_1.ClientActions.JOIN_CHANNEL,
+            action: enums_1.ClientActions.JOIN_CHANNEL,
             channelName: this._name,
-            event: endpoint_1.ClientActions.JOIN_CHANNEL,
+            event: enums_1.ClientActions.JOIN_CHANNEL,
             payload: this._joinParams,
         };
         this._publish(joinMessage);
@@ -38,9 +36,9 @@ class Channel {
      */
     leave() {
         const leaveMessage = {
-            action: endpoint_1.ClientActions.LEAVE_CHANNEL,
+            action: enums_1.ClientActions.LEAVE_CHANNEL,
             channelName: this._name,
-            event: endpoint_1.ClientActions.LEAVE_CHANNEL,
+            event: enums_1.ClientActions.LEAVE_CHANNEL,
             payload: {},
         };
         this._publish(leaveMessage);
@@ -54,7 +52,7 @@ class Channel {
      */
     onMessage(event, callback) {
         return this._receiver.subscribe((data) => {
-            if (data.action === channelEngine_1.ServerActions.BROADCAST && data.event === event && data.channelName === this._name) {
+            if (data.action === enums_1.ServerActions.BROADCAST && data.event === event && data.channelName === this._name) {
                 return callback(data.payload);
             }
         });
@@ -74,7 +72,7 @@ class Channel {
      */
     onJoin(callback) {
         return this._receiver.subscribe((data) => {
-            if (data.action === channelEngine_1.ServerActions.PRESENCE && data.event === presenceEngine_1.PresenceEventTypes.JOIN && data.channelName === this._name) {
+            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.JOIN && data.channelName === this._name) {
                 return callback(data.payload.changed);
             }
         });
@@ -85,7 +83,7 @@ class Channel {
      */
     onLeave(callback) {
         return this._receiver.subscribe((data) => {
-            if (data.action === channelEngine_1.ServerActions.PRESENCE && data.event === presenceEngine_1.PresenceEventTypes.LEAVE && data.channelName === this._name) {
+            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.LEAVE && data.channelName === this._name) {
                 return callback(data.payload.changed);
             }
         });
@@ -96,7 +94,7 @@ class Channel {
      */
     onPresenceChange(callback) {
         return this._receiver.subscribe((data) => {
-            if (data.action === channelEngine_1.ServerActions.PRESENCE && data.event === presenceEngine_1.PresenceEventTypes.UPDATE && data.channelName === this._name) {
+            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.UPDATE && data.channelName === this._name) {
                 return callback(data.payload);
             }
         });
@@ -155,7 +153,7 @@ class Channel {
     }
     _send(event, payload, receivers = 'all_users') {
         const message = {
-            action: endpoint_1.ClientActions.BROADCAST,
+            action: enums_1.ClientActions.BROADCAST,
             channelName: this._name,
             event,
             payload,
@@ -174,9 +172,9 @@ class Channel {
         const unsubStateChange = this._clientState.subscribe((state) => {
             if (state === 'OPEN') {
                 const joinMessage = {
-                    action: endpoint_1.ClientActions.JOIN_CHANNEL,
+                    action: enums_1.ClientActions.JOIN_CHANNEL,
                     channelName: this._name,
-                    event: endpoint_1.ClientActions.JOIN_CHANNEL,
+                    event: enums_1.ClientActions.JOIN_CHANNEL,
                     payload: this._joinParams,
                 };
                 this._publisher(joinMessage);
@@ -187,7 +185,7 @@ class Channel {
             }
         });
         const unsubPresence = this._receiver.subscribe((data) => {
-            if (data.action === channelEngine_1.ServerActions.PRESENCE && data.channelName === this._name) {
+            if (data.action === enums_1.ServerActions.PRESENCE && data.channelName === this._name) {
                 this._presence.publish(data.payload.presence);
             }
         });

package/client.d.ts

@@ -0,0 +1,4 @@
+// eslint-disable-next-line import/no-unresolved
+import { PondSocketClient } from './types';
+
+export default PondSocketClient;

package/{dist/client/index.js → client.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const channel_1 = require("./channel");
-const subjectUtils_1 = require("../server/utils/subjectUtils");
+const channel_1 = require("./client/channel");
+const subjectUtils_1 = require("./server/utils/subjectUtils");
 class PondClient {
     constructor(endpoint, params = {}) {
         let address;

package/enums.d.ts

@@ -0,0 +1,19 @@
+
+export enum PresenceEventTypes {
+    JOIN = 'JOIN',
+    LEAVE = 'LEAVE',
+    UPDATE = 'UPDATE'
+}
+
+export enum ServerActions {
+    PRESENCE = 'PRESENCE',
+    SYSTEM = 'SYSTEM',
+    BROADCAST = 'BROADCAST',
+    ERROR = 'ERROR',
+}
+
+export enum ClientActions {
+    JOIN_CHANNEL = 'JOIN_CHANNEL',
+    LEAVE_CHANNEL = 'LEAVE_CHANNEL',
+    BROADCAST = 'BROADCAST',
+}

package/enums.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientActions = exports.ServerActions = exports.PresenceEventTypes = void 0;
+var PresenceEventTypes;
+(function (PresenceEventTypes) {
+    PresenceEventTypes["JOIN"] = "JOIN";
+    PresenceEventTypes["LEAVE"] = "LEAVE";
+    PresenceEventTypes["UPDATE"] = "UPDATE";
+})(PresenceEventTypes = exports.PresenceEventTypes || (exports.PresenceEventTypes = {}));
+var ServerActions;
+(function (ServerActions) {
+    ServerActions["PRESENCE"] = "PRESENCE";
+    ServerActions["SYSTEM"] = "SYSTEM";
+    ServerActions["BROADCAST"] = "BROADCAST";
+    ServerActions["ERROR"] = "ERROR";
+})(ServerActions = exports.ServerActions || (exports.ServerActions = {}));
+var ClientActions;
+(function (ClientActions) {
+    ClientActions["JOIN_CHANNEL"] = "JOIN_CHANNEL";
+    ClientActions["LEAVE_CHANNEL"] = "LEAVE_CHANNEL";
+    ClientActions["BROADCAST"] = "BROADCAST";
+})(ClientActions = exports.ClientActions || (exports.ClientActions = {}));

package/express.d.ts

@@ -0,0 +1,3 @@
+import { PondSocketFromExpress } from './types';
+
+export default PondSocketFromExpress;

package/{dist/express/index.js → express.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const http_1 = require("http");
-const pondSocket_1 = require("../server/server/pondSocket");
+const pondSocket_1 = require("./server/server/pondSocket");
 /**
  * @desc Creates a pond socket server
  * @param app - The Express app to be used by the server

package/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -21,11 +21,8 @@
   },
   "author": "Roy OSSAI",
   "license": "GPL-3.0",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/**/*"
-  ],
+  "main": "index.js",
+  "types": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Eleven-am/pondSocket.git"
@@ -33,18 +30,6 @@
   "dependencies": {
     "ws": "^8.12.0"
   },
-  "exports": {
-    ".": "./dist/index.js",
-    "./express": "./dist/express/index.js",
-    "./client": "./dist/client/index.js"
-  },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/*"
-      ]
-    }
-  },
   "devDependencies": {
     "@types/express": "^4.17.14",
     "@types/jest": "^29.5.0",

package/{dist/index.d.ts → types.d.ts}

@@ -5,6 +5,8 @@ import internal from 'stream';
 import { Express } from 'express';
 import { WebSocketServer, WebSocket } from 'ws';
 
+import { ClientActions, PresenceEventTypes } from './enums.d';
+
 export type PondPath = string | RegExp;
 type NextFunction = () => void;
 export type JoinParams = Record<string, any>;
@@ -15,7 +17,29 @@ export type EndpointHandler = (req: IncomingConnection, res: ConnectionResponse)
 type SocketCache = Pick<RequestCache, 'socket' | 'clientId' | 'assigns'>;
 type AuthorizeMiddleware = (request: JoinRequest, response: JoinResponse) => void | Promise<void>;
 type SocketMiddlewareFunction = (req: IncomingMessage, socket: internal.Duplex, head: Buffer, next: NextFunction) => void;
+export type ChannelReceivers = 'all_users' | 'all_except_sender' | string[];
+export type ChannelSenders = 'channel' | string;
+export type ChannelEvent = Event | PresenceEvent;
 
+interface Event {
+    action: 'SYSTEM' | 'BROADCAST' | 'ERROR';
+    event: string;
+    payload: PondMessage;
+    channelName: string;
+}
+export interface ClientMessage {
+    action: ClientActions;
+    channelName: string;
+    event: string;
+    payload: Record<string, any>;
+    addresses?: ChannelReceivers;
+}
+interface PresenceEvent {
+    action: 'PRESENCE';
+    event: PresenceEventTypes;
+    channelName: string;
+    payload: PresencePayload;
+}
 interface RequestCache {
     clientId: string;
     socket: WebSocket;
@@ -50,6 +74,158 @@ interface UserPresences {
     [userId: string]: PondPresence;
 }
 
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    namespace Express {
+        export interface Application {
+            upgrade(path: PondPath, handler: EndpointHandler): Endpoint;
+        }
+    }
+}
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+interface PondSocketExpressApp extends Express {
+
+    /**
+     * @desc Accepts a new socket upgrade request on the provided endpoint using the handler function to authenticate the socket
+     * @param path - the pattern to accept || can also be a regex
+     * @param handler - the handler function to authenticate the socket
+     * @example
+     * const endpoint = pond.createEndpoint('/api/socket', (req, res) => {
+     *    const token = req.query.token;
+     *    if (!token)
+     *       return res.reject("No token provided");
+     *    res.accept({
+     *       assign: {
+     *           token
+     *       }
+     *    });
+     * })
+     */
+    upgrade(path: PondPath, handler: EndpointHandler): Endpoint;
+}
+export type PondState = 'CONNECTING' | 'OPEN' | 'CLOSING' | 'CLOSED';
+type Unsubscribe = () => void;
+
+export interface PresencePayload {
+    changed: PondPresence;
+    presence: PondPresence[];
+}
+
+export declare class Channel {
+    /**
+     * @desc Connects to the channel.
+     */
+    public join(): void;
+
+    /**
+     * @desc Disconnects from the channel.
+     */
+    public leave(): void;
+
+    /**
+     * @desc Monitors the channel for messages.
+     * @param event - The event to monitor.
+     * @param callback - The callback to call when a message is received.
+     */
+    public onMessage(event: string, callback: (message: PondMessage) => void): Unsubscribe;
+
+    /**
+     * @desc Monitors the connection state of the channel.
+     * @param callback - The callback to call when the connection state changes.
+     */
+    public onConnectionChange(callback: (connected: boolean) => void): Unsubscribe;
+
+    /**
+     * @desc Detects when clients join the channel.
+     * @param callback - The callback to call when a client joins the channel.
+     */
+    public onJoin(callback: (presence: PondPresence) => void): Unsubscribe;
+
+    /**
+     * @desc Detects when clients leave the channel.
+     * @param callback - The callback to call when a client leaves the channel.
+     */
+    public onLeave(callback: (presence: PondPresence) => void): Unsubscribe;
+
+    /**
+     * @desc Detects when clients change their presence in the channel.
+     * @param callback - The callback to call when a client changes their presence in the channel.
+     */
+    public onPresenceChange(callback: (presence: PresencePayload) => void): Unsubscribe;
+
+    /**
+     * @desc Sends a message to specific clients in the channel.
+     * @param event - The event to send.
+     * @param payload - The message to send.
+     * @param recipient - The clients to send the message to.
+     */
+    public sendMessage(event: string, payload: PondMessage, recipient: string[]): void;
+
+    /**
+     * @desc Broadcasts a message to every other client in the channel except yourself.
+     * @param event - The event to send.
+     * @param payload - The message to send.
+     */
+    public broadcastFrom(event: string, payload: PondMessage): void;
+
+    /**
+     * @desc Broadcasts a message to the channel, including yourself.
+     * @param event - The event to send.
+     * @param payload - The message to send.
+     */
+    public broadcast(event: string, payload: PondMessage): void;
+
+    /**
+     * @desc Gets the current connection state of the channel.
+     */
+    public isConnected(): boolean;
+
+
+    /**
+     * @desc check is the channel has been closed.
+     */
+    public hasClosed(): boolean;
+
+    /**
+     * @desc Gets the current presence of the channel.
+     */
+    public getPresence(): PondPresence[];
+
+    /**
+     * @desc Monitors the presence of the channel.
+     * @param callback - The callback to call when the presence changes.
+     */
+    public onUsersChange(callback: (users: PondPresence[]) => void): Unsubscribe;
+}
+
+export declare class PondSocketClient {
+    constructor(endpoint: string, params?: Record<string, any>);
+
+    /**
+     * @desc Connects to the server and returns the socket.
+     */
+    public connect(backoff?: number): void;
+
+    /**
+     * @desc Returns the current state of the socket.
+     */
+    public getState(): PondState;
+
+    /**
+     * @desc Disconnects the socket.
+     */
+    public disconnect(): void;
+
+    /**
+     * @desc Creates a channel with the given name and params.
+     * @param name - The name of the channel.
+     * @param params - The params to send to the server.
+     */
+    public createChannel(name: string, params?: JoinParams): Channel;
+}
+
 declare class AbstractRequest {
     get event (): EventObject;
 
@@ -296,7 +472,7 @@ export declare class Endpoint {
     closeConnection (clientIds: string | string[]): void;
 }
 
-declare class PondSocket {
+export declare class PondSocket {
     constructor (server?: HTTPServer, socketServer?: WebSocketServer);
 
     /**
@@ -337,4 +513,10 @@ declare class PondSocket {
     use (middleware: SocketMiddlewareFunction): void;
 }
 
-export default PondSocket;
+/**
+ * @desc Creates a pond socket server
+ * @param app - The Express app to be used by the server
+ * @constructor
+ */
+export declare const PondSocketFromExpress: (app: Express) => PondSocketExpressApp;
+

package/dist/client/index.d.ts

@@ -1,122 +0,0 @@
-// eslint-disable-next-line import/no-unresolved
-import { PondMessage, JoinParams, PondPresence } from '../index';
-export type PondState = 'CONNECTING' | 'OPEN' | 'CLOSING' | 'CLOSED';
-type Unsubscribe = () => void;
-
-export interface PresencePayload {
-    changed: PondPresence;
-    presence: PondPresence[];
-}
-
-export declare class Channel {
-    /**
-     * @desc Connects to the channel.
-     */
-    public join(): void;
-
-    /**
-     * @desc Disconnects from the channel.
-     */
-    public leave(): void;
-
-    /**
-     * @desc Monitors the channel for messages.
-     * @param event - The event to monitor.
-     * @param callback - The callback to call when a message is received.
-     */
-    public onMessage(event: string, callback: (message: PondMessage) => void): Unsubscribe;
-
-    /**
-     * @desc Monitors the connection state of the channel.
-     * @param callback - The callback to call when the connection state changes.
-     */
-    public onConnectionChange(callback: (connected: boolean) => void): Unsubscribe;
-
-    /**
-     * @desc Detects when clients join the channel.
-     * @param callback - The callback to call when a client joins the channel.
-     */
-    public onJoin(callback: (presence: PondPresence) => void): Unsubscribe;
-
-    /**
-     * @desc Detects when clients leave the channel.
-     * @param callback - The callback to call when a client leaves the channel.
-     */
-    public onLeave(callback: (presence: PondPresence) => void): Unsubscribe;
-
-    /**
-     * @desc Detects when clients change their presence in the channel.
-     * @param callback - The callback to call when a client changes their presence in the channel.
-     */
-    public onPresenceChange(callback: (presence: PresencePayload) => void): Unsubscribe;
-
-    /**
-     * @desc Sends a message to specific clients in the channel.
-     * @param event - The event to send.
-     * @param payload - The message to send.
-     * @param recipient - The clients to send the message to.
-     */
-    public sendMessage(event: string, payload: PondMessage, recipient: string[]): void;
-
-    /**
-     * @desc Broadcasts a message to every other client in the channel except yourself.
-     * @param event - The event to send.
-     * @param payload - The message to send.
-     */
-    public broadcastFrom(event: string, payload: PondMessage): void;
-
-    /**
-     * @desc Broadcasts a message to the channel, including yourself.
-     * @param event - The event to send.
-     * @param payload - The message to send.
-     */
-    public broadcast(event: string, payload: PondMessage): void;
-
-    /**
-     * @desc Gets the current connection state of the channel.
-     */
-    public isConnected(): boolean;
-
-
-    /**
-     * @desc check is the channel has been closed.
-     */
-    public hasClosed(): boolean;
-
-    /**
-     * @desc Gets the current presence of the channel.
-     */
-    public getPresence(): PondPresence[];
-
-    /**
-     * @desc Monitors the presence of the channel.
-     * @param callback - The callback to call when the presence changes.
-     */
-    public onUsersChange(callback: (users: PondPresence[]) => void): Unsubscribe;
-}
-
-export default class PondClient {
-    constructor(endpoint: string, params?: Record<string, any>);
-
-    /**
-     * @desc Connects to the server and returns the socket.
-     */
-    public connect(backoff?: number): void;
-
-    /**
-     * @desc Returns the current state of the socket.
-     */
-    public getState(): PondState;
-
-    /**
-     * @desc Disconnects the socket.
-     */
-    public disconnect(): void;
-
-    /**
-     * @desc Creates a channel with the given name and params.
-     * @param name - The name of the channel.
-     * @param params - The params to send to the server.
-     */
-    public createChannel(name: string, params?: JoinParams): Channel;
-}

package/dist/express/index.d.ts

@@ -1,36 +0,0 @@
-/* eslint-disable import/no-unresolved */
-import { Express } from 'express';
-
-import { EndpointHandler, Endpoint, PondPath } from '../index';
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-interface PondSocketExpressApp extends Express {
-
-    /**
-     * @desc Accepts a new socket upgrade request on the provided endpoint using the handler function to authenticate the socket
-     * @param path - the pattern to accept || can also be a regex
-     * @param handler - the handler function to authenticate the socket
-     * @example
-     * const endpoint = pond.createEndpoint('/api/socket', (req, res) => {
-     *    const token = req.query.token;
-     *    if (!token)
-     *       return res.reject("No token provided");
-     *    res.accept({
-     *       assign: {
-     *           token
-     *       }
-     *    });
-     * })
-     */
-    upgrade(path: PondPath, handler: EndpointHandler): Endpoint;
-}
-
-/**
- * @desc Creates a pond socket server
- * @param app - The Express app to be used by the server
- * @constructor
- */
-declare const PondSocket: (app: Express) => PondSocketExpressApp;
-
-export default PondSocket;