@dxos/network-manager 0.3.4 → 0.3.5-main.1429e83
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-DMOCNTZB.mjs → chunk-UKYZHA5S.mjs} +81 -36
- package/dist/lib/browser/chunk-UKYZHA5S.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 +80 -35
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +80 -35
- package/dist/lib/node/testing/index.cjs.map +3 -3
- package/dist/types/src/transport/memory-transport.d.ts.map +1 -1
- package/dist/types/src/transport/simplepeer-transport-proxy.d.ts +1 -0
- package/dist/types/src/transport/simplepeer-transport-proxy.d.ts.map +1 -1
- package/package.json +17 -17
- package/src/swarm/connection.ts +1 -1
- package/src/transport/memory-transport.ts +5 -2
- package/src/transport/simplepeer-transport-proxy.ts +43 -17
- package/dist/lib/browser/chunk-DMOCNTZB.mjs.map +0 -7
|
@@ -21,7 +21,7 @@ function _ts_decorate(decorators, target, key, desc) {
|
|
|
21
21
|
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
23
|
}
|
|
24
|
-
var __dxlog_file = "/
|
|
24
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts";
|
|
25
25
|
var STARTING_SIGNALLING_DELAY = 10;
|
|
26
26
|
var TRANSPORT_CONNECTION_TIMEOUT = 1e4;
|
|
27
27
|
var MAX_SIGNALLING_DELAY = 300;
|
|
@@ -408,7 +408,7 @@ var Connection = class {
|
|
|
408
408
|
S: this,
|
|
409
409
|
C: (f, a) => f(...a)
|
|
410
410
|
});
|
|
411
|
-
await this.close();
|
|
411
|
+
await this.close(new ConnectivityError("signal message failed to deliver", err));
|
|
412
412
|
}
|
|
413
413
|
}
|
|
414
414
|
/**
|
|
@@ -547,7 +547,7 @@ import { PublicKey as PublicKey2 } from "@dxos/keys";
|
|
|
547
547
|
import { log as log2 } from "@dxos/log";
|
|
548
548
|
import { schema, TimeoutError } from "@dxos/protocols";
|
|
549
549
|
import { ComplexMap } from "@dxos/util";
|
|
550
|
-
var __dxlog_file2 = "/
|
|
550
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/swarm-messenger.ts";
|
|
551
551
|
var SwarmMessage = schema.getCodecForType("dxos.mesh.swarm.SwarmMessage");
|
|
552
552
|
var SwarmMessenger = class {
|
|
553
553
|
constructor({ sendMessage, onSignal, onOffer, topic }) {
|
|
@@ -810,7 +810,7 @@ function _ts_decorate2(decorators, target, key, desc) {
|
|
|
810
810
|
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
811
811
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
812
812
|
}
|
|
813
|
-
var __dxlog_file3 = "/
|
|
813
|
+
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
|
|
814
814
|
var ConnectionDisplacedError = class extends SystemError {
|
|
815
815
|
constructor() {
|
|
816
816
|
super("Connection displaced by remote initiator.");
|
|
@@ -1288,7 +1288,7 @@ function _ts_decorate3(decorators, target, key, desc) {
|
|
|
1288
1288
|
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
1289
1289
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
1290
1290
|
}
|
|
1291
|
-
var __dxlog_file4 = "/
|
|
1291
|
+
var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts";
|
|
1292
1292
|
var INITIATION_DELAY = 100;
|
|
1293
1293
|
var getClassName = (obj) => Object.getPrototypeOf(obj).constructor.name;
|
|
1294
1294
|
var Swarm = class {
|
|
@@ -1779,7 +1779,7 @@ import { Event as Event4, EventSubscriptions } from "@dxos/async";
|
|
|
1779
1779
|
import { PublicKey as PublicKey5 } from "@dxos/keys";
|
|
1780
1780
|
import { log as log5 } from "@dxos/log";
|
|
1781
1781
|
import { ComplexMap as ComplexMap3 } from "@dxos/util";
|
|
1782
|
-
var __dxlog_file5 = "/
|
|
1782
|
+
var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts";
|
|
1783
1783
|
var SwarmMapper = class {
|
|
1784
1784
|
get peers() {
|
|
1785
1785
|
return Array.from(this._peers.values());
|
|
@@ -1851,7 +1851,7 @@ import { PublicKey as PublicKey6 } from "@dxos/keys";
|
|
|
1851
1851
|
import { log as log6 } from "@dxos/log";
|
|
1852
1852
|
import { CancelledError as CancelledError3 } from "@dxos/protocols";
|
|
1853
1853
|
import { ComplexMap as ComplexMap4 } from "@dxos/util";
|
|
1854
|
-
var __dxlog_file6 = "/
|
|
1854
|
+
var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
|
|
1855
1855
|
var MAX_CONCURRENT_INITIATING_CONNECTIONS = 50;
|
|
1856
1856
|
var ConnectionLimiter = class {
|
|
1857
1857
|
constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
|
|
@@ -2006,7 +2006,7 @@ import { Messenger } from "@dxos/messaging";
|
|
|
2006
2006
|
import { trace as trace3 } from "@dxos/protocols";
|
|
2007
2007
|
import { ConnectionState as ConnectionState2 } from "@dxos/protocols/proto/dxos/client/services";
|
|
2008
2008
|
import { ComplexMap as ComplexMap6 } from "@dxos/util";
|
|
2009
|
-
var __dxlog_file7 = "/
|
|
2009
|
+
var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts";
|
|
2010
2010
|
var NetworkManager = class {
|
|
2011
2011
|
constructor({ transportFactory, signalManager, log: log1 }) {
|
|
2012
2012
|
/**
|
|
@@ -2242,7 +2242,7 @@ var NetworkManager = class {
|
|
|
2242
2242
|
|
|
2243
2243
|
// packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
|
|
2244
2244
|
import { invariant as invariant7 } from "@dxos/invariant";
|
|
2245
|
-
var __dxlog_file8 = "/
|
|
2245
|
+
var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts";
|
|
2246
2246
|
var FullyConnectedTopology = class {
|
|
2247
2247
|
toString() {
|
|
2248
2248
|
return "FullyConnectedTopology";
|
|
@@ -2285,7 +2285,7 @@ var FullyConnectedTopology = class {
|
|
|
2285
2285
|
import distance from "xor-distance";
|
|
2286
2286
|
import { invariant as invariant8 } from "@dxos/invariant";
|
|
2287
2287
|
import { log as log8 } from "@dxos/log";
|
|
2288
|
-
var __dxlog_file9 = "/
|
|
2288
|
+
var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts";
|
|
2289
2289
|
var MMSTTopology = class {
|
|
2290
2290
|
constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
|
|
2291
2291
|
this._sampleCollected = false;
|
|
@@ -2394,7 +2394,7 @@ var sortByXorDistance = (keys, reference) => keys.sort((a, b) => distance.gt(dis
|
|
|
2394
2394
|
// packages/core/mesh/network-manager/src/topology/star-topology.ts
|
|
2395
2395
|
import { invariant as invariant9 } from "@dxos/invariant";
|
|
2396
2396
|
import { log as log9 } from "@dxos/log";
|
|
2397
|
-
var __dxlog_file10 = "/
|
|
2397
|
+
var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
|
|
2398
2398
|
var StarTopology = class {
|
|
2399
2399
|
constructor(_centralPeer) {
|
|
2400
2400
|
this._centralPeer = _centralPeer;
|
|
@@ -2505,7 +2505,7 @@ function _ts_decorate4(decorators, target, key, desc) {
|
|
|
2505
2505
|
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
2506
2506
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
2507
2507
|
}
|
|
2508
|
-
var __dxlog_file11 = "/
|
|
2508
|
+
var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts";
|
|
2509
2509
|
var MEMORY_TRANSPORT_DELAY = 1;
|
|
2510
2510
|
var createStreamDelay = (delay) => {
|
|
2511
2511
|
return new Transform({
|
|
@@ -2627,14 +2627,17 @@ var MemoryTransport = class _MemoryTransport {
|
|
|
2627
2627
|
});
|
|
2628
2628
|
this._remoteConnection._destroyed = true;
|
|
2629
2629
|
_MemoryTransport._connections.delete(this._remoteInstanceId);
|
|
2630
|
-
this.
|
|
2631
|
-
this._incomingDelay.unpipe();
|
|
2630
|
+
this.options.stream.unpipe(this._incomingDelay);
|
|
2631
|
+
this._incomingDelay.unpipe(this._remoteConnection.options.stream);
|
|
2632
|
+
this._remoteConnection.options.stream.unpipe(this._outgoingDelay);
|
|
2633
|
+
this._outgoingDelay.unpipe(this.options.stream);
|
|
2634
|
+
this.options.stream.unpipe(this._outgoingDelay);
|
|
2632
2635
|
this._remoteConnection.closed.emit();
|
|
2633
2636
|
this._remoteConnection._remoteConnection = void 0;
|
|
2634
2637
|
this._remoteConnection = void 0;
|
|
2635
2638
|
log10("closed", void 0, {
|
|
2636
2639
|
F: __dxlog_file11,
|
|
2637
|
-
L:
|
|
2640
|
+
L: 150,
|
|
2638
2641
|
S: this,
|
|
2639
2642
|
C: (f, a) => f(...a)
|
|
2640
2643
|
});
|
|
@@ -2642,7 +2645,7 @@ var MemoryTransport = class _MemoryTransport {
|
|
|
2642
2645
|
this.closed.emit();
|
|
2643
2646
|
log10("closed", void 0, {
|
|
2644
2647
|
F: __dxlog_file11,
|
|
2645
|
-
L:
|
|
2648
|
+
L: 154,
|
|
2646
2649
|
S: this,
|
|
2647
2650
|
C: (f, a) => f(...a)
|
|
2648
2651
|
});
|
|
@@ -2652,7 +2655,7 @@ var MemoryTransport = class _MemoryTransport {
|
|
|
2652
2655
|
payload
|
|
2653
2656
|
}, {
|
|
2654
2657
|
F: __dxlog_file11,
|
|
2655
|
-
L:
|
|
2658
|
+
L: 158,
|
|
2656
2659
|
S: this,
|
|
2657
2660
|
C: (f, a) => f(...a)
|
|
2658
2661
|
});
|
|
@@ -2700,7 +2703,7 @@ try {
|
|
|
2700
2703
|
}
|
|
2701
2704
|
|
|
2702
2705
|
// packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts
|
|
2703
|
-
var __dxlog_file12 = "/
|
|
2706
|
+
var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts";
|
|
2704
2707
|
var SimplePeerTransport = class {
|
|
2705
2708
|
constructor(params) {
|
|
2706
2709
|
this.params = params;
|
|
@@ -2889,7 +2892,7 @@ import { PublicKey as PublicKey11 } from "@dxos/keys";
|
|
|
2889
2892
|
import { log as log12 } from "@dxos/log";
|
|
2890
2893
|
import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/mesh/bridge";
|
|
2891
2894
|
import { ComplexMap as ComplexMap8 } from "@dxos/util";
|
|
2892
|
-
var __dxlog_file13 = "/
|
|
2895
|
+
var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
|
|
2893
2896
|
var SimplePeerTransportService = class {
|
|
2894
2897
|
constructor(_webrtcConfig) {
|
|
2895
2898
|
this._webrtcConfig = _webrtcConfig;
|
|
@@ -3023,7 +3026,7 @@ var SimplePeerTransportService = class {
|
|
|
3023
3026
|
|
|
3024
3027
|
// packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts
|
|
3025
3028
|
import { Writable } from "@dxos/node-std/stream";
|
|
3026
|
-
import { Event as Event9 } from "@dxos/async";
|
|
3029
|
+
import { Event as Event9, scheduleTask as scheduleTask4 } from "@dxos/async";
|
|
3027
3030
|
import { Context as Context6 } from "@dxos/context";
|
|
3028
3031
|
import { ErrorStream as ErrorStream5 } from "@dxos/debug";
|
|
3029
3032
|
import { invariant as invariant13 } from "@dxos/invariant";
|
|
@@ -3032,12 +3035,15 @@ import { log as log13 } from "@dxos/log";
|
|
|
3032
3035
|
import { ConnectionResetError as ConnectionResetError3, TimeoutError as TimeoutError2, ProtocolError as ProtocolError3, ConnectivityError as ConnectivityError3, UnknownProtocolError as UnknownProtocolError3 } from "@dxos/protocols";
|
|
3033
3036
|
import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/mesh/bridge";
|
|
3034
3037
|
import { arrayToBuffer } from "@dxos/util";
|
|
3035
|
-
var __dxlog_file14 = "/
|
|
3038
|
+
var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
|
|
3039
|
+
var RESP_MIN_THRESHOLD = 500;
|
|
3040
|
+
var TIMEOUT_THRESHOLD = 10;
|
|
3036
3041
|
var SimplePeerTransportProxy = class {
|
|
3037
3042
|
constructor(_params) {
|
|
3038
3043
|
this._params = _params;
|
|
3039
3044
|
this._proxyId = PublicKey12.random();
|
|
3040
3045
|
this._ctx = new Context6();
|
|
3046
|
+
this._timeoutCount = 0;
|
|
3041
3047
|
this.closed = new Event9();
|
|
3042
3048
|
this.connected = new Event9();
|
|
3043
3049
|
this.errors = new ErrorStream5();
|
|
@@ -3050,7 +3056,7 @@ var SimplePeerTransportProxy = class {
|
|
|
3050
3056
|
this._serviceStream.subscribe(async (event) => {
|
|
3051
3057
|
log13("SimplePeerTransportProxy: event", event, {
|
|
3052
3058
|
F: __dxlog_file14,
|
|
3053
|
-
L:
|
|
3059
|
+
L: 59,
|
|
3054
3060
|
S: this,
|
|
3055
3061
|
C: (f, a) => f(...a)
|
|
3056
3062
|
});
|
|
@@ -3062,24 +3068,63 @@ var SimplePeerTransportProxy = class {
|
|
|
3062
3068
|
await this._handleSignal(event.signal);
|
|
3063
3069
|
}
|
|
3064
3070
|
});
|
|
3065
|
-
|
|
3071
|
+
const proxyStream = new Writable({
|
|
3066
3072
|
write: (chunk, _, callback) => {
|
|
3073
|
+
const then = performance.now();
|
|
3067
3074
|
this._params.bridgeService.sendData({
|
|
3068
3075
|
proxyId: this._proxyId,
|
|
3069
3076
|
payload: chunk
|
|
3070
|
-
}).then(() =>
|
|
3071
|
-
|
|
3072
|
-
|
|
3073
|
-
|
|
3074
|
-
|
|
3075
|
-
|
|
3076
|
-
|
|
3077
|
+
}).then(() => {
|
|
3078
|
+
if (performance.now() - then > RESP_MIN_THRESHOLD) {
|
|
3079
|
+
log13("slow response, delaying callback", void 0, {
|
|
3080
|
+
F: __dxlog_file14,
|
|
3081
|
+
L: 80,
|
|
3082
|
+
S: this,
|
|
3083
|
+
C: (f, a) => f(...a)
|
|
3084
|
+
});
|
|
3085
|
+
scheduleTask4(this._ctx, () => callback(), RESP_MIN_THRESHOLD);
|
|
3086
|
+
} else {
|
|
3087
|
+
callback();
|
|
3088
|
+
}
|
|
3089
|
+
this._timeoutCount = 0;
|
|
3090
|
+
}, (err) => {
|
|
3091
|
+
if (err instanceof TimeoutError2 || err.constructor.name === "TimeoutError") {
|
|
3092
|
+
if (this._timeoutCount++ > TIMEOUT_THRESHOLD) {
|
|
3093
|
+
throw new TimeoutError2(`too many timeoutes (${this._timeoutCount} > ${TIMEOUT_THRESHOLD}`);
|
|
3094
|
+
} else {
|
|
3095
|
+
log13("timeout error, but still invoking callback", void 0, {
|
|
3096
|
+
F: __dxlog_file14,
|
|
3097
|
+
L: 92,
|
|
3098
|
+
S: this,
|
|
3099
|
+
C: (f, a) => f(...a)
|
|
3100
|
+
});
|
|
3101
|
+
callback();
|
|
3102
|
+
}
|
|
3103
|
+
} else {
|
|
3104
|
+
log13.catch(err, void 0, {
|
|
3105
|
+
F: __dxlog_file14,
|
|
3106
|
+
L: 96,
|
|
3107
|
+
S: this,
|
|
3108
|
+
C: (f, a) => f(...a)
|
|
3109
|
+
});
|
|
3110
|
+
}
|
|
3077
3111
|
});
|
|
3078
3112
|
}
|
|
3079
|
-
})
|
|
3113
|
+
});
|
|
3114
|
+
proxyStream.on("error", (err) => {
|
|
3115
|
+
log13("proxystream error", {
|
|
3116
|
+
err
|
|
3117
|
+
}, {
|
|
3118
|
+
F: __dxlog_file14,
|
|
3119
|
+
L: 104,
|
|
3120
|
+
S: this,
|
|
3121
|
+
C: (f, a) => f(...a)
|
|
3122
|
+
});
|
|
3123
|
+
});
|
|
3124
|
+
this._params.stream.pipe(proxyStream);
|
|
3080
3125
|
}, (error) => log13.catch(error, void 0, {
|
|
3081
3126
|
F: __dxlog_file14,
|
|
3082
|
-
L:
|
|
3127
|
+
L: 109,
|
|
3083
3128
|
S: this,
|
|
3084
3129
|
C: (f, a) => f(...a)
|
|
3085
3130
|
}));
|
|
@@ -3125,7 +3170,7 @@ var SimplePeerTransportProxy = class {
|
|
|
3125
3170
|
} catch (err) {
|
|
3126
3171
|
log13.catch(err, void 0, {
|
|
3127
3172
|
F: __dxlog_file14,
|
|
3128
|
-
L:
|
|
3173
|
+
L: 160,
|
|
3129
3174
|
S: this,
|
|
3130
3175
|
C: (f, a) => f(...a)
|
|
3131
3176
|
});
|
|
@@ -3161,7 +3206,7 @@ var SimplePeerTransportProxyFactory = class {
|
|
|
3161
3206
|
createTransport(options) {
|
|
3162
3207
|
invariant13(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
|
|
3163
3208
|
F: __dxlog_file14,
|
|
3164
|
-
L:
|
|
3209
|
+
L: 197,
|
|
3165
3210
|
S: this,
|
|
3166
3211
|
A: [
|
|
3167
3212
|
"this._bridgeService",
|
|
@@ -3209,7 +3254,7 @@ function _ts_decorate5(decorators, target, key, desc) {
|
|
|
3209
3254
|
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
3210
3255
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
3211
3256
|
}
|
|
3212
|
-
var __dxlog_file15 = "/
|
|
3257
|
+
var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/libdatachannel-transport.ts";
|
|
3213
3258
|
var DATACHANNEL_LABEL = "dxos.mesh.transport";
|
|
3214
3259
|
var MAX_BUFFERED_AMOUNT = 64 * 1024;
|
|
3215
3260
|
var MAX_MESSAGE_SIZE = 64 * 1024;
|
|
@@ -3602,4 +3647,4 @@ export {
|
|
|
3602
3647
|
TcpTransport,
|
|
3603
3648
|
createTeleportProtocolFactory
|
|
3604
3649
|
};
|
|
3605
|
-
//# sourceMappingURL=chunk-
|
|
3650
|
+
//# sourceMappingURL=chunk-UKYZHA5S.mjs.map
|