@dxos/client-services 0.8.4-main.fd6878d → 0.8.4-main.fffef41
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-6C7MTZLC.mjs → chunk-I2RGLVJF.mjs} +157 -146
- package/dist/lib/browser/chunk-I2RGLVJF.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 +2 -3
- package/dist/lib/browser/testing/index.mjs.map +1 -1
- package/dist/lib/node-esm/{chunk-YOHACH7G.mjs → chunk-QTUURCR4.mjs} +157 -146
- package/dist/lib/node-esm/chunk-QTUURCR4.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 +2 -3
- package/dist/lib/node-esm/testing/index.mjs.map +1 -1
- package/dist/types/src/packlets/agents/edge-agent-service.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/types/src/packlets/space-export/space-archive-writer.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +39 -39
- package/src/packlets/agents/edge-agent-manager.ts +2 -2
- package/src/packlets/agents/edge-agent-service.ts +11 -1
- package/src/packlets/devices/devices-service.ts +1 -1
- package/src/packlets/identity/identity.test.ts +4 -4
- package/src/packlets/logging/logging-service.ts +1 -1
- package/src/packlets/services/service-context.ts +5 -4
- package/src/packlets/services/service-host.ts +8 -1
- package/src/packlets/space-export/space-archive-reader.ts +1 -1
- package/src/packlets/space-export/space-archive-writer.ts +4 -3
- package/src/packlets/spaces/data-space-manager.ts +19 -3
- package/src/packlets/spaces/edge-feed-replicator.test.ts +1 -1
- package/src/packlets/spaces/edge-feed-replicator.ts +1 -1
- package/src/packlets/spaces/spaces-service.ts +1 -1
- package/src/version.ts +1 -1
- package/dist/lib/browser/chunk-6C7MTZLC.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-YOHACH7G.mjs.map +0 -7
|
@@ -396,7 +396,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
|
|
|
396
396
|
import { TRACE_PROCESSOR } from "@dxos/tracing";
|
|
397
397
|
|
|
398
398
|
// src/version.ts
|
|
399
|
-
var DXOS_VERSION = "0.8.4-main.
|
|
399
|
+
var DXOS_VERSION = "0.8.4-main.fffef41";
|
|
400
400
|
|
|
401
401
|
// src/packlets/services/platform.ts
|
|
402
402
|
import { Platform } from "@dxos/protocols/proto/dxos/client/services";
|
|
@@ -624,13 +624,12 @@ var createAuthProvider = (signer) => async (nonce) => {
|
|
|
624
624
|
};
|
|
625
625
|
var TrustedKeySetAuthVerifier = class {
|
|
626
626
|
_params;
|
|
627
|
-
_ctx
|
|
627
|
+
_ctx = new Context2(void 0, {
|
|
628
|
+
F: __dxlog_file4,
|
|
629
|
+
L: 45
|
|
630
|
+
});
|
|
628
631
|
constructor(_params) {
|
|
629
632
|
this._params = _params;
|
|
630
|
-
this._ctx = new Context2(void 0, {
|
|
631
|
-
F: __dxlog_file4,
|
|
632
|
-
L: 45
|
|
633
|
-
});
|
|
634
633
|
}
|
|
635
634
|
async close() {
|
|
636
635
|
await this._ctx.dispose();
|
|
@@ -878,7 +877,7 @@ var EdgeFeedReplicator = class extends Resource {
|
|
|
878
877
|
}
|
|
879
878
|
async _handleReconnect() {
|
|
880
879
|
await this._resetConnection();
|
|
881
|
-
if (this._messenger.status === EdgeStatus.CONNECTED) {
|
|
880
|
+
if (this._messenger.status.state === EdgeStatus.ConnectionState.CONNECTED) {
|
|
882
881
|
this._startReplication();
|
|
883
882
|
}
|
|
884
883
|
}
|
|
@@ -1279,9 +1278,9 @@ import { Event as Event2, synchronized, trackLeaks } from "@dxos/async";
|
|
|
1279
1278
|
import { PropertiesType, TYPE_PROPERTIES } from "@dxos/client-protocol";
|
|
1280
1279
|
import { Context as Context4, LifecycleState, Resource as Resource2, cancelWithContext } from "@dxos/context";
|
|
1281
1280
|
import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/credentials";
|
|
1281
|
+
import { ObjectId, getTypeReference } from "@dxos/echo/internal";
|
|
1282
1282
|
import { AuthStatus, CredentialServerExtension, DatabaseRoot, FIND_PARAMS, findInlineObjectOfType } from "@dxos/echo-pipeline";
|
|
1283
1283
|
import { SpaceDocVersion, createIdFromSpaceKey, encodeReference } from "@dxos/echo-protocol";
|
|
1284
|
-
import { ObjectId, getTypeReference } from "@dxos/echo-schema";
|
|
1285
1284
|
import { writeMessages } from "@dxos/feed-store";
|
|
1286
1285
|
import { assertArgument, assertState, failedInvariant, invariant as invariant3 } from "@dxos/invariant";
|
|
1287
1286
|
import { PublicKey as PublicKey4 } from "@dxos/keys";
|
|
@@ -1512,7 +1511,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1512
1511
|
* Creates a new space writing the genesis credentials to the control feed.
|
|
1513
1512
|
*/
|
|
1514
1513
|
async createSpace(options = {}) {
|
|
1515
|
-
assertArgument(!!options.rootUrl === !!options.documents, "root url must be required when providing documents");
|
|
1514
|
+
assertArgument(!!options.rootUrl === !!options.documents, "options", "root url must be required when providing documents");
|
|
1516
1515
|
assertState(this._lifecycleState === LifecycleState.OPEN, "Not open.");
|
|
1517
1516
|
const spaceKey = await this._keyring.createKey();
|
|
1518
1517
|
const controlFeedKey = await this._keyring.createKey();
|
|
@@ -1530,7 +1529,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1530
1529
|
spaceKey
|
|
1531
1530
|
}, {
|
|
1532
1531
|
F: __dxlog_file6,
|
|
1533
|
-
L:
|
|
1532
|
+
L: 269,
|
|
1534
1533
|
S: this,
|
|
1535
1534
|
C: (f, a) => f(...a)
|
|
1536
1535
|
});
|
|
@@ -1538,7 +1537,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1538
1537
|
if (options.documents) {
|
|
1539
1538
|
invariant3(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", {
|
|
1540
1539
|
F: __dxlog_file6,
|
|
1541
|
-
L:
|
|
1540
|
+
L: 274,
|
|
1542
1541
|
S: this,
|
|
1543
1542
|
A: [
|
|
1544
1543
|
"Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
|
|
@@ -1550,13 +1549,18 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1550
1549
|
documentId
|
|
1551
1550
|
}, {
|
|
1552
1551
|
F: __dxlog_file6,
|
|
1553
|
-
L:
|
|
1552
|
+
L: 281,
|
|
1554
1553
|
S: this,
|
|
1555
1554
|
C: (f, a) => f(...a)
|
|
1556
1555
|
});
|
|
1557
1556
|
const newDoc = await this._echoHost.createDoc(data, {
|
|
1558
1557
|
preserveHistory: true
|
|
1559
1558
|
});
|
|
1559
|
+
if (newDoc.doc().access !== void 0 && newDoc.doc().access.spaceKey !== spaceKey.toHex()) {
|
|
1560
|
+
newDoc.change((doc) => {
|
|
1561
|
+
doc.access.spaceKey = spaceKey.toHex();
|
|
1562
|
+
});
|
|
1563
|
+
}
|
|
1560
1564
|
documentIdMapping[documentId] = newDoc.documentId;
|
|
1561
1565
|
}));
|
|
1562
1566
|
}
|
|
@@ -1564,7 +1568,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1564
1568
|
spaceKey
|
|
1565
1569
|
}, {
|
|
1566
1570
|
F: __dxlog_file6,
|
|
1567
|
-
L:
|
|
1571
|
+
L: 299,
|
|
1568
1572
|
S: this,
|
|
1569
1573
|
C: (f, a) => f(...a)
|
|
1570
1574
|
});
|
|
@@ -1573,18 +1577,19 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1573
1577
|
const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
|
|
1574
1578
|
const rootDocHandle = await this._echoHost.loadDoc(Context4.default(void 0, {
|
|
1575
1579
|
F: __dxlog_file6,
|
|
1576
|
-
L:
|
|
1580
|
+
L: 304
|
|
1577
1581
|
}), newRootDocId);
|
|
1578
1582
|
DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
|
|
1579
1583
|
root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
|
|
1580
1584
|
} else {
|
|
1581
1585
|
root = await this._echoHost.createSpaceRoot(spaceKey);
|
|
1582
1586
|
}
|
|
1587
|
+
await this._echoHost.flush();
|
|
1583
1588
|
log4("constructing space...", {
|
|
1584
1589
|
spaceKey
|
|
1585
1590
|
}, {
|
|
1586
1591
|
F: __dxlog_file6,
|
|
1587
|
-
L:
|
|
1592
|
+
L: 313,
|
|
1588
1593
|
S: this,
|
|
1589
1594
|
C: (f, a) => f(...a)
|
|
1590
1595
|
});
|
|
@@ -1594,7 +1599,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1594
1599
|
spaceKey
|
|
1595
1600
|
}, {
|
|
1596
1601
|
F: __dxlog_file6,
|
|
1597
|
-
L:
|
|
1602
|
+
L: 318,
|
|
1598
1603
|
S: this,
|
|
1599
1604
|
C: (f, a) => f(...a)
|
|
1600
1605
|
});
|
|
@@ -1603,7 +1608,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1603
1608
|
const memberCredential = credentials[1];
|
|
1604
1609
|
invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
|
|
1605
1610
|
F: __dxlog_file6,
|
|
1606
|
-
L:
|
|
1611
|
+
L: 324,
|
|
1607
1612
|
S: this,
|
|
1608
1613
|
A: [
|
|
1609
1614
|
"getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
|
|
@@ -1617,7 +1622,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1617
1622
|
spaceKey
|
|
1618
1623
|
}, {
|
|
1619
1624
|
F: __dxlog_file6,
|
|
1620
|
-
L:
|
|
1625
|
+
L: 329,
|
|
1621
1626
|
S: this,
|
|
1622
1627
|
C: (f, a) => f(...a)
|
|
1623
1628
|
});
|
|
@@ -1635,7 +1640,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1635
1640
|
spaceId: space.id
|
|
1636
1641
|
}, {
|
|
1637
1642
|
F: __dxlog_file6,
|
|
1638
|
-
L:
|
|
1643
|
+
L: 342,
|
|
1639
1644
|
S: this,
|
|
1640
1645
|
C: (f, a) => f(...a)
|
|
1641
1646
|
});
|
|
@@ -1653,7 +1658,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1653
1658
|
spaceId: space.id
|
|
1654
1659
|
}, {
|
|
1655
1660
|
F: __dxlog_file6,
|
|
1656
|
-
L:
|
|
1661
|
+
L: 353,
|
|
1657
1662
|
S: this,
|
|
1658
1663
|
C: (f, a) => f(...a)
|
|
1659
1664
|
});
|
|
@@ -1688,7 +1693,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1688
1693
|
const automergeIndex = space.automergeSpaceState.rootUrl;
|
|
1689
1694
|
invariant3(automergeIndex, void 0, {
|
|
1690
1695
|
F: __dxlog_file6,
|
|
1691
|
-
L:
|
|
1696
|
+
L: 386,
|
|
1692
1697
|
S: this,
|
|
1693
1698
|
A: [
|
|
1694
1699
|
"automergeIndex",
|
|
@@ -1705,13 +1710,13 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1705
1710
|
opts
|
|
1706
1711
|
}, {
|
|
1707
1712
|
F: __dxlog_file6,
|
|
1708
|
-
L:
|
|
1713
|
+
L: 395,
|
|
1709
1714
|
S: this,
|
|
1710
1715
|
C: (f, a) => f(...a)
|
|
1711
1716
|
});
|
|
1712
1717
|
invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
|
|
1713
1718
|
F: __dxlog_file6,
|
|
1714
|
-
L:
|
|
1719
|
+
L: 396,
|
|
1715
1720
|
S: this,
|
|
1716
1721
|
A: [
|
|
1717
1722
|
"this._lifecycleState === LifecycleState.OPEN",
|
|
@@ -1720,7 +1725,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1720
1725
|
});
|
|
1721
1726
|
invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", {
|
|
1722
1727
|
F: __dxlog_file6,
|
|
1723
|
-
L:
|
|
1728
|
+
L: 397,
|
|
1724
1729
|
S: this,
|
|
1725
1730
|
A: [
|
|
1726
1731
|
"!this._spaces.has(opts.spaceKey)",
|
|
@@ -1744,7 +1749,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1744
1749
|
const space = this._spaceManager.spaces.get(options.spaceKey);
|
|
1745
1750
|
invariant3(space, void 0, {
|
|
1746
1751
|
F: __dxlog_file6,
|
|
1747
|
-
L:
|
|
1752
|
+
L: 417,
|
|
1748
1753
|
S: this,
|
|
1749
1754
|
A: [
|
|
1750
1755
|
"space",
|
|
@@ -1757,7 +1762,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1757
1762
|
const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
|
|
1758
1763
|
invariant3(credentials[0].credential, void 0, {
|
|
1759
1764
|
F: __dxlog_file6,
|
|
1760
|
-
L:
|
|
1765
|
+
L: 436,
|
|
1761
1766
|
S: this,
|
|
1762
1767
|
A: [
|
|
1763
1768
|
"credentials[0].credential",
|
|
@@ -1767,7 +1772,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1767
1772
|
const spaceMemberCredential = credentials[0].credential.credential;
|
|
1768
1773
|
invariant3(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
|
|
1769
1774
|
F: __dxlog_file6,
|
|
1770
|
-
L:
|
|
1775
|
+
L: 438,
|
|
1771
1776
|
S: this,
|
|
1772
1777
|
A: [
|
|
1773
1778
|
"getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
|
|
@@ -1805,7 +1810,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1805
1810
|
const space = this._spaces.get(spaceKey);
|
|
1806
1811
|
invariant3(space, "Space not found.", {
|
|
1807
1812
|
F: __dxlog_file6,
|
|
1808
|
-
L:
|
|
1813
|
+
L: 475,
|
|
1809
1814
|
S: this,
|
|
1810
1815
|
A: [
|
|
1811
1816
|
"space",
|
|
@@ -1830,7 +1835,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1830
1835
|
metadata
|
|
1831
1836
|
}, {
|
|
1832
1837
|
F: __dxlog_file6,
|
|
1833
|
-
L:
|
|
1838
|
+
L: 494,
|
|
1834
1839
|
S: this,
|
|
1835
1840
|
C: (f, a) => f(...a)
|
|
1836
1841
|
});
|
|
@@ -1874,7 +1879,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1874
1879
|
err
|
|
1875
1880
|
}, {
|
|
1876
1881
|
F: __dxlog_file6,
|
|
1877
|
-
L:
|
|
1882
|
+
L: 536,
|
|
1878
1883
|
S: this,
|
|
1879
1884
|
C: (f, a) => f(...a)
|
|
1880
1885
|
});
|
|
@@ -1884,7 +1889,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1884
1889
|
onAuthFailure: () => {
|
|
1885
1890
|
log4.warn("auth failure", void 0, {
|
|
1886
1891
|
F: __dxlog_file6,
|
|
1887
|
-
L:
|
|
1892
|
+
L: 541,
|
|
1888
1893
|
S: this,
|
|
1889
1894
|
C: (f, a) => f(...a)
|
|
1890
1895
|
});
|
|
@@ -1917,7 +1922,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1917
1922
|
space: space.key
|
|
1918
1923
|
}, {
|
|
1919
1924
|
F: __dxlog_file6,
|
|
1920
|
-
L:
|
|
1925
|
+
L: 568,
|
|
1921
1926
|
S: this,
|
|
1922
1927
|
C: (f, a) => f(...a)
|
|
1923
1928
|
});
|
|
@@ -1928,7 +1933,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1928
1933
|
open: this._lifecycleState === LifecycleState.OPEN
|
|
1929
1934
|
}, {
|
|
1930
1935
|
F: __dxlog_file6,
|
|
1931
|
-
L:
|
|
1936
|
+
L: 571,
|
|
1932
1937
|
S: this,
|
|
1933
1938
|
C: (f, a) => f(...a)
|
|
1934
1939
|
});
|
|
@@ -1947,7 +1952,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1947
1952
|
space: space.key
|
|
1948
1953
|
}, {
|
|
1949
1954
|
F: __dxlog_file6,
|
|
1950
|
-
L:
|
|
1955
|
+
L: 579,
|
|
1951
1956
|
S: this,
|
|
1952
1957
|
C: (f, a) => f(...a)
|
|
1953
1958
|
});
|
|
@@ -1968,7 +1973,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1968
1973
|
spaceId: dataSpace.id
|
|
1969
1974
|
}, {
|
|
1970
1975
|
F: __dxlog_file6,
|
|
1971
|
-
L:
|
|
1976
|
+
L: 593,
|
|
1972
1977
|
S: this,
|
|
1973
1978
|
C: (f, a) => f(...a)
|
|
1974
1979
|
});
|
|
@@ -1998,7 +2003,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1998
2003
|
space: space.key
|
|
1999
2004
|
}, {
|
|
2000
2005
|
F: __dxlog_file6,
|
|
2001
|
-
L:
|
|
2006
|
+
L: 620,
|
|
2002
2007
|
S: this,
|
|
2003
2008
|
C: (f, a) => f(...a)
|
|
2004
2009
|
});
|
|
@@ -2031,7 +2036,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2031
2036
|
closedSessions
|
|
2032
2037
|
}, {
|
|
2033
2038
|
F: __dxlog_file6,
|
|
2034
|
-
L:
|
|
2039
|
+
L: 646,
|
|
2035
2040
|
S: this,
|
|
2036
2041
|
C: (f, a) => f(...a)
|
|
2037
2042
|
});
|
|
@@ -2046,7 +2051,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2046
2051
|
peerId: peerState.peerId
|
|
2047
2052
|
}, {
|
|
2048
2053
|
F: __dxlog_file6,
|
|
2049
|
-
L:
|
|
2054
|
+
L: 660,
|
|
2050
2055
|
S: this,
|
|
2051
2056
|
C: (f, a) => f(...a)
|
|
2052
2057
|
});
|
|
@@ -2142,13 +2147,13 @@ var SpaceArchiveWriter = class extends Resource3 {
|
|
|
2142
2147
|
this._archive = new this._tar.Archive();
|
|
2143
2148
|
}
|
|
2144
2149
|
async setCurrentRootUrl(url) {
|
|
2145
|
-
assertArgument2(url.startsWith("automerge:"), "Invalid root URL");
|
|
2150
|
+
assertArgument2(url.startsWith("automerge:"), "url", "Invalid root URL");
|
|
2146
2151
|
assertState2(this._tar, "Not open");
|
|
2147
2152
|
assertState2(this._meta, "Not started");
|
|
2148
2153
|
this._currentRootUrl = url;
|
|
2149
2154
|
}
|
|
2150
2155
|
async writeDocument(documentId, data) {
|
|
2151
|
-
assertArgument2(!documentId.startsWith("automerge:"), "Invalid document ID");
|
|
2156
|
+
assertArgument2(!documentId.startsWith("automerge:"), "documentId", "Invalid document ID");
|
|
2152
2157
|
assertState2(this._archive, "Not open");
|
|
2153
2158
|
this._archive.addBinaryFile(`${SpaceArchiveFileStructure.documents}/${documentId}.bin`, data);
|
|
2154
2159
|
}
|
|
@@ -2168,7 +2173,8 @@ var SpaceArchiveWriter = class extends Resource3 {
|
|
|
2168
2173
|
this._archive.addTextFile(SpaceArchiveFileStructure.metadata, JSON.stringify(metadata));
|
|
2169
2174
|
const binary = this._archive.toUint8Array();
|
|
2170
2175
|
return {
|
|
2171
|
-
|
|
2176
|
+
// TODO(wittjosiah): Factor out file name construction.
|
|
2177
|
+
filename: `${(/* @__PURE__ */ new Date()).toISOString()}-${this._meta.spaceId}.tar`,
|
|
2172
2178
|
contents: binary
|
|
2173
2179
|
};
|
|
2174
2180
|
}
|
|
@@ -2183,7 +2189,7 @@ var extractSpaceArchive = async (archive) => {
|
|
|
2183
2189
|
const { Archive } = await import("@obsidize/tar-browserify");
|
|
2184
2190
|
const { entries } = await Archive.extract(archive.contents);
|
|
2185
2191
|
const metadataEntry = entries.find((entry2) => entry2.fileName === SpaceArchiveFileStructure2.metadata);
|
|
2186
|
-
assertArgument3(metadataEntry, "Metadata entry not found");
|
|
2192
|
+
assertArgument3(metadataEntry, "metadataEntry", "Metadata entry not found");
|
|
2187
2193
|
const metadata = JSON.parse(metadataEntry.getContentAsText());
|
|
2188
2194
|
const documents = {};
|
|
2189
2195
|
for (const entry2 of entries.filter((entry3) => entry3.fileName.startsWith(`${SpaceArchiveFileStructure2.documents}/`))) {
|
|
@@ -2524,7 +2530,7 @@ var SpacesServiceImpl = class {
|
|
|
2524
2530
|
};
|
|
2525
2531
|
try {
|
|
2526
2532
|
const writer = _ts_add_disposable_resource2(env, await new SpaceArchiveWriter().open(), true);
|
|
2527
|
-
assertArgument4(SpaceId.isValid(request.spaceId), "Invalid space ID");
|
|
2533
|
+
assertArgument4(SpaceId.isValid(request.spaceId), "spaceId", "Invalid space ID");
|
|
2528
2534
|
const dataSpaceManager = await this._getDataSpaceManager();
|
|
2529
2535
|
const space = dataSpaceManager.getSpaceById(request.spaceId) ?? raise(new Error("Space not found"));
|
|
2530
2536
|
await writer.begin({
|
|
@@ -3645,12 +3651,12 @@ import { Resource as Resource5 } from "@dxos/context";
|
|
|
3645
3651
|
import { checkCredentialType } from "@dxos/credentials";
|
|
3646
3652
|
var AutomergeSpaceState = class extends Resource5 {
|
|
3647
3653
|
_onNewRoot;
|
|
3648
|
-
rootUrl;
|
|
3649
|
-
lastEpoch;
|
|
3650
|
-
onNewEpoch;
|
|
3651
|
-
_isProcessingRootDocs;
|
|
3654
|
+
rootUrl = void 0;
|
|
3655
|
+
lastEpoch = void 0;
|
|
3656
|
+
onNewEpoch = new Event5();
|
|
3657
|
+
_isProcessingRootDocs = false;
|
|
3652
3658
|
constructor(_onNewRoot) {
|
|
3653
|
-
super(), this._onNewRoot = _onNewRoot
|
|
3659
|
+
super(), this._onNewRoot = _onNewRoot;
|
|
3654
3660
|
}
|
|
3655
3661
|
async _open(ctx) {
|
|
3656
3662
|
}
|
|
@@ -5230,13 +5236,16 @@ var OPTIONS_TIMEOUT = 1e4;
|
|
|
5230
5236
|
var InvitationGuestExtension = class extends RpcExtension2 {
|
|
5231
5237
|
_invitationFlowMutex;
|
|
5232
5238
|
_callbacks;
|
|
5233
|
-
_ctx
|
|
5239
|
+
_ctx = new Context7(void 0, {
|
|
5240
|
+
F: __dxlog_file18,
|
|
5241
|
+
L: 38
|
|
5242
|
+
});
|
|
5234
5243
|
_remoteOptions;
|
|
5235
|
-
_remoteOptionsTrigger;
|
|
5244
|
+
_remoteOptionsTrigger = new Trigger4();
|
|
5236
5245
|
/**
|
|
5237
5246
|
* Held to allow only one invitation flow at a time to be active.
|
|
5238
5247
|
*/
|
|
5239
|
-
_invitationFlowLock;
|
|
5248
|
+
_invitationFlowLock = null;
|
|
5240
5249
|
constructor(_invitationFlowMutex, _callbacks) {
|
|
5241
5250
|
super({
|
|
5242
5251
|
requested: {
|
|
@@ -5245,10 +5254,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
|
|
|
5245
5254
|
exposed: {
|
|
5246
5255
|
InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
|
|
5247
5256
|
}
|
|
5248
|
-
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks
|
|
5249
|
-
F: __dxlog_file18,
|
|
5250
|
-
L: 38
|
|
5251
|
-
}), this._remoteOptionsTrigger = new Trigger4(), this._invitationFlowLock = null;
|
|
5257
|
+
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
|
|
5252
5258
|
}
|
|
5253
5259
|
hasFlowLock() {
|
|
5254
5260
|
return this._invitationFlowLock != null;
|
|
@@ -5374,24 +5380,27 @@ var InvitationHostExtension = class extends RpcExtension3 {
|
|
|
5374
5380
|
/**
|
|
5375
5381
|
* @internal
|
|
5376
5382
|
*/
|
|
5377
|
-
_ctx
|
|
5383
|
+
_ctx = new Context8(void 0, {
|
|
5384
|
+
F: __dxlog_file19,
|
|
5385
|
+
L: 57
|
|
5386
|
+
});
|
|
5378
5387
|
_remoteOptions;
|
|
5379
|
-
_remoteOptionsTrigger;
|
|
5380
|
-
_challenge;
|
|
5381
|
-
guestProfile;
|
|
5382
|
-
authenticationPassed;
|
|
5388
|
+
_remoteOptionsTrigger = new Trigger5();
|
|
5389
|
+
_challenge = void 0;
|
|
5390
|
+
guestProfile = void 0;
|
|
5391
|
+
authenticationPassed = false;
|
|
5383
5392
|
/**
|
|
5384
5393
|
* Retry counter for SHARED_SECRET authentication method.
|
|
5385
5394
|
*/
|
|
5386
|
-
authenticationRetry;
|
|
5395
|
+
authenticationRetry = 0;
|
|
5387
5396
|
/**
|
|
5388
5397
|
* Resolved when admission is completed.
|
|
5389
5398
|
*/
|
|
5390
|
-
completedTrigger;
|
|
5399
|
+
completedTrigger = new Trigger5();
|
|
5391
5400
|
/**
|
|
5392
5401
|
* Held to allow only one invitation flow at a time to be active.
|
|
5393
5402
|
*/
|
|
5394
|
-
_invitationFlowLock;
|
|
5403
|
+
_invitationFlowLock = null;
|
|
5395
5404
|
constructor(_invitationFlowMutex, _callbacks) {
|
|
5396
5405
|
super({
|
|
5397
5406
|
requested: {
|
|
@@ -5400,10 +5409,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
|
|
|
5400
5409
|
exposed: {
|
|
5401
5410
|
InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
|
|
5402
5411
|
}
|
|
5403
|
-
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks
|
|
5404
|
-
F: __dxlog_file19,
|
|
5405
|
-
L: 57
|
|
5406
|
-
}), this._remoteOptionsTrigger = new Trigger5(), this._challenge = void 0, this.guestProfile = void 0, this.authenticationPassed = false, this.authenticationRetry = 0, this.completedTrigger = new Trigger5(), this._invitationFlowLock = null;
|
|
5412
|
+
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
|
|
5407
5413
|
}
|
|
5408
5414
|
hasFlowLock() {
|
|
5409
5415
|
return this._invitationFlowLock != null;
|
|
@@ -5822,10 +5828,9 @@ var InvitationTopology = class {
|
|
|
5822
5828
|
* Consider keeping a separate set for peers we know are hosts and have some retry timeout
|
|
5823
5829
|
* for guests we failed an invitation flow with (potentially due to a network error).
|
|
5824
5830
|
*/
|
|
5825
|
-
_seenPeers;
|
|
5831
|
+
_seenPeers = new ComplexSet4(PublicKey10.hash);
|
|
5826
5832
|
constructor(_role) {
|
|
5827
5833
|
this._role = _role;
|
|
5828
|
-
this._seenPeers = new ComplexSet4(PublicKey10.hash);
|
|
5829
5834
|
}
|
|
5830
5835
|
init(controller) {
|
|
5831
5836
|
invariant16(!this._controller, "Already initialized.", {
|
|
@@ -6899,28 +6904,19 @@ var InvitationsManager = class {
|
|
|
6899
6904
|
_invitationsHandler;
|
|
6900
6905
|
_getHandler;
|
|
6901
6906
|
_metadataStore;
|
|
6902
|
-
_createInvitations;
|
|
6903
|
-
_acceptInvitations;
|
|
6904
|
-
invitationCreated;
|
|
6905
|
-
invitationAccepted;
|
|
6906
|
-
removedCreated;
|
|
6907
|
-
removedAccepted;
|
|
6908
|
-
saved;
|
|
6909
|
-
_persistentInvitationsLoadedEvent;
|
|
6910
|
-
_persistentInvitationsLoaded;
|
|
6907
|
+
_createInvitations = /* @__PURE__ */ new Map();
|
|
6908
|
+
_acceptInvitations = /* @__PURE__ */ new Map();
|
|
6909
|
+
invitationCreated = new Event8();
|
|
6910
|
+
invitationAccepted = new Event8();
|
|
6911
|
+
removedCreated = new Event8();
|
|
6912
|
+
removedAccepted = new Event8();
|
|
6913
|
+
saved = new Event8();
|
|
6914
|
+
_persistentInvitationsLoadedEvent = new Event8();
|
|
6915
|
+
_persistentInvitationsLoaded = false;
|
|
6911
6916
|
constructor(_invitationsHandler, _getHandler, _metadataStore) {
|
|
6912
6917
|
this._invitationsHandler = _invitationsHandler;
|
|
6913
6918
|
this._getHandler = _getHandler;
|
|
6914
6919
|
this._metadataStore = _metadataStore;
|
|
6915
|
-
this._createInvitations = /* @__PURE__ */ new Map();
|
|
6916
|
-
this._acceptInvitations = /* @__PURE__ */ new Map();
|
|
6917
|
-
this.invitationCreated = new Event8();
|
|
6918
|
-
this.invitationAccepted = new Event8();
|
|
6919
|
-
this.removedCreated = new Event8();
|
|
6920
|
-
this.removedAccepted = new Event8();
|
|
6921
|
-
this.saved = new Event8();
|
|
6922
|
-
this._persistentInvitationsLoadedEvent = new Event8();
|
|
6923
|
-
this._persistentInvitationsLoaded = false;
|
|
6924
6920
|
}
|
|
6925
6921
|
async createInvitation(options) {
|
|
6926
6922
|
if (options.invitationId) {
|
|
@@ -7431,13 +7427,13 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7431
7427
|
_edgeHttpClient;
|
|
7432
7428
|
_dataSpaceManager;
|
|
7433
7429
|
_identity;
|
|
7434
|
-
agentStatusChanged;
|
|
7430
|
+
agentStatusChanged = new Event9();
|
|
7435
7431
|
_agentDeviceKey;
|
|
7436
7432
|
_agentStatus;
|
|
7437
|
-
_lastKnownDeviceCount;
|
|
7433
|
+
_lastKnownDeviceCount = 0;
|
|
7438
7434
|
_fetchAgentStatusTask;
|
|
7439
7435
|
constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
|
|
7440
|
-
super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity
|
|
7436
|
+
super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity;
|
|
7441
7437
|
}
|
|
7442
7438
|
get agentStatus() {
|
|
7443
7439
|
return this._agentStatus;
|
|
@@ -7617,7 +7613,7 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7617
7613
|
].some((feed) => feed.assertion.deviceKey.equals(agentDeviceKey));
|
|
7618
7614
|
space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
|
|
7619
7615
|
activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
|
|
7620
|
-
log22.
|
|
7616
|
+
log22.verbose("set active edge polling", {
|
|
7621
7617
|
enabled: agentFeedNeedsNotarization,
|
|
7622
7618
|
spaceId: space.id
|
|
7623
7619
|
}, {
|
|
@@ -7638,7 +7634,7 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7638
7634
|
if (deviceKey) {
|
|
7639
7635
|
this._ensureAgentIsInSpaces(deviceKey);
|
|
7640
7636
|
}
|
|
7641
|
-
log22.
|
|
7637
|
+
log22.verbose("agent status update", {
|
|
7642
7638
|
status
|
|
7643
7639
|
}, {
|
|
7644
7640
|
F: __dxlog_file26,
|
|
@@ -7668,7 +7664,15 @@ var EdgeAgentServiceImpl = class {
|
|
|
7668
7664
|
return new Stream11(({ ctx, next }) => {
|
|
7669
7665
|
const update = () => {
|
|
7670
7666
|
next({
|
|
7671
|
-
status: this._edgeConnection?.status ??
|
|
7667
|
+
status: this._edgeConnection?.status ?? {
|
|
7668
|
+
state: EdgeStatus2.ConnectionState.NOT_CONNECTED,
|
|
7669
|
+
rtt: 0,
|
|
7670
|
+
uptime: 0,
|
|
7671
|
+
rateBytesUp: 0,
|
|
7672
|
+
rateBytesDown: 0,
|
|
7673
|
+
messagesSent: 0,
|
|
7674
|
+
messagesReceived: 0
|
|
7675
|
+
}
|
|
7672
7676
|
});
|
|
7673
7677
|
};
|
|
7674
7678
|
this._edgeConnection?.statusChanged.on(ctx, update);
|
|
@@ -8029,8 +8033,8 @@ var ServiceContext = class extends Resource8 {
|
|
|
8029
8033
|
_edgeHttpClient;
|
|
8030
8034
|
_runtimeParams;
|
|
8031
8035
|
_edgeFeatures;
|
|
8032
|
-
_edgeIdentityUpdateMutex;
|
|
8033
|
-
initialized;
|
|
8036
|
+
_edgeIdentityUpdateMutex = new Mutex4();
|
|
8037
|
+
initialized = new Trigger7();
|
|
8034
8038
|
metadataStore;
|
|
8035
8039
|
blobStore;
|
|
8036
8040
|
feedStore;
|
|
@@ -8041,16 +8045,16 @@ var ServiceContext = class extends Resource8 {
|
|
|
8041
8045
|
invitations;
|
|
8042
8046
|
invitationsManager;
|
|
8043
8047
|
echoHost;
|
|
8044
|
-
_meshReplicator;
|
|
8045
|
-
_echoEdgeReplicator;
|
|
8048
|
+
_meshReplicator = void 0;
|
|
8049
|
+
_echoEdgeReplicator = void 0;
|
|
8046
8050
|
// Initialized after identity is initialized.
|
|
8047
8051
|
dataSpaceManager;
|
|
8048
8052
|
edgeAgentManager;
|
|
8049
|
-
_handlerFactories;
|
|
8053
|
+
_handlerFactories = /* @__PURE__ */ new Map();
|
|
8050
8054
|
_deviceSpaceSync;
|
|
8051
|
-
_instanceId;
|
|
8055
|
+
_instanceId = PublicKey15.random().toHex();
|
|
8052
8056
|
constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
|
|
8053
|
-
super(), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtimeParams = _runtimeParams, this._edgeFeatures = _edgeFeatures
|
|
8057
|
+
super(), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtimeParams = _runtimeParams, this._edgeFeatures = _edgeFeatures;
|
|
8054
8058
|
this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
|
|
8055
8059
|
this.blobStore = new BlobStore(storage.createDirectory("blobs"));
|
|
8056
8060
|
this.keyring = new Keyring(storage.createDirectory("keyring"));
|
|
@@ -8097,9 +8101,10 @@ var ServiceContext = class extends Resource8 {
|
|
|
8097
8101
|
if (!this._runtimeParams?.disableP2pReplication) {
|
|
8098
8102
|
this._meshReplicator = new MeshEchoReplicator();
|
|
8099
8103
|
}
|
|
8100
|
-
if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
|
|
8104
|
+
if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
|
|
8101
8105
|
this._echoEdgeReplicator = new EchoEdgeReplicator({
|
|
8102
|
-
edgeConnection: this._edgeConnection
|
|
8106
|
+
edgeConnection: this._edgeConnection,
|
|
8107
|
+
edgeHttpClient: this._edgeHttpClient
|
|
8103
8108
|
});
|
|
8104
8109
|
}
|
|
8105
8110
|
}
|
|
@@ -8107,7 +8112,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8107
8112
|
await this._checkStorageVersion();
|
|
8108
8113
|
log24("opening...", void 0, {
|
|
8109
8114
|
F: __dxlog_file28,
|
|
8110
|
-
L:
|
|
8115
|
+
L: 204,
|
|
8111
8116
|
S: this,
|
|
8112
8117
|
C: (f, a) => f(...a)
|
|
8113
8118
|
});
|
|
@@ -8115,7 +8120,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8115
8120
|
id: this._instanceId
|
|
8116
8121
|
}), {
|
|
8117
8122
|
F: __dxlog_file28,
|
|
8118
|
-
L:
|
|
8123
|
+
L: 205,
|
|
8119
8124
|
S: this,
|
|
8120
8125
|
C: (f, a) => f(...a)
|
|
8121
8126
|
});
|
|
@@ -8142,7 +8147,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8142
8147
|
count: loadedInvitations.invitations?.length
|
|
8143
8148
|
}, {
|
|
8144
8149
|
F: __dxlog_file28,
|
|
8145
|
-
L:
|
|
8150
|
+
L: 233,
|
|
8146
8151
|
S: this,
|
|
8147
8152
|
C: (f, a) => f(...a)
|
|
8148
8153
|
});
|
|
@@ -8150,13 +8155,13 @@ var ServiceContext = class extends Resource8 {
|
|
|
8150
8155
|
id: this._instanceId
|
|
8151
8156
|
}), {
|
|
8152
8157
|
F: __dxlog_file28,
|
|
8153
|
-
L:
|
|
8158
|
+
L: 235,
|
|
8154
8159
|
S: this,
|
|
8155
8160
|
C: (f, a) => f(...a)
|
|
8156
8161
|
});
|
|
8157
8162
|
log24("opened", void 0, {
|
|
8158
8163
|
F: __dxlog_file28,
|
|
8159
|
-
L:
|
|
8164
|
+
L: 236,
|
|
8160
8165
|
S: this,
|
|
8161
8166
|
C: (f, a) => f(...a)
|
|
8162
8167
|
});
|
|
@@ -8164,7 +8169,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8164
8169
|
async _close(ctx) {
|
|
8165
8170
|
log24("closing...", void 0, {
|
|
8166
8171
|
F: __dxlog_file28,
|
|
8167
|
-
L:
|
|
8172
|
+
L: 240,
|
|
8168
8173
|
S: this,
|
|
8169
8174
|
C: (f, a) => f(...a)
|
|
8170
8175
|
});
|
|
@@ -8175,15 +8180,15 @@ var ServiceContext = class extends Resource8 {
|
|
|
8175
8180
|
await this.edgeAgentManager?.close();
|
|
8176
8181
|
await this.identityManager.close();
|
|
8177
8182
|
await this.spaceManager.close();
|
|
8178
|
-
await this.feedStore.close();
|
|
8179
|
-
await this.metadataStore.close();
|
|
8180
8183
|
await this.echoHost.close(ctx);
|
|
8181
8184
|
await this.networkManager.close();
|
|
8182
8185
|
await this.signalManager.close();
|
|
8183
8186
|
await this._edgeConnection?.close();
|
|
8187
|
+
await this.feedStore.close();
|
|
8188
|
+
await this.metadataStore.close();
|
|
8184
8189
|
log24("closed", void 0, {
|
|
8185
8190
|
F: __dxlog_file28,
|
|
8186
|
-
L:
|
|
8191
|
+
L: 256,
|
|
8187
8192
|
S: this,
|
|
8188
8193
|
C: (f, a) => f(...a)
|
|
8189
8194
|
});
|
|
@@ -8194,7 +8199,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8194
8199
|
await identity.joinNetwork();
|
|
8195
8200
|
await this._initialize(new Context10(void 0, {
|
|
8196
8201
|
F: __dxlog_file28,
|
|
8197
|
-
L:
|
|
8202
|
+
L: 263
|
|
8198
8203
|
}));
|
|
8199
8204
|
return identity;
|
|
8200
8205
|
}
|
|
@@ -8205,7 +8210,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8205
8210
|
const factory = this._handlerFactories.get(invitation.kind);
|
|
8206
8211
|
invariant23(factory, `Unknown invitation kind: ${invitation.kind}`, {
|
|
8207
8212
|
F: __dxlog_file28,
|
|
8208
|
-
L:
|
|
8213
|
+
L: 272,
|
|
8209
8214
|
S: this,
|
|
8210
8215
|
A: [
|
|
8211
8216
|
"factory",
|
|
@@ -8231,7 +8236,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8231
8236
|
await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
|
|
8232
8237
|
await this._initialize(new Context10(void 0, {
|
|
8233
8238
|
F: __dxlog_file28,
|
|
8234
|
-
L:
|
|
8239
|
+
L: 291
|
|
8235
8240
|
}));
|
|
8236
8241
|
return identity;
|
|
8237
8242
|
}
|
|
@@ -8245,7 +8250,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8245
8250
|
async _initialize(ctx) {
|
|
8246
8251
|
log24("initializing spaces...", void 0, {
|
|
8247
8252
|
F: __dxlog_file28,
|
|
8248
|
-
L:
|
|
8253
|
+
L: 306,
|
|
8249
8254
|
S: this,
|
|
8250
8255
|
C: (f, a) => f(...a)
|
|
8251
8256
|
});
|
|
@@ -8284,7 +8289,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8284
8289
|
this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
|
|
8285
8290
|
invariant23(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
|
|
8286
8291
|
F: __dxlog_file28,
|
|
8287
|
-
L:
|
|
8292
|
+
L: 344,
|
|
8288
8293
|
S: this,
|
|
8289
8294
|
A: [
|
|
8290
8295
|
"this.dataSpaceManager",
|
|
@@ -8308,7 +8313,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8308
8313
|
details: assertion
|
|
8309
8314
|
}, {
|
|
8310
8315
|
F: __dxlog_file28,
|
|
8311
|
-
L:
|
|
8316
|
+
L: 360,
|
|
8312
8317
|
S: this,
|
|
8313
8318
|
C: (f, a) => f(...a)
|
|
8314
8319
|
});
|
|
@@ -8319,7 +8324,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8319
8324
|
details: assertion
|
|
8320
8325
|
}, {
|
|
8321
8326
|
F: __dxlog_file28,
|
|
8322
|
-
L:
|
|
8327
|
+
L: 364,
|
|
8323
8328
|
S: this,
|
|
8324
8329
|
C: (f, a) => f(...a)
|
|
8325
8330
|
});
|
|
@@ -8330,7 +8335,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8330
8335
|
details: assertion
|
|
8331
8336
|
}, {
|
|
8332
8337
|
F: __dxlog_file28,
|
|
8333
|
-
L:
|
|
8338
|
+
L: 369,
|
|
8334
8339
|
S: this,
|
|
8335
8340
|
C: (f, a) => f(...a)
|
|
8336
8341
|
});
|
|
@@ -8341,7 +8346,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8341
8346
|
} catch (err) {
|
|
8342
8347
|
log24.catch(err, void 0, {
|
|
8343
8348
|
F: __dxlog_file28,
|
|
8344
|
-
L:
|
|
8349
|
+
L: 375,
|
|
8345
8350
|
S: this,
|
|
8346
8351
|
C: (f, a) => f(...a)
|
|
8347
8352
|
});
|
|
@@ -8366,7 +8371,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8366
8371
|
swarms: this.networkManager.topics
|
|
8367
8372
|
}, {
|
|
8368
8373
|
F: __dxlog_file28,
|
|
8369
|
-
L:
|
|
8374
|
+
L: 389,
|
|
8370
8375
|
S: this,
|
|
8371
8376
|
C: (f, a) => f(...a)
|
|
8372
8377
|
});
|
|
@@ -8380,7 +8385,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8380
8385
|
});
|
|
8381
8386
|
invariant23(identity.deviceCredentialChain, void 0, {
|
|
8382
8387
|
F: __dxlog_file28,
|
|
8383
|
-
L:
|
|
8388
|
+
L: 408,
|
|
8384
8389
|
S: this,
|
|
8385
8390
|
A: [
|
|
8386
8391
|
"identity.deviceCredentialChain",
|
|
@@ -8733,7 +8738,7 @@ var DevicesServiceImpl = class {
|
|
|
8733
8738
|
if (isMe) {
|
|
8734
8739
|
presence = Device2.PresenceState.ONLINE;
|
|
8735
8740
|
} else if (profile.os?.toUpperCase() === "EDGE") {
|
|
8736
|
-
presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8741
|
+
presence = this._edgeConnection?.status.state === EdgeStatus3.ConnectionState.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8737
8742
|
} else {
|
|
8738
8743
|
presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8739
8744
|
}
|
|
@@ -9270,12 +9275,6 @@ var ClientServicesHost = class {
|
|
|
9270
9275
|
}
|
|
9271
9276
|
}
|
|
9272
9277
|
if (!options.signalManager) {
|
|
9273
|
-
log27.warn("running signaling without telemetry metadata.", void 0, {
|
|
9274
|
-
F: __dxlog_file31,
|
|
9275
|
-
L: 221,
|
|
9276
|
-
S: this,
|
|
9277
|
-
C: (f, a) => f(...a)
|
|
9278
|
-
});
|
|
9279
9278
|
}
|
|
9280
9279
|
const endpoint = config?.get("runtime.services.edge.url");
|
|
9281
9280
|
if (endpoint) {
|
|
@@ -9292,7 +9291,7 @@ var ClientServicesHost = class {
|
|
|
9292
9291
|
this._signalManager = signalManager;
|
|
9293
9292
|
invariant26(!this._networkManager, "network manager already set", {
|
|
9294
9293
|
F: __dxlog_file31,
|
|
9295
|
-
L:
|
|
9294
|
+
L: 244,
|
|
9296
9295
|
S: this,
|
|
9297
9296
|
A: [
|
|
9298
9297
|
"!this._networkManager",
|
|
@@ -9310,7 +9309,7 @@ var ClientServicesHost = class {
|
|
|
9310
9309
|
});
|
|
9311
9310
|
log27("initialized", void 0, {
|
|
9312
9311
|
F: __dxlog_file31,
|
|
9313
|
-
L:
|
|
9312
|
+
L: 257,
|
|
9314
9313
|
S: this,
|
|
9315
9314
|
C: (f, a) => f(...a)
|
|
9316
9315
|
});
|
|
@@ -9324,13 +9323,13 @@ var ClientServicesHost = class {
|
|
|
9324
9323
|
id: traceId
|
|
9325
9324
|
}), {
|
|
9326
9325
|
F: __dxlog_file31,
|
|
9327
|
-
L:
|
|
9326
|
+
L: 268,
|
|
9328
9327
|
S: this,
|
|
9329
9328
|
C: (f, a) => f(...a)
|
|
9330
9329
|
});
|
|
9331
9330
|
invariant26(this._config, "config not set", {
|
|
9332
9331
|
F: __dxlog_file31,
|
|
9333
|
-
L:
|
|
9332
|
+
L: 270,
|
|
9334
9333
|
S: this,
|
|
9335
9334
|
A: [
|
|
9336
9335
|
"this._config",
|
|
@@ -9339,7 +9338,7 @@ var ClientServicesHost = class {
|
|
|
9339
9338
|
});
|
|
9340
9339
|
invariant26(this._storage, "storage not set", {
|
|
9341
9340
|
F: __dxlog_file31,
|
|
9342
|
-
L:
|
|
9341
|
+
L: 271,
|
|
9343
9342
|
S: this,
|
|
9344
9343
|
A: [
|
|
9345
9344
|
"this._storage",
|
|
@@ -9348,7 +9347,7 @@ var ClientServicesHost = class {
|
|
|
9348
9347
|
});
|
|
9349
9348
|
invariant26(this._signalManager, "signal manager not set", {
|
|
9350
9349
|
F: __dxlog_file31,
|
|
9351
|
-
L:
|
|
9350
|
+
L: 272,
|
|
9352
9351
|
S: this,
|
|
9353
9352
|
A: [
|
|
9354
9353
|
"this._signalManager",
|
|
@@ -9357,7 +9356,7 @@ var ClientServicesHost = class {
|
|
|
9357
9356
|
});
|
|
9358
9357
|
invariant26(this._networkManager, "network manager not set", {
|
|
9359
9358
|
F: __dxlog_file31,
|
|
9360
|
-
L:
|
|
9359
|
+
L: 273,
|
|
9361
9360
|
S: this,
|
|
9362
9361
|
A: [
|
|
9363
9362
|
"this._networkManager",
|
|
@@ -9369,7 +9368,7 @@ var ClientServicesHost = class {
|
|
|
9369
9368
|
lockKey: this._resourceLock?.lockKey
|
|
9370
9369
|
}, {
|
|
9371
9370
|
F: __dxlog_file31,
|
|
9372
|
-
L:
|
|
9371
|
+
L: 276,
|
|
9373
9372
|
S: this,
|
|
9374
9373
|
C: (f, a) => f(...a)
|
|
9375
9374
|
});
|
|
@@ -9430,7 +9429,7 @@ var ClientServicesHost = class {
|
|
|
9430
9429
|
deviceKey
|
|
9431
9430
|
}, {
|
|
9432
9431
|
F: __dxlog_file31,
|
|
9433
|
-
L:
|
|
9432
|
+
L: 377,
|
|
9434
9433
|
S: this,
|
|
9435
9434
|
C: (f, a) => f(...a)
|
|
9436
9435
|
});
|
|
@@ -9438,7 +9437,7 @@ var ClientServicesHost = class {
|
|
|
9438
9437
|
id: traceId
|
|
9439
9438
|
}), {
|
|
9440
9439
|
F: __dxlog_file31,
|
|
9441
|
-
L:
|
|
9440
|
+
L: 378,
|
|
9442
9441
|
S: this,
|
|
9443
9442
|
C: (f, a) => f(...a)
|
|
9444
9443
|
});
|
|
@@ -9452,7 +9451,7 @@ var ClientServicesHost = class {
|
|
|
9452
9451
|
deviceKey
|
|
9453
9452
|
}, {
|
|
9454
9453
|
F: __dxlog_file31,
|
|
9455
|
-
L:
|
|
9454
|
+
L: 389,
|
|
9456
9455
|
S: this,
|
|
9457
9456
|
C: (f, a) => f(...a)
|
|
9458
9457
|
});
|
|
@@ -9470,7 +9469,7 @@ var ClientServicesHost = class {
|
|
|
9470
9469
|
deviceKey
|
|
9471
9470
|
}, {
|
|
9472
9471
|
F: __dxlog_file31,
|
|
9473
|
-
L:
|
|
9472
|
+
L: 398,
|
|
9474
9473
|
S: this,
|
|
9475
9474
|
C: (f, a) => f(...a)
|
|
9476
9475
|
});
|
|
@@ -9481,23 +9480,35 @@ var ClientServicesHost = class {
|
|
|
9481
9480
|
id: traceId
|
|
9482
9481
|
}), {
|
|
9483
9482
|
F: __dxlog_file31,
|
|
9484
|
-
L:
|
|
9483
|
+
L: 403,
|
|
9485
9484
|
S: this,
|
|
9486
9485
|
C: (f, a) => f(...a)
|
|
9487
9486
|
});
|
|
9488
9487
|
log27.info("resetting...", void 0, {
|
|
9489
9488
|
F: __dxlog_file31,
|
|
9490
|
-
L:
|
|
9489
|
+
L: 405,
|
|
9491
9490
|
S: this,
|
|
9492
9491
|
C: (f, a) => f(...a)
|
|
9493
9492
|
});
|
|
9494
9493
|
this._resetting = true;
|
|
9495
9494
|
this._statusUpdate.emit();
|
|
9496
9495
|
await this._serviceContext?.close();
|
|
9496
|
+
try {
|
|
9497
|
+
await this._level.clear();
|
|
9498
|
+
} catch (err) {
|
|
9499
|
+
log27.warn("failed to clear leveldb during reset", {
|
|
9500
|
+
err
|
|
9501
|
+
}, {
|
|
9502
|
+
F: __dxlog_file31,
|
|
9503
|
+
L: 415,
|
|
9504
|
+
S: this,
|
|
9505
|
+
C: (f, a) => f(...a)
|
|
9506
|
+
});
|
|
9507
|
+
}
|
|
9497
9508
|
await this._storage.reset();
|
|
9498
9509
|
log27.info("reset", void 0, {
|
|
9499
9510
|
F: __dxlog_file31,
|
|
9500
|
-
L:
|
|
9511
|
+
L: 418,
|
|
9501
9512
|
S: this,
|
|
9502
9513
|
C: (f, a) => f(...a)
|
|
9503
9514
|
});
|
|
@@ -9505,7 +9516,7 @@ var ClientServicesHost = class {
|
|
|
9505
9516
|
id: traceId
|
|
9506
9517
|
}), {
|
|
9507
9518
|
F: __dxlog_file31,
|
|
9508
|
-
L:
|
|
9519
|
+
L: 419,
|
|
9509
9520
|
S: this,
|
|
9510
9521
|
C: (f, a) => f(...a)
|
|
9511
9522
|
});
|
|
@@ -9583,4 +9594,4 @@ export {
|
|
|
9583
9594
|
ServiceRegistry,
|
|
9584
9595
|
ClientServicesHost
|
|
9585
9596
|
};
|
|
9586
|
-
//# sourceMappingURL=chunk-
|
|
9597
|
+
//# sourceMappingURL=chunk-QTUURCR4.mjs.map
|