@dxos/echo-pipeline 0.5.2 → 0.5.3-main.088a2c8
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-VQQD32DM.mjs → chunk-VUJXFVSK.mjs} +49 -30
- package/dist/lib/browser/{chunk-VQQD32DM.mjs.map → chunk-VUJXFVSK.mjs.map} +3 -3
- package/dist/lib/browser/index.mjs +435 -288
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +3 -1
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node/{chunk-P7L7ICAH.cjs → chunk-6733E3WM.cjs} +50 -32
- package/dist/lib/node/{chunk-P7L7ICAH.cjs.map → chunk-6733E3WM.cjs.map} +3 -3
- package/dist/lib/node/index.cjs +446 -299
- package/dist/lib/node/index.cjs.map +4 -4
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +13 -11
- package/dist/lib/node/testing/index.cjs.map +3 -3
- package/dist/types/src/automerge/automerge-host.d.ts +4 -11
- package/dist/types/src/automerge/automerge-host.d.ts.map +1 -1
- package/dist/types/src/automerge/echo-network-adapter.d.ts +6 -0
- package/dist/types/src/automerge/echo-network-adapter.d.ts.map +1 -1
- package/dist/types/src/automerge/echo-replicator.d.ts +2 -0
- package/dist/types/src/automerge/echo-replicator.d.ts.map +1 -1
- package/dist/types/src/automerge/index.d.ts +1 -1
- package/dist/types/src/automerge/leveldb-storage-adapter.d.ts +2 -2
- package/dist/types/src/automerge/mesh-echo-replicator.d.ts +23 -0
- package/dist/types/src/automerge/mesh-echo-replicator.d.ts.map +1 -0
- package/dist/types/src/automerge/migrations.d.ts +2 -2
- package/dist/types/src/space/space-manager.d.ts +3 -2
- package/dist/types/src/space/space-manager.d.ts.map +1 -1
- package/dist/types/src/space/space-protocol.d.ts +2 -0
- package/dist/types/src/space/space-protocol.d.ts.map +1 -1
- package/dist/types/src/space/space.d.ts +4 -3
- package/dist/types/src/space/space.d.ts.map +1 -1
- package/dist/types/src/testing/test-agent-builder.d.ts.map +1 -1
- package/package.json +33 -33
- package/src/automerge/automerge-host.test.ts +22 -9
- package/src/automerge/automerge-host.ts +62 -88
- package/src/automerge/echo-network-adapter.ts +19 -0
- package/src/automerge/echo-replicator.ts +3 -0
- package/src/automerge/index.ts +1 -1
- package/src/automerge/leveldb-storage-adapter.ts +2 -2
- package/src/automerge/mesh-echo-replicator.ts +232 -0
- package/src/automerge/migrations.ts +2 -2
- package/src/space/space-manager.ts +4 -1
- package/src/space/space-protocol.ts +11 -8
- package/src/space/space.ts +8 -3
- package/src/testing/test-agent-builder.ts +1 -0
- package/dist/types/src/automerge/mesh-network-adapter.d.ts +0 -18
- package/dist/types/src/automerge/mesh-network-adapter.d.ts.map +0 -1
- package/src/automerge/mesh-network-adapter.ts +0 -107
|
@@ -1149,7 +1149,7 @@ var AuthExtension = class extends RpcExtension {
|
|
|
1149
1149
|
|
|
1150
1150
|
// packages/core/echo/echo-pipeline/src/space/space.ts
|
|
1151
1151
|
import { Event as Event4, Mutex, synchronized as synchronized3, trackLeaks as trackLeaks2 } from "@dxos/async";
|
|
1152
|
-
import {
|
|
1152
|
+
import { LifecycleState, Resource } from "@dxos/context";
|
|
1153
1153
|
import { invariant as invariant6 } from "@dxos/invariant";
|
|
1154
1154
|
import { log as log7, logInfo } from "@dxos/log";
|
|
1155
1155
|
import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
|
|
@@ -1439,7 +1439,7 @@ var Space = class extends Resource {
|
|
|
1439
1439
|
this.stateUpdate = new Event4();
|
|
1440
1440
|
invariant6(params.spaceKey && params.feedProvider, void 0, {
|
|
1441
1441
|
F: __dxlog_file8,
|
|
1442
|
-
L:
|
|
1442
|
+
L: 75,
|
|
1443
1443
|
S: this,
|
|
1444
1444
|
A: [
|
|
1445
1445
|
"params.spaceKey && params.feedProvider",
|
|
@@ -1472,7 +1472,7 @@ var Space = class extends Resource {
|
|
|
1472
1472
|
credential
|
|
1473
1473
|
}, {
|
|
1474
1474
|
F: __dxlog_file8,
|
|
1475
|
-
L:
|
|
1475
|
+
L: 102,
|
|
1476
1476
|
S: this,
|
|
1477
1477
|
C: (f, a) => f(...a)
|
|
1478
1478
|
});
|
|
@@ -1483,7 +1483,7 @@ var Space = class extends Resource {
|
|
|
1483
1483
|
invitation
|
|
1484
1484
|
}, {
|
|
1485
1485
|
F: __dxlog_file8,
|
|
1486
|
-
L:
|
|
1486
|
+
L: 106,
|
|
1487
1487
|
S: this,
|
|
1488
1488
|
C: (f, a) => f(...a)
|
|
1489
1489
|
});
|
|
@@ -1494,12 +1494,26 @@ var Space = class extends Resource {
|
|
|
1494
1494
|
invitation
|
|
1495
1495
|
}, {
|
|
1496
1496
|
F: __dxlog_file8,
|
|
1497
|
-
L:
|
|
1497
|
+
L: 110,
|
|
1498
1498
|
S: this,
|
|
1499
1499
|
C: (f, a) => f(...a)
|
|
1500
1500
|
});
|
|
1501
1501
|
await params.onDelegatedInvitationStatusChange(invitation, false);
|
|
1502
1502
|
});
|
|
1503
|
+
this._controlPipeline.onMemberRoleChanged.set(async (changedMembers) => {
|
|
1504
|
+
log7("onMemberRoleChanged", () => ({
|
|
1505
|
+
changedMembers: changedMembers.map((m) => [
|
|
1506
|
+
m.key,
|
|
1507
|
+
m.role
|
|
1508
|
+
])
|
|
1509
|
+
}), {
|
|
1510
|
+
F: __dxlog_file8,
|
|
1511
|
+
L: 114,
|
|
1512
|
+
S: this,
|
|
1513
|
+
C: (f, a) => f(...a)
|
|
1514
|
+
});
|
|
1515
|
+
await params.onMemberRolesChanged(changedMembers);
|
|
1516
|
+
});
|
|
1503
1517
|
this.protocol = params.protocol;
|
|
1504
1518
|
this.protocol.addFeed(params.genesisFeed);
|
|
1505
1519
|
}
|
|
@@ -1533,7 +1547,7 @@ var Space = class extends Resource {
|
|
|
1533
1547
|
async setControlFeed(feed) {
|
|
1534
1548
|
invariant6(!this._controlFeed, "Control feed already set.", {
|
|
1535
1549
|
F: __dxlog_file8,
|
|
1536
|
-
L:
|
|
1550
|
+
L: 161,
|
|
1537
1551
|
S: this,
|
|
1538
1552
|
A: [
|
|
1539
1553
|
"!this._controlFeed",
|
|
@@ -1547,7 +1561,7 @@ var Space = class extends Resource {
|
|
|
1547
1561
|
async setDataFeed(feed) {
|
|
1548
1562
|
invariant6(!this._dataFeed, "Data feed already set.", {
|
|
1549
1563
|
F: __dxlog_file8,
|
|
1550
|
-
L:
|
|
1564
|
+
L: 168,
|
|
1551
1565
|
S: this,
|
|
1552
1566
|
A: [
|
|
1553
1567
|
"!this._dataFeed",
|
|
@@ -1566,7 +1580,7 @@ var Space = class extends Resource {
|
|
|
1566
1580
|
async _open(ctx) {
|
|
1567
1581
|
log7("opening...", void 0, {
|
|
1568
1582
|
F: __dxlog_file8,
|
|
1569
|
-
L:
|
|
1583
|
+
L: 182,
|
|
1570
1584
|
S: this,
|
|
1571
1585
|
C: (f, a) => f(...a)
|
|
1572
1586
|
});
|
|
@@ -1574,7 +1588,7 @@ var Space = class extends Resource {
|
|
|
1574
1588
|
await this.protocol.start();
|
|
1575
1589
|
log7("opened", void 0, {
|
|
1576
1590
|
F: __dxlog_file8,
|
|
1577
|
-
L:
|
|
1591
|
+
L: 188,
|
|
1578
1592
|
S: this,
|
|
1579
1593
|
C: (f, a) => f(...a)
|
|
1580
1594
|
});
|
|
@@ -1584,7 +1598,7 @@ var Space = class extends Resource {
|
|
|
1584
1598
|
key: this._key
|
|
1585
1599
|
}, {
|
|
1586
1600
|
F: __dxlog_file8,
|
|
1587
|
-
L:
|
|
1601
|
+
L: 193,
|
|
1588
1602
|
S: this,
|
|
1589
1603
|
C: (f, a) => f(...a)
|
|
1590
1604
|
});
|
|
@@ -1592,7 +1606,7 @@ var Space = class extends Resource {
|
|
|
1592
1606
|
await this._controlPipeline.stop();
|
|
1593
1607
|
log7("closed", void 0, {
|
|
1594
1608
|
F: __dxlog_file8,
|
|
1595
|
-
L:
|
|
1609
|
+
L: 199,
|
|
1596
1610
|
S: this,
|
|
1597
1611
|
C: (f, a) => f(...a)
|
|
1598
1612
|
});
|
|
@@ -1646,6 +1660,12 @@ var SpaceProtocol = class {
|
|
|
1646
1660
|
constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore }) {
|
|
1647
1661
|
this._feeds = /* @__PURE__ */ new Set();
|
|
1648
1662
|
this._sessions = new ComplexMap3(PublicKey5.hash);
|
|
1663
|
+
// TODO(burdon): Move to config (with sensible defaults).
|
|
1664
|
+
this._topology = new MMSTTopology({
|
|
1665
|
+
originateConnections: 4,
|
|
1666
|
+
maxPeers: 10,
|
|
1667
|
+
sampleSize: 20
|
|
1668
|
+
});
|
|
1649
1669
|
this._spaceKey = topic;
|
|
1650
1670
|
this._networkManager = networkManager;
|
|
1651
1671
|
this._swarmIdentity = swarmIdentity;
|
|
@@ -1671,7 +1691,7 @@ var SpaceProtocol = class {
|
|
|
1671
1691
|
key: feed.key
|
|
1672
1692
|
}, {
|
|
1673
1693
|
F: __dxlog_file9,
|
|
1674
|
-
L:
|
|
1694
|
+
L: 109,
|
|
1675
1695
|
S: this,
|
|
1676
1696
|
C: (f, a) => f(...a)
|
|
1677
1697
|
});
|
|
@@ -1686,15 +1706,10 @@ var SpaceProtocol = class {
|
|
|
1686
1706
|
return;
|
|
1687
1707
|
}
|
|
1688
1708
|
const credentials = await this._swarmIdentity.credentialProvider(Buffer.from(""));
|
|
1689
|
-
const topologyConfig = {
|
|
1690
|
-
originateConnections: 4,
|
|
1691
|
-
maxPeers: 10,
|
|
1692
|
-
sampleSize: 20
|
|
1693
|
-
};
|
|
1694
1709
|
await this.blobSync.open();
|
|
1695
1710
|
log8("starting...", void 0, {
|
|
1696
1711
|
F: __dxlog_file9,
|
|
1697
|
-
L:
|
|
1712
|
+
L: 128,
|
|
1698
1713
|
S: this,
|
|
1699
1714
|
C: (f, a) => f(...a)
|
|
1700
1715
|
});
|
|
@@ -1703,29 +1718,32 @@ var SpaceProtocol = class {
|
|
|
1703
1718
|
protocolProvider: this._createProtocolProvider(credentials),
|
|
1704
1719
|
peerId: this._swarmIdentity.peerKey,
|
|
1705
1720
|
topic,
|
|
1706
|
-
topology:
|
|
1721
|
+
topology: this._topology,
|
|
1707
1722
|
label: `swarm ${topic.truncate()} for space ${this._spaceKey.truncate()}`
|
|
1708
1723
|
});
|
|
1709
1724
|
log8("started", void 0, {
|
|
1710
1725
|
F: __dxlog_file9,
|
|
1711
|
-
L:
|
|
1726
|
+
L: 138,
|
|
1712
1727
|
S: this,
|
|
1713
1728
|
C: (f, a) => f(...a)
|
|
1714
1729
|
});
|
|
1715
1730
|
}
|
|
1731
|
+
updateTopology() {
|
|
1732
|
+
this._topology.forceUpdate();
|
|
1733
|
+
}
|
|
1716
1734
|
async stop() {
|
|
1717
1735
|
await this.blobSync.close();
|
|
1718
1736
|
if (this._connection) {
|
|
1719
1737
|
log8("stopping...", void 0, {
|
|
1720
1738
|
F: __dxlog_file9,
|
|
1721
|
-
L:
|
|
1739
|
+
L: 149,
|
|
1722
1740
|
S: this,
|
|
1723
1741
|
C: (f, a) => f(...a)
|
|
1724
1742
|
});
|
|
1725
1743
|
await this._connection.close();
|
|
1726
1744
|
log8("stopped", void 0, {
|
|
1727
1745
|
F: __dxlog_file9,
|
|
1728
|
-
L:
|
|
1746
|
+
L: 151,
|
|
1729
1747
|
S: this,
|
|
1730
1748
|
C: (f, a) => f(...a)
|
|
1731
1749
|
});
|
|
@@ -1799,7 +1817,7 @@ var SpaceProtocolSession = class {
|
|
|
1799
1817
|
onAuthSuccess: () => {
|
|
1800
1818
|
log8("Peer authenticated", void 0, {
|
|
1801
1819
|
F: __dxlog_file9,
|
|
1802
|
-
L:
|
|
1820
|
+
L: 248,
|
|
1803
1821
|
S: this,
|
|
1804
1822
|
C: (f, a) => f(...a)
|
|
1805
1823
|
});
|
|
@@ -1817,7 +1835,7 @@ var SpaceProtocolSession = class {
|
|
|
1817
1835
|
async close() {
|
|
1818
1836
|
log8("close", void 0, {
|
|
1819
1837
|
F: __dxlog_file9,
|
|
1820
|
-
L:
|
|
1838
|
+
L: 264,
|
|
1821
1839
|
S: this,
|
|
1822
1840
|
C: (f, a) => f(...a)
|
|
1823
1841
|
});
|
|
@@ -1873,12 +1891,12 @@ var SpaceManager = class {
|
|
|
1873
1891
|
...this._spaces.values()
|
|
1874
1892
|
].map((space) => space.close()));
|
|
1875
1893
|
}
|
|
1876
|
-
async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, memberKey }) {
|
|
1894
|
+
async constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, onMemberRolesChanged, memberKey }) {
|
|
1877
1895
|
log9.trace("dxos.echo.space-manager.construct-space", trace4.begin({
|
|
1878
1896
|
id: this._instanceId
|
|
1879
1897
|
}), {
|
|
1880
1898
|
F: __dxlog_file10,
|
|
1881
|
-
L:
|
|
1899
|
+
L: 94,
|
|
1882
1900
|
S: this,
|
|
1883
1901
|
C: (f, a) => f(...a)
|
|
1884
1902
|
});
|
|
@@ -1886,7 +1904,7 @@ var SpaceManager = class {
|
|
|
1886
1904
|
spaceKey: metadata.genesisFeedKey
|
|
1887
1905
|
}, {
|
|
1888
1906
|
F: __dxlog_file10,
|
|
1889
|
-
L:
|
|
1907
|
+
L: 95,
|
|
1890
1908
|
S: this,
|
|
1891
1909
|
C: (f, a) => f(...a)
|
|
1892
1910
|
});
|
|
@@ -1909,14 +1927,15 @@ var SpaceManager = class {
|
|
|
1909
1927
|
metadataStore: this._metadataStore,
|
|
1910
1928
|
snapshotManager,
|
|
1911
1929
|
memberKey,
|
|
1912
|
-
onDelegatedInvitationStatusChange
|
|
1930
|
+
onDelegatedInvitationStatusChange,
|
|
1931
|
+
onMemberRolesChanged
|
|
1913
1932
|
});
|
|
1914
1933
|
this._spaces.set(space.key, space);
|
|
1915
1934
|
log9.trace("dxos.echo.space-manager.construct-space", trace4.end({
|
|
1916
1935
|
id: this._instanceId
|
|
1917
1936
|
}), {
|
|
1918
1937
|
F: __dxlog_file10,
|
|
1919
|
-
L:
|
|
1938
|
+
L: 124,
|
|
1920
1939
|
S: this,
|
|
1921
1940
|
C: (f, a) => f(...a)
|
|
1922
1941
|
});
|
|
@@ -1957,4 +1976,4 @@ export {
|
|
|
1957
1976
|
SpaceProtocolSession,
|
|
1958
1977
|
SpaceManager
|
|
1959
1978
|
};
|
|
1960
|
-
//# sourceMappingURL=chunk-
|
|
1979
|
+
//# sourceMappingURL=chunk-VUJXFVSK.mjs.map
|