@casual-simulation/aux-websocket 3.2.7-alpha.6385045848 → 3.2.7-alpha.6777319727
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.
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
2
|
import { ReconnectableSocketInterface } from '@casual-simulation/websocket';
|
|
3
|
-
import { ConnectionClient, ClientConnectionState, WebsocketMessage, ConnectionInfo } from '@casual-simulation/aux-common';
|
|
3
|
+
import { ConnectionClient, ClientConnectionState, WebsocketMessage, ConnectionInfo, WebsocketErrorInfo, ConnectionIndicator } from '@casual-simulation/aux-common';
|
|
4
4
|
export declare class WebsocketConnectionClient implements ConnectionClient {
|
|
5
5
|
private _socket;
|
|
6
6
|
private _connectionStateChanged;
|
|
7
7
|
private _events;
|
|
8
|
+
private _onError;
|
|
8
9
|
private _requestCounter;
|
|
10
|
+
get onError(): Observable<WebsocketErrorInfo>;
|
|
9
11
|
get info(): ConnectionInfo;
|
|
12
|
+
get indicator(): ConnectionIndicator | null;
|
|
13
|
+
get origin(): string;
|
|
10
14
|
event<T>(name: string): Observable<T>;
|
|
11
15
|
disconnect(): void;
|
|
12
16
|
connect(): void;
|
|
@@ -2,9 +2,18 @@ import { BehaviorSubject, merge, } from 'rxjs';
|
|
|
2
2
|
import { map, tap, filter, share, } from 'rxjs/operators';
|
|
3
3
|
import { WebsocketEventTypes, } from '@casual-simulation/aux-common';
|
|
4
4
|
export class WebsocketConnectionClient {
|
|
5
|
+
get onError() {
|
|
6
|
+
return this._onError;
|
|
7
|
+
}
|
|
5
8
|
get info() {
|
|
6
9
|
return this._connectionStateChanged.value.info;
|
|
7
10
|
}
|
|
11
|
+
get indicator() {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
get origin() {
|
|
15
|
+
return this._socket.origin;
|
|
16
|
+
}
|
|
8
17
|
event(name) {
|
|
9
18
|
return this._events.pipe(filter(([type, requestId, message]) => message.type === name), map(([type, requestId, message]) => message));
|
|
10
19
|
}
|
|
@@ -26,7 +35,17 @@ export class WebsocketConnectionClient {
|
|
|
26
35
|
connected: false,
|
|
27
36
|
info: null,
|
|
28
37
|
});
|
|
29
|
-
|
|
38
|
+
let events = socketEvents(this._socket);
|
|
39
|
+
this._onError = events.pipe(filter((message) => message[0] === WebsocketEventTypes.Error), map((event) => event[2]));
|
|
40
|
+
this._events = events.pipe(filter((message) => {
|
|
41
|
+
if (message[0] === WebsocketEventTypes.Error) {
|
|
42
|
+
console.log(`[WebsocketConnectionClient] Error: (${message[1]})`, message[2]);
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
}), share());
|
|
30
49
|
const connected = this._socket.onOpen.pipe(tap(() => console.log('[ApiaryConnectionClient] Connected.')), map(() => ({
|
|
31
50
|
connected: true,
|
|
32
51
|
info: null,
|
|
@@ -53,15 +72,7 @@ function socketEmit(socket, requestId, message) {
|
|
|
53
72
|
socket.send(JSON.stringify(event));
|
|
54
73
|
}
|
|
55
74
|
function socketEvents(socket) {
|
|
56
|
-
return socket.onMessage.pipe(map((message) => safeParse(message.data)), filter((data) => !!data && Array.isArray(data) && data.length >= 3),
|
|
57
|
-
if (message[0] === WebsocketEventTypes.Error) {
|
|
58
|
-
console.log(`[WebsocketConnectionClient] Error: (${message[1]})`, message[2]);
|
|
59
|
-
return false;
|
|
60
|
-
}
|
|
61
|
-
else {
|
|
62
|
-
return true;
|
|
63
|
-
}
|
|
64
|
-
}), share());
|
|
75
|
+
return socket.onMessage.pipe(map((message) => safeParse(message.data)), filter((data) => !!data && Array.isArray(data) && data.length >= 3), share());
|
|
65
76
|
}
|
|
66
77
|
function safeParse(json) {
|
|
67
78
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebsocketConnectionClient.js","sourceRoot":"","sources":["WebsocketConnectionClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,eAAe,EAEf,KAAK,GAER,MAAM,MAAM,CAAC;AAEd,OAAO,EACH,GAAG,EACH,GAAG,EAIH,MAAM,EAEN,KAAK,GACR,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAMH,mBAAmB,
|
|
1
|
+
{"version":3,"file":"WebsocketConnectionClient.js","sourceRoot":"","sources":["WebsocketConnectionClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@casual-simulation/aux-websocket",
|
|
3
|
-
"version": "3.2.7-alpha.
|
|
3
|
+
"version": "3.2.7-alpha.6777319727",
|
|
4
4
|
"description": "Websocket integration with AUX services",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Casual Simulation, Inc.",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"access": "public"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@casual-simulation/aux-common": "^3.2.7-alpha.
|
|
41
|
-
"@casual-simulation/websocket": "^3.
|
|
40
|
+
"@casual-simulation/aux-common": "^3.2.7-alpha.6777319727",
|
|
41
|
+
"@casual-simulation/websocket": "^3.2.7-alpha.6777319727",
|
|
42
42
|
"rxjs": "7.5.7"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "cb79f312a97a8425a573a851f99f1774f50589ff"
|
|
45
45
|
}
|