@dxos/network-manager 0.3.3-main.ff5734a → 0.3.3
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/lib/browser/{chunk-DBVOJAYS.mjs → chunk-DMOCNTZB.mjs} +75 -64
- package/dist/lib/browser/chunk-DMOCNTZB.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +3 -3
- package/dist/lib/node/index.cjs +72 -61
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +72 -61
- package/dist/lib/node/testing/index.cjs.map +3 -3
- package/dist/types/src/signal/swarm-messenger.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm.d.ts.map +1 -1
- package/package.json +17 -17
- package/src/signal/swarm-messenger.ts +6 -2
- package/src/swarm/connection.ts +4 -4
- package/src/swarm/peer.ts +2 -2
- package/src/swarm/swarm.ts +2 -1
- package/src/transport/libdatachannel-transport.ts +1 -1
- package/src/transport/simplepeer-transport.ts +1 -1
- package/dist/lib/browser/chunk-DBVOJAYS.mjs.map +0 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uCAAuC,CAAC;AAGlF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoF;IACjH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;gBAE9F,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAOtE,cAAc,CAAC,EACnB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE;QACD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BX,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YAerC,oBAAoB;YA0BpB,eAAe;YAWf,YAAY;
|
|
1
|
+
{"version":3,"file":"swarm-messenger.d.ts","sourceRoot":"","sources":["../../../../src/signal/swarm-messenger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uCAAuC,CAAC;AAGlF,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAMjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClG,OAAO,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IACpD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoF;IACjH,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6C;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IAEnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4E;gBAE9F,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAOtE,cAAc,CAAC,EACnB,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE;QACD,MAAM,EAAE,SAAS,CAAC;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,OAAO,EAAE,GAAG,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BX,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YAerC,oBAAoB;YA0BpB,eAAe;YAWf,YAAY;YAqCZ,aAAa;CAuB5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAkB,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAClF,OAAO,EAAwB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAO7D;;;;GAIG;AACH,qBAAa,KAAK;IA0Cd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAjDnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAOvD;;OAEG;IAEH,QAAQ,CAAC,WAAW,SAA8B;IAoBlD,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,oBAAoB,EACvC,UAAU,EAAE,SAAS,EACrB,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,kBAAkB,EAAE,iBAAiB,EACrC,gBAAgB,SAAmB;IAkBtD,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAEK,IAAI;
|
|
1
|
+
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAwB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,UAAU,EAAmB,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAkB,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAClF,OAAO,EAAwB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAO7D;;;;GAIG;AACH,qBAAa,KAAK;IA0Cd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAjDnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,IAAI,CAAiB;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAOvD;;OAEG;IAEH,QAAQ,CAAC,WAAW,SAA8B;IAoBlD,QAAQ,CAAC,MAAM,cAAqB;gBAMjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,oBAAoB,EACvC,UAAU,EAAE,SAAS,EACrB,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,kBAAkB,EAAE,iBAAiB,EACrC,gBAAgB,SAAmB;IAkBtD,IAAI,WAAW,iBAId;IAED,IACI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IACI,KAAK,IAAI,KAAK,CAEjB;IAEK,IAAI;IAcJ,OAAO;IAWP,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAiBpC,YAAY,CAAC,UAAU,EAAE,UAAU;IAgC7B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAwB/C,QAAQ,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB/C,SAAS;IAOT,QAAQ;IAId,OAAO,CAAC,gBAAgB;YAmDV,YAAY;IAM1B,OAAO,CAAC,mBAAmB;IAuC3B;;OAEG;YACW,mBAAmB;YA0BnB,gBAAgB;CAQ/B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/network-manager",
|
|
3
|
-
"version": "0.3.3
|
|
3
|
+
"version": "0.3.3",
|
|
4
4
|
"description": "Network Manager",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -31,21 +31,21 @@
|
|
|
31
31
|
"tiny-invariant": "^1.3.1",
|
|
32
32
|
"ws": "^7.4.4",
|
|
33
33
|
"xor-distance": "^2.0.0",
|
|
34
|
-
"@dxos/async": "0.3.3
|
|
35
|
-
"@dxos/codec-protobuf": "0.3.3
|
|
36
|
-
"@dxos/context": "0.3.3
|
|
37
|
-
"@dxos/credentials": "0.3.3
|
|
38
|
-
"@dxos/crypto": "0.3.3
|
|
39
|
-
"@dxos/debug": "0.3.3
|
|
40
|
-
"@dxos/invariant": "0.3.3
|
|
41
|
-
"@dxos/keys": "0.3.3
|
|
42
|
-
"@dxos/log": "0.3.3
|
|
43
|
-
"@dxos/messaging": "0.3.3
|
|
44
|
-
"@dxos/node-std": "0.3.3
|
|
45
|
-
"@dxos/protocols": "0.3.3
|
|
46
|
-
"@dxos/rpc": "0.3.3
|
|
47
|
-
"@dxos/teleport": "0.3.3
|
|
48
|
-
"@dxos/util": "0.3.3
|
|
34
|
+
"@dxos/async": "0.3.3",
|
|
35
|
+
"@dxos/codec-protobuf": "0.3.3",
|
|
36
|
+
"@dxos/context": "0.3.3",
|
|
37
|
+
"@dxos/credentials": "0.3.3",
|
|
38
|
+
"@dxos/crypto": "0.3.3",
|
|
39
|
+
"@dxos/debug": "0.3.3",
|
|
40
|
+
"@dxos/invariant": "0.3.3",
|
|
41
|
+
"@dxos/keys": "0.3.3",
|
|
42
|
+
"@dxos/log": "0.3.3",
|
|
43
|
+
"@dxos/messaging": "0.3.3",
|
|
44
|
+
"@dxos/node-std": "0.3.3",
|
|
45
|
+
"@dxos/protocols": "0.3.3",
|
|
46
|
+
"@dxos/rpc": "0.3.3",
|
|
47
|
+
"@dxos/teleport": "0.3.3",
|
|
48
|
+
"@dxos/util": "0.3.3"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@swc-node/register": "1.5.4",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"earljs": "~0.1.10",
|
|
56
56
|
"fast-check": "~3.3.0",
|
|
57
57
|
"typescript": "^5.2.2",
|
|
58
|
-
"@dxos/signal": "0.3.3
|
|
58
|
+
"@dxos/signal": "0.3.3"
|
|
59
59
|
},
|
|
60
60
|
"publishConfig": {
|
|
61
61
|
"access": "public"
|
|
@@ -7,7 +7,7 @@ import { Context } from '@dxos/context';
|
|
|
7
7
|
import { invariant } from '@dxos/invariant';
|
|
8
8
|
import { PublicKey } from '@dxos/keys';
|
|
9
9
|
import { log } from '@dxos/log';
|
|
10
|
-
import { schema } from '@dxos/protocols';
|
|
10
|
+
import { schema, TimeoutError } from '@dxos/protocols';
|
|
11
11
|
import { type Answer, SwarmMessage } from '@dxos/protocols/proto/dxos/mesh/swarm';
|
|
12
12
|
import { ComplexMap, type MakeOptional } from '@dxos/util';
|
|
13
13
|
|
|
@@ -171,7 +171,11 @@ export class SwarmMessenger implements SignalMessenger {
|
|
|
171
171
|
},
|
|
172
172
|
});
|
|
173
173
|
} catch (err) {
|
|
174
|
-
|
|
174
|
+
if (err instanceof TimeoutError) {
|
|
175
|
+
log.info('timeout sending answer to offer', { err });
|
|
176
|
+
} else {
|
|
177
|
+
log.info('error sending answer to offer', { err });
|
|
178
|
+
}
|
|
175
179
|
}
|
|
176
180
|
}
|
|
177
181
|
|
package/src/swarm/connection.ts
CHANGED
|
@@ -177,7 +177,7 @@ export class Connection {
|
|
|
177
177
|
scheduleTask(
|
|
178
178
|
this.connectedTimeoutContext,
|
|
179
179
|
async () => {
|
|
180
|
-
log.
|
|
180
|
+
log.info('timeout waiting for transport to connect, aborting');
|
|
181
181
|
await this.abort().catch((err) => this.errors.raise(err));
|
|
182
182
|
},
|
|
183
183
|
TRANSPORT_CONNECTION_TIMEOUT,
|
|
@@ -210,10 +210,10 @@ export class Connection {
|
|
|
210
210
|
|
|
211
211
|
// TODO(nf): fix ErrorStream so instanceof works here
|
|
212
212
|
if (err instanceof ConnectionResetError) {
|
|
213
|
-
log.
|
|
213
|
+
log.info('aborting due to transport ConnectionResetError');
|
|
214
214
|
this.abort().catch((err) => this.errors.raise(err));
|
|
215
215
|
} else if (err instanceof ConnectivityError) {
|
|
216
|
-
log.
|
|
216
|
+
log.info('aborting due to transport ConnectivityError');
|
|
217
217
|
this.abort().catch((err) => this.errors.raise(err));
|
|
218
218
|
} else if (err instanceof UnknownProtocolError) {
|
|
219
219
|
log.warn('unsure what to do with UnknownProtocolError, will keep on truckin', { err });
|
|
@@ -352,7 +352,7 @@ export class Connection {
|
|
|
352
352
|
}
|
|
353
353
|
|
|
354
354
|
// If signal fails treat connection as failed
|
|
355
|
-
log.
|
|
355
|
+
log.info('signal message failed to deliver', { err });
|
|
356
356
|
await this.close();
|
|
357
357
|
}
|
|
358
358
|
}
|
package/src/swarm/peer.ts
CHANGED
|
@@ -151,7 +151,7 @@ export class Peer {
|
|
|
151
151
|
await connection.openConnection();
|
|
152
152
|
} catch (err: any) {
|
|
153
153
|
if (!(err instanceof CancelledError)) {
|
|
154
|
-
log.
|
|
154
|
+
log.info('connection error', { topic: this.topic, peerId: this.localPeerId, remoteId: this.id, err });
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
// Calls `onStateChange` with CLOSED state.
|
|
@@ -327,7 +327,7 @@ export class Peer {
|
|
|
327
327
|
this._connectionCtx = this._ctx.derive();
|
|
328
328
|
|
|
329
329
|
connection.errors.handle((err) => {
|
|
330
|
-
log.
|
|
330
|
+
log.info('connection error, closing', {
|
|
331
331
|
topic: this.topic,
|
|
332
332
|
peerId: this.localPeerId,
|
|
333
333
|
remoteId: this.id,
|
package/src/swarm/swarm.ts
CHANGED
|
@@ -132,7 +132,8 @@ export class Swarm {
|
|
|
132
132
|
onMessage: async (message) => {
|
|
133
133
|
await this._swarmMessenger
|
|
134
134
|
.receiveMessage(message)
|
|
135
|
-
|
|
135
|
+
// TODO(nf): discriminate between errors
|
|
136
|
+
.catch((err) => log.info('Error while receiving message', { err }));
|
|
136
137
|
},
|
|
137
138
|
});
|
|
138
139
|
}
|
|
@@ -107,7 +107,7 @@ export class SimplePeerTransport implements Transport {
|
|
|
107
107
|
try {
|
|
108
108
|
if (typeof (this._peer as any)?._pc?.getStats === 'function') {
|
|
109
109
|
(this._peer as any)._pc.getStats().then((stats: any) => {
|
|
110
|
-
log.
|
|
110
|
+
log.info('report after webrtc error', {
|
|
111
111
|
config: this.params.webrtcConfig,
|
|
112
112
|
stats,
|
|
113
113
|
});
|