@push.rocks/smartsocket 3.0.0 → 4.0.0
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_bundle/bundle.js +132 -117
- package/dist_bundle/bundle.js.map +4 -4
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/interfaces/message.d.ts +4 -6
- package/dist_ts/smartsocket.classes.smartsocket.d.ts +1 -1
- package/dist_ts/smartsocket.classes.smartsocket.js +1 -1
- package/dist_ts/smartsocket.classes.smartsocketclient.d.ts +1 -0
- package/dist_ts/smartsocket.classes.smartsocketclient.js +9 -1
- package/dist_ts/smartsocket.classes.socketconnection.d.ts +6 -7
- package/dist_ts/smartsocket.classes.socketconnection.js +7 -8
- package/dist_ts/smartsocket.classes.socketrequest.js +5 -1
- package/dist_ts/smartsocket.classes.socketserver.js +2 -2
- package/dist_ts/smartsocket.pluginstyped.d.ts +22 -0
- package/package.json +2 -2
- package/readme.md +14 -10
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/interfaces/message.ts +4 -4
- package/ts/smartsocket.classes.smartsocket.ts +3 -3
- package/ts/smartsocket.classes.smartsocketclient.ts +9 -0
- package/ts/smartsocket.classes.socketconnection.ts +18 -19
- package/ts/smartsocket.classes.socketrequest.ts +4 -0
- package/ts/smartsocket.classes.socketserver.ts +4 -4
- package/ts/smartsocket.pluginstyped.ts +23 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartsocket',
|
|
6
|
-
version: '
|
|
6
|
+
version: '4.0.0',
|
|
7
7
|
description: 'Provides easy and secure websocket communication mechanisms, including server and client implementation, function call routing, connection management, and tagging.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFLQUFxSztDQUNuTCxDQUFBIn0=
|
|
@@ -5,7 +5,7 @@ export type TMessageType = 'authRequest' | 'auth' | 'authResponse' | 'serverRead
|
|
|
5
5
|
/**
|
|
6
6
|
* Base message interface for all smartsocket messages
|
|
7
7
|
*/
|
|
8
|
-
export interface ISocketMessage<T =
|
|
8
|
+
export interface ISocketMessage<T = unknown> {
|
|
9
9
|
type: TMessageType;
|
|
10
10
|
id?: string;
|
|
11
11
|
payload: T;
|
|
@@ -32,17 +32,15 @@ export interface IAuthResponsePayload {
|
|
|
32
32
|
/**
|
|
33
33
|
* Function call payload
|
|
34
34
|
*/
|
|
35
|
-
export interface IFunctionCallPayload {
|
|
35
|
+
export interface IFunctionCallPayload<T = unknown> {
|
|
36
36
|
funcName: string;
|
|
37
|
-
funcData:
|
|
37
|
+
funcData: T;
|
|
38
38
|
}
|
|
39
39
|
/**
|
|
40
40
|
* Tag update payload
|
|
41
41
|
*/
|
|
42
42
|
export interface ITagUpdatePayload {
|
|
43
|
-
tags:
|
|
44
|
-
[key: string]: any;
|
|
45
|
-
};
|
|
43
|
+
tags: Record<string, unknown>;
|
|
46
44
|
}
|
|
47
45
|
/**
|
|
48
46
|
* Helper type for creating typed messages
|
|
@@ -34,7 +34,7 @@ export declare class Smartsocket {
|
|
|
34
34
|
* Handle a new WebSocket connection
|
|
35
35
|
* Called by SocketServer when a new connection is established
|
|
36
36
|
*/
|
|
37
|
-
handleNewConnection(socket:
|
|
37
|
+
handleNewConnection(socket: pluginsTyped.TWebSocket | pluginsTyped.IWebSocketLike): Promise<void>;
|
|
38
38
|
/**
|
|
39
39
|
* stops smartsocket
|
|
40
40
|
*/
|
|
@@ -103,4 +103,4 @@ export class Smartsocket {
|
|
|
103
103
|
this.socketFunctions.add(socketFunction);
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zbWFydHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c29ja2V0LmNsYXNzZXMuc21hcnRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQkFBMEIsQ0FBQztBQUNwRCxPQUFPLEtBQUssWUFBWSxNQUFNLCtCQUErQixDQUFDO0FBQzlELE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsVUFBVTtBQUNWLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzdFLE9BQU8sRUFFTCxjQUFjLEdBRWYsTUFBTSx5Q0FBeUMsQ0FBQztBQUNqRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDdkUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXJFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQU9sRCxNQUFNLE9BQU8sV0FBVztJQWV0QixZQUFZLFVBQTBDO1FBVi9DLGFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFM0Msc0JBQWlCLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBb0IsQ0FBQztRQUNsRSxvQkFBZSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQXVCLENBQUM7UUFDbkUsbUJBQWMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFzQixDQUFDO1FBRWpFLGlCQUFZLEdBQUcsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQWdDLENBQUM7UUFFL0UsaUJBQVksR0FBRyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUc1QyxJQUFJLENBQUMsT0FBTyxHQUFH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
|
|
@@ -50,6 +50,7 @@ export declare class SmartsocketClient {
|
|
|
50
50
|
constructor(optionsArg: ISmartsocketClientOptions);
|
|
51
51
|
addSocketFunction(socketFunction: SocketFunction<any>): void;
|
|
52
52
|
private isReconnecting;
|
|
53
|
+
private isConnecting;
|
|
53
54
|
/**
|
|
54
55
|
* connect the client to the server
|
|
55
56
|
*/
|
|
@@ -49,6 +49,7 @@ export class SmartsocketClient {
|
|
|
49
49
|
// tagStore
|
|
50
50
|
this.tagStore = {};
|
|
51
51
|
this.isReconnecting = false;
|
|
52
|
+
this.isConnecting = false;
|
|
52
53
|
this.disconnectRunning = false;
|
|
53
54
|
this.currentSocket = null;
|
|
54
55
|
this.connectionAttemptId = 0; // Increment on each connect attempt to invalidate old timers
|
|
@@ -68,6 +69,11 @@ export class SmartsocketClient {
|
|
|
68
69
|
* connect the client to the server
|
|
69
70
|
*/
|
|
70
71
|
async connect() {
|
|
72
|
+
// Prevent duplicate connection attempts
|
|
73
|
+
if (this.isConnecting) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
this.isConnecting = true;
|
|
71
77
|
// Only reset retry counters on fresh connection (not during auto-reconnect)
|
|
72
78
|
if (!this.isReconnecting) {
|
|
73
79
|
this.currentRetryCount = 0;
|
|
@@ -162,6 +168,7 @@ export class SmartsocketClient {
|
|
|
162
168
|
await this.addTag(oldTagStore[tag]);
|
|
163
169
|
}
|
|
164
170
|
this.updateStatus('connected');
|
|
171
|
+
this.isConnecting = false;
|
|
165
172
|
done.resolve();
|
|
166
173
|
break;
|
|
167
174
|
default:
|
|
@@ -199,6 +206,7 @@ export class SmartsocketClient {
|
|
|
199
206
|
return;
|
|
200
207
|
}
|
|
201
208
|
this.disconnectRunning = true;
|
|
209
|
+
this.isConnecting = false;
|
|
202
210
|
this.updateStatus('disconnecting');
|
|
203
211
|
this.tagStoreSubscription?.unsubscribe();
|
|
204
212
|
// Store reference to current socket before cleanup
|
|
@@ -288,4 +296,4 @@ export class SmartsocketClient {
|
|
|
288
296
|
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
289
297
|
}
|
|
290
298
|
}
|
|
291
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsocket.classes.smartsocketclient.js","sourceRoot":"","sources":["../ts/smartsocket.classes.smartsocketclient.ts"],"names":[],"mappings":"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"}
|
|
299
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsocket.classes.smartsocketclient.js","sourceRoot":"","sources":["../ts/smartsocket.classes.smartsocketclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export interface ISocketConnectionConstructorOptions {
|
|
|
15
15
|
authenticated: boolean;
|
|
16
16
|
side: TSocketConnectionSide;
|
|
17
17
|
smartsocketHost: Smartsocket | SmartsocketClient;
|
|
18
|
-
socket:
|
|
18
|
+
socket: pluginsTyped.TWebSocket | pluginsTyped.IWebSocketLike;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
21
|
* interface for authentication data
|
|
@@ -32,7 +32,7 @@ export declare class SocketConnection {
|
|
|
32
32
|
side: TSocketConnectionSide;
|
|
33
33
|
authenticated: boolean;
|
|
34
34
|
smartsocketRef: Smartsocket | SmartsocketClient;
|
|
35
|
-
socket:
|
|
35
|
+
socket: pluginsTyped.TWebSocket | pluginsTyped.IWebSocketLike;
|
|
36
36
|
eventSubject: plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>;
|
|
37
37
|
eventStatus: interfaces.TConnectionStatus;
|
|
38
38
|
private tagStore;
|
|
@@ -55,14 +55,13 @@ export declare class SocketConnection {
|
|
|
55
55
|
*/
|
|
56
56
|
addTag(tagArg: interfaces.ITag): Promise<void>;
|
|
57
57
|
/**
|
|
58
|
-
*
|
|
59
|
-
* @param tagIdArg
|
|
58
|
+
* Gets a tag by id
|
|
60
59
|
*/
|
|
61
|
-
getTagById(tagIdArg: interfaces.ITag['id']):
|
|
60
|
+
getTagById(tagIdArg: interfaces.ITag['id']): interfaces.ITag | undefined;
|
|
62
61
|
/**
|
|
63
|
-
*
|
|
62
|
+
* Removes a tag from a connection
|
|
64
63
|
*/
|
|
65
|
-
removeTagById(tagIdArg: interfaces.ITag['id']):
|
|
64
|
+
removeTagById(tagIdArg: interfaces.ITag['id']): void;
|
|
66
65
|
/**
|
|
67
66
|
* authenticate the socket (server side)
|
|
68
67
|
*/
|
|
@@ -131,16 +131,15 @@ export class SocketConnection {
|
|
|
131
131
|
await done.promise;
|
|
132
132
|
}
|
|
133
133
|
/**
|
|
134
|
-
*
|
|
135
|
-
* @param tagIdArg
|
|
134
|
+
* Gets a tag by id
|
|
136
135
|
*/
|
|
137
|
-
|
|
136
|
+
getTagById(tagIdArg) {
|
|
138
137
|
return this.tagStore[tagIdArg];
|
|
139
138
|
}
|
|
140
139
|
/**
|
|
141
|
-
*
|
|
140
|
+
* Removes a tag from a connection
|
|
142
141
|
*/
|
|
143
|
-
|
|
142
|
+
removeTagById(tagIdArg) {
|
|
144
143
|
delete this.tagStore[tagIdArg];
|
|
145
144
|
this.tagStoreObservable.next(this.tagStore);
|
|
146
145
|
this.sendMessage({
|
|
@@ -185,7 +184,7 @@ export class SocketConnection {
|
|
|
185
184
|
}
|
|
186
185
|
}
|
|
187
186
|
catch (err) {
|
|
188
|
-
|
|
187
|
+
logger.log('warn', `Failed to parse auth message: ${err instanceof Error ? err.message : String(err)}`);
|
|
189
188
|
}
|
|
190
189
|
};
|
|
191
190
|
this.socket.addEventListener('message', messageHandler);
|
|
@@ -214,7 +213,7 @@ export class SocketConnection {
|
|
|
214
213
|
this.handleMessage(message);
|
|
215
214
|
}
|
|
216
215
|
catch (err) {
|
|
217
|
-
|
|
216
|
+
logger.log('warn', `Failed to parse socket message: ${err instanceof Error ? err.message : String(err)}`);
|
|
218
217
|
}
|
|
219
218
|
};
|
|
220
219
|
this.socket.addEventListener('message', messageHandler);
|
|
@@ -243,4 +242,4 @@ export class SocketConnection {
|
|
|
243
242
|
this.eventStatus = statusArg;
|
|
244
243
|
}
|
|
245
244
|
}
|
|
246
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsocket.classes.socketconnection.js","sourceRoot":"","sources":["../ts/smartsocket.classes.socketconnection.ts"],"names":[],"mappings":"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"}
|
|
245
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsocket.classes.socketconnection.js","sourceRoot":"","sources":["../ts/smartsocket.classes.socketconnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,11 @@ export class SocketRequest {
|
|
|
72
72
|
};
|
|
73
73
|
this.originSocketConnection.sendMessage(message);
|
|
74
74
|
this.smartsocketRef.socketRequests.remove(this);
|
|
75
|
+
})
|
|
76
|
+
.catch((error) => {
|
|
77
|
+
logger.log('error', `Function invocation failed for ${this.funcCallData.funcName}: ${error instanceof Error ? error.message : String(error)}`);
|
|
78
|
+
this.smartsocketRef.socketRequests.remove(this);
|
|
75
79
|
});
|
|
76
80
|
}
|
|
77
81
|
}
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFVBQVUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxvQkFBb0I7QUFDcEIsT0FBTyxFQUNMLGNBQWMsR0FHZixNQUFNLHlDQUF5QyxDQUFDO0FBRWpELGlCQUFpQjtBQUNqQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBMkIvRSxpQkFBaUI7QUFDakIsTUFBTSxPQUFPLGFBQWE7SUFDeEIsU0FBUztJQUNGLE1BQU0sQ0FBQyxvQkFBb0IsQ0FDaEMsY0FBK0MsRUFDL0MsVUFBa0I7UUFFbEIsT0FBTyxjQUFjLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDLGdCQUFnQixFQUFFLEVBQUU7WUFDakUsT0FBTyxnQkFBZ0IsQ0FBQyxPQUFPLEtBQUssVUFBVSxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQVlELFlBQ0UsaUJBQWtELEVBQ2xELFVBQStDO1FBWmpELFdBQVc7UUFDSixXQUFNLEdBQXlCLEtBQUssQ0FBQztRQUtyQyxTQUFJLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQXNDLENBQUM7UUFRN0UsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQztRQUN4QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJ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
|
|
@@ -148,7 +148,7 @@ export class SocketServer {
|
|
|
148
148
|
},
|
|
149
149
|
});
|
|
150
150
|
return {
|
|
151
|
-
readyState
|
|
151
|
+
get readyState() { return peer.readyState; },
|
|
152
152
|
send: (data) => peer.send(data),
|
|
153
153
|
close: (code, reason) => peer.close(code, reason),
|
|
154
154
|
addEventListener: (event, listener) => {
|
|
@@ -182,4 +182,4 @@ export class SocketServer {
|
|
|
182
182
|
};
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxZQUFZLE1BQU0sK0JBQStCLENBQUM7QUFFOUQsMkNBQTJDO0FBQzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFVdkIsWUFBWSxtQkFBZ0M7UUFMNUM7O1dBRUc7UUFDSyxxQkFBZ0IsR0FBRyxLQUFLLENBQUM7UUFHL0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxtQkFBbUIsQ0FBQztJQUN6QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLEtBQUs7UUFDaEIsK0RBQStEO1FBQy9ELElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNuQyxPQUFPO1FBQ1QsQ0FBQztRQUVELG9FQUFvRTtRQUNwRSxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFDLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0UsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV6RSxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUM1QyxJQUFJLENBQUMsZ0JBQWdC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
|
|
@@ -7,6 +7,28 @@ export declare namespace ws {
|
|
|
7
7
|
type WebSocketServer = wsTypes.WebSocketServer;
|
|
8
8
|
type RawData = wsTypes.RawData;
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Unified WebSocket type supporting both browser and Node.js environments
|
|
12
|
+
*/
|
|
13
|
+
export type TWebSocket = WebSocket | ws.WebSocket;
|
|
14
|
+
/**
|
|
15
|
+
* Message event type for WebSocket messages (browser and Node.js compatible)
|
|
16
|
+
*/
|
|
17
|
+
export type TMessageEvent = MessageEvent | {
|
|
18
|
+
data: string;
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* WebSocket-like interface for adapters (e.g., smartserve peer adapter)
|
|
22
|
+
*/
|
|
23
|
+
export interface IWebSocketLike {
|
|
24
|
+
readyState: number;
|
|
25
|
+
send(data: string): void;
|
|
26
|
+
close(code?: number, reason?: string): void;
|
|
27
|
+
addEventListener(event: 'message', listener: (event: TMessageEvent) => void): void;
|
|
28
|
+
addEventListener(event: 'close', listener: () => void): void;
|
|
29
|
+
addEventListener(event: 'error', listener: () => void): void;
|
|
30
|
+
removeEventListener?(event: string, listener: (...args: any[]) => void): void;
|
|
31
|
+
}
|
|
10
32
|
export interface ISmartserveWebSocketPeer {
|
|
11
33
|
id: string;
|
|
12
34
|
url: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartsocket",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0",
|
|
4
4
|
"description": "Provides easy and secure websocket communication mechanisms, including server and client implementation, function call routing, connection management, and tagging.",
|
|
5
5
|
"main": "dist_ts/index.js",
|
|
6
6
|
"typings": "dist_ts/index.d.ts",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@git.zone/tsbundle": "^2.6.3",
|
|
35
35
|
"@git.zone/tsrun": "^2.0.0",
|
|
36
36
|
"@git.zone/tstest": "^3.1.3",
|
|
37
|
-
"@push.rocks/smartserve": "^1.1.
|
|
37
|
+
"@push.rocks/smartserve": "^1.1.2",
|
|
38
38
|
"@types/node": "^24.10.1",
|
|
39
39
|
"@types/ws": "^8.18.1"
|
|
40
40
|
},
|
package/readme.md
CHANGED
|
@@ -143,20 +143,24 @@ await socketConnection.addTag({
|
|
|
143
143
|
Use smartsocket with `@push.rocks/smartserve` for advanced HTTP/WebSocket handling:
|
|
144
144
|
|
|
145
145
|
```typescript
|
|
146
|
-
import {
|
|
146
|
+
import { SmartServe } from '@push.rocks/smartserve';
|
|
147
147
|
import { Smartsocket } from '@push.rocks/smartsocket';
|
|
148
148
|
|
|
149
|
-
|
|
149
|
+
// Create smartsocket without a port (hooks mode)
|
|
150
150
|
const smartsocket = new Smartsocket({ alias: 'myServer' });
|
|
151
151
|
|
|
152
|
-
//
|
|
153
|
-
|
|
152
|
+
// Get WebSocket hooks and pass them to SmartServe
|
|
153
|
+
const wsHooks = smartsocket.getSmartserveWebSocketHooks();
|
|
154
|
+
const smartserve = new SmartServe({
|
|
155
|
+
port: 3000,
|
|
156
|
+
websocket: wsHooks
|
|
157
|
+
});
|
|
154
158
|
|
|
155
|
-
//
|
|
156
|
-
|
|
159
|
+
// Add socket functions as usual
|
|
160
|
+
smartsocket.addSocketFunction(myFunction);
|
|
157
161
|
|
|
158
|
-
//
|
|
159
|
-
|
|
162
|
+
// Start smartserve (smartsocket hooks mode doesn't need start())
|
|
163
|
+
await smartserve.start();
|
|
160
164
|
```
|
|
161
165
|
|
|
162
166
|
### Handling Disconnections
|
|
@@ -223,11 +227,11 @@ const response = await client.serverCall<IGreetRequest>('greet', { name: 'Bob' }
|
|
|
223
227
|
|
|
224
228
|
| Method | Description |
|
|
225
229
|
|--------|-------------|
|
|
226
|
-
| `start()` | Start the WebSocket server |
|
|
230
|
+
| `start()` | Start the WebSocket server (not needed in hooks mode) |
|
|
227
231
|
| `stop()` | Stop the server and close all connections |
|
|
228
232
|
| `addSocketFunction(fn)` | Register a function that clients can call |
|
|
229
233
|
| `clientCall(funcName, data, connection)` | Call a function on a specific client |
|
|
230
|
-
| `
|
|
234
|
+
| `getSmartserveWebSocketHooks()` | Get hooks for smartserve integration |
|
|
231
235
|
|
|
232
236
|
### SmartsocketClient
|
|
233
237
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartsocket',
|
|
6
|
-
version: '
|
|
6
|
+
version: '4.0.0',
|
|
7
7
|
description: 'Provides easy and secure websocket communication mechanisms, including server and client implementation, function call routing, connection management, and tagging.'
|
|
8
8
|
}
|
package/ts/interfaces/message.ts
CHANGED
|
@@ -13,7 +13,7 @@ export type TMessageType =
|
|
|
13
13
|
/**
|
|
14
14
|
* Base message interface for all smartsocket messages
|
|
15
15
|
*/
|
|
16
|
-
export interface ISocketMessage<T =
|
|
16
|
+
export interface ISocketMessage<T = unknown> {
|
|
17
17
|
type: TMessageType;
|
|
18
18
|
id?: string; // For request/response correlation
|
|
19
19
|
payload: T;
|
|
@@ -44,16 +44,16 @@ export interface IAuthResponsePayload {
|
|
|
44
44
|
/**
|
|
45
45
|
* Function call payload
|
|
46
46
|
*/
|
|
47
|
-
export interface IFunctionCallPayload {
|
|
47
|
+
export interface IFunctionCallPayload<T = unknown> {
|
|
48
48
|
funcName: string;
|
|
49
|
-
funcData:
|
|
49
|
+
funcData: T;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
/**
|
|
53
53
|
* Tag update payload
|
|
54
54
|
*/
|
|
55
55
|
export interface ITagUpdatePayload {
|
|
56
|
-
tags:
|
|
56
|
+
tags: Record<string, unknown>;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
/**
|
|
@@ -58,7 +58,7 @@ export class Smartsocket {
|
|
|
58
58
|
* Handle a new WebSocket connection
|
|
59
59
|
* Called by SocketServer when a new connection is established
|
|
60
60
|
*/
|
|
61
|
-
public async handleNewConnection(socket:
|
|
61
|
+
public async handleNewConnection(socket: pluginsTyped.TWebSocket | pluginsTyped.IWebSocketLike) {
|
|
62
62
|
const socketConnection: SocketConnection = new SocketConnection({
|
|
63
63
|
alias: undefined,
|
|
64
64
|
authenticated: false,
|
|
@@ -76,8 +76,8 @@ export class Smartsocket {
|
|
|
76
76
|
socketConnection.eventSubject.next('disconnected');
|
|
77
77
|
};
|
|
78
78
|
|
|
79
|
-
socket.addEventListener('close', handleClose);
|
|
80
|
-
socket.addEventListener('error', handleClose);
|
|
79
|
+
(socket as pluginsTyped.IWebSocketLike).addEventListener('close', handleClose);
|
|
80
|
+
(socket as pluginsTyped.IWebSocketLike).addEventListener('error', handleClose);
|
|
81
81
|
|
|
82
82
|
try {
|
|
83
83
|
await socketConnection.authenticate();
|
|
@@ -98,11 +98,18 @@ export class SmartsocketClient {
|
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
private isReconnecting = false;
|
|
101
|
+
private isConnecting = false;
|
|
101
102
|
|
|
102
103
|
/**
|
|
103
104
|
* connect the client to the server
|
|
104
105
|
*/
|
|
105
106
|
public async connect() {
|
|
107
|
+
// Prevent duplicate connection attempts
|
|
108
|
+
if (this.isConnecting) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
this.isConnecting = true;
|
|
112
|
+
|
|
106
113
|
// Only reset retry counters on fresh connection (not during auto-reconnect)
|
|
107
114
|
if (!this.isReconnecting) {
|
|
108
115
|
this.currentRetryCount = 0;
|
|
@@ -213,6 +220,7 @@ export class SmartsocketClient {
|
|
|
213
220
|
await this.addTag(oldTagStore[tag]);
|
|
214
221
|
}
|
|
215
222
|
this.updateStatus('connected');
|
|
223
|
+
this.isConnecting = false;
|
|
216
224
|
done.resolve();
|
|
217
225
|
break;
|
|
218
226
|
|
|
@@ -262,6 +270,7 @@ export class SmartsocketClient {
|
|
|
262
270
|
return;
|
|
263
271
|
}
|
|
264
272
|
this.disconnectRunning = true;
|
|
273
|
+
this.isConnecting = false;
|
|
265
274
|
this.updateStatus('disconnecting');
|
|
266
275
|
this.tagStoreSubscription?.unsubscribe();
|
|
267
276
|
|