@nmtjs/ws-client 0.15.0-beta.43 → 0.15.0-beta.45

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.
Files changed (5) hide show
  1. package/dist/index.d.ts +1 -0
  2. package/dist/index.js +29 -8
  3. package/dist/index.js.map +1 -1
  4. package/package.json +12 -8
  5. package/src/index.ts +32 -10
package/dist/index.d.ts CHANGED
@@ -22,6 +22,7 @@ export declare class WsTransportClient {
22
22
  type: ConnectionType.Bidirectional;
23
23
  protected webSocket: WebSocket | null;
24
24
  protected connecting: Promise<void> | null;
25
+ protected closingByClient: boolean;
25
26
  constructor(format: BaseClientFormat, protocol: ProtocolVersion, options: WsClientTransportOptions);
26
27
  connect(params: ClientTransportStartParams): Promise<void>;
27
28
  disconnect(): Promise<void>;
package/dist/index.js CHANGED
@@ -7,6 +7,7 @@ export class WsTransportClient {
7
7
  type = ConnectionType.Bidirectional;
8
8
  webSocket = null;
9
9
  connecting = null;
10
+ closingByClient = false;
10
11
  constructor(format, protocol, options) {
11
12
  this.format = format;
12
13
  this.protocol = protocol;
@@ -14,6 +15,7 @@ export class WsTransportClient {
14
15
  this.options = { debug: false, ...options };
15
16
  }
16
17
  async connect(params) {
18
+ this.closingByClient = false;
17
19
  const url = new URL(params.application ? `/${params.application}` : '/', this.options.url);
18
20
  const secure = url.protocol === 'wss:' || url.protocol === 'https:';
19
21
  url.protocol = secure ? 'wss:' : 'ws:';
@@ -27,22 +29,40 @@ export class WsTransportClient {
27
29
  : new WebSocket(url.toString());
28
30
  ws.binaryType = 'arraybuffer';
29
31
  this.connecting = new Promise((resolve, reject) => {
32
+ let settled = false;
33
+ const settle = (fn) => {
34
+ if (settled)
35
+ return;
36
+ settled = true;
37
+ fn();
38
+ };
30
39
  ws.addEventListener('open', () => {
31
- this.connecting = null;
32
- params.onConnect();
33
- resolve();
40
+ settle(() => {
41
+ this.connecting = null;
42
+ params.onConnect();
43
+ resolve();
44
+ });
34
45
  });
35
46
  ws.addEventListener('message', (event) => {
36
47
  params.onMessage(new Uint8Array(event.data));
37
48
  });
38
49
  ws.addEventListener('error', (event) => {
39
- this.connecting = null;
40
- reject(new Error('WebSocket error', { cause: event.error }));
50
+ settle(() => {
51
+ this.connecting = null;
52
+ reject(new Error('WebSocket error', {
53
+ cause: event.error,
54
+ }));
55
+ });
41
56
  });
42
57
  ws.addEventListener('close', (event) => {
43
- this.webSocket = null;
44
- this.connecting = null;
45
- params.onDisconnect('server');
58
+ const reason = this.closingByClient || event.reason === 'client'
59
+ ? 'client'
60
+ : 'server';
61
+ settle(() => {
62
+ this.webSocket = null;
63
+ this.connecting = null;
64
+ params.onDisconnect(reason);
65
+ });
46
66
  });
47
67
  });
48
68
  this.webSocket = ws;
@@ -51,6 +71,7 @@ export class WsTransportClient {
51
71
  async disconnect() {
52
72
  if (this.webSocket === null)
53
73
  return;
74
+ this.closingByClient = true;
54
75
  const closing = once(this.webSocket, 'close');
55
76
  this.webSocket.close(1000, 'client');
56
77
  return closing;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -3,19 +3,23 @@
3
3
  "description": "WebSocket client transport for Neemata.",
4
4
  "type": "module",
5
5
  "exports": {
6
- ".": "./dist/index.js"
6
+ ".": {
7
+ "types": "./dist/index.d.ts",
8
+ "import": "./dist/index.js",
9
+ "module-sync": "./dist/index.js"
10
+ }
7
11
  },
8
12
  "dependencies": {
9
- "@nmtjs/client": "0.15.0-beta.43",
10
- "@nmtjs/common": "0.15.0-beta.43"
13
+ "@nmtjs/client": "0.15.0-beta.45",
14
+ "@nmtjs/common": "0.15.0-beta.45"
11
15
  },
12
16
  "devDependencies": {
13
- "@nmtjs/protocol": "0.15.0-beta.43"
17
+ "@nmtjs/protocol": "0.15.0-beta.45"
14
18
  },
15
19
  "peerDependencies": {
16
- "@nmtjs/client": "0.15.0-beta.43",
17
- "@nmtjs/common": "0.15.0-beta.43",
18
- "@nmtjs/protocol": "0.15.0-beta.43"
20
+ "@nmtjs/client": "0.15.0-beta.45",
21
+ "@nmtjs/common": "0.15.0-beta.45",
22
+ "@nmtjs/protocol": "0.15.0-beta.45"
19
23
  },
20
24
  "files": [
21
25
  "dist",
@@ -23,7 +27,7 @@
23
27
  "LICENSE.md",
24
28
  "README.md"
25
29
  ],
26
- "version": "0.15.0-beta.43",
30
+ "version": "0.15.0-beta.45",
27
31
  "scripts": {
28
32
  "clean-build": "rm -rf ./dist"
29
33
  }
package/src/index.ts CHANGED
@@ -28,6 +28,7 @@ export class WsTransportClient {
28
28
 
29
29
  protected webSocket: WebSocket | null = null
30
30
  protected connecting: Promise<void> | null = null
31
+ protected closingByClient = false
31
32
 
32
33
  constructor(
33
34
  protected readonly format: BaseClientFormat,
@@ -38,6 +39,7 @@ export class WsTransportClient {
38
39
  }
39
40
 
40
41
  async connect(params: ClientTransportStartParams) {
42
+ this.closingByClient = false
41
43
  const url = new URL(
42
44
  params.application ? `/${params.application}` : '/',
43
45
  this.options.url,
@@ -60,24 +62,43 @@ export class WsTransportClient {
60
62
  ws.binaryType = 'arraybuffer'
61
63
 
62
64
  this.connecting = new Promise((resolve, reject) => {
65
+ let settled = false
66
+ const settle = (fn: () => void) => {
67
+ if (settled) return
68
+ settled = true
69
+ fn()
70
+ }
71
+
63
72
  ws.addEventListener('open', () => {
64
- this.connecting = null
65
- params.onConnect()
66
- resolve()
73
+ settle(() => {
74
+ this.connecting = null
75
+ params.onConnect()
76
+ resolve()
77
+ })
67
78
  })
68
79
  ws.addEventListener('message', (event) => {
69
80
  params.onMessage(new Uint8Array(event.data as ArrayBuffer))
70
81
  })
71
82
  ws.addEventListener('error', (event) => {
72
- this.connecting = null
73
- reject(
74
- new Error('WebSocket error', { cause: (event as ErrorEvent).error }),
75
- )
83
+ settle(() => {
84
+ this.connecting = null
85
+ reject(
86
+ new Error('WebSocket error', {
87
+ cause: (event as ErrorEvent).error,
88
+ }),
89
+ )
90
+ })
76
91
  })
77
92
  ws.addEventListener('close', (event) => {
78
- this.webSocket = null
79
- this.connecting = null
80
- params.onDisconnect('server')
93
+ const reason: 'client' | 'server' =
94
+ this.closingByClient || event.reason === 'client'
95
+ ? 'client'
96
+ : 'server'
97
+ settle(() => {
98
+ this.webSocket = null
99
+ this.connecting = null
100
+ params.onDisconnect(reason)
101
+ })
81
102
  })
82
103
  })
83
104
 
@@ -88,6 +109,7 @@ export class WsTransportClient {
88
109
 
89
110
  async disconnect() {
90
111
  if (this.webSocket === null) return
112
+ this.closingByClient = true
91
113
  const closing = once(this.webSocket, 'close')
92
114
  this.webSocket!.close(1000, 'client')
93
115
  return closing