@dxos/network-manager 0.6.14-main.8b352a0 → 0.6.14-staging.54a8bab
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-RUNQZNCV.mjs → chunk-UEVA7BFW.mjs} +76 -36
- package/dist/lib/browser/chunk-UEVA7BFW.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 +15 -9
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node/{chunk-D6P7ACEM.cjs → chunk-LK5D44SA.cjs} +79 -39
- package/dist/lib/node/chunk-LK5D44SA.cjs.map +7 -0
- package/dist/lib/node/index.cjs +23 -23
- package/dist/lib/node/index.cjs.map +1 -1
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +28 -22
- package/dist/lib/node/testing/index.cjs.map +3 -3
- package/dist/lib/node-esm/{chunk-22DA2US6.mjs → chunk-Y5TD36KR.mjs} +76 -36
- package/dist/lib/node-esm/chunk-Y5TD36KR.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +1 -1
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +15 -9
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/types/src/swarm/peer.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm.d.ts +1 -0
- package/dist/types/src/swarm/swarm.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts.map +1 -1
- package/dist/types/src/testing/test-wire-protocol.d.ts.map +1 -1
- package/package.json +18 -18
- package/src/swarm/connection.ts +2 -2
- package/src/swarm/peer.ts +4 -1
- package/src/swarm/swarm.ts +15 -2
- package/src/testing/test-builder.ts +1 -0
- package/src/testing/test-wire-protocol.ts +6 -4
- package/src/tests/basic-test-suite.ts +13 -13
- package/src/tests/webrtc-transport.test.ts +1 -1
- package/src/transport/webrtc/rtc-peer-connection.ts +1 -1
- package/src/transport/webrtc/rtc-transport.test.ts +18 -6
- package/dist/lib/browser/chunk-RUNQZNCV.mjs.map +0 -7
- package/dist/lib/node/chunk-D6P7ACEM.cjs.map +0 -7
- package/dist/lib/node-esm/chunk-22DA2US6.mjs.map +0 -7
|
@@ -197,7 +197,7 @@ var Connection = class {
|
|
|
197
197
|
S: this,
|
|
198
198
|
C: (f, a) => f(...a)
|
|
199
199
|
});
|
|
200
|
-
this.abort().catch((err2) => this.errors.raise(err2));
|
|
200
|
+
this.abort(err).catch((err2) => this.errors.raise(err2));
|
|
201
201
|
} else if (err instanceof ConnectivityError) {
|
|
202
202
|
log.info("aborting due to transport ConnectivityError", void 0, {
|
|
203
203
|
F: __dxlog_file,
|
|
@@ -205,7 +205,7 @@ var Connection = class {
|
|
|
205
205
|
S: this,
|
|
206
206
|
C: (f, a) => f(...a)
|
|
207
207
|
});
|
|
208
|
-
this.abort().catch((err2) => this.errors.raise(err2));
|
|
208
|
+
this.abort(err).catch((err2) => this.errors.raise(err2));
|
|
209
209
|
}
|
|
210
210
|
if (this._state !== "CLOSED" && this._state !== "CLOSING") {
|
|
211
211
|
await this.connectedTimeoutContext.dispose();
|
|
@@ -1183,21 +1183,22 @@ var Peer = class {
|
|
|
1183
1183
|
});
|
|
1184
1184
|
},
|
|
1185
1185
|
onClosed: (err) => {
|
|
1186
|
-
|
|
1186
|
+
const logMeta = {
|
|
1187
1187
|
topic: this.topic,
|
|
1188
1188
|
peerId: this.localInfo,
|
|
1189
1189
|
remoteId: this.remoteInfo,
|
|
1190
1190
|
initiator
|
|
1191
|
-
}
|
|
1191
|
+
};
|
|
1192
|
+
log4("connection closed", logMeta, {
|
|
1192
1193
|
F: __dxlog_file4,
|
|
1193
|
-
L:
|
|
1194
|
+
L: 289,
|
|
1194
1195
|
S: this,
|
|
1195
1196
|
C: (f, a) => f(...a)
|
|
1196
1197
|
});
|
|
1197
1198
|
this._connectionLimiter.doneConnecting(sessionId);
|
|
1198
1199
|
invariant3(this.connection === connection, "Connection mismatch (race condition).", {
|
|
1199
1200
|
F: __dxlog_file4,
|
|
1200
|
-
L:
|
|
1201
|
+
L: 294,
|
|
1201
1202
|
S: this,
|
|
1202
1203
|
A: [
|
|
1203
1204
|
"this.connection === connection",
|
|
@@ -1212,7 +1213,7 @@ var Peer = class {
|
|
|
1212
1213
|
initiator
|
|
1213
1214
|
}, {
|
|
1214
1215
|
F: __dxlog_file4,
|
|
1215
|
-
L:
|
|
1216
|
+
L: 296,
|
|
1216
1217
|
S: this,
|
|
1217
1218
|
C: (f, a) => f(...a)
|
|
1218
1219
|
});
|
|
@@ -1227,6 +1228,12 @@ var Peer = class {
|
|
|
1227
1228
|
}
|
|
1228
1229
|
this._callbacks.onDisconnected();
|
|
1229
1230
|
scheduleTask2(this._connectionCtx, () => {
|
|
1231
|
+
log4("peer became available", logMeta, {
|
|
1232
|
+
F: __dxlog_file4,
|
|
1233
|
+
L: 320,
|
|
1234
|
+
S: this,
|
|
1235
|
+
C: (f, a) => f(...a)
|
|
1236
|
+
});
|
|
1230
1237
|
this.availableToConnect = true;
|
|
1231
1238
|
this._callbacks.onPeerAvailable();
|
|
1232
1239
|
}, this._availableAfter);
|
|
@@ -1247,7 +1254,7 @@ var Peer = class {
|
|
|
1247
1254
|
err
|
|
1248
1255
|
}, {
|
|
1249
1256
|
F: __dxlog_file4,
|
|
1250
|
-
L:
|
|
1257
|
+
L: 338,
|
|
1251
1258
|
S: this,
|
|
1252
1259
|
C: (f, a) => f(...a)
|
|
1253
1260
|
});
|
|
@@ -1260,7 +1267,7 @@ var Peer = class {
|
|
|
1260
1267
|
err
|
|
1261
1268
|
}, {
|
|
1262
1269
|
F: __dxlog_file4,
|
|
1263
|
-
L:
|
|
1270
|
+
L: 345,
|
|
1264
1271
|
S: this,
|
|
1265
1272
|
C: (f, a) => f(...a)
|
|
1266
1273
|
});
|
|
@@ -1279,7 +1286,7 @@ var Peer = class {
|
|
|
1279
1286
|
sessionId: connection.sessionId
|
|
1280
1287
|
}, {
|
|
1281
1288
|
F: __dxlog_file4,
|
|
1282
|
-
L:
|
|
1289
|
+
L: 370,
|
|
1283
1290
|
S: this,
|
|
1284
1291
|
C: (f, a) => f(...a)
|
|
1285
1292
|
});
|
|
@@ -1289,7 +1296,7 @@ var Peer = class {
|
|
|
1289
1296
|
sessionId: connection.sessionId
|
|
1290
1297
|
}, {
|
|
1291
1298
|
F: __dxlog_file4,
|
|
1292
|
-
L:
|
|
1299
|
+
L: 376,
|
|
1293
1300
|
S: this,
|
|
1294
1301
|
C: (f, a) => f(...a)
|
|
1295
1302
|
});
|
|
@@ -1300,7 +1307,7 @@ var Peer = class {
|
|
|
1300
1307
|
message
|
|
1301
1308
|
}, {
|
|
1302
1309
|
F: __dxlog_file4,
|
|
1303
|
-
L:
|
|
1310
|
+
L: 381,
|
|
1304
1311
|
S: this,
|
|
1305
1312
|
C: (f, a) => f(...a)
|
|
1306
1313
|
});
|
|
@@ -1315,7 +1322,7 @@ var Peer = class {
|
|
|
1315
1322
|
topic: this.topic
|
|
1316
1323
|
}, {
|
|
1317
1324
|
F: __dxlog_file4,
|
|
1318
|
-
L:
|
|
1325
|
+
L: 391,
|
|
1319
1326
|
S: this,
|
|
1320
1327
|
C: (f, a) => f(...a)
|
|
1321
1328
|
});
|
|
@@ -1533,10 +1540,16 @@ var Swarm = class {
|
|
|
1533
1540
|
const peer = this._peers.get(swarmEvent.peerLeft.peer);
|
|
1534
1541
|
if (peer) {
|
|
1535
1542
|
peer.advertizing = false;
|
|
1536
|
-
if (peer
|
|
1543
|
+
if (this._isConnectionEstablishmentInProgress(peer)) {
|
|
1544
|
+
log5(`destroying peer, state: ${peer.connection?.state}`, void 0, {
|
|
1545
|
+
F: __dxlog_file5,
|
|
1546
|
+
L: 195,
|
|
1547
|
+
S: this,
|
|
1548
|
+
C: (f, a) => f(...a)
|
|
1549
|
+
});
|
|
1537
1550
|
void this._destroyPeer(swarmEvent.peerLeft.peer, "peer left").catch((err) => log5.catch(err, void 0, {
|
|
1538
1551
|
F: __dxlog_file5,
|
|
1539
|
-
L:
|
|
1552
|
+
L: 196,
|
|
1540
1553
|
S: this,
|
|
1541
1554
|
C: (f, a) => f(...a)
|
|
1542
1555
|
}));
|
|
@@ -1546,7 +1559,7 @@ var Swarm = class {
|
|
|
1546
1559
|
peer: swarmEvent.peerLeft.peer.peerKey
|
|
1547
1560
|
}, {
|
|
1548
1561
|
F: __dxlog_file5,
|
|
1549
|
-
L:
|
|
1562
|
+
L: 199,
|
|
1550
1563
|
S: this,
|
|
1551
1564
|
C: (f, a) => f(...a)
|
|
1552
1565
|
});
|
|
@@ -1559,14 +1572,14 @@ var Swarm = class {
|
|
|
1559
1572
|
message
|
|
1560
1573
|
}, {
|
|
1561
1574
|
F: __dxlog_file5,
|
|
1562
|
-
L:
|
|
1575
|
+
L: 208,
|
|
1563
1576
|
S: this,
|
|
1564
1577
|
C: (f, a) => f(...a)
|
|
1565
1578
|
});
|
|
1566
1579
|
if (this._ctx.disposed) {
|
|
1567
1580
|
log5("ignored for disposed swarm", void 0, {
|
|
1568
1581
|
F: __dxlog_file5,
|
|
1569
|
-
L:
|
|
1582
|
+
L: 210,
|
|
1570
1583
|
S: this,
|
|
1571
1584
|
C: (f, a) => f(...a)
|
|
1572
1585
|
});
|
|
@@ -1576,7 +1589,7 @@ var Swarm = class {
|
|
|
1576
1589
|
}
|
|
1577
1590
|
invariant4(message.author, void 0, {
|
|
1578
1591
|
F: __dxlog_file5,
|
|
1579
|
-
L:
|
|
1592
|
+
L: 215,
|
|
1580
1593
|
S: this,
|
|
1581
1594
|
A: [
|
|
1582
1595
|
"message.author",
|
|
@@ -1588,7 +1601,7 @@ var Swarm = class {
|
|
|
1588
1601
|
message
|
|
1589
1602
|
}, {
|
|
1590
1603
|
F: __dxlog_file5,
|
|
1591
|
-
L:
|
|
1604
|
+
L: 217,
|
|
1592
1605
|
S: this,
|
|
1593
1606
|
C: (f, a) => f(...a)
|
|
1594
1607
|
});
|
|
@@ -1601,7 +1614,7 @@ var Swarm = class {
|
|
|
1601
1614
|
message
|
|
1602
1615
|
}, {
|
|
1603
1616
|
F: __dxlog_file5,
|
|
1604
|
-
L:
|
|
1617
|
+
L: 221,
|
|
1605
1618
|
S: this,
|
|
1606
1619
|
C: (f, a) => f(...a)
|
|
1607
1620
|
});
|
|
@@ -1619,14 +1632,14 @@ var Swarm = class {
|
|
|
1619
1632
|
message
|
|
1620
1633
|
}, {
|
|
1621
1634
|
F: __dxlog_file5,
|
|
1622
|
-
L:
|
|
1635
|
+
L: 232,
|
|
1623
1636
|
S: this,
|
|
1624
1637
|
C: (f, a) => f(...a)
|
|
1625
1638
|
});
|
|
1626
1639
|
if (this._ctx.disposed) {
|
|
1627
1640
|
log5.info("ignored for offline swarm", void 0, {
|
|
1628
1641
|
F: __dxlog_file5,
|
|
1629
|
-
L:
|
|
1642
|
+
L: 234,
|
|
1630
1643
|
S: this,
|
|
1631
1644
|
C: (f, a) => f(...a)
|
|
1632
1645
|
});
|
|
@@ -1634,7 +1647,7 @@ var Swarm = class {
|
|
|
1634
1647
|
}
|
|
1635
1648
|
invariant4(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
|
|
1636
1649
|
F: __dxlog_file5,
|
|
1637
|
-
L:
|
|
1650
|
+
L: 237,
|
|
1638
1651
|
S: this,
|
|
1639
1652
|
A: [
|
|
1640
1653
|
"message.recipient.peerKey === this._ownPeer.peerKey",
|
|
@@ -1643,7 +1656,7 @@ var Swarm = class {
|
|
|
1643
1656
|
});
|
|
1644
1657
|
invariant4(message.topic?.equals(this._topic), void 0, {
|
|
1645
1658
|
F: __dxlog_file5,
|
|
1646
|
-
L:
|
|
1659
|
+
L: 241,
|
|
1647
1660
|
S: this,
|
|
1648
1661
|
A: [
|
|
1649
1662
|
"message.topic?.equals(this._topic)",
|
|
@@ -1652,7 +1665,7 @@ var Swarm = class {
|
|
|
1652
1665
|
});
|
|
1653
1666
|
invariant4(message.author, void 0, {
|
|
1654
1667
|
F: __dxlog_file5,
|
|
1655
|
-
L:
|
|
1668
|
+
L: 242,
|
|
1656
1669
|
S: this,
|
|
1657
1670
|
A: [
|
|
1658
1671
|
"message.author",
|
|
@@ -1673,13 +1686,13 @@ var Swarm = class {
|
|
|
1673
1686
|
async goOnline() {
|
|
1674
1687
|
this._ctx = new Context4(void 0, {
|
|
1675
1688
|
F: __dxlog_file5,
|
|
1676
|
-
L:
|
|
1689
|
+
L: 258
|
|
1677
1690
|
});
|
|
1678
1691
|
}
|
|
1679
1692
|
_getOrCreatePeer(peerInfo) {
|
|
1680
1693
|
invariant4(peerInfo.peerKey, "PeerInfo.peerKey is required", {
|
|
1681
1694
|
F: __dxlog_file5,
|
|
1682
|
-
L:
|
|
1695
|
+
L: 262,
|
|
1683
1696
|
S: this,
|
|
1684
1697
|
A: [
|
|
1685
1698
|
"peerInfo.peerKey",
|
|
@@ -1697,6 +1710,12 @@ var Swarm = class {
|
|
|
1697
1710
|
},
|
|
1698
1711
|
onDisconnected: async () => {
|
|
1699
1712
|
if (this._isUnregistered(peer)) {
|
|
1713
|
+
log5.verbose("ignored onDisconnected for unregistered peer", void 0, {
|
|
1714
|
+
F: __dxlog_file5,
|
|
1715
|
+
L: 282,
|
|
1716
|
+
S: this,
|
|
1717
|
+
C: (f, a) => f(...a)
|
|
1718
|
+
});
|
|
1700
1719
|
return;
|
|
1701
1720
|
}
|
|
1702
1721
|
if (!peer.advertizing) {
|
|
@@ -1711,7 +1730,7 @@ var Swarm = class {
|
|
|
1711
1730
|
peerInfo
|
|
1712
1731
|
}, {
|
|
1713
1732
|
F: __dxlog_file5,
|
|
1714
|
-
L:
|
|
1733
|
+
L: 296,
|
|
1715
1734
|
S: this,
|
|
1716
1735
|
C: (f, a) => f(...a)
|
|
1717
1736
|
});
|
|
@@ -1733,10 +1752,19 @@ var Swarm = class {
|
|
|
1733
1752
|
return peer;
|
|
1734
1753
|
}
|
|
1735
1754
|
async _destroyPeer(peerInfo, reason) {
|
|
1755
|
+
log5("destroy peer", {
|
|
1756
|
+
peerKey: peerInfo.peerKey,
|
|
1757
|
+
reason
|
|
1758
|
+
}, {
|
|
1759
|
+
F: __dxlog_file5,
|
|
1760
|
+
L: 318,
|
|
1761
|
+
S: this,
|
|
1762
|
+
C: (f, a) => f(...a)
|
|
1763
|
+
});
|
|
1736
1764
|
const peer = this._peers.get(peerInfo);
|
|
1737
1765
|
invariant4(peer, void 0, {
|
|
1738
1766
|
F: __dxlog_file5,
|
|
1739
|
-
L:
|
|
1767
|
+
L: 320,
|
|
1740
1768
|
S: this,
|
|
1741
1769
|
A: [
|
|
1742
1770
|
"peer",
|
|
@@ -1766,7 +1794,7 @@ var Swarm = class {
|
|
|
1766
1794
|
} catch (err) {
|
|
1767
1795
|
log5("initiation error", err, {
|
|
1768
1796
|
F: __dxlog_file5,
|
|
1769
|
-
L:
|
|
1797
|
+
L: 347,
|
|
1770
1798
|
S: this,
|
|
1771
1799
|
C: (f, a) => f(...a)
|
|
1772
1800
|
});
|
|
@@ -1797,7 +1825,7 @@ var Swarm = class {
|
|
|
1797
1825
|
remotePeer
|
|
1798
1826
|
}, {
|
|
1799
1827
|
F: __dxlog_file5,
|
|
1800
|
-
L:
|
|
1828
|
+
L: 375,
|
|
1801
1829
|
S: this,
|
|
1802
1830
|
C: (f, a) => f(...a)
|
|
1803
1831
|
});
|
|
@@ -1816,7 +1844,7 @@ var Swarm = class {
|
|
|
1816
1844
|
remotePeer
|
|
1817
1845
|
}, {
|
|
1818
1846
|
F: __dxlog_file5,
|
|
1819
|
-
L:
|
|
1847
|
+
L: 391,
|
|
1820
1848
|
S: this,
|
|
1821
1849
|
C: (f, a) => f(...a)
|
|
1822
1850
|
});
|
|
@@ -1826,7 +1854,7 @@ var Swarm = class {
|
|
|
1826
1854
|
remotePeer
|
|
1827
1855
|
}, {
|
|
1828
1856
|
F: __dxlog_file5,
|
|
1829
|
-
L:
|
|
1857
|
+
L: 394,
|
|
1830
1858
|
S: this,
|
|
1831
1859
|
C: (f, a) => f(...a)
|
|
1832
1860
|
});
|
|
@@ -1838,6 +1866,16 @@ var Swarm = class {
|
|
|
1838
1866
|
}
|
|
1839
1867
|
await peer.closeConnection();
|
|
1840
1868
|
}
|
|
1869
|
+
_isConnectionEstablishmentInProgress(peer) {
|
|
1870
|
+
if (!peer.connection) {
|
|
1871
|
+
return true;
|
|
1872
|
+
}
|
|
1873
|
+
return [
|
|
1874
|
+
ConnectionState.INITIAL,
|
|
1875
|
+
ConnectionState.CREATED,
|
|
1876
|
+
ConnectionState.CONNECTING
|
|
1877
|
+
].includes(peer.connection.state);
|
|
1878
|
+
}
|
|
1841
1879
|
_isUnregistered(peer) {
|
|
1842
1880
|
return !peer || this._peers.get(peer.remoteInfo) !== peer;
|
|
1843
1881
|
}
|
|
@@ -3609,7 +3647,9 @@ var RtcPeerConnection = class {
|
|
|
3609
3647
|
this._abortConnection(connection, new Error(`Unknown signal type ${data.type}.`));
|
|
3610
3648
|
break;
|
|
3611
3649
|
}
|
|
3612
|
-
log13("signal processed",
|
|
3650
|
+
log13("signal processed", {
|
|
3651
|
+
type: data.type
|
|
3652
|
+
}, {
|
|
3613
3653
|
F: __dxlog_file14,
|
|
3614
3654
|
L: 330,
|
|
3615
3655
|
S: this,
|
|
@@ -4370,4 +4410,4 @@ export {
|
|
|
4370
4410
|
RtcTransportService,
|
|
4371
4411
|
createTeleportProtocolFactory
|
|
4372
4412
|
};
|
|
4373
|
-
//# sourceMappingURL=chunk-
|
|
4413
|
+
//# sourceMappingURL=chunk-UEVA7BFW.mjs.map
|