topsyde-utils 1.0.56 → 1.0.58
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts
CHANGED
|
@@ -38,4 +38,4 @@ export { ClassConstructor, NonNullableType, ObjectKeys, KVObj, I_ApplicationResp
|
|
|
38
38
|
export { E_IS, E_ENVIRONMENTS } from "./enums";
|
|
39
39
|
export { ControllerResponse, ControllerAction, ControllerMap, ControllerOptions } from "./server/controller";
|
|
40
40
|
export { Routes } from "./server/bun/router/routes";
|
|
41
|
-
export { I_WebsocketEntity, I_WebsocketClient, WebsocketClientData, WebsocketMessage, WebsocketStructuredMessage, WebsocketChannel, } from "./server/bun/websocket/websocket.types";
|
|
41
|
+
export { I_WebsocketEntity, I_WebsocketClient, WebsocketClientData, WebsocketMessage, WebsocketStructuredMessage, WebsocketChannel, I_WebsocketInterface, } from "./server/bun/websocket/websocket.types";
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Server, WebSocketHandler } from "bun";
|
|
2
2
|
import Singleton from "../../../singleton";
|
|
3
|
-
import type { I_WebsocketEntity, WebsocketChannel, WebsocketClientData, WebsocketStructuredMessage } from "./websocket.types";
|
|
3
|
+
import type { I_WebsocketEntity, I_WebsocketInterface, WebsocketChannel, WebsocketClientData, WebsocketStructuredMessage } from "./websocket.types";
|
|
4
4
|
export default class Websocket extends Singleton {
|
|
5
|
+
private websocket_interface?;
|
|
5
6
|
protected channels: WebsocketChannel;
|
|
6
7
|
private _server;
|
|
7
|
-
protected constructor();
|
|
8
|
+
protected constructor(websocket_interface?: I_WebsocketInterface | undefined);
|
|
8
9
|
get server(): Server;
|
|
9
10
|
protected set server(value: Server);
|
|
10
11
|
set(server: Server): void;
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const singleton_1 = __importDefault(require("../../../singleton"));
|
|
7
7
|
const Console_1 = require("../../../utils/Console");
|
|
8
8
|
const Channel_1 = __importDefault(require("./Channel"));
|
|
9
|
-
const utils_1 = require("../../../utils");
|
|
10
9
|
class Websocket extends singleton_1.default {
|
|
11
|
-
constructor() {
|
|
10
|
+
constructor(websocket_interface) {
|
|
12
11
|
super();
|
|
12
|
+
this.websocket_interface = websocket_interface;
|
|
13
13
|
this.channels = new Map();
|
|
14
14
|
this.clientMessageReceived = (ws, message) => {
|
|
15
15
|
console.log("Received message:", message);
|
|
@@ -46,10 +46,12 @@ class Websocket extends singleton_1.default {
|
|
|
46
46
|
Console_1.Console.success("Websocket server set");
|
|
47
47
|
}
|
|
48
48
|
setup() {
|
|
49
|
+
const setup = this.websocket_interface?.setup();
|
|
49
50
|
return {
|
|
50
51
|
open: this.clientConnected,
|
|
51
52
|
message: this.clientMessageReceived,
|
|
52
53
|
close: this.clientDisconnected,
|
|
54
|
+
...setup,
|
|
53
55
|
};
|
|
54
56
|
}
|
|
55
57
|
static Server() {
|
|
@@ -57,12 +59,11 @@ class Websocket extends singleton_1.default {
|
|
|
57
59
|
}
|
|
58
60
|
static Broadcast(channel, message) {
|
|
59
61
|
// Get the server from the singleton instance
|
|
60
|
-
const
|
|
61
|
-
if (!server) {
|
|
62
|
-
|
|
63
|
-
return;
|
|
62
|
+
const ws = this.GetInstance();
|
|
63
|
+
if (!ws.server) {
|
|
64
|
+
throw new Error("Websocket server not set");
|
|
64
65
|
}
|
|
65
|
-
server.publish(channel, JSON.stringify(message));
|
|
66
|
+
ws.server.publish(channel, JSON.stringify(message));
|
|
66
67
|
}
|
|
67
68
|
static Publish(message) {
|
|
68
69
|
const ws = this.GetInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Websocket.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Websocket.ts"],"names":[],"mappings":";;;;;AACA,mEAA2C;AAC3C,oDAAiD;AACjD,wDAAgC;
|
|
1
|
+
{"version":3,"file":"Websocket.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ServerWebSocket } from "bun";
|
|
1
|
+
import { ServerWebSocket, WebSocketHandler } from "bun";
|
|
2
2
|
import Channel from "./Channel";
|
|
3
3
|
export interface I_WebsocketEntity {
|
|
4
4
|
ws: ServerWebSocket<WebsocketClientData>;
|
|
@@ -20,3 +20,6 @@ export type WebsocketStructuredMessage = {
|
|
|
20
20
|
metadata?: Record<string, string>;
|
|
21
21
|
};
|
|
22
22
|
export type WebsocketChannel<T extends Channel = Channel> = Map<string, T>;
|
|
23
|
+
export interface I_WebsocketInterface {
|
|
24
|
+
setup: () => Partial<WebSocketHandler<WebsocketClientData>>;
|
|
25
|
+
}
|