@digo-labs/ws 0.1.10 → 0.2.0

package/dist/client.d.ts

@@ -7,21 +7,35 @@ export declare class WebsocketClient {
     private reconnectInterval;
     private maxReconnectInterval;
     private reconnectDelay;
+    private getToken;
     private socket;
     private alive;
+    private isIdentified;
+    private refreshTimer;
     private listeners;
     private subscribedChannels;
+    private deniedChannels;
+    private pending;
     private openHandlers;
+    private readyHandlers;
     private closeHandlers;
     private errorHandlers;
     constructor(properties: WebsocketConnectionConfig);
     private open;
+    private identify;
+    private handleIdentified;
+    private stopRefresh;
+    private scheduleReconnect;
+    private sendRaw;
     private sendToHub;
     send(channel: string, data?: unknown): void;
     setState(channel: string, data?: unknown): void;
     subscribe(channel: string, listener: WebsocketListener): void;
     unsubscribe(channel: string, listener?: WebsocketListener): void;
+    isLive(channel: string): boolean;
     onOpen(handler: () => void): void;
+    onReady(handler: () => void): void;
+    offReady(handler: () => void): void;
     onClose(handler: () => void): void;
     onError(handler: (error: Event) => void): void;
     close(): void;

package/dist/client.js

@@ -1,6 +1,6 @@
-import { WS_URL as e, WebsocketClientEvent as t } from "@digo-labs/common";
+import { WS_URL as e, WebSocketHubEvent as t, WebsocketClientEvent as n } from "@digo-labs/common";
 //#region src/client.ts
-var n = class {
+var r = 4e3, i = 4401, a = 6e5, o = class {
 	url;
 	app;
 	id;
@@ -8,80 +8,134 @@ var n = class {
 	reconnectInterval;
 	maxReconnectInterval;
 	reconnectDelay;
+	getToken;
 	socket = null;
 	alive = !0;
+	isIdentified = !1;
+	refreshTimer = null;
 	listeners = /* @__PURE__ */ new Map();
 	subscribedChannels = /* @__PURE__ */ new Set();
+	deniedChannels = /* @__PURE__ */ new Set();
+	pending = [];
 	openHandlers = [];
+	readyHandlers = [];
 	closeHandlers = [];
 	errorHandlers = [];
 	constructor(t) {
-		this.url = t.url ?? e, this.app = t.app ?? "unknown", this.id = t.id ?? crypto.randomUUID(), this.reconnectEnabled = t.reconnect ?? !0, this.reconnectInterval = t.reconnectInterval ?? 1e3, this.maxReconnectInterval = t.maxReconnectInterval ?? 1e4, this.reconnectDelay = this.reconnectInterval, this.open();
+		this.url = t.url ?? e, this.app = t.app ?? "unknown", this.id = t.id ?? crypto.randomUUID(), this.reconnectEnabled = t.reconnect ?? !0, this.reconnectInterval = t.reconnectInterval ?? 1e3, this.maxReconnectInterval = t.maxReconnectInterval ?? 1e4, this.reconnectDelay = this.reconnectInterval, this.getToken = t.getToken ?? null, this.open();
 	}
 	open() {
-		this.socket = new WebSocket(this.url), this.socket.onopen = () => {
-			this.reconnectDelay = this.reconnectInterval, this.sendToHub({
-				type: t.IDENTIFY,
-				id: this.id,
-				app: this.app
-			}), this.subscribedChannels.size > 0 && this.sendToHub({
-				type: t.SUBSCRIBE,
-				channels: [...this.subscribedChannels]
-			}), this.openHandlers.forEach((e) => e());
+		this.socket = new WebSocket(this.url), this.isIdentified = !1, this.socket.onopen = () => {
+			this.reconnectDelay = this.reconnectInterval, this.identify(), this.openHandlers.forEach((e) => e());
 		}, this.socket.onmessage = (e) => {
-			let t;
+			let n;
 			try {
-				t = JSON.parse(e.data);
+				n = JSON.parse(e.data);
 			} catch {
 				return;
 			}
-			this.listeners.get(t.channel)?.forEach((e) => e(t.data));
-		}, this.socket.onclose = (e) => {
-			if (this.closeHandlers.forEach((e) => e()), e.code !== 4e3 && this.alive && this.reconnectEnabled) {
-				let e = this.reconnectDelay * (.5 + Math.random());
-				setTimeout(() => {
-					this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectInterval), this.open();
-				}, e);
+			if (n.type === t.IDENTIFIED) {
+				this.handleIdentified();
+				return;
+			}
+			if (n.type === t.DENIED) {
+				n.channel && this.deniedChannels.add(n.channel);
+				return;
 			}
+			n.channel && this.listeners.get(n.channel)?.forEach((e) => e(n.data));
+		}, this.socket.onclose = (e) => {
+			this.isIdentified = !1, this.pending = [], this.stopRefresh(), this.closeHandlers.forEach((e) => e()), e.code !== r && this.alive && this.reconnectEnabled && this.scheduleReconnect(e.code === i);
 		}, this.socket.onerror = (e) => {
 			this.errorHandlers.forEach((t) => t(e));
 		};
 	}
-	sendToHub(e) {
+	async identify() {
+		if (!this.getToken) {
+			this.sendRaw({
+				type: n.IDENTIFY,
+				id: this.id,
+				app: this.app
+			}), this.handleIdentified();
+			return;
+		}
+		let e = await this.getToken().catch(() => null);
+		if (!e) {
+			this.socket?.close();
+			return;
+		}
+		this.sendRaw({
+			type: n.IDENTIFY,
+			id: this.id,
+			app: this.app,
+			token: e
+		});
+	}
+	handleIdentified() {
+		this.isIdentified || (this.isIdentified = !0, this.deniedChannels.clear(), this.subscribedChannels.size > 0 && this.sendRaw({
+			type: n.SUBSCRIBE,
+			channels: [...this.subscribedChannels]
+		}), this.pending.splice(0).forEach((e) => this.sendRaw(e)), this.getToken && !this.refreshTimer && (this.refreshTimer = setInterval(() => void this.identify(), a)), this.readyHandlers.forEach((e) => e()));
+	}
+	stopRefresh() {
+		this.refreshTimer && clearInterval(this.refreshTimer), this.refreshTimer = null;
+	}
+	scheduleReconnect(e) {
+		let t = (e ? this.maxReconnectInterval : this.reconnectDelay) * (.5 + Math.random());
+		setTimeout(() => {
+			this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectInterval), this.open();
+		}, t);
+	}
+	sendRaw(e) {
 		this.socket?.readyState === WebSocket.OPEN && this.socket.send(JSON.stringify(e));
 	}
-	send(e, n) {
+	sendToHub(e) {
+		if (this.isIdentified) {
+			this.sendRaw(e);
+			return;
+		}
+		(e.type === n.MESSAGE || e.type === n.STATE) && this.socket?.readyState === WebSocket.OPEN && this.pending.push(e);
+	}
+	send(e, t) {
 		this.sendToHub({
-			type: t.MESSAGE,
+			type: n.MESSAGE,
 			channel: e,
-			data: n
+			data: t
 		});
 	}
-	setState(e, n) {
+	setState(e, t) {
 		this.sendToHub({
-			type: t.STATE,
+			type: n.STATE,
 			channel: e,
-			data: n
+			data: t
 		});
 	}
-	subscribe(e, n) {
-		this.listeners.has(e) || this.listeners.set(e, /* @__PURE__ */ new Set()), this.listeners.get(e).add(n), this.subscribedChannels.has(e) || (this.subscribedChannels.add(e), this.sendToHub({
-			type: t.SUBSCRIBE,
+	subscribe(e, t) {
+		this.listeners.has(e) || this.listeners.set(e, /* @__PURE__ */ new Set()), this.listeners.get(e).add(t), this.subscribedChannels.has(e) || (this.subscribedChannels.add(e), this.deniedChannels.delete(e), this.sendToHub({
+			type: n.SUBSCRIBE,
 			channels: [e]
 		}));
 	}
-	unsubscribe(e, n) {
-		n ? (this.listeners.get(e)?.delete(n), this.listeners.get(e)?.size === 0 && (this.listeners.delete(e), this.subscribedChannels.delete(e), this.sendToHub({
-			type: t.UNSUBSCRIBE,
+	unsubscribe(e, t) {
+		t ? (this.listeners.get(e)?.delete(t), this.listeners.get(e)?.size === 0 && (this.listeners.delete(e), this.subscribedChannels.delete(e), this.deniedChannels.delete(e), this.sendToHub({
+			type: n.UNSUBSCRIBE,
 			channels: [e]
-		}))) : (this.listeners.delete(e), this.subscribedChannels.delete(e), this.sendToHub({
-			type: t.UNSUBSCRIBE,
+		}))) : (this.listeners.delete(e), this.subscribedChannels.delete(e), this.deniedChannels.delete(e), this.sendToHub({
+			type: n.UNSUBSCRIBE,
 			channels: [e]
 		}));
 	}
+	isLive(e) {
+		return this.isIdentified && this.subscribedChannels.has(e) && !this.deniedChannels.has(e);
+	}
 	onOpen(e) {
 		this.openHandlers.push(e);
 	}
+	onReady(e) {
+		this.readyHandlers.push(e);
+	}
+	offReady(e) {
+		this.readyHandlers = this.readyHandlers.filter((t) => t !== e);
+	}
 	onClose(e) {
 		this.closeHandlers.push(e);
 	}
@@ -89,10 +143,10 @@ var n = class {
 		this.errorHandlers.push(e);
 	}
 	close() {
-		this.alive = !1, this.socket?.close();
+		this.alive = !1, this.isIdentified = !1, this.stopRefresh(), this.socket?.close();
 	}
 };
 //#endregion
-export { n as WebsocketClient };
+export { o as WebsocketClient };
 
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","names":[],"sources":["../src/client.ts"],"sourcesContent":["import { WebsocketConnectionConfig, WebsocketClientEvent, WebsocketClientMessage, WebsocketHubMessage, WebsocketListener, WS_URL } from '@digo-labs/common';\n\nexport class WebsocketClient {\n  private url:                  string;\n  private app:                  string;\n  private id:                   string;\n  private reconnectEnabled:     boolean;\n  private reconnectInterval:    number;\n  private maxReconnectInterval: number;\n  private reconnectDelay:       number;\n\n  private socket:        WebSocket | null = null;\n  private alive = true;\n  private listeners = new Map<string, Set<WebsocketListener>>();\n  private subscribedChannels = new Set<string>();\n  private openHandlers:  (() => void)[] = [];\n  private closeHandlers: (() => void)[] = [];\n  private errorHandlers: ((error: Event) => void)[] = [];\n\n  constructor(properties: WebsocketConnectionConfig) {\n    this.url                  = properties.url ?? WS_URL;\n    this.app                  = properties.app ?? 'unknown';\n    this.id                   = properties.id  ?? crypto.randomUUID();\n    this.reconnectEnabled     = properties.reconnect ?? true;\n    this.reconnectInterval    = properties.reconnectInterval ?? 1000;\n    this.maxReconnectInterval = properties.maxReconnectInterval ?? 10000;\n    this.reconnectDelay       = this.reconnectInterval;\n\n    this.open();\n  }\n\n  private open(): void {\n    this.socket = new WebSocket(this.url);\n\n    this.socket.onopen = () => {\n      this.reconnectDelay = this.reconnectInterval;\n\n      this.sendToHub({ type: WebsocketClientEvent.IDENTIFY, id: this.id, app: this.app });\n\n      if (this.subscribedChannels.size > 0) {\n        this.sendToHub({ type: WebsocketClientEvent.SUBSCRIBE, channels: [...this.subscribedChannels] });\n      }\n\n      this.openHandlers.forEach(h => h());\n    };\n\n    this.socket.onmessage = (event) => {\n      let message: WebsocketHubMessage;\n\n      try {\n        message = JSON.parse(event.data as string);\n      } catch { return; }\n\n      const channelListeners = this.listeners.get(message.channel);\n\n      channelListeners?.forEach(listener => listener(message.data));\n    };\n\n    this.socket.onclose = (event) => {\n      this.closeHandlers.forEach(h => h());\n\n      if (event.code === 4000) return;\n\n      if (this.alive && this.reconnectEnabled) {\n        const jitteredDelay = this.reconnectDelay * (0.5 + Math.random());\n\n        setTimeout(() => {\n          this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectInterval);\n          this.open();\n        }, jitteredDelay);\n      }\n    };\n\n    this.socket.onerror = (error) => {\n      this.errorHandlers.forEach(h => h(error));\n    };\n  }\n\n  private sendToHub(message: WebsocketClientMessage): void {\n    if (this.socket?.readyState === WebSocket.OPEN) {\n      this.socket.send(JSON.stringify(message));\n    }\n  }\n\n  public send(channel: string, data?: unknown): void {\n    this.sendToHub({ type: WebsocketClientEvent.MESSAGE, channel: channel, data: data });\n  }\n\n  public setState(channel: string, data?: unknown): void {\n    this.sendToHub({ type: WebsocketClientEvent.STATE, channel: channel, data: data });\n  }\n\n  public subscribe(channel: string, listener: WebsocketListener): void {\n    if (!this.listeners.has(channel)) this.listeners.set(channel, new Set());\n\n    this.listeners.get(channel)!.add(listener);\n\n    if (!this.subscribedChannels.has(channel)) {\n      this.subscribedChannels.add(channel);\n      this.sendToHub({ type: WebsocketClientEvent.SUBSCRIBE, channels: [channel] });\n    }\n  }\n\n  public unsubscribe(channel: string, listener?: WebsocketListener): void {\n    if (listener) {\n      this.listeners.get(channel)?.delete(listener);\n\n      if (this.listeners.get(channel)?.size === 0) {\n        this.listeners.delete(channel);\n        this.subscribedChannels.delete(channel);\n        this.sendToHub({ type: WebsocketClientEvent.UNSUBSCRIBE, channels: [channel] });\n      }\n    } else {\n      this.listeners.delete(channel);\n      this.subscribedChannels.delete(channel);\n      this.sendToHub({ type: WebsocketClientEvent.UNSUBSCRIBE, channels: [channel] });\n    }\n  }\n\n  public onOpen(handler: () => void): void { this.openHandlers.push(handler); }\n\n  public onClose(handler: () => void): void { this.closeHandlers.push(handler); }\n\n  public onError(handler: (error: Event) => void): void { this.errorHandlers.push(handler); }\n\n  public close(): void {\n    this.alive = false;\n    this.socket?.close();\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"client.js","names":[],"sources":["../src/client.ts"],"sourcesContent":["import { WebsocketConnectionConfig, WebsocketClientEvent, WebsocketClientMessage, WebSocketHubEvent, WebsocketHubMessage, WebsocketListener, WS_URL } from '@digo-labs/common';\n\nconst KICKED_CODE      = 4000;\nconst DENIED_CODE      = 4401;\nconst REFRESH_INTERVAL = 600_000;\n\nexport class WebsocketClient {\n  private url:                  string;\n  private app:                  string;\n  private id:                   string;\n  private reconnectEnabled:     boolean;\n  private reconnectInterval:    number;\n  private maxReconnectInterval: number;\n  private reconnectDelay:       number;\n  private getToken:             (() => Promise<string | null>) | null;\n\n  private socket:        WebSocket | null = null;\n  private alive = true;\n  private isIdentified = false;\n  private refreshTimer:  ReturnType<typeof setInterval> | null = null;\n  private listeners = new Map<string, Set<WebsocketListener>>();\n  private subscribedChannels = new Set<string>();\n  private deniedChannels = new Set<string>();\n  private pending:       WebsocketClientMessage[] = [];\n  private openHandlers:  (() => void)[] = [];\n  private readyHandlers: (() => void)[] = [];\n  private closeHandlers: (() => void)[] = [];\n  private errorHandlers: ((error: Event) => void)[] = [];\n\n  constructor(properties: WebsocketConnectionConfig) {\n    this.url                  = properties.url ?? WS_URL;\n    this.app                  = properties.app ?? 'unknown';\n    this.id                   = properties.id  ?? crypto.randomUUID();\n    this.reconnectEnabled     = properties.reconnect ?? true;\n    this.reconnectInterval    = properties.reconnectInterval ?? 1000;\n    this.maxReconnectInterval = properties.maxReconnectInterval ?? 10000;\n    this.reconnectDelay       = this.reconnectInterval;\n    this.getToken             = properties.getToken ?? null;\n\n    this.open();\n  }\n\n  private open(): void {\n    this.socket       = new WebSocket(this.url);\n    this.isIdentified = false;\n\n    this.socket.onopen = () => {\n      this.reconnectDelay = this.reconnectInterval;\n\n      void this.identify();\n\n      this.openHandlers.forEach(h => h());\n    };\n\n    this.socket.onmessage = (event) => {\n      let message: WebsocketHubMessage;\n\n      try {\n        message = JSON.parse(event.data as string);\n      } catch { return; }\n\n      if (message.type === WebSocketHubEvent.IDENTIFIED) {\n        this.handleIdentified();\n\n        return;\n      }\n\n      if (message.type === WebSocketHubEvent.DENIED) {\n        if (message.channel) this.deniedChannels.add(message.channel);\n\n        return;\n      }\n\n      if (!message.channel) return;\n\n      this.listeners.get(message.channel)?.forEach(listener => listener(message.data));\n    };\n\n    this.socket.onclose = (event) => {\n      this.isIdentified = false;\n      this.pending      = [];\n\n      this.stopRefresh();\n\n      this.closeHandlers.forEach(h => h());\n\n      if (event.code === KICKED_CODE) return;\n\n      if (this.alive && this.reconnectEnabled) this.scheduleReconnect(event.code === DENIED_CODE);\n    };\n\n    this.socket.onerror = (error) => {\n      this.errorHandlers.forEach(h => h(error));\n    };\n  }\n\n  private async identify(): Promise<void> {\n    if (!this.getToken) {\n      this.sendRaw({ type: WebsocketClientEvent.IDENTIFY, id: this.id, app: this.app });\n      this.handleIdentified();\n\n      return;\n    }\n\n    const token = await this.getToken().catch(() => null);\n\n    if (!token) {\n      this.socket?.close();\n\n      return;\n    }\n\n    this.sendRaw({ type: WebsocketClientEvent.IDENTIFY, id: this.id, app: this.app, token: token });\n  }\n\n  private handleIdentified(): void {\n    if (this.isIdentified) return;\n\n    this.isIdentified = true;\n    this.deniedChannels.clear();\n\n    if (this.subscribedChannels.size > 0) this.sendRaw({ type: WebsocketClientEvent.SUBSCRIBE, channels: [...this.subscribedChannels] });\n\n    this.pending.splice(0).forEach(message => this.sendRaw(message));\n\n    if (this.getToken && !this.refreshTimer) {\n      this.refreshTimer = setInterval(() => void this.identify(), REFRESH_INTERVAL);\n    }\n\n    this.readyHandlers.forEach(h => h());\n  }\n\n  private stopRefresh(): void {\n    if (this.refreshTimer) clearInterval(this.refreshTimer);\n\n    this.refreshTimer = null;\n  }\n\n  private scheduleReconnect(isSlow: boolean): void {\n    const jitteredDelay = (isSlow ? this.maxReconnectInterval : this.reconnectDelay) * (0.5 + Math.random());\n\n    setTimeout(() => {\n      this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectInterval);\n      this.open();\n    }, jitteredDelay);\n  }\n\n  private sendRaw(message: WebsocketClientMessage): void {\n    if (this.socket?.readyState === WebSocket.OPEN) {\n      this.socket.send(JSON.stringify(message));\n    }\n  }\n\n  private sendToHub(message: WebsocketClientMessage): void {\n    if (this.isIdentified) {\n      this.sendRaw(message);\n\n      return;\n    }\n\n    const isHeld = message.type === WebsocketClientEvent.MESSAGE || message.type === WebsocketClientEvent.STATE;\n\n    if (isHeld && this.socket?.readyState === WebSocket.OPEN) this.pending.push(message);\n  }\n\n  public send(channel: string, data?: unknown): void {\n    this.sendToHub({ type: WebsocketClientEvent.MESSAGE, channel: channel, data: data });\n  }\n\n  public setState(channel: string, data?: unknown): void {\n    this.sendToHub({ type: WebsocketClientEvent.STATE, channel: channel, data: data });\n  }\n\n  public subscribe(channel: string, listener: WebsocketListener): void {\n    if (!this.listeners.has(channel)) this.listeners.set(channel, new Set());\n\n    this.listeners.get(channel)!.add(listener);\n\n    if (!this.subscribedChannels.has(channel)) {\n      this.subscribedChannels.add(channel);\n      this.deniedChannels.delete(channel);\n      this.sendToHub({ type: WebsocketClientEvent.SUBSCRIBE, channels: [channel] });\n    }\n  }\n\n  public unsubscribe(channel: string, listener?: WebsocketListener): void {\n    if (listener) {\n      this.listeners.get(channel)?.delete(listener);\n\n      if (this.listeners.get(channel)?.size === 0) {\n        this.listeners.delete(channel);\n        this.subscribedChannels.delete(channel);\n        this.deniedChannels.delete(channel);\n        this.sendToHub({ type: WebsocketClientEvent.UNSUBSCRIBE, channels: [channel] });\n      }\n    } else {\n      this.listeners.delete(channel);\n      this.subscribedChannels.delete(channel);\n      this.deniedChannels.delete(channel);\n      this.sendToHub({ type: WebsocketClientEvent.UNSUBSCRIBE, channels: [channel] });\n    }\n  }\n\n  public isLive(channel: string): boolean {\n    return this.isIdentified && this.subscribedChannels.has(channel) && !this.deniedChannels.has(channel);\n  }\n\n  public onOpen(handler: () => void): void { this.openHandlers.push(handler); }\n\n  public onReady(handler: () => void): void { this.readyHandlers.push(handler); }\n\n  public offReady(handler: () => void): void { this.readyHandlers = this.readyHandlers.filter(h => h !== handler); }\n\n  public onClose(handler: () => void): void { this.closeHandlers.push(handler); }\n\n  public onError(handler: (error: Event) => void): void { this.errorHandlers.push(handler); }\n\n  public close(): void {\n    this.alive        = false;\n    this.isIdentified = false;\n\n    this.stopRefresh();\n\n    this.socket?.close();\n  }\n}\n"],"mappings":"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"}

package/dist/server.d.ts

@@ -2,6 +2,7 @@ import { WebsocketsHubConfig } from '@digo-labs/common';
 export declare class WebsocketHub {
     private httpServer;
     private wss;
+    private config;
     private clients;
     private state;
     private logs;
@@ -12,9 +13,21 @@ export declare class WebsocketHub {
     constructor(config: WebsocketsHubConfig);
     private heartbeat;
     private handleConnection;
+    private parseMessage;
     private handleMessage;
-    private addLog;
+    private identify;
+    private identifyWithToken;
+    private canSubscribe;
+    private canPublish;
+    private channelKey;
+    private namespacedKey;
+    private storeState;
+    private readState;
     private broadcast;
+    private deny;
+    private isOverRate;
+    private rawSize;
+    private addLog;
     private broadcastStatus;
     private sendStatus;
     onMessage(handler: (channel: string, data: unknown) => void): void;

package/dist/server.js

@@ -1,10 +1,11 @@
-import { WEBSOCKET_HUB_CHANNEL as e, WebSocketHubEvent as t, WebsocketClientEvent as n, WebsocketLogEvent as r } from "@digo-labs/common";
-import i from "node:http";
-import { WebSocket as a, WebSocketServer as o } from "ws";
+import { CHANNEL_NAMESPACE_PREFIX as e, RealtimeHelpers as t, WEBSOCKET_HUB_CHANNEL as n, WebSocketHubEvent as r, WebsocketClientEvent as i, WebsocketLogEvent as a, tryCatch as o, websocketClientMessageSchema as s } from "@digo-labs/common";
+import c from "node:http";
+import { WebSocket as l, WebSocketServer as u } from "ws";
 //#region src/server.ts
-var s = class {
+var d = 1024 * 1024, f = 64 * 1024, p = 1e3, m = 20, h = 1e3, g = 4e3, _ = 4401, v = "/", y = class {
 	httpServer;
 	wss;
+	config;
 	clients = /* @__PURE__ */ new Set();
 	state = /* @__PURE__ */ new Map();
 	logs = [];
@@ -13,7 +14,7 @@ var s = class {
 	statusTimer = null;
 	statusDirty = !1;
 	constructor(e) {
-		this.httpServer = i.createServer((e, t) => {
+		this.config = e, this.httpServer = c.createServer((e, t) => {
 			if (e.method === "GET" && e.url === "/health") {
 				t.writeHead(200, { "Content-Type": "application/json" }), t.end(JSON.stringify({
 					ok: !0,
@@ -22,7 +23,10 @@ var s = class {
 				return;
 			}
 			t.writeHead(404), t.end();
-		}), this.wss = new o({ server: this.httpServer }), this.heartbeatInterval = setInterval(() => this.heartbeat(), 3e4), this.wss.on("close", () => clearInterval(this.heartbeatInterval)), this.wss.on("connection", (e) => this.handleConnection(e)), this.httpServer.listen(e.port);
+		}), this.wss = new u({
+			server: this.httpServer,
+			maxPayload: d
+		}), this.heartbeatInterval = setInterval(() => this.heartbeat(), 3e4), this.wss.on("close", () => clearInterval(this.heartbeatInterval)), this.wss.on("connection", (e) => this.handleConnection(e)), this.httpServer.listen(e.port);
 	}
 	heartbeat() {
 		let e = !1;
@@ -32,6 +36,10 @@ var s = class {
 				return;
 			}
 			t.alive = !1, t.ws.ping();
+		});
+		let t = Date.now();
+		this.state.forEach((e, n) => {
+			e.expiresAt !== null && e.expiresAt <= t && this.state.delete(n);
 		}), e && this.broadcastStatus();
 	}
 	handleConnection(e) {
@@ -40,80 +48,169 @@ var s = class {
 			app: "unknown",
 			ws: e,
 			channels: /* @__PURE__ */ new Set(),
-			alive: !0
+			alive: !0,
+			token: null,
+			windowStart: Date.now(),
+			messages: 0
 		};
 		this.clients.add(t), e.on("error", () => {}), e.on("pong", () => {
 			t.alive = !0;
 		}), e.on("message", (n) => {
-			let r;
-			try {
-				r = JSON.parse(n.toString());
-			} catch {
-				return;
-			}
-			this.handleMessage(t, e, r);
+			if (t.token && (this.rawSize(n) > f || this.isOverRate(t))) return;
+			let r = this.parseMessage(n);
+			r && o(this.handleMessage(t, e, r));
 		}), e.on("close", () => {
-			this.clients.delete(t), this.addLog(t, r.DISCONNECT, ""), this.broadcastStatus();
+			this.clients.delete(t), this.addLog(t, a.DISCONNECT, ""), this.broadcastStatus();
 		});
 	}
-	handleMessage(e, i, a) {
-		switch (a.type) {
-			case n.IDENTIFY: {
-				let t = [...this.clients].find((t) => t.id === a.id && t !== e);
-				t && (t.ws.close(4e3), this.clients.delete(t)), e.id = a.id, e.app = a.app, this.addLog(e, r.CONNECT, ""), this.broadcastStatus();
+	parseMessage(e) {
+		let t;
+		try {
+			t = JSON.parse(e.toString());
+		} catch {
+			return null;
+		}
+		let n = s.safeParse(t);
+		return n.success ? n.data : null;
+	}
+	async handleMessage(e, n, o) {
+		switch (o.type) {
+			case i.IDENTIFY:
+				if (o.token) {
+					await this.identifyWithToken(e, n, o.id, o.token);
+					break;
+				}
+				this.identify(e, o.id, o.app);
 				break;
-			}
-			case n.SUBSCRIBE:
-				a.channels.forEach((n) => {
-					if (e.channels.add(n), this.state.has(n)) {
+			case i.SUBSCRIBE: {
+				let t = o.channels.filter((t) => this.canSubscribe(e, t));
+				t.forEach((t) => {
+					let i = this.channelKey(e, t);
+					e.channels.add(i);
+					let a = this.readState(i);
+					if (a !== void 0) {
 						let e = {
-							type: t.STATE,
-							channel: n,
-							data: this.state.get(n)
+							type: r.STATE,
+							channel: t,
+							data: a
 						};
-						i.send(JSON.stringify(e));
+						n.send(JSON.stringify(e));
 					}
-				}), this.addLog(e, r.SUBSCRIBE, a.channels.join(", ")), this.broadcastStatus();
+				}), o.channels.filter((e) => !t.includes(e)).forEach((e) => this.deny(n, e)), this.addLog(e, a.SUBSCRIBE, t.join(", ")), this.broadcastStatus();
 				break;
-			case n.UNSUBSCRIBE:
-				a.channels.forEach((t) => e.channels.delete(t)), this.addLog(e, r.UNSUBSCRIBE, a.channels.join(", ")), this.broadcastStatus();
+			}
+			case i.UNSUBSCRIBE:
+				o.channels.forEach((t) => e.channels.delete(this.channelKey(e, t))), this.addLog(e, a.UNSUBSCRIBE, o.channels.join(", ")), this.broadcastStatus();
 				break;
-			case n.MESSAGE: {
-				let n = {
-					type: t.MESSAGE,
-					channel: a.channel,
-					data: a.data
+			case i.MESSAGE: {
+				if (!this.canPublish(e, o.channel)) {
+					this.deny(n, o.channel);
+					break;
+				}
+				let t = {
+					type: r.MESSAGE,
+					channel: o.channel,
+					data: o.data
 				};
-				this.broadcast(e, a.channel, n), this.messageHandlers.forEach((e) => e(a.channel, a.data)), this.addLog(e, r.MESSAGE, a.channel, a.data), this.broadcastStatus();
+				this.broadcast(e, this.channelKey(e, o.channel), t), this.messageHandlers.forEach((e) => e(o.channel, o.data)), this.addLog(e, a.MESSAGE, o.channel, o.data), this.broadcastStatus();
 				break;
 			}
-			case n.STATE: {
-				this.state.set(a.channel, a.data);
-				let n = {
-					type: t.STATE,
-					channel: a.channel,
-					data: a.data
+			case i.STATE: {
+				if (!this.canPublish(e, o.channel)) {
+					this.deny(n, o.channel);
+					break;
+				}
+				let i = this.channelKey(e, o.channel);
+				if (!this.storeState(i, o.data, e.token ? t.getRetainSeconds(e.token, o.channel) : null)) {
+					this.deny(n, o.channel);
+					break;
+				}
+				let s = {
+					type: r.STATE,
+					channel: o.channel,
+					data: o.data
 				};
-				this.broadcast(e, a.channel, n), this.messageHandlers.forEach((e) => e(a.channel, a.data)), this.addLog(e, r.STATE, a.channel, a.data), this.broadcastStatus();
+				this.broadcast(e, i, s), this.messageHandlers.forEach((e) => e(o.channel, o.data)), this.addLog(e, a.STATE, o.channel, o.data), this.broadcastStatus();
 				break;
 			}
 		}
 	}
+	identify(e, t, n) {
+		let r = [...this.clients].find((r) => r.id === t && r.app === n && !r.token == !e.token && r !== e);
+		r && (r.ws.close(g), this.clients.delete(r)), e.id = t, e.app = n, this.addLog(e, a.CONNECT, ""), this.broadcastStatus();
+	}
+	async identifyWithToken(e, n, i, a) {
+		let o = this.config.tokenSecret ? await t.verify(a, this.config.tokenSecret) : null;
+		if (!o || e.token && e.token.app !== o.app) {
+			this.deny(n), n.close(_);
+			return;
+		}
+		let s = !!e.token;
+		e.token = o, s || this.identify(e, i, o.app);
+		let c = { type: r.IDENTIFIED };
+		n.send(JSON.stringify(c));
+	}
+	canSubscribe(e, n) {
+		return e.token ? t.matchesAny(e.token.subscribe, n) : !0;
+	}
+	canPublish(e, n) {
+		return e.token ? t.matchesAny(e.token.publish, n) : !0;
+	}
+	channelKey(e, t) {
+		return e.token ? this.namespacedKey(e.token.app, t) : t;
+	}
+	namespacedKey(t, n) {
+		return `${e}${t}${v}${n}`;
+	}
+	storeState(t, n, r) {
+		if (t.startsWith(e) && !this.state.has(t)) {
+			let e = t.slice(0, t.indexOf(v) + 1);
+			if ([...this.state.keys()].filter((t) => t.startsWith(e)).length >= h) return !1;
+		}
+		return this.state.set(t, {
+			data: n,
+			expiresAt: r === null ? null : Date.now() + r * 1e3
+		}), !0;
+	}
+	readState(e) {
+		let t = this.state.get(e);
+		if (t) {
+			if (t.expiresAt !== null && t.expiresAt <= Date.now()) {
+				this.state.delete(e);
+				return;
+			}
+			return t.data;
+		}
+	}
+	broadcast(e, t, n) {
+		let r = JSON.stringify(n);
+		this.clients.forEach((n) => {
+			n !== e && n.channels.has(t) && n.ws.readyState === l.OPEN && n.ws.send(r);
+		});
+	}
+	deny(e, t) {
+		let n = {
+			type: r.DENIED,
+			channel: t
+		};
+		e.readyState === l.OPEN && e.send(JSON.stringify(n));
+	}
+	isOverRate(e) {
+		let t = Date.now();
+		return t - e.windowStart >= p && (e.windowStart = t, e.messages = 0), e.messages++, e.messages > m;
+	}
+	rawSize(e) {
+		return Array.isArray(e) ? e.reduce((e, t) => e + t.length, 0) : e instanceof ArrayBuffer ? e.byteLength : e.length;
+	}
 	addLog(e, t, n, r) {
-		this.logs.push({
+		e.token || (this.logs.push({
 			timestamp: Date.now(),
 			sender: e.id,
 			app: e.app,
 			type: t,
 			channel: n,
 			data: r
-		}), this.logs.length > 808 && this.logs.shift();
-	}
-	broadcast(e, t, n) {
-		let r = JSON.stringify(n);
-		this.clients.forEach((n) => {
-			n !== e && n.channels.has(t) && n.ws.readyState === a.OPEN && n.ws.send(r);
-		});
+		}), this.logs.length > 808 && this.logs.shift());
 	}
 	broadcastStatus() {
 		if (this.statusTimer) {
@@ -125,38 +222,41 @@ var s = class {
 		}, 200);
 	}
 	sendStatus() {
-		let n = {
-			clients: [...this.clients].map((e) => ({
+		let t = [...this.clients].filter((e) => e.channels.has(n) && e.ws.readyState === l.OPEN);
+		if (!t.length) return;
+		let i = [...this.clients].filter((e) => !e.token), a = [...this.state].filter(([t]) => t !== n && !t.startsWith(e)), o = {
+			clients: i.map((e) => ({
 				id: e.id,
 				app: e.app,
 				channels: [...e.channels]
 			})),
-			state: Object.fromEntries([...this.state].filter(([t]) => t !== e)),
+			state: Object.fromEntries(a.map(([e, t]) => [e, t.data])),
 			logs: this.logs
 		};
-		this.state.set(e, n);
-		let r = {
-			type: t.STATE,
-			channel: e,
-			data: n
-		}, i = JSON.stringify(r);
-		this.clients.forEach((t) => {
-			t.channels.has(e) && t.ws.readyState === a.OPEN && t.ws.send(i);
+		this.state.set(n, {
+			data: o,
+			expiresAt: null
 		});
+		let s = {
+			type: r.STATE,
+			channel: n,
+			data: o
+		}, c = JSON.stringify(s);
+		t.forEach((e) => e.ws.send(c));
 	}
 	onMessage(e) {
 		this.messageHandlers.push(e);
 	}
 	getState(e) {
-		return this.state.get(e);
+		return this.readState(e);
 	}
 	close() {
 		clearInterval(this.heartbeatInterval), this.statusTimer && clearTimeout(this.statusTimer), this.clients.forEach((e) => {
-			e.ws.readyState === a.OPEN && e.ws.close(1001, "Hub shutting down");
+			e.ws.readyState === l.OPEN && e.ws.close(1001, "Hub shutting down");
 		}), this.wss.close(), this.httpServer.close();
 	}
 };
 //#endregion
-export { s as WebsocketHub };
+export { y as WebsocketHub };
 
 //# sourceMappingURL=server.js.map