@libp2p/webrtc 3.1.10 → 3.1.11
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.min.js +13 -13
- package/dist/src/private-to-private/handler.js +1 -1
- package/dist/src/stream.d.ts +8 -0
- package/dist/src/stream.d.ts.map +1 -1
- package/dist/src/stream.js +16 -12
- package/dist/src/stream.js.map +1 -1
- package/package.json +7 -7
- package/src/private-to-private/handler.ts +1 -1
- package/src/stream.ts +18 -13
|
@@ -132,6 +132,6 @@ function parseRemoteAddress(sdp) {
|
|
|
132
132
|
log('could not parse remote address from', candidateLine);
|
|
133
133
|
return '/webrtc';
|
|
134
134
|
}
|
|
135
|
-
return `/dnsaddr/${candidateParts[4]}/${candidateParts[2].toLowerCase()}/${candidateParts[
|
|
135
|
+
return `/dnsaddr/${candidateParts[4]}/${candidateParts[2].toLowerCase()}/${candidateParts[5]}/webrtc`;
|
|
136
136
|
}
|
|
137
137
|
//# sourceMappingURL=handler.js.map
|
package/dist/src/stream.d.ts
CHANGED
|
@@ -17,6 +17,11 @@ export interface WebRTCStreamInit extends AbstractStreamInit {
|
|
|
17
17
|
dataChannelOptions?: Partial<DataChannelOpts>;
|
|
18
18
|
maxDataSize: number;
|
|
19
19
|
}
|
|
20
|
+
export declare const MAX_MESSAGE_SIZE: number;
|
|
21
|
+
export declare const MAX_BUFFERED_AMOUNT: number;
|
|
22
|
+
export declare const BUFFERED_AMOUNT_LOW_TIMEOUT: number;
|
|
23
|
+
export declare const PROTOBUF_OVERHEAD = 5;
|
|
24
|
+
export declare const VARINT_LENGTH = 2;
|
|
20
25
|
export declare class WebRTCStream extends AbstractStream {
|
|
21
26
|
/**
|
|
22
27
|
* The data channel used to send and receive data
|
|
@@ -32,6 +37,9 @@ export declare class WebRTCStream extends AbstractStream {
|
|
|
32
37
|
*/
|
|
33
38
|
private readonly incomingData;
|
|
34
39
|
private messageQueue?;
|
|
40
|
+
/**
|
|
41
|
+
* The maximum size of a message in bytes
|
|
42
|
+
*/
|
|
35
43
|
private readonly maxDataSize;
|
|
36
44
|
constructor(init: WebRTCStreamInit);
|
|
37
45
|
sendNewStream(): void;
|
package/dist/src/stream.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAK/F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAK/F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;IACzB,6BAA6B,EAAE,MAAM,CAAA;CACtC;AAED,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;;;;OAKG;IACH,OAAO,EAAE,cAAc,CAAA;IAEvB,kBAAkB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAE7C,WAAW,EAAE,MAAM,CAAA;CACpB;AAGD,eAAO,MAAM,gBAAgB,QAAY,CAAA;AAGzC,eAAO,MAAM,mBAAmB,QAAmB,CAAA;AAGnD,eAAO,MAAM,2BAA2B,QAAY,CAAA;AAGpD,eAAO,MAAM,iBAAiB,IAAI,CAAA;AAGlC,eAAO,MAAM,aAAa,IAAI,CAAA;AAE9B,qBAAa,YAAa,SAAQ,cAAc;IAC9C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IAExC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAiB;IAEpD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsB;IAEnD,OAAO,CAAC,YAAY,CAAC,CAAgB;IAErC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;gBAEvB,IAAI,EAAE,gBAAgB;IAuFnC,aAAa,IAAK,IAAI;IAIhB,YAAY,CAAE,IAAI,EAAE,cAAc,EAAE,WAAW,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC/E,QAAQ,CAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9C,SAAS,IAAK,OAAO,CAAC,IAAI,CAAC;IAI3B,cAAc,IAAK,OAAO,CAAC,IAAI,CAAC;IAIhC,aAAa,IAAK,OAAO,CAAC,IAAI,CAAC;IAIrC;;OAEG;IACH,OAAO,CAAC,uBAAuB;YAwBjB,SAAS;CAOxB;AAED,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,OAAO,EAAE,cAAc,CAAA;IAEvB;;OAEG;IACH,SAAS,EAAE,SAAS,CAAA;IAEpB,kBAAkB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAE7C,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,KAAK,IAAI,CAAA;CAC1C;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAYxE"}
|
package/dist/src/stream.js
CHANGED
|
@@ -6,15 +6,16 @@ import { pushable } from 'it-pushable';
|
|
|
6
6
|
import { pEvent, TimeoutError } from 'p-event';
|
|
7
7
|
import { Uint8ArrayList } from 'uint8arraylist';
|
|
8
8
|
import { Message } from './pb/message.js';
|
|
9
|
-
const log = logger('libp2p:webrtc:stream');
|
|
10
9
|
// Max message size that can be sent to the DataChannel
|
|
11
|
-
const MAX_MESSAGE_SIZE = 16 * 1024;
|
|
10
|
+
export const MAX_MESSAGE_SIZE = 16 * 1024;
|
|
12
11
|
// How much can be buffered to the DataChannel at once
|
|
13
|
-
const MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024;
|
|
12
|
+
export const MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024;
|
|
14
13
|
// How long time we wait for the 'bufferedamountlow' event to be emitted
|
|
15
|
-
const BUFFERED_AMOUNT_LOW_TIMEOUT = 30 * 1000;
|
|
14
|
+
export const BUFFERED_AMOUNT_LOW_TIMEOUT = 30 * 1000;
|
|
16
15
|
// protobuf field definition overhead
|
|
17
|
-
const PROTOBUF_OVERHEAD =
|
|
16
|
+
export const PROTOBUF_OVERHEAD = 5;
|
|
17
|
+
// Length of varint, in bytes.
|
|
18
|
+
export const VARINT_LENGTH = 2;
|
|
18
19
|
export class WebRTCStream extends AbstractStream {
|
|
19
20
|
/**
|
|
20
21
|
* The data channel used to send and receive data
|
|
@@ -30,6 +31,9 @@ export class WebRTCStream extends AbstractStream {
|
|
|
30
31
|
*/
|
|
31
32
|
incomingData;
|
|
32
33
|
messageQueue;
|
|
34
|
+
/**
|
|
35
|
+
* The maximum size of a message in bytes
|
|
36
|
+
*/
|
|
33
37
|
maxDataSize;
|
|
34
38
|
constructor(init) {
|
|
35
39
|
super(init);
|
|
@@ -40,7 +44,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
40
44
|
this.dataChannelOptions = {
|
|
41
45
|
bufferedAmountLowEventTimeout: init.dataChannelOptions?.bufferedAmountLowEventTimeout ?? BUFFERED_AMOUNT_LOW_TIMEOUT,
|
|
42
46
|
maxBufferedAmount: init.dataChannelOptions?.maxBufferedAmount ?? MAX_BUFFERED_AMOUNT,
|
|
43
|
-
maxMessageSize: init.dataChannelOptions?.maxMessageSize ??
|
|
47
|
+
maxMessageSize: init.dataChannelOptions?.maxMessageSize ?? init.maxDataSize
|
|
44
48
|
};
|
|
45
49
|
this.maxDataSize = init.maxDataSize;
|
|
46
50
|
// set up initial state
|
|
@@ -57,7 +61,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
57
61
|
// noop
|
|
58
62
|
break;
|
|
59
63
|
default:
|
|
60
|
-
log.error('unknown datachannel state %s', this.channel.readyState);
|
|
64
|
+
this.log.error('unknown datachannel state %s', this.channel.readyState);
|
|
61
65
|
throw new CodeError('Unknown datachannel state', 'ERR_INVALID_STATE');
|
|
62
66
|
}
|
|
63
67
|
// handle RTCDataChannel events
|
|
@@ -74,7 +78,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
74
78
|
};
|
|
75
79
|
this.channel.onclose = (_evt) => {
|
|
76
80
|
void this.close().catch(err => {
|
|
77
|
-
log.error('error closing stream after channel closed', err);
|
|
81
|
+
this.log.error('error closing stream after channel closed', err);
|
|
78
82
|
});
|
|
79
83
|
};
|
|
80
84
|
this.channel.onerror = (evt) => {
|
|
@@ -100,7 +104,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
100
104
|
}
|
|
101
105
|
})
|
|
102
106
|
.catch(err => {
|
|
103
|
-
log.error('error processing incoming data channel messages', err);
|
|
107
|
+
this.log.error('error processing incoming data channel messages', err);
|
|
104
108
|
});
|
|
105
109
|
}
|
|
106
110
|
sendNewStream() {
|
|
@@ -135,7 +139,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
135
139
|
this.messageQueue.append(data);
|
|
136
140
|
}
|
|
137
141
|
else {
|
|
138
|
-
log.error('unknown datachannel state %s', this.channel.readyState);
|
|
142
|
+
this.log.error('unknown datachannel state %s', this.channel.readyState);
|
|
139
143
|
throw new CodeError('Unknown datachannel state', 'ERR_INVALID_STATE');
|
|
140
144
|
}
|
|
141
145
|
}
|
|
@@ -182,7 +186,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
182
186
|
return message.message;
|
|
183
187
|
}
|
|
184
188
|
async _sendFlag(flag) {
|
|
185
|
-
log.trace('Sending flag: %s', flag.toString());
|
|
189
|
+
this.log.trace('Sending flag: %s', flag.toString());
|
|
186
190
|
const msgbuf = Message.encode({ flag });
|
|
187
191
|
const prefixedBuf = lengthPrefixed.encode.single(msgbuf);
|
|
188
192
|
await this._sendMessage(prefixedBuf, false);
|
|
@@ -193,7 +197,7 @@ export function createStream(options) {
|
|
|
193
197
|
return new WebRTCStream({
|
|
194
198
|
id: direction === 'inbound' ? (`i${channel.id}`) : `r${channel.id}`,
|
|
195
199
|
direction,
|
|
196
|
-
maxDataSize: (dataChannelOptions?.maxMessageSize ?? MAX_MESSAGE_SIZE) - PROTOBUF_OVERHEAD,
|
|
200
|
+
maxDataSize: (dataChannelOptions?.maxMessageSize ?? MAX_MESSAGE_SIZE) - PROTOBUF_OVERHEAD - VARINT_LENGTH,
|
|
197
201
|
dataChannelOptions,
|
|
198
202
|
onEnd,
|
|
199
203
|
channel,
|
package/dist/src/stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,cAAc,EAA2B,MAAM,uCAAuC,CAAA;AAC/F,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,cAAc,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAiB,QAAQ,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/webrtc",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.11",
|
|
4
4
|
"description": "A libp2p transport using WebRTC connections",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/transport-webrtc#readme",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@chainsafe/libp2p-noise": "^13.0.0",
|
|
48
48
|
"@libp2p/interface": "^0.1.2",
|
|
49
|
-
"@libp2p/interface-internal": "^0.1.
|
|
49
|
+
"@libp2p/interface-internal": "^0.1.5",
|
|
50
50
|
"@libp2p/logger": "^3.0.2",
|
|
51
51
|
"@libp2p/peer-id": "^3.0.2",
|
|
52
52
|
"@multiformats/mafmt": "^12.1.2",
|
|
@@ -70,18 +70,18 @@
|
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
72
|
"@chainsafe/libp2p-yamux": "^5.0.0",
|
|
73
|
-
"@libp2p/interface-compliance-tests": "^4.0.
|
|
74
|
-
"@libp2p/peer-id-factory": "^3.0.
|
|
75
|
-
"@libp2p/websockets": "^7.0.
|
|
73
|
+
"@libp2p/interface-compliance-tests": "^4.0.6",
|
|
74
|
+
"@libp2p/peer-id-factory": "^3.0.4",
|
|
75
|
+
"@libp2p/websockets": "^7.0.7",
|
|
76
76
|
"@types/sinon": "^10.0.15",
|
|
77
77
|
"aegir": "^40.0.8",
|
|
78
78
|
"delay": "^6.0.0",
|
|
79
79
|
"it-length": "^3.0.2",
|
|
80
80
|
"it-map": "^3.0.3",
|
|
81
81
|
"it-pair": "^2.0.6",
|
|
82
|
-
"libp2p": "^0.46.
|
|
82
|
+
"libp2p": "^0.46.11",
|
|
83
83
|
"protons": "^7.0.2",
|
|
84
|
-
"sinon": "^
|
|
84
|
+
"sinon": "^16.0.0",
|
|
85
85
|
"sinon-ts": "^1.0.0"
|
|
86
86
|
},
|
|
87
87
|
"browser": {
|
|
@@ -173,5 +173,5 @@ function parseRemoteAddress (sdp: string): string {
|
|
|
173
173
|
return '/webrtc'
|
|
174
174
|
}
|
|
175
175
|
|
|
176
|
-
return `/dnsaddr/${candidateParts[4]}/${candidateParts[2].toLowerCase()}/${candidateParts[
|
|
176
|
+
return `/dnsaddr/${candidateParts[4]}/${candidateParts[2].toLowerCase()}/${candidateParts[5]}/webrtc`
|
|
177
177
|
}
|
package/src/stream.ts
CHANGED
|
@@ -8,8 +8,6 @@ import { Uint8ArrayList } from 'uint8arraylist'
|
|
|
8
8
|
import { Message } from './pb/message.js'
|
|
9
9
|
import type { Direction } from '@libp2p/interface/connection'
|
|
10
10
|
|
|
11
|
-
const log = logger('libp2p:webrtc:stream')
|
|
12
|
-
|
|
13
11
|
export interface DataChannelOpts {
|
|
14
12
|
maxMessageSize: number
|
|
15
13
|
maxBufferedAmount: number
|
|
@@ -31,16 +29,19 @@ export interface WebRTCStreamInit extends AbstractStreamInit {
|
|
|
31
29
|
}
|
|
32
30
|
|
|
33
31
|
// Max message size that can be sent to the DataChannel
|
|
34
|
-
const MAX_MESSAGE_SIZE = 16 * 1024
|
|
32
|
+
export const MAX_MESSAGE_SIZE = 16 * 1024
|
|
35
33
|
|
|
36
34
|
// How much can be buffered to the DataChannel at once
|
|
37
|
-
const MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024
|
|
35
|
+
export const MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024
|
|
38
36
|
|
|
39
37
|
// How long time we wait for the 'bufferedamountlow' event to be emitted
|
|
40
|
-
const BUFFERED_AMOUNT_LOW_TIMEOUT = 30 * 1000
|
|
38
|
+
export const BUFFERED_AMOUNT_LOW_TIMEOUT = 30 * 1000
|
|
41
39
|
|
|
42
40
|
// protobuf field definition overhead
|
|
43
|
-
const PROTOBUF_OVERHEAD =
|
|
41
|
+
export const PROTOBUF_OVERHEAD = 5
|
|
42
|
+
|
|
43
|
+
// Length of varint, in bytes.
|
|
44
|
+
export const VARINT_LENGTH = 2
|
|
44
45
|
|
|
45
46
|
export class WebRTCStream extends AbstractStream {
|
|
46
47
|
/**
|
|
@@ -60,6 +61,10 @@ export class WebRTCStream extends AbstractStream {
|
|
|
60
61
|
private readonly incomingData: Pushable<Uint8Array>
|
|
61
62
|
|
|
62
63
|
private messageQueue?: Uint8ArrayList
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* The maximum size of a message in bytes
|
|
67
|
+
*/
|
|
63
68
|
private readonly maxDataSize: number
|
|
64
69
|
|
|
65
70
|
constructor (init: WebRTCStreamInit) {
|
|
@@ -72,7 +77,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
72
77
|
this.dataChannelOptions = {
|
|
73
78
|
bufferedAmountLowEventTimeout: init.dataChannelOptions?.bufferedAmountLowEventTimeout ?? BUFFERED_AMOUNT_LOW_TIMEOUT,
|
|
74
79
|
maxBufferedAmount: init.dataChannelOptions?.maxBufferedAmount ?? MAX_BUFFERED_AMOUNT,
|
|
75
|
-
maxMessageSize: init.dataChannelOptions?.maxMessageSize ??
|
|
80
|
+
maxMessageSize: init.dataChannelOptions?.maxMessageSize ?? init.maxDataSize
|
|
76
81
|
}
|
|
77
82
|
this.maxDataSize = init.maxDataSize
|
|
78
83
|
|
|
@@ -92,7 +97,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
92
97
|
break
|
|
93
98
|
|
|
94
99
|
default:
|
|
95
|
-
log.error('unknown datachannel state %s', this.channel.readyState)
|
|
100
|
+
this.log.error('unknown datachannel state %s', this.channel.readyState)
|
|
96
101
|
throw new CodeError('Unknown datachannel state', 'ERR_INVALID_STATE')
|
|
97
102
|
}
|
|
98
103
|
|
|
@@ -112,7 +117,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
112
117
|
|
|
113
118
|
this.channel.onclose = (_evt) => {
|
|
114
119
|
void this.close().catch(err => {
|
|
115
|
-
log.error('error closing stream after channel closed', err)
|
|
120
|
+
this.log.error('error closing stream after channel closed', err)
|
|
116
121
|
})
|
|
117
122
|
}
|
|
118
123
|
|
|
@@ -145,7 +150,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
145
150
|
}
|
|
146
151
|
})
|
|
147
152
|
.catch(err => {
|
|
148
|
-
log.error('error processing incoming data channel messages', err)
|
|
153
|
+
this.log.error('error processing incoming data channel messages', err)
|
|
149
154
|
})
|
|
150
155
|
}
|
|
151
156
|
|
|
@@ -183,7 +188,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
183
188
|
|
|
184
189
|
this.messageQueue.append(data)
|
|
185
190
|
} else {
|
|
186
|
-
log.error('unknown datachannel state %s', this.channel.readyState)
|
|
191
|
+
this.log.error('unknown datachannel state %s', this.channel.readyState)
|
|
187
192
|
throw new CodeError('Unknown datachannel state', 'ERR_INVALID_STATE')
|
|
188
193
|
}
|
|
189
194
|
}
|
|
@@ -242,7 +247,7 @@ export class WebRTCStream extends AbstractStream {
|
|
|
242
247
|
}
|
|
243
248
|
|
|
244
249
|
private async _sendFlag (flag: Message.Flag): Promise<void> {
|
|
245
|
-
log.trace('Sending flag: %s', flag.toString())
|
|
250
|
+
this.log.trace('Sending flag: %s', flag.toString())
|
|
246
251
|
const msgbuf = Message.encode({ flag })
|
|
247
252
|
const prefixedBuf = lengthPrefixed.encode.single(msgbuf)
|
|
248
253
|
|
|
@@ -277,7 +282,7 @@ export function createStream (options: WebRTCStreamOptions): WebRTCStream {
|
|
|
277
282
|
return new WebRTCStream({
|
|
278
283
|
id: direction === 'inbound' ? (`i${channel.id}`) : `r${channel.id}`,
|
|
279
284
|
direction,
|
|
280
|
-
maxDataSize: (dataChannelOptions?.maxMessageSize ?? MAX_MESSAGE_SIZE) - PROTOBUF_OVERHEAD,
|
|
285
|
+
maxDataSize: (dataChannelOptions?.maxMessageSize ?? MAX_MESSAGE_SIZE) - PROTOBUF_OVERHEAD - VARINT_LENGTH,
|
|
281
286
|
dataChannelOptions,
|
|
282
287
|
onEnd,
|
|
283
288
|
channel,
|