@push.rocks/smartsocket 2.0.27 → 2.1.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 +9443 -3429
- package/dist_bundle/bundle.js.map +4 -4
- package/dist_ts/00_commitinfo_data.d.ts +1 -1
- package/dist_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/smartsocket.classes.smartsocketclient.d.ts +12 -0
- package/dist_ts/smartsocket.classes.smartsocketclient.js +38 -3
- package/dist_ts/smartsocket.classes.socketserver.d.ts +0 -2
- package/dist_ts/smartsocket.pluginstyped.d.ts +0 -2
- package/package.json +7 -7
- package/ts/00_commitinfo_data.ts +2 -2
- package/ts/smartsocket.classes.smartsocketclient.ts +53 -2
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* autocreated commitinfo by @
|
|
2
|
+
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartsocket',
|
|
6
|
-
version: '2.0
|
|
6
|
+
version: '2.1.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
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFLQUFxSztDQUNuTCxDQUFBIn0=
|
|
@@ -11,6 +11,9 @@ export interface ISmartsocketClientOptions {
|
|
|
11
11
|
url: string;
|
|
12
12
|
alias: string;
|
|
13
13
|
autoReconnect?: boolean;
|
|
14
|
+
maxRetries?: number;
|
|
15
|
+
initialBackoffDelay?: number;
|
|
16
|
+
maxBackoffDelay?: number;
|
|
14
17
|
}
|
|
15
18
|
export declare class SmartsocketClient {
|
|
16
19
|
shortId: string;
|
|
@@ -20,6 +23,11 @@ export declare class SmartsocketClient {
|
|
|
20
23
|
serverUrl: string;
|
|
21
24
|
serverPort: number;
|
|
22
25
|
autoReconnect: boolean;
|
|
26
|
+
maxRetries: number;
|
|
27
|
+
initialBackoffDelay: number;
|
|
28
|
+
maxBackoffDelay: number;
|
|
29
|
+
currentRetryCount: number;
|
|
30
|
+
currentBackoffDelay: number;
|
|
23
31
|
eventSubject: plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>;
|
|
24
32
|
eventStatus: interfaces.TConnectionStatus;
|
|
25
33
|
socketFunctions: plugins.lik.ObjectMap<SocketFunction<any>>;
|
|
@@ -61,4 +69,8 @@ export declare class SmartsocketClient {
|
|
|
61
69
|
*/
|
|
62
70
|
serverCall<T extends plugins.typedrequestInterfaces.ITypedRequest>(functionNameArg: T['method'], dataArg: T['request']): Promise<T['response']>;
|
|
63
71
|
private updateStatus;
|
|
72
|
+
/**
|
|
73
|
+
* Resets the reconnection state
|
|
74
|
+
*/
|
|
75
|
+
resetReconnectionState(): void;
|
|
64
76
|
}
|
|
@@ -40,6 +40,7 @@ export class SmartsocketClient {
|
|
|
40
40
|
this.shortId = plugins.isounique.uni();
|
|
41
41
|
// the shortId of the remote we connect to
|
|
42
42
|
this.remoteShortId = null;
|
|
43
|
+
this.currentRetryCount = 0;
|
|
43
44
|
// status handling
|
|
44
45
|
this.eventSubject = new plugins.smartrx.rxjs.Subject();
|
|
45
46
|
this.eventStatus = 'new';
|
|
@@ -52,6 +53,10 @@ export class SmartsocketClient {
|
|
|
52
53
|
this.serverUrl = optionsArg.url;
|
|
53
54
|
this.serverPort = optionsArg.port;
|
|
54
55
|
this.autoReconnect = optionsArg.autoReconnect;
|
|
56
|
+
this.maxRetries = optionsArg.maxRetries ?? 100; // Default to 100 retries
|
|
57
|
+
this.initialBackoffDelay = optionsArg.initialBackoffDelay ?? 1000; // Default to 1 second
|
|
58
|
+
this.maxBackoffDelay = optionsArg.maxBackoffDelay ?? 60000; // Default to 1 minute
|
|
59
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
55
60
|
}
|
|
56
61
|
addSocketFunction(socketFunction) {
|
|
57
62
|
this.socketFunctions.add(socketFunction);
|
|
@@ -60,6 +65,9 @@ export class SmartsocketClient {
|
|
|
60
65
|
* connect the client to the server
|
|
61
66
|
*/
|
|
62
67
|
async connect() {
|
|
68
|
+
// Reset retry counters on new connection attempt
|
|
69
|
+
this.currentRetryCount = 0;
|
|
70
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
63
71
|
const done = plugins.smartpromise.defer();
|
|
64
72
|
const smartenvInstance = new plugins.smartenv.Smartenv();
|
|
65
73
|
const socketIoClient = await smartenvInstance.getEnvAwareModule({
|
|
@@ -171,8 +179,21 @@ export class SmartsocketClient {
|
|
|
171
179
|
this.remoteShortId = null;
|
|
172
180
|
if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
|
|
173
181
|
this.updateStatus('connecting');
|
|
174
|
-
|
|
175
|
-
|
|
182
|
+
// Check if we've exceeded the maximum number of retries
|
|
183
|
+
if (this.currentRetryCount >= this.maxRetries) {
|
|
184
|
+
logger.log('warn', `Maximum reconnection attempts (${this.maxRetries}) reached. Giving up.`);
|
|
185
|
+
this.disconnectRunning = false;
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
// Increment retry counter
|
|
189
|
+
this.currentRetryCount++;
|
|
190
|
+
// Calculate backoff with jitter (±20% randomness)
|
|
191
|
+
const jitter = this.currentBackoffDelay * 0.2 * (Math.random() * 2 - 1);
|
|
192
|
+
const delay = Math.min(this.currentBackoffDelay + jitter, this.maxBackoffDelay);
|
|
193
|
+
logger.log('info', `Reconnect attempt ${this.currentRetryCount}/${this.maxRetries} in ${Math.round(delay)}ms`);
|
|
194
|
+
// Apply exponential backoff for next time (doubling with each attempt)
|
|
195
|
+
this.currentBackoffDelay = Math.min(this.currentBackoffDelay * 2, this.maxBackoffDelay);
|
|
196
|
+
await plugins.smartdelay.delayFor(delay);
|
|
176
197
|
this.disconnectRunning = false;
|
|
177
198
|
await this.connect();
|
|
178
199
|
}
|
|
@@ -185,6 +206,8 @@ export class SmartsocketClient {
|
|
|
185
206
|
*/
|
|
186
207
|
async stop() {
|
|
187
208
|
this.autoReconnect = false;
|
|
209
|
+
this.currentRetryCount = 0;
|
|
210
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
188
211
|
await this.disconnect();
|
|
189
212
|
}
|
|
190
213
|
/**
|
|
@@ -212,6 +235,18 @@ export class SmartsocketClient {
|
|
|
212
235
|
this.eventSubject.next(statusArg);
|
|
213
236
|
}
|
|
214
237
|
this.eventStatus = statusArg;
|
|
238
|
+
// Reset reconnection state when connection is successful
|
|
239
|
+
if (statusArg === 'connected') {
|
|
240
|
+
this.currentRetryCount = 0;
|
|
241
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* Resets the reconnection state
|
|
246
|
+
*/
|
|
247
|
+
resetReconnectionState() {
|
|
248
|
+
this.currentRetryCount = 0;
|
|
249
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
215
250
|
}
|
|
216
251
|
}
|
|
217
|
-
//# 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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"}
|
|
252
|
+
//# 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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"}
|
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartsocket",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.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",
|
|
7
7
|
"type": "module",
|
|
8
8
|
"repository": {
|
|
9
9
|
"type": "git",
|
|
10
|
-
"url": "
|
|
10
|
+
"url": "https://code.foss.global/push.rocks/smartsocket.git"
|
|
11
11
|
},
|
|
12
12
|
"author": "Lossless GmbH",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"bugs": {
|
|
15
15
|
"url": "https://gitlab.com/pushrocks/smartsocket/issues"
|
|
16
16
|
},
|
|
17
|
-
"homepage": "https://
|
|
17
|
+
"homepage": "https://code.foss.global/push.rocks/smartsocket",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@api.global/typedrequest-interfaces": "^3.0.18",
|
|
20
20
|
"@api.global/typedserver": "^3.0.27",
|
|
@@ -28,9 +28,9 @@
|
|
|
28
28
|
"@push.rocks/smartpromise": "^4.0.3",
|
|
29
29
|
"@push.rocks/smartrx": "^3.0.7",
|
|
30
30
|
"@push.rocks/smarttime": "^4.0.6",
|
|
31
|
-
"engine.io": "6.
|
|
32
|
-
"socket.io": "4.
|
|
33
|
-
"socket.io-client": "4.
|
|
31
|
+
"engine.io": "6.6.4",
|
|
32
|
+
"socket.io": "4.8.1",
|
|
33
|
+
"socket.io-client": "4.8.1"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@git.zone/tsbuild": "^2.1.66",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@git.zone/tsrun": "^1.2.44",
|
|
39
39
|
"@git.zone/tstest": "^1.0.77",
|
|
40
40
|
"@push.rocks/tapbundle": "^5.0.23",
|
|
41
|
-
"@types/node": "^
|
|
41
|
+
"@types/node": "^22.13.10"
|
|
42
42
|
},
|
|
43
43
|
"private": false,
|
|
44
44
|
"files": [
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* autocreated commitinfo by @
|
|
2
|
+
* autocreated commitinfo by @push.rocks/commitinfo
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartsocket',
|
|
6
|
-
version: '2.0
|
|
6
|
+
version: '2.1.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
|
}
|
|
@@ -18,6 +18,9 @@ export interface ISmartsocketClientOptions {
|
|
|
18
18
|
url: string;
|
|
19
19
|
alias: string; // an alias makes it easier to identify this client in a multo client environment
|
|
20
20
|
autoReconnect?: boolean;
|
|
21
|
+
maxRetries?: number; // maximum number of reconnection attempts
|
|
22
|
+
initialBackoffDelay?: number; // initial backoff delay in ms
|
|
23
|
+
maxBackoffDelay?: number; // maximum backoff delay in ms
|
|
21
24
|
}
|
|
22
25
|
|
|
23
26
|
export class SmartsocketClient {
|
|
@@ -32,6 +35,11 @@ export class SmartsocketClient {
|
|
|
32
35
|
public serverUrl: string;
|
|
33
36
|
public serverPort: number;
|
|
34
37
|
public autoReconnect: boolean;
|
|
38
|
+
public maxRetries: number;
|
|
39
|
+
public initialBackoffDelay: number;
|
|
40
|
+
public maxBackoffDelay: number;
|
|
41
|
+
public currentRetryCount = 0;
|
|
42
|
+
public currentBackoffDelay: number;
|
|
35
43
|
|
|
36
44
|
// status handling
|
|
37
45
|
public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
|
|
@@ -79,6 +87,10 @@ export class SmartsocketClient {
|
|
|
79
87
|
this.serverUrl = optionsArg.url;
|
|
80
88
|
this.serverPort = optionsArg.port;
|
|
81
89
|
this.autoReconnect = optionsArg.autoReconnect;
|
|
90
|
+
this.maxRetries = optionsArg.maxRetries ?? 100; // Default to 100 retries
|
|
91
|
+
this.initialBackoffDelay = optionsArg.initialBackoffDelay ?? 1000; // Default to 1 second
|
|
92
|
+
this.maxBackoffDelay = optionsArg.maxBackoffDelay ?? 60000; // Default to 1 minute
|
|
93
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
82
94
|
}
|
|
83
95
|
|
|
84
96
|
public addSocketFunction(socketFunction: SocketFunction<any>) {
|
|
@@ -89,6 +101,10 @@ export class SmartsocketClient {
|
|
|
89
101
|
* connect the client to the server
|
|
90
102
|
*/
|
|
91
103
|
public async connect() {
|
|
104
|
+
// Reset retry counters on new connection attempt
|
|
105
|
+
this.currentRetryCount = 0;
|
|
106
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
107
|
+
|
|
92
108
|
const done = plugins.smartpromise.defer();
|
|
93
109
|
const smartenvInstance = new plugins.smartenv.Smartenv();
|
|
94
110
|
const socketIoClient: any = await smartenvInstance.getEnvAwareModule({
|
|
@@ -216,8 +232,27 @@ export class SmartsocketClient {
|
|
|
216
232
|
|
|
217
233
|
if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
|
|
218
234
|
this.updateStatus('connecting');
|
|
219
|
-
|
|
220
|
-
|
|
235
|
+
|
|
236
|
+
// Check if we've exceeded the maximum number of retries
|
|
237
|
+
if (this.currentRetryCount >= this.maxRetries) {
|
|
238
|
+
logger.log('warn', `Maximum reconnection attempts (${this.maxRetries}) reached. Giving up.`);
|
|
239
|
+
this.disconnectRunning = false;
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
// Increment retry counter
|
|
244
|
+
this.currentRetryCount++;
|
|
245
|
+
|
|
246
|
+
// Calculate backoff with jitter (±20% randomness)
|
|
247
|
+
const jitter = this.currentBackoffDelay * 0.2 * (Math.random() * 2 - 1);
|
|
248
|
+
const delay = Math.min(this.currentBackoffDelay + jitter, this.maxBackoffDelay);
|
|
249
|
+
|
|
250
|
+
logger.log('info', `Reconnect attempt ${this.currentRetryCount}/${this.maxRetries} in ${Math.round(delay)}ms`);
|
|
251
|
+
|
|
252
|
+
// Apply exponential backoff for next time (doubling with each attempt)
|
|
253
|
+
this.currentBackoffDelay = Math.min(this.currentBackoffDelay * 2, this.maxBackoffDelay);
|
|
254
|
+
|
|
255
|
+
await plugins.smartdelay.delayFor(delay);
|
|
221
256
|
this.disconnectRunning = false;
|
|
222
257
|
await this.connect();
|
|
223
258
|
} else {
|
|
@@ -230,6 +265,8 @@ export class SmartsocketClient {
|
|
|
230
265
|
*/
|
|
231
266
|
public async stop() {
|
|
232
267
|
this.autoReconnect = false;
|
|
268
|
+
this.currentRetryCount = 0;
|
|
269
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
233
270
|
await this.disconnect();
|
|
234
271
|
}
|
|
235
272
|
|
|
@@ -262,5 +299,19 @@ export class SmartsocketClient {
|
|
|
262
299
|
this.eventSubject.next(statusArg);
|
|
263
300
|
}
|
|
264
301
|
this.eventStatus = statusArg;
|
|
302
|
+
|
|
303
|
+
// Reset reconnection state when connection is successful
|
|
304
|
+
if (statusArg === 'connected') {
|
|
305
|
+
this.currentRetryCount = 0;
|
|
306
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
/**
|
|
311
|
+
* Resets the reconnection state
|
|
312
|
+
*/
|
|
313
|
+
public resetReconnectionState() {
|
|
314
|
+
this.currentRetryCount = 0;
|
|
315
|
+
this.currentBackoffDelay = this.initialBackoffDelay;
|
|
265
316
|
}
|
|
266
317
|
}
|