@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";
|
|
@@ -695,13 +695,12 @@ var createAuthProvider = (signer) => async (nonce) => {
|
|
|
695
695
|
};
|
|
696
696
|
var TrustedKeySetAuthVerifier = class {
|
|
697
697
|
_params;
|
|
698
|
-
_ctx
|
|
698
|
+
_ctx = new Context2(void 0, {
|
|
699
|
+
F: __dxlog_file5,
|
|
700
|
+
L: 45
|
|
701
|
+
});
|
|
699
702
|
constructor(_params) {
|
|
700
703
|
this._params = _params;
|
|
701
|
-
this._ctx = new Context2(void 0, {
|
|
702
|
-
F: __dxlog_file5,
|
|
703
|
-
L: 45
|
|
704
|
-
});
|
|
705
704
|
}
|
|
706
705
|
async close() {
|
|
707
706
|
await this._ctx.dispose();
|
|
@@ -949,7 +948,7 @@ var EdgeFeedReplicator = class extends Resource {
|
|
|
949
948
|
}
|
|
950
949
|
async _handleReconnect() {
|
|
951
950
|
await this._resetConnection();
|
|
952
|
-
if (this._messenger.status === EdgeStatus.CONNECTED) {
|
|
951
|
+
if (this._messenger.status.state === EdgeStatus.ConnectionState.CONNECTED) {
|
|
953
952
|
this._startReplication();
|
|
954
953
|
}
|
|
955
954
|
}
|
|
@@ -1350,9 +1349,9 @@ import { Event as Event2, synchronized, trackLeaks } from "@dxos/async";
|
|
|
1350
1349
|
import { PropertiesType, TYPE_PROPERTIES } from "@dxos/client-protocol";
|
|
1351
1350
|
import { Context as Context4, LifecycleState, Resource as Resource2, cancelWithContext } from "@dxos/context";
|
|
1352
1351
|
import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/credentials";
|
|
1352
|
+
import { ObjectId, getTypeReference } from "@dxos/echo/internal";
|
|
1353
1353
|
import { AuthStatus, CredentialServerExtension, DatabaseRoot, FIND_PARAMS, findInlineObjectOfType } from "@dxos/echo-pipeline";
|
|
1354
1354
|
import { SpaceDocVersion, createIdFromSpaceKey, encodeReference } from "@dxos/echo-protocol";
|
|
1355
|
-
import { ObjectId, getTypeReference } from "@dxos/echo-schema";
|
|
1356
1355
|
import { writeMessages } from "@dxos/feed-store";
|
|
1357
1356
|
import { assertArgument, assertState, failedInvariant, invariant as invariant3 } from "@dxos/invariant";
|
|
1358
1357
|
import { PublicKey as PublicKey4 } from "@dxos/keys";
|
|
@@ -1583,7 +1582,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1583
1582
|
* Creates a new space writing the genesis credentials to the control feed.
|
|
1584
1583
|
*/
|
|
1585
1584
|
async createSpace(options = {}) {
|
|
1586
|
-
assertArgument(!!options.rootUrl === !!options.documents, "root url must be required when providing documents");
|
|
1585
|
+
assertArgument(!!options.rootUrl === !!options.documents, "options", "root url must be required when providing documents");
|
|
1587
1586
|
assertState(this._lifecycleState === LifecycleState.OPEN, "Not open.");
|
|
1588
1587
|
const spaceKey = await this._keyring.createKey();
|
|
1589
1588
|
const controlFeedKey = await this._keyring.createKey();
|
|
@@ -1601,7 +1600,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1601
1600
|
spaceKey
|
|
1602
1601
|
}, {
|
|
1603
1602
|
F: __dxlog_file7,
|
|
1604
|
-
L:
|
|
1603
|
+
L: 269,
|
|
1605
1604
|
S: this,
|
|
1606
1605
|
C: (f, a) => f(...a)
|
|
1607
1606
|
});
|
|
@@ -1609,7 +1608,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1609
1608
|
if (options.documents) {
|
|
1610
1609
|
invariant3(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", {
|
|
1611
1610
|
F: __dxlog_file7,
|
|
1612
|
-
L:
|
|
1611
|
+
L: 274,
|
|
1613
1612
|
S: this,
|
|
1614
1613
|
A: [
|
|
1615
1614
|
"Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
|
|
@@ -1621,13 +1620,18 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1621
1620
|
documentId
|
|
1622
1621
|
}, {
|
|
1623
1622
|
F: __dxlog_file7,
|
|
1624
|
-
L:
|
|
1623
|
+
L: 281,
|
|
1625
1624
|
S: this,
|
|
1626
1625
|
C: (f, a) => f(...a)
|
|
1627
1626
|
});
|
|
1628
1627
|
const newDoc = await this._echoHost.createDoc(data, {
|
|
1629
1628
|
preserveHistory: true
|
|
1630
1629
|
});
|
|
1630
|
+
if (newDoc.doc().access !== void 0 && newDoc.doc().access.spaceKey !== spaceKey.toHex()) {
|
|
1631
|
+
newDoc.change((doc) => {
|
|
1632
|
+
doc.access.spaceKey = spaceKey.toHex();
|
|
1633
|
+
});
|
|
1634
|
+
}
|
|
1631
1635
|
documentIdMapping[documentId] = newDoc.documentId;
|
|
1632
1636
|
}));
|
|
1633
1637
|
}
|
|
@@ -1635,7 +1639,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1635
1639
|
spaceKey
|
|
1636
1640
|
}, {
|
|
1637
1641
|
F: __dxlog_file7,
|
|
1638
|
-
L:
|
|
1642
|
+
L: 299,
|
|
1639
1643
|
S: this,
|
|
1640
1644
|
C: (f, a) => f(...a)
|
|
1641
1645
|
});
|
|
@@ -1644,18 +1648,19 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1644
1648
|
const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
|
|
1645
1649
|
const rootDocHandle = await this._echoHost.loadDoc(Context4.default(void 0, {
|
|
1646
1650
|
F: __dxlog_file7,
|
|
1647
|
-
L:
|
|
1651
|
+
L: 304
|
|
1648
1652
|
}), newRootDocId);
|
|
1649
1653
|
DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
|
|
1650
1654
|
root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
|
|
1651
1655
|
} else {
|
|
1652
1656
|
root = await this._echoHost.createSpaceRoot(spaceKey);
|
|
1653
1657
|
}
|
|
1658
|
+
await this._echoHost.flush();
|
|
1654
1659
|
log5("constructing space...", {
|
|
1655
1660
|
spaceKey
|
|
1656
1661
|
}, {
|
|
1657
1662
|
F: __dxlog_file7,
|
|
1658
|
-
L:
|
|
1663
|
+
L: 313,
|
|
1659
1664
|
S: this,
|
|
1660
1665
|
C: (f, a) => f(...a)
|
|
1661
1666
|
});
|
|
@@ -1665,7 +1670,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1665
1670
|
spaceKey
|
|
1666
1671
|
}, {
|
|
1667
1672
|
F: __dxlog_file7,
|
|
1668
|
-
L:
|
|
1673
|
+
L: 318,
|
|
1669
1674
|
S: this,
|
|
1670
1675
|
C: (f, a) => f(...a)
|
|
1671
1676
|
});
|
|
@@ -1674,7 +1679,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1674
1679
|
const memberCredential = credentials[1];
|
|
1675
1680
|
invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
|
|
1676
1681
|
F: __dxlog_file7,
|
|
1677
|
-
L:
|
|
1682
|
+
L: 324,
|
|
1678
1683
|
S: this,
|
|
1679
1684
|
A: [
|
|
1680
1685
|
"getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
|
|
@@ -1688,7 +1693,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1688
1693
|
spaceKey
|
|
1689
1694
|
}, {
|
|
1690
1695
|
F: __dxlog_file7,
|
|
1691
|
-
L:
|
|
1696
|
+
L: 329,
|
|
1692
1697
|
S: this,
|
|
1693
1698
|
C: (f, a) => f(...a)
|
|
1694
1699
|
});
|
|
@@ -1706,7 +1711,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1706
1711
|
spaceId: space.id
|
|
1707
1712
|
}, {
|
|
1708
1713
|
F: __dxlog_file7,
|
|
1709
|
-
L:
|
|
1714
|
+
L: 342,
|
|
1710
1715
|
S: this,
|
|
1711
1716
|
C: (f, a) => f(...a)
|
|
1712
1717
|
});
|
|
@@ -1724,7 +1729,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1724
1729
|
spaceId: space.id
|
|
1725
1730
|
}, {
|
|
1726
1731
|
F: __dxlog_file7,
|
|
1727
|
-
L:
|
|
1732
|
+
L: 353,
|
|
1728
1733
|
S: this,
|
|
1729
1734
|
C: (f, a) => f(...a)
|
|
1730
1735
|
});
|
|
@@ -1759,7 +1764,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1759
1764
|
const automergeIndex = space.automergeSpaceState.rootUrl;
|
|
1760
1765
|
invariant3(automergeIndex, void 0, {
|
|
1761
1766
|
F: __dxlog_file7,
|
|
1762
|
-
L:
|
|
1767
|
+
L: 386,
|
|
1763
1768
|
S: this,
|
|
1764
1769
|
A: [
|
|
1765
1770
|
"automergeIndex",
|
|
@@ -1776,13 +1781,13 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1776
1781
|
opts
|
|
1777
1782
|
}, {
|
|
1778
1783
|
F: __dxlog_file7,
|
|
1779
|
-
L:
|
|
1784
|
+
L: 395,
|
|
1780
1785
|
S: this,
|
|
1781
1786
|
C: (f, a) => f(...a)
|
|
1782
1787
|
});
|
|
1783
1788
|
invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
|
|
1784
1789
|
F: __dxlog_file7,
|
|
1785
|
-
L:
|
|
1790
|
+
L: 396,
|
|
1786
1791
|
S: this,
|
|
1787
1792
|
A: [
|
|
1788
1793
|
"this._lifecycleState === LifecycleState.OPEN",
|
|
@@ -1791,7 +1796,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1791
1796
|
});
|
|
1792
1797
|
invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", {
|
|
1793
1798
|
F: __dxlog_file7,
|
|
1794
|
-
L:
|
|
1799
|
+
L: 397,
|
|
1795
1800
|
S: this,
|
|
1796
1801
|
A: [
|
|
1797
1802
|
"!this._spaces.has(opts.spaceKey)",
|
|
@@ -1815,7 +1820,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1815
1820
|
const space = this._spaceManager.spaces.get(options.spaceKey);
|
|
1816
1821
|
invariant3(space, void 0, {
|
|
1817
1822
|
F: __dxlog_file7,
|
|
1818
|
-
L:
|
|
1823
|
+
L: 417,
|
|
1819
1824
|
S: this,
|
|
1820
1825
|
A: [
|
|
1821
1826
|
"space",
|
|
@@ -1828,7 +1833,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1828
1833
|
const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
|
|
1829
1834
|
invariant3(credentials[0].credential, void 0, {
|
|
1830
1835
|
F: __dxlog_file7,
|
|
1831
|
-
L:
|
|
1836
|
+
L: 436,
|
|
1832
1837
|
S: this,
|
|
1833
1838
|
A: [
|
|
1834
1839
|
"credentials[0].credential",
|
|
@@ -1838,7 +1843,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1838
1843
|
const spaceMemberCredential = credentials[0].credential.credential;
|
|
1839
1844
|
invariant3(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
|
|
1840
1845
|
F: __dxlog_file7,
|
|
1841
|
-
L:
|
|
1846
|
+
L: 438,
|
|
1842
1847
|
S: this,
|
|
1843
1848
|
A: [
|
|
1844
1849
|
"getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
|
|
@@ -1876,7 +1881,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1876
1881
|
const space = this._spaces.get(spaceKey);
|
|
1877
1882
|
invariant3(space, "Space not found.", {
|
|
1878
1883
|
F: __dxlog_file7,
|
|
1879
|
-
L:
|
|
1884
|
+
L: 475,
|
|
1880
1885
|
S: this,
|
|
1881
1886
|
A: [
|
|
1882
1887
|
"space",
|
|
@@ -1901,7 +1906,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1901
1906
|
metadata
|
|
1902
1907
|
}, {
|
|
1903
1908
|
F: __dxlog_file7,
|
|
1904
|
-
L:
|
|
1909
|
+
L: 494,
|
|
1905
1910
|
S: this,
|
|
1906
1911
|
C: (f, a) => f(...a)
|
|
1907
1912
|
});
|
|
@@ -1945,7 +1950,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1945
1950
|
err
|
|
1946
1951
|
}, {
|
|
1947
1952
|
F: __dxlog_file7,
|
|
1948
|
-
L:
|
|
1953
|
+
L: 536,
|
|
1949
1954
|
S: this,
|
|
1950
1955
|
C: (f, a) => f(...a)
|
|
1951
1956
|
});
|
|
@@ -1955,7 +1960,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1955
1960
|
onAuthFailure: () => {
|
|
1956
1961
|
log5.warn("auth failure", void 0, {
|
|
1957
1962
|
F: __dxlog_file7,
|
|
1958
|
-
L:
|
|
1963
|
+
L: 541,
|
|
1959
1964
|
S: this,
|
|
1960
1965
|
C: (f, a) => f(...a)
|
|
1961
1966
|
});
|
|
@@ -1988,7 +1993,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1988
1993
|
space: space.key
|
|
1989
1994
|
}, {
|
|
1990
1995
|
F: __dxlog_file7,
|
|
1991
|
-
L:
|
|
1996
|
+
L: 568,
|
|
1992
1997
|
S: this,
|
|
1993
1998
|
C: (f, a) => f(...a)
|
|
1994
1999
|
});
|
|
@@ -1999,7 +2004,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
1999
2004
|
open: this._lifecycleState === LifecycleState.OPEN
|
|
2000
2005
|
}, {
|
|
2001
2006
|
F: __dxlog_file7,
|
|
2002
|
-
L:
|
|
2007
|
+
L: 571,
|
|
2003
2008
|
S: this,
|
|
2004
2009
|
C: (f, a) => f(...a)
|
|
2005
2010
|
});
|
|
@@ -2018,7 +2023,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2018
2023
|
space: space.key
|
|
2019
2024
|
}, {
|
|
2020
2025
|
F: __dxlog_file7,
|
|
2021
|
-
L:
|
|
2026
|
+
L: 579,
|
|
2022
2027
|
S: this,
|
|
2023
2028
|
C: (f, a) => f(...a)
|
|
2024
2029
|
});
|
|
@@ -2039,7 +2044,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2039
2044
|
spaceId: dataSpace.id
|
|
2040
2045
|
}, {
|
|
2041
2046
|
F: __dxlog_file7,
|
|
2042
|
-
L:
|
|
2047
|
+
L: 593,
|
|
2043
2048
|
S: this,
|
|
2044
2049
|
C: (f, a) => f(...a)
|
|
2045
2050
|
});
|
|
@@ -2069,7 +2074,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2069
2074
|
space: space.key
|
|
2070
2075
|
}, {
|
|
2071
2076
|
F: __dxlog_file7,
|
|
2072
|
-
L:
|
|
2077
|
+
L: 620,
|
|
2073
2078
|
S: this,
|
|
2074
2079
|
C: (f, a) => f(...a)
|
|
2075
2080
|
});
|
|
@@ -2102,7 +2107,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2102
2107
|
closedSessions
|
|
2103
2108
|
}, {
|
|
2104
2109
|
F: __dxlog_file7,
|
|
2105
|
-
L:
|
|
2110
|
+
L: 646,
|
|
2106
2111
|
S: this,
|
|
2107
2112
|
C: (f, a) => f(...a)
|
|
2108
2113
|
});
|
|
@@ -2117,7 +2122,7 @@ var DataSpaceManager = class extends Resource2 {
|
|
|
2117
2122
|
peerId: peerState.peerId
|
|
2118
2123
|
}, {
|
|
2119
2124
|
F: __dxlog_file7,
|
|
2120
|
-
L:
|
|
2125
|
+
L: 660,
|
|
2121
2126
|
S: this,
|
|
2122
2127
|
C: (f, a) => f(...a)
|
|
2123
2128
|
});
|
|
@@ -2213,13 +2218,13 @@ var SpaceArchiveWriter = class extends Resource3 {
|
|
|
2213
2218
|
this._archive = new this._tar.Archive();
|
|
2214
2219
|
}
|
|
2215
2220
|
async setCurrentRootUrl(url) {
|
|
2216
|
-
assertArgument2(url.startsWith("automerge:"), "Invalid root URL");
|
|
2221
|
+
assertArgument2(url.startsWith("automerge:"), "url", "Invalid root URL");
|
|
2217
2222
|
assertState2(this._tar, "Not open");
|
|
2218
2223
|
assertState2(this._meta, "Not started");
|
|
2219
2224
|
this._currentRootUrl = url;
|
|
2220
2225
|
}
|
|
2221
2226
|
async writeDocument(documentId, data) {
|
|
2222
|
-
assertArgument2(!documentId.startsWith("automerge:"), "Invalid document ID");
|
|
2227
|
+
assertArgument2(!documentId.startsWith("automerge:"), "documentId", "Invalid document ID");
|
|
2223
2228
|
assertState2(this._archive, "Not open");
|
|
2224
2229
|
this._archive.addBinaryFile(`${SpaceArchiveFileStructure.documents}/${documentId}.bin`, data);
|
|
2225
2230
|
}
|
|
@@ -2239,7 +2244,8 @@ var SpaceArchiveWriter = class extends Resource3 {
|
|
|
2239
2244
|
this._archive.addTextFile(SpaceArchiveFileStructure.metadata, JSON.stringify(metadata));
|
|
2240
2245
|
const binary = this._archive.toUint8Array();
|
|
2241
2246
|
return {
|
|
2242
|
-
|
|
2247
|
+
// TODO(wittjosiah): Factor out file name construction.
|
|
2248
|
+
filename: `${(/* @__PURE__ */ new Date()).toISOString()}-${this._meta.spaceId}.tar`,
|
|
2243
2249
|
contents: binary
|
|
2244
2250
|
};
|
|
2245
2251
|
}
|
|
@@ -2254,7 +2260,7 @@ var extractSpaceArchive = async (archive) => {
|
|
|
2254
2260
|
const { Archive } = await import("@obsidize/tar-browserify");
|
|
2255
2261
|
const { entries } = await Archive.extract(archive.contents);
|
|
2256
2262
|
const metadataEntry = entries.find((entry2) => entry2.fileName === SpaceArchiveFileStructure2.metadata);
|
|
2257
|
-
assertArgument3(metadataEntry, "Metadata entry not found");
|
|
2263
|
+
assertArgument3(metadataEntry, "metadataEntry", "Metadata entry not found");
|
|
2258
2264
|
const metadata = JSON.parse(metadataEntry.getContentAsText());
|
|
2259
2265
|
const documents = {};
|
|
2260
2266
|
for (const entry2 of entries.filter((entry3) => entry3.fileName.startsWith(`${SpaceArchiveFileStructure2.documents}/`))) {
|
|
@@ -2595,7 +2601,7 @@ var SpacesServiceImpl = class {
|
|
|
2595
2601
|
};
|
|
2596
2602
|
try {
|
|
2597
2603
|
const writer = _ts_add_disposable_resource2(env, await new SpaceArchiveWriter().open(), true);
|
|
2598
|
-
assertArgument4(SpaceId.isValid(request.spaceId), "Invalid space ID");
|
|
2604
|
+
assertArgument4(SpaceId.isValid(request.spaceId), "spaceId", "Invalid space ID");
|
|
2599
2605
|
const dataSpaceManager = await this._getDataSpaceManager();
|
|
2600
2606
|
const space = dataSpaceManager.getSpaceById(request.spaceId) ?? raise(new Error("Space not found"));
|
|
2601
2607
|
await writer.begin({
|
|
@@ -3716,12 +3722,12 @@ import { Resource as Resource5 } from "@dxos/context";
|
|
|
3716
3722
|
import { checkCredentialType } from "@dxos/credentials";
|
|
3717
3723
|
var AutomergeSpaceState = class extends Resource5 {
|
|
3718
3724
|
_onNewRoot;
|
|
3719
|
-
rootUrl;
|
|
3720
|
-
lastEpoch;
|
|
3721
|
-
onNewEpoch;
|
|
3722
|
-
_isProcessingRootDocs;
|
|
3725
|
+
rootUrl = void 0;
|
|
3726
|
+
lastEpoch = void 0;
|
|
3727
|
+
onNewEpoch = new Event5();
|
|
3728
|
+
_isProcessingRootDocs = false;
|
|
3723
3729
|
constructor(_onNewRoot) {
|
|
3724
|
-
super(), this._onNewRoot = _onNewRoot
|
|
3730
|
+
super(), this._onNewRoot = _onNewRoot;
|
|
3725
3731
|
}
|
|
3726
3732
|
async _open(ctx) {
|
|
3727
3733
|
}
|
|
@@ -5301,13 +5307,16 @@ var OPTIONS_TIMEOUT = 1e4;
|
|
|
5301
5307
|
var InvitationGuestExtension = class extends RpcExtension2 {
|
|
5302
5308
|
_invitationFlowMutex;
|
|
5303
5309
|
_callbacks;
|
|
5304
|
-
_ctx
|
|
5310
|
+
_ctx = new Context7(void 0, {
|
|
5311
|
+
F: __dxlog_file19,
|
|
5312
|
+
L: 38
|
|
5313
|
+
});
|
|
5305
5314
|
_remoteOptions;
|
|
5306
|
-
_remoteOptionsTrigger;
|
|
5315
|
+
_remoteOptionsTrigger = new Trigger5();
|
|
5307
5316
|
/**
|
|
5308
5317
|
* Held to allow only one invitation flow at a time to be active.
|
|
5309
5318
|
*/
|
|
5310
|
-
_invitationFlowLock;
|
|
5319
|
+
_invitationFlowLock = null;
|
|
5311
5320
|
constructor(_invitationFlowMutex, _callbacks) {
|
|
5312
5321
|
super({
|
|
5313
5322
|
requested: {
|
|
@@ -5316,10 +5325,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
|
|
|
5316
5325
|
exposed: {
|
|
5317
5326
|
InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
|
|
5318
5327
|
}
|
|
5319
|
-
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks
|
|
5320
|
-
F: __dxlog_file19,
|
|
5321
|
-
L: 38
|
|
5322
|
-
}), this._remoteOptionsTrigger = new Trigger5(), this._invitationFlowLock = null;
|
|
5328
|
+
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
|
|
5323
5329
|
}
|
|
5324
5330
|
hasFlowLock() {
|
|
5325
5331
|
return this._invitationFlowLock != null;
|
|
@@ -5445,24 +5451,27 @@ var InvitationHostExtension = class extends RpcExtension3 {
|
|
|
5445
5451
|
/**
|
|
5446
5452
|
* @internal
|
|
5447
5453
|
*/
|
|
5448
|
-
_ctx
|
|
5454
|
+
_ctx = new Context8(void 0, {
|
|
5455
|
+
F: __dxlog_file20,
|
|
5456
|
+
L: 57
|
|
5457
|
+
});
|
|
5449
5458
|
_remoteOptions;
|
|
5450
|
-
_remoteOptionsTrigger;
|
|
5451
|
-
_challenge;
|
|
5452
|
-
guestProfile;
|
|
5453
|
-
authenticationPassed;
|
|
5459
|
+
_remoteOptionsTrigger = new Trigger6();
|
|
5460
|
+
_challenge = void 0;
|
|
5461
|
+
guestProfile = void 0;
|
|
5462
|
+
authenticationPassed = false;
|
|
5454
5463
|
/**
|
|
5455
5464
|
* Retry counter for SHARED_SECRET authentication method.
|
|
5456
5465
|
*/
|
|
5457
|
-
authenticationRetry;
|
|
5466
|
+
authenticationRetry = 0;
|
|
5458
5467
|
/**
|
|
5459
5468
|
* Resolved when admission is completed.
|
|
5460
5469
|
*/
|
|
5461
|
-
completedTrigger;
|
|
5470
|
+
completedTrigger = new Trigger6();
|
|
5462
5471
|
/**
|
|
5463
5472
|
* Held to allow only one invitation flow at a time to be active.
|
|
5464
5473
|
*/
|
|
5465
|
-
_invitationFlowLock;
|
|
5474
|
+
_invitationFlowLock = null;
|
|
5466
5475
|
constructor(_invitationFlowMutex, _callbacks) {
|
|
5467
5476
|
super({
|
|
5468
5477
|
requested: {
|
|
@@ -5471,10 +5480,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
|
|
|
5471
5480
|
exposed: {
|
|
5472
5481
|
InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
|
|
5473
5482
|
}
|
|
5474
|
-
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks
|
|
5475
|
-
F: __dxlog_file20,
|
|
5476
|
-
L: 57
|
|
5477
|
-
}), this._remoteOptionsTrigger = new Trigger6(), this._challenge = void 0, this.guestProfile = void 0, this.authenticationPassed = false, this.authenticationRetry = 0, this.completedTrigger = new Trigger6(), this._invitationFlowLock = null;
|
|
5483
|
+
}), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
|
|
5478
5484
|
}
|
|
5479
5485
|
hasFlowLock() {
|
|
5480
5486
|
return this._invitationFlowLock != null;
|
|
@@ -5893,10 +5899,9 @@ var InvitationTopology = class {
|
|
|
5893
5899
|
* Consider keeping a separate set for peers we know are hosts and have some retry timeout
|
|
5894
5900
|
* for guests we failed an invitation flow with (potentially due to a network error).
|
|
5895
5901
|
*/
|
|
5896
|
-
_seenPeers;
|
|
5902
|
+
_seenPeers = new ComplexSet4(PublicKey10.hash);
|
|
5897
5903
|
constructor(_role) {
|
|
5898
5904
|
this._role = _role;
|
|
5899
|
-
this._seenPeers = new ComplexSet4(PublicKey10.hash);
|
|
5900
5905
|
}
|
|
5901
5906
|
init(controller) {
|
|
5902
5907
|
invariant16(!this._controller, "Already initialized.", {
|
|
@@ -6970,28 +6975,19 @@ var InvitationsManager = class {
|
|
|
6970
6975
|
_invitationsHandler;
|
|
6971
6976
|
_getHandler;
|
|
6972
6977
|
_metadataStore;
|
|
6973
|
-
_createInvitations;
|
|
6974
|
-
_acceptInvitations;
|
|
6975
|
-
invitationCreated;
|
|
6976
|
-
invitationAccepted;
|
|
6977
|
-
removedCreated;
|
|
6978
|
-
removedAccepted;
|
|
6979
|
-
saved;
|
|
6980
|
-
_persistentInvitationsLoadedEvent;
|
|
6981
|
-
_persistentInvitationsLoaded;
|
|
6978
|
+
_createInvitations = /* @__PURE__ */ new Map();
|
|
6979
|
+
_acceptInvitations = /* @__PURE__ */ new Map();
|
|
6980
|
+
invitationCreated = new Event8();
|
|
6981
|
+
invitationAccepted = new Event8();
|
|
6982
|
+
removedCreated = new Event8();
|
|
6983
|
+
removedAccepted = new Event8();
|
|
6984
|
+
saved = new Event8();
|
|
6985
|
+
_persistentInvitationsLoadedEvent = new Event8();
|
|
6986
|
+
_persistentInvitationsLoaded = false;
|
|
6982
6987
|
constructor(_invitationsHandler, _getHandler, _metadataStore) {
|
|
6983
6988
|
this._invitationsHandler = _invitationsHandler;
|
|
6984
6989
|
this._getHandler = _getHandler;
|
|
6985
6990
|
this._metadataStore = _metadataStore;
|
|
6986
|
-
this._createInvitations = /* @__PURE__ */ new Map();
|
|
6987
|
-
this._acceptInvitations = /* @__PURE__ */ new Map();
|
|
6988
|
-
this.invitationCreated = new Event8();
|
|
6989
|
-
this.invitationAccepted = new Event8();
|
|
6990
|
-
this.removedCreated = new Event8();
|
|
6991
|
-
this.removedAccepted = new Event8();
|
|
6992
|
-
this.saved = new Event8();
|
|
6993
|
-
this._persistentInvitationsLoadedEvent = new Event8();
|
|
6994
|
-
this._persistentInvitationsLoaded = false;
|
|
6995
6991
|
}
|
|
6996
6992
|
async createInvitation(options) {
|
|
6997
6993
|
if (options.invitationId) {
|
|
@@ -7562,13 +7558,13 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7562
7558
|
_edgeHttpClient;
|
|
7563
7559
|
_dataSpaceManager;
|
|
7564
7560
|
_identity;
|
|
7565
|
-
agentStatusChanged;
|
|
7561
|
+
agentStatusChanged = new Event9();
|
|
7566
7562
|
_agentDeviceKey;
|
|
7567
7563
|
_agentStatus;
|
|
7568
|
-
_lastKnownDeviceCount;
|
|
7564
|
+
_lastKnownDeviceCount = 0;
|
|
7569
7565
|
_fetchAgentStatusTask;
|
|
7570
7566
|
constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
|
|
7571
|
-
super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity
|
|
7567
|
+
super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity;
|
|
7572
7568
|
}
|
|
7573
7569
|
get agentStatus() {
|
|
7574
7570
|
return this._agentStatus;
|
|
@@ -7748,7 +7744,7 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7748
7744
|
].some((feed) => feed.assertion.deviceKey.equals(agentDeviceKey));
|
|
7749
7745
|
space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
|
|
7750
7746
|
activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
|
|
7751
|
-
log23.
|
|
7747
|
+
log23.verbose("set active edge polling", {
|
|
7752
7748
|
enabled: agentFeedNeedsNotarization,
|
|
7753
7749
|
spaceId: space.id
|
|
7754
7750
|
}, {
|
|
@@ -7769,7 +7765,7 @@ var EdgeAgentManager = class extends Resource7 {
|
|
|
7769
7765
|
if (deviceKey) {
|
|
7770
7766
|
this._ensureAgentIsInSpaces(deviceKey);
|
|
7771
7767
|
}
|
|
7772
|
-
log23.
|
|
7768
|
+
log23.verbose("agent status update", {
|
|
7773
7769
|
status
|
|
7774
7770
|
}, {
|
|
7775
7771
|
F: __dxlog_file27,
|
|
@@ -7799,7 +7795,15 @@ var EdgeAgentServiceImpl = class {
|
|
|
7799
7795
|
return new Stream11(({ ctx, next }) => {
|
|
7800
7796
|
const update = () => {
|
|
7801
7797
|
next({
|
|
7802
|
-
status: this._edgeConnection?.status ??
|
|
7798
|
+
status: this._edgeConnection?.status ?? {
|
|
7799
|
+
state: EdgeStatus2.ConnectionState.NOT_CONNECTED,
|
|
7800
|
+
rtt: 0,
|
|
7801
|
+
uptime: 0,
|
|
7802
|
+
rateBytesUp: 0,
|
|
7803
|
+
rateBytesDown: 0,
|
|
7804
|
+
messagesSent: 0,
|
|
7805
|
+
messagesReceived: 0
|
|
7806
|
+
}
|
|
7803
7807
|
});
|
|
7804
7808
|
};
|
|
7805
7809
|
this._edgeConnection?.statusChanged.on(ctx, update);
|
|
@@ -8160,8 +8164,8 @@ var ServiceContext = class extends Resource8 {
|
|
|
8160
8164
|
_edgeHttpClient;
|
|
8161
8165
|
_runtimeParams;
|
|
8162
8166
|
_edgeFeatures;
|
|
8163
|
-
_edgeIdentityUpdateMutex;
|
|
8164
|
-
initialized;
|
|
8167
|
+
_edgeIdentityUpdateMutex = new Mutex4();
|
|
8168
|
+
initialized = new Trigger9();
|
|
8165
8169
|
metadataStore;
|
|
8166
8170
|
blobStore;
|
|
8167
8171
|
feedStore;
|
|
@@ -8172,16 +8176,16 @@ var ServiceContext = class extends Resource8 {
|
|
|
8172
8176
|
invitations;
|
|
8173
8177
|
invitationsManager;
|
|
8174
8178
|
echoHost;
|
|
8175
|
-
_meshReplicator;
|
|
8176
|
-
_echoEdgeReplicator;
|
|
8179
|
+
_meshReplicator = void 0;
|
|
8180
|
+
_echoEdgeReplicator = void 0;
|
|
8177
8181
|
// Initialized after identity is initialized.
|
|
8178
8182
|
dataSpaceManager;
|
|
8179
8183
|
edgeAgentManager;
|
|
8180
|
-
_handlerFactories;
|
|
8184
|
+
_handlerFactories = /* @__PURE__ */ new Map();
|
|
8181
8185
|
_deviceSpaceSync;
|
|
8182
|
-
_instanceId;
|
|
8186
|
+
_instanceId = PublicKey15.random().toHex();
|
|
8183
8187
|
constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
|
|
8184
|
-
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
|
|
8188
|
+
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;
|
|
8185
8189
|
this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
|
|
8186
8190
|
this.blobStore = new BlobStore(storage.createDirectory("blobs"));
|
|
8187
8191
|
this.keyring = new Keyring(storage.createDirectory("keyring"));
|
|
@@ -8228,9 +8232,10 @@ var ServiceContext = class extends Resource8 {
|
|
|
8228
8232
|
if (!this._runtimeParams?.disableP2pReplication) {
|
|
8229
8233
|
this._meshReplicator = new MeshEchoReplicator();
|
|
8230
8234
|
}
|
|
8231
|
-
if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
|
|
8235
|
+
if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
|
|
8232
8236
|
this._echoEdgeReplicator = new EchoEdgeReplicator({
|
|
8233
|
-
edgeConnection: this._edgeConnection
|
|
8237
|
+
edgeConnection: this._edgeConnection,
|
|
8238
|
+
edgeHttpClient: this._edgeHttpClient
|
|
8234
8239
|
});
|
|
8235
8240
|
}
|
|
8236
8241
|
}
|
|
@@ -8238,7 +8243,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8238
8243
|
await this._checkStorageVersion();
|
|
8239
8244
|
log25("opening...", void 0, {
|
|
8240
8245
|
F: __dxlog_file29,
|
|
8241
|
-
L:
|
|
8246
|
+
L: 204,
|
|
8242
8247
|
S: this,
|
|
8243
8248
|
C: (f, a) => f(...a)
|
|
8244
8249
|
});
|
|
@@ -8246,7 +8251,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8246
8251
|
id: this._instanceId
|
|
8247
8252
|
}), {
|
|
8248
8253
|
F: __dxlog_file29,
|
|
8249
|
-
L:
|
|
8254
|
+
L: 205,
|
|
8250
8255
|
S: this,
|
|
8251
8256
|
C: (f, a) => f(...a)
|
|
8252
8257
|
});
|
|
@@ -8273,7 +8278,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8273
8278
|
count: loadedInvitations.invitations?.length
|
|
8274
8279
|
}, {
|
|
8275
8280
|
F: __dxlog_file29,
|
|
8276
|
-
L:
|
|
8281
|
+
L: 233,
|
|
8277
8282
|
S: this,
|
|
8278
8283
|
C: (f, a) => f(...a)
|
|
8279
8284
|
});
|
|
@@ -8281,13 +8286,13 @@ var ServiceContext = class extends Resource8 {
|
|
|
8281
8286
|
id: this._instanceId
|
|
8282
8287
|
}), {
|
|
8283
8288
|
F: __dxlog_file29,
|
|
8284
|
-
L:
|
|
8289
|
+
L: 235,
|
|
8285
8290
|
S: this,
|
|
8286
8291
|
C: (f, a) => f(...a)
|
|
8287
8292
|
});
|
|
8288
8293
|
log25("opened", void 0, {
|
|
8289
8294
|
F: __dxlog_file29,
|
|
8290
|
-
L:
|
|
8295
|
+
L: 236,
|
|
8291
8296
|
S: this,
|
|
8292
8297
|
C: (f, a) => f(...a)
|
|
8293
8298
|
});
|
|
@@ -8295,7 +8300,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8295
8300
|
async _close(ctx) {
|
|
8296
8301
|
log25("closing...", void 0, {
|
|
8297
8302
|
F: __dxlog_file29,
|
|
8298
|
-
L:
|
|
8303
|
+
L: 240,
|
|
8299
8304
|
S: this,
|
|
8300
8305
|
C: (f, a) => f(...a)
|
|
8301
8306
|
});
|
|
@@ -8306,15 +8311,15 @@ var ServiceContext = class extends Resource8 {
|
|
|
8306
8311
|
await this.edgeAgentManager?.close();
|
|
8307
8312
|
await this.identityManager.close();
|
|
8308
8313
|
await this.spaceManager.close();
|
|
8309
|
-
await this.feedStore.close();
|
|
8310
|
-
await this.metadataStore.close();
|
|
8311
8314
|
await this.echoHost.close(ctx);
|
|
8312
8315
|
await this.networkManager.close();
|
|
8313
8316
|
await this.signalManager.close();
|
|
8314
8317
|
await this._edgeConnection?.close();
|
|
8318
|
+
await this.feedStore.close();
|
|
8319
|
+
await this.metadataStore.close();
|
|
8315
8320
|
log25("closed", void 0, {
|
|
8316
8321
|
F: __dxlog_file29,
|
|
8317
|
-
L:
|
|
8322
|
+
L: 256,
|
|
8318
8323
|
S: this,
|
|
8319
8324
|
C: (f, a) => f(...a)
|
|
8320
8325
|
});
|
|
@@ -8325,7 +8330,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8325
8330
|
await identity.joinNetwork();
|
|
8326
8331
|
await this._initialize(new Context10(void 0, {
|
|
8327
8332
|
F: __dxlog_file29,
|
|
8328
|
-
L:
|
|
8333
|
+
L: 263
|
|
8329
8334
|
}));
|
|
8330
8335
|
return identity;
|
|
8331
8336
|
}
|
|
@@ -8336,7 +8341,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8336
8341
|
const factory = this._handlerFactories.get(invitation.kind);
|
|
8337
8342
|
invariant22(factory, `Unknown invitation kind: ${invitation.kind}`, {
|
|
8338
8343
|
F: __dxlog_file29,
|
|
8339
|
-
L:
|
|
8344
|
+
L: 272,
|
|
8340
8345
|
S: this,
|
|
8341
8346
|
A: [
|
|
8342
8347
|
"factory",
|
|
@@ -8362,7 +8367,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8362
8367
|
await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
|
|
8363
8368
|
await this._initialize(new Context10(void 0, {
|
|
8364
8369
|
F: __dxlog_file29,
|
|
8365
|
-
L:
|
|
8370
|
+
L: 291
|
|
8366
8371
|
}));
|
|
8367
8372
|
return identity;
|
|
8368
8373
|
}
|
|
@@ -8376,7 +8381,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8376
8381
|
async _initialize(ctx) {
|
|
8377
8382
|
log25("initializing spaces...", void 0, {
|
|
8378
8383
|
F: __dxlog_file29,
|
|
8379
|
-
L:
|
|
8384
|
+
L: 306,
|
|
8380
8385
|
S: this,
|
|
8381
8386
|
C: (f, a) => f(...a)
|
|
8382
8387
|
});
|
|
@@ -8415,7 +8420,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8415
8420
|
this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
|
|
8416
8421
|
invariant22(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
|
|
8417
8422
|
F: __dxlog_file29,
|
|
8418
|
-
L:
|
|
8423
|
+
L: 344,
|
|
8419
8424
|
S: this,
|
|
8420
8425
|
A: [
|
|
8421
8426
|
"this.dataSpaceManager",
|
|
@@ -8439,7 +8444,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8439
8444
|
details: assertion
|
|
8440
8445
|
}, {
|
|
8441
8446
|
F: __dxlog_file29,
|
|
8442
|
-
L:
|
|
8447
|
+
L: 360,
|
|
8443
8448
|
S: this,
|
|
8444
8449
|
C: (f, a) => f(...a)
|
|
8445
8450
|
});
|
|
@@ -8450,7 +8455,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8450
8455
|
details: assertion
|
|
8451
8456
|
}, {
|
|
8452
8457
|
F: __dxlog_file29,
|
|
8453
|
-
L:
|
|
8458
|
+
L: 364,
|
|
8454
8459
|
S: this,
|
|
8455
8460
|
C: (f, a) => f(...a)
|
|
8456
8461
|
});
|
|
@@ -8461,7 +8466,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8461
8466
|
details: assertion
|
|
8462
8467
|
}, {
|
|
8463
8468
|
F: __dxlog_file29,
|
|
8464
|
-
L:
|
|
8469
|
+
L: 369,
|
|
8465
8470
|
S: this,
|
|
8466
8471
|
C: (f, a) => f(...a)
|
|
8467
8472
|
});
|
|
@@ -8472,7 +8477,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8472
8477
|
} catch (err) {
|
|
8473
8478
|
log25.catch(err, void 0, {
|
|
8474
8479
|
F: __dxlog_file29,
|
|
8475
|
-
L:
|
|
8480
|
+
L: 375,
|
|
8476
8481
|
S: this,
|
|
8477
8482
|
C: (f, a) => f(...a)
|
|
8478
8483
|
});
|
|
@@ -8497,7 +8502,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8497
8502
|
swarms: this.networkManager.topics
|
|
8498
8503
|
}, {
|
|
8499
8504
|
F: __dxlog_file29,
|
|
8500
|
-
L:
|
|
8505
|
+
L: 389,
|
|
8501
8506
|
S: this,
|
|
8502
8507
|
C: (f, a) => f(...a)
|
|
8503
8508
|
});
|
|
@@ -8511,7 +8516,7 @@ var ServiceContext = class extends Resource8 {
|
|
|
8511
8516
|
});
|
|
8512
8517
|
invariant22(identity.deviceCredentialChain, void 0, {
|
|
8513
8518
|
F: __dxlog_file29,
|
|
8514
|
-
L:
|
|
8519
|
+
L: 408,
|
|
8515
8520
|
S: this,
|
|
8516
8521
|
A: [
|
|
8517
8522
|
"identity.deviceCredentialChain",
|
|
@@ -8864,7 +8869,7 @@ var DevicesServiceImpl = class {
|
|
|
8864
8869
|
if (isMe) {
|
|
8865
8870
|
presence = Device2.PresenceState.ONLINE;
|
|
8866
8871
|
} else if (profile.os?.toUpperCase() === "EDGE") {
|
|
8867
|
-
presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8872
|
+
presence = this._edgeConnection?.status.state === EdgeStatus3.ConnectionState.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8868
8873
|
} else {
|
|
8869
8874
|
presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
|
|
8870
8875
|
}
|
|
@@ -9401,12 +9406,6 @@ var ClientServicesHost = class {
|
|
|
9401
9406
|
}
|
|
9402
9407
|
}
|
|
9403
9408
|
if (!options.signalManager) {
|
|
9404
|
-
log28.warn("running signaling without telemetry metadata.", void 0, {
|
|
9405
|
-
F: __dxlog_file32,
|
|
9406
|
-
L: 221,
|
|
9407
|
-
S: this,
|
|
9408
|
-
C: (f, a) => f(...a)
|
|
9409
|
-
});
|
|
9410
9409
|
}
|
|
9411
9410
|
const endpoint = config?.get("runtime.services.edge.url");
|
|
9412
9411
|
if (endpoint) {
|
|
@@ -9423,7 +9422,7 @@ var ClientServicesHost = class {
|
|
|
9423
9422
|
this._signalManager = signalManager;
|
|
9424
9423
|
invariant25(!this._networkManager, "network manager already set", {
|
|
9425
9424
|
F: __dxlog_file32,
|
|
9426
|
-
L:
|
|
9425
|
+
L: 244,
|
|
9427
9426
|
S: this,
|
|
9428
9427
|
A: [
|
|
9429
9428
|
"!this._networkManager",
|
|
@@ -9441,7 +9440,7 @@ var ClientServicesHost = class {
|
|
|
9441
9440
|
});
|
|
9442
9441
|
log28("initialized", void 0, {
|
|
9443
9442
|
F: __dxlog_file32,
|
|
9444
|
-
L:
|
|
9443
|
+
L: 257,
|
|
9445
9444
|
S: this,
|
|
9446
9445
|
C: (f, a) => f(...a)
|
|
9447
9446
|
});
|
|
@@ -9455,13 +9454,13 @@ var ClientServicesHost = class {
|
|
|
9455
9454
|
id: traceId
|
|
9456
9455
|
}), {
|
|
9457
9456
|
F: __dxlog_file32,
|
|
9458
|
-
L:
|
|
9457
|
+
L: 268,
|
|
9459
9458
|
S: this,
|
|
9460
9459
|
C: (f, a) => f(...a)
|
|
9461
9460
|
});
|
|
9462
9461
|
invariant25(this._config, "config not set", {
|
|
9463
9462
|
F: __dxlog_file32,
|
|
9464
|
-
L:
|
|
9463
|
+
L: 270,
|
|
9465
9464
|
S: this,
|
|
9466
9465
|
A: [
|
|
9467
9466
|
"this._config",
|
|
@@ -9470,7 +9469,7 @@ var ClientServicesHost = class {
|
|
|
9470
9469
|
});
|
|
9471
9470
|
invariant25(this._storage, "storage not set", {
|
|
9472
9471
|
F: __dxlog_file32,
|
|
9473
|
-
L:
|
|
9472
|
+
L: 271,
|
|
9474
9473
|
S: this,
|
|
9475
9474
|
A: [
|
|
9476
9475
|
"this._storage",
|
|
@@ -9479,7 +9478,7 @@ var ClientServicesHost = class {
|
|
|
9479
9478
|
});
|
|
9480
9479
|
invariant25(this._signalManager, "signal manager not set", {
|
|
9481
9480
|
F: __dxlog_file32,
|
|
9482
|
-
L:
|
|
9481
|
+
L: 272,
|
|
9483
9482
|
S: this,
|
|
9484
9483
|
A: [
|
|
9485
9484
|
"this._signalManager",
|
|
@@ -9488,7 +9487,7 @@ var ClientServicesHost = class {
|
|
|
9488
9487
|
});
|
|
9489
9488
|
invariant25(this._networkManager, "network manager not set", {
|
|
9490
9489
|
F: __dxlog_file32,
|
|
9491
|
-
L:
|
|
9490
|
+
L: 273,
|
|
9492
9491
|
S: this,
|
|
9493
9492
|
A: [
|
|
9494
9493
|
"this._networkManager",
|
|
@@ -9500,7 +9499,7 @@ var ClientServicesHost = class {
|
|
|
9500
9499
|
lockKey: this._resourceLock?.lockKey
|
|
9501
9500
|
}, {
|
|
9502
9501
|
F: __dxlog_file32,
|
|
9503
|
-
L:
|
|
9502
|
+
L: 276,
|
|
9504
9503
|
S: this,
|
|
9505
9504
|
C: (f, a) => f(...a)
|
|
9506
9505
|
});
|
|
@@ -9561,7 +9560,7 @@ var ClientServicesHost = class {
|
|
|
9561
9560
|
deviceKey
|
|
9562
9561
|
}, {
|
|
9563
9562
|
F: __dxlog_file32,
|
|
9564
|
-
L:
|
|
9563
|
+
L: 377,
|
|
9565
9564
|
S: this,
|
|
9566
9565
|
C: (f, a) => f(...a)
|
|
9567
9566
|
});
|
|
@@ -9569,7 +9568,7 @@ var ClientServicesHost = class {
|
|
|
9569
9568
|
id: traceId
|
|
9570
9569
|
}), {
|
|
9571
9570
|
F: __dxlog_file32,
|
|
9572
|
-
L:
|
|
9571
|
+
L: 378,
|
|
9573
9572
|
S: this,
|
|
9574
9573
|
C: (f, a) => f(...a)
|
|
9575
9574
|
});
|
|
@@ -9583,7 +9582,7 @@ var ClientServicesHost = class {
|
|
|
9583
9582
|
deviceKey
|
|
9584
9583
|
}, {
|
|
9585
9584
|
F: __dxlog_file32,
|
|
9586
|
-
L:
|
|
9585
|
+
L: 389,
|
|
9587
9586
|
S: this,
|
|
9588
9587
|
C: (f, a) => f(...a)
|
|
9589
9588
|
});
|
|
@@ -9601,7 +9600,7 @@ var ClientServicesHost = class {
|
|
|
9601
9600
|
deviceKey
|
|
9602
9601
|
}, {
|
|
9603
9602
|
F: __dxlog_file32,
|
|
9604
|
-
L:
|
|
9603
|
+
L: 398,
|
|
9605
9604
|
S: this,
|
|
9606
9605
|
C: (f, a) => f(...a)
|
|
9607
9606
|
});
|
|
@@ -9612,23 +9611,35 @@ var ClientServicesHost = class {
|
|
|
9612
9611
|
id: traceId
|
|
9613
9612
|
}), {
|
|
9614
9613
|
F: __dxlog_file32,
|
|
9615
|
-
L:
|
|
9614
|
+
L: 403,
|
|
9616
9615
|
S: this,
|
|
9617
9616
|
C: (f, a) => f(...a)
|
|
9618
9617
|
});
|
|
9619
9618
|
log28.info("resetting...", void 0, {
|
|
9620
9619
|
F: __dxlog_file32,
|
|
9621
|
-
L:
|
|
9620
|
+
L: 405,
|
|
9622
9621
|
S: this,
|
|
9623
9622
|
C: (f, a) => f(...a)
|
|
9624
9623
|
});
|
|
9625
9624
|
this._resetting = true;
|
|
9626
9625
|
this._statusUpdate.emit();
|
|
9627
9626
|
await this._serviceContext?.close();
|
|
9627
|
+
try {
|
|
9628
|
+
await this._level.clear();
|
|
9629
|
+
} catch (err) {
|
|
9630
|
+
log28.warn("failed to clear leveldb during reset", {
|
|
9631
|
+
err
|
|
9632
|
+
}, {
|
|
9633
|
+
F: __dxlog_file32,
|
|
9634
|
+
L: 415,
|
|
9635
|
+
S: this,
|
|
9636
|
+
C: (f, a) => f(...a)
|
|
9637
|
+
});
|
|
9638
|
+
}
|
|
9628
9639
|
await this._storage.reset();
|
|
9629
9640
|
log28.info("reset", void 0, {
|
|
9630
9641
|
F: __dxlog_file32,
|
|
9631
|
-
L:
|
|
9642
|
+
L: 418,
|
|
9632
9643
|
S: this,
|
|
9633
9644
|
C: (f, a) => f(...a)
|
|
9634
9645
|
});
|
|
@@ -9636,7 +9647,7 @@ var ClientServicesHost = class {
|
|
|
9636
9647
|
id: traceId
|
|
9637
9648
|
}), {
|
|
9638
9649
|
F: __dxlog_file32,
|
|
9639
|
-
L:
|
|
9650
|
+
L: 419,
|
|
9640
9651
|
S: this,
|
|
9641
9652
|
C: (f, a) => f(...a)
|
|
9642
9653
|
});
|
|
@@ -9714,4 +9725,4 @@ export {
|
|
|
9714
9725
|
ServiceRegistry,
|
|
9715
9726
|
ClientServicesHost
|
|
9716
9727
|
};
|
|
9717
|
-
//# sourceMappingURL=chunk-
|
|
9728
|
+
//# sourceMappingURL=chunk-I2RGLVJF.mjs.map
|