@dxos/client-services 0.8.2-main.f11618f → 0.8.2-staging.7ac8446
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-R24OWGT7.mjs → chunk-2TKMQ2UP.mjs} +71 -61
- package/dist/lib/browser/chunk-2TKMQ2UP.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 +1 -1
- package/dist/lib/node/{chunk-ZIKA2DAN.cjs → chunk-HUMVSL5Y.cjs} +242 -232
- package/dist/lib/node/chunk-HUMVSL5Y.cjs.map +7 -0
- package/dist/lib/node/index.cjs +47 -47
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +8 -8
- package/dist/lib/node-esm/{chunk-QLUXYSIC.mjs → chunk-DQCPFIVI.mjs} +71 -61
- package/dist/lib/node-esm/chunk-DQCPFIVI.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 +1 -1
- package/dist/types/src/packlets/agents/edge-agent-service.d.ts +1 -1
- package/dist/types/src/packlets/agents/edge-agent-service.d.ts.map +1 -1
- package/dist/types/src/packlets/devices/devices-service.d.ts.map +1 -1
- package/dist/types/src/packlets/network/network-service.d.ts +1 -3
- package/dist/types/src/packlets/network/network-service.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/edge-feed-replicator.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/src/version.d.ts.map +1 -1
- package/package.json +38 -38
- package/src/packlets/agents/edge-agent-service.ts +11 -8
- package/src/packlets/devices/devices-service.ts +3 -5
- package/src/packlets/identity/identity.test.ts +6 -9
- package/src/packlets/network/network-service.ts +15 -9
- package/src/packlets/services/service-host.ts +1 -5
- package/src/packlets/spaces/data-space-manager.ts +2 -2
- package/src/packlets/spaces/edge-feed-replicator.test.ts +1 -2
- package/src/packlets/spaces/edge-feed-replicator.ts +1 -2
- package/src/version.ts +1 -1
- package/dist/lib/browser/chunk-R24OWGT7.mjs.map +0 -7
- package/dist/lib/node/chunk-ZIKA2DAN.cjs.map +0 -7
- package/dist/lib/node-esm/chunk-QLUXYSIC.mjs.map +0 -7
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
InvitationsManager,
|
|
7
7
|
ServiceContext,
|
|
8
8
|
SpaceInvitationProtocol
|
|
9
|
-
} from "../chunk-
|
|
9
|
+
} from "../chunk-DQCPFIVI.mjs";
|
|
10
10
|
|
|
11
11
|
// packages/sdk/client-services/src/packlets/testing/credential-utils.ts
|
|
12
12
|
import { createCredential } from "@dxos/credentials";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf/stream';
|
|
2
2
|
import { type EdgeConnection } from '@dxos/edge-client';
|
|
3
|
-
import { QueryAgentStatusResponse,
|
|
3
|
+
import { QueryAgentStatusResponse, QueryEdgeStatusResponse, type EdgeAgentService } from '@dxos/protocols/proto/dxos/client/services';
|
|
4
4
|
import { type EdgeAgentManager } from './edge-agent-manager';
|
|
5
5
|
export declare class EdgeAgentServiceImpl implements EdgeAgentService {
|
|
6
6
|
private readonly _agentManagerProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-agent-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/agents/edge-agent-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EACL,wBAAwB,
|
|
1
|
+
{"version":3,"file":"edge-agent-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/agents/edge-agent-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,KAAK,gBAAgB,EACtB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG7D,qBAAa,oBAAqB,YAAW,gBAAgB;IAEzD,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;gBADhB,qBAAqB,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,EACtD,eAAe,CAAC,EAAE,cAAc,YAAA;IAGnD,eAAe,IAAI,MAAM,CAAC,uBAAuB,CAAC;IAgB5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAIlC,gBAAgB,IAAI,MAAM,CAAC,wBAAwB,CAAC;CAWrD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devices-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devices/devices-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EACL,MAAM,
|
|
1
|
+
{"version":3,"file":"devices-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devices/devices-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EACL,MAAM,EAEN,KAAK,cAAc,EACnB,KAAK,oBAAoB,EAC1B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAEzF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,qBAAa,kBAAmB,YAAW,cAAc;IAErD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;gBADhB,gBAAgB,EAAE,eAAe,EACjC,eAAe,CAAC,EAAE,cAAc,YAAA;IAG7C,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAInE,YAAY,IAAI,MAAM,CAAC,oBAAoB,CAAC;CA+E7C"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf/stream';
|
|
2
|
-
import { type EdgeConnection } from '@dxos/edge-client';
|
|
3
2
|
import { type SignalManager } from '@dxos/messaging';
|
|
4
3
|
import { type SwarmNetworkManager } from '@dxos/network-manager';
|
|
5
4
|
import { type SubscribeSwarmStateRequest, type NetworkService, type NetworkStatus, type UpdateConfigRequest } from '@dxos/protocols/proto/dxos/client/services';
|
|
@@ -8,8 +7,7 @@ import { type LeaveRequest, type JoinRequest, type Message, type QueryRequest }
|
|
|
8
7
|
export declare class NetworkServiceImpl implements NetworkService {
|
|
9
8
|
private readonly networkManager;
|
|
10
9
|
private readonly signalManager;
|
|
11
|
-
|
|
12
|
-
constructor(networkManager: SwarmNetworkManager, signalManager: SignalManager, edgeConnection?: EdgeConnection | undefined);
|
|
10
|
+
constructor(networkManager: SwarmNetworkManager, signalManager: SignalManager);
|
|
13
11
|
queryStatus(): Stream<NetworkStatus>;
|
|
14
12
|
updateConfig(request: UpdateConfigRequest): Promise<void>;
|
|
15
13
|
joinSwarm(request: JoinRequest): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/network/network-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"network-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/network/network-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACzB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,OAAO,EACZ,KAAK,YAAY,EAClB,MAAM,wCAAwC,CAAC;AAEhD,qBAAa,kBAAmB,YAAW,cAAc;IAErD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,cAAc,EAAE,mBAAmB,EACnC,aAAa,EAAE,aAAa;IAG/C,WAAW;IAqBL,YAAY,CAAC,OAAO,EAAE,mBAAmB;IAIzC,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,UAAU,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAI/D,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,MAAM,CAAC,aAAa,CAAC;IAWzE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;CAW/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-feed-replicator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/edge-feed-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,QAAQ,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"edge-feed-replicator.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/edge-feed-replicator.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,QAAQ,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAWrD,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAG5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IAEnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IAEtF,OAAO,CAAC,cAAc,CAAC,CAAsB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAC3B;;OAEG;IACH,OAAO,CAAC,aAAa,CAAqD;IAE1E;;OAEG;IACH,OAAO,CAAC,UAAU,CAAoD;gBAE1D,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,wBAAwB;cAMnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAgCjC,gBAAgB;cAOL,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKhD,OAAO,CAAC,iBAAiB;YAYX,gBAAgB;IAQxB,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;IASpC,OAAO,CAAC,aAAa;YAIP,cAAc;YAYd,YAAY;IA6B1B,OAAO,CAAC,UAAU;YA0DJ,WAAW;YA0BX,gBAAgB;YAkBhB,mBAAmB;IAcjC,OAAO,CAAC,wBAAwB;CAgBjC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.8.2-
|
|
1
|
+
export declare const DXOS_VERSION = "0.8.2-staging.7ac8446";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,0BAA0B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.8.2-
|
|
3
|
+
"version": "0.8.2-staging.7ac8446",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -44,48 +44,48 @@
|
|
|
44
44
|
"@obsidize/tar-browserify": "^5.2.0",
|
|
45
45
|
"cbor-x": "^1.5.4",
|
|
46
46
|
"platform": "^1.3.6",
|
|
47
|
-
"@dxos/async": "0.8.2-
|
|
48
|
-
"@dxos/automerge": "0.8.2-
|
|
49
|
-
"@dxos/client-protocol": "0.8.2-
|
|
50
|
-
"@dxos/codec-protobuf": "0.8.2-
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/debug": "0.8.2-
|
|
56
|
-
"@dxos/echo-db": "0.8.2-
|
|
57
|
-
"@dxos/echo-pipeline": "0.8.2-
|
|
58
|
-
"@dxos/echo-protocol": "0.8.2-
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/
|
|
62
|
-
"@dxos/indexing": "0.8.2-
|
|
63
|
-
"@dxos/invariant": "0.8.2-
|
|
64
|
-
"@dxos/keyring": "0.8.2-
|
|
65
|
-
"@dxos/keys": "0.8.2-
|
|
66
|
-
"@dxos/kv-store": "0.8.2-
|
|
67
|
-
"@dxos/lock-file": "0.8.2-
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/
|
|
73
|
-
"@dxos/random-access-storage": "0.8.2-
|
|
74
|
-
"@dxos/rpc": "0.8.2-
|
|
75
|
-
"@dxos/teleport
|
|
76
|
-
"@dxos/teleport-extension-
|
|
77
|
-
"@dxos/
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/timeframe": "0.8.2-
|
|
80
|
-
"@dxos/util": "0.8.2-
|
|
81
|
-
"@dxos/websocket-rpc": "0.8.2-
|
|
47
|
+
"@dxos/async": "0.8.2-staging.7ac8446",
|
|
48
|
+
"@dxos/automerge": "0.8.2-staging.7ac8446",
|
|
49
|
+
"@dxos/client-protocol": "0.8.2-staging.7ac8446",
|
|
50
|
+
"@dxos/codec-protobuf": "0.8.2-staging.7ac8446",
|
|
51
|
+
"@dxos/config": "0.8.2-staging.7ac8446",
|
|
52
|
+
"@dxos/context": "0.8.2-staging.7ac8446",
|
|
53
|
+
"@dxos/crypto": "0.8.2-staging.7ac8446",
|
|
54
|
+
"@dxos/credentials": "0.8.2-staging.7ac8446",
|
|
55
|
+
"@dxos/debug": "0.8.2-staging.7ac8446",
|
|
56
|
+
"@dxos/echo-db": "0.8.2-staging.7ac8446",
|
|
57
|
+
"@dxos/echo-pipeline": "0.8.2-staging.7ac8446",
|
|
58
|
+
"@dxos/echo-protocol": "0.8.2-staging.7ac8446",
|
|
59
|
+
"@dxos/echo-schema": "0.8.2-staging.7ac8446",
|
|
60
|
+
"@dxos/edge-client": "0.8.2-staging.7ac8446",
|
|
61
|
+
"@dxos/feed-store": "0.8.2-staging.7ac8446",
|
|
62
|
+
"@dxos/indexing": "0.8.2-staging.7ac8446",
|
|
63
|
+
"@dxos/invariant": "0.8.2-staging.7ac8446",
|
|
64
|
+
"@dxos/keyring": "0.8.2-staging.7ac8446",
|
|
65
|
+
"@dxos/keys": "0.8.2-staging.7ac8446",
|
|
66
|
+
"@dxos/kv-store": "0.8.2-staging.7ac8446",
|
|
67
|
+
"@dxos/lock-file": "0.8.2-staging.7ac8446",
|
|
68
|
+
"@dxos/log": "0.8.2-staging.7ac8446",
|
|
69
|
+
"@dxos/network-manager": "0.8.2-staging.7ac8446",
|
|
70
|
+
"@dxos/messaging": "0.8.2-staging.7ac8446",
|
|
71
|
+
"@dxos/node-std": "0.8.2-staging.7ac8446",
|
|
72
|
+
"@dxos/protocols": "0.8.2-staging.7ac8446",
|
|
73
|
+
"@dxos/random-access-storage": "0.8.2-staging.7ac8446",
|
|
74
|
+
"@dxos/rpc": "0.8.2-staging.7ac8446",
|
|
75
|
+
"@dxos/teleport": "0.8.2-staging.7ac8446",
|
|
76
|
+
"@dxos/teleport-extension-gossip": "0.8.2-staging.7ac8446",
|
|
77
|
+
"@dxos/teleport-extension-object-sync": "0.8.2-staging.7ac8446",
|
|
78
|
+
"@dxos/tracing": "0.8.2-staging.7ac8446",
|
|
79
|
+
"@dxos/timeframe": "0.8.2-staging.7ac8446",
|
|
80
|
+
"@dxos/util": "0.8.2-staging.7ac8446",
|
|
81
|
+
"@dxos/websocket-rpc": "0.8.2-staging.7ac8446"
|
|
82
82
|
},
|
|
83
83
|
"devDependencies": {
|
|
84
84
|
"@types/platform": "^1.3.4",
|
|
85
85
|
"@types/readable-stream": "^2.3.9",
|
|
86
86
|
"get-port-please": "^3.1.1",
|
|
87
|
-
"@dxos/signal": "0.8.2-
|
|
88
|
-
"@dxos/test-utils": "0.8.2-
|
|
87
|
+
"@dxos/signal": "0.8.2-staging.7ac8446",
|
|
88
|
+
"@dxos/test-utils": "0.8.2-staging.7ac8446"
|
|
89
89
|
},
|
|
90
90
|
"publishConfig": {
|
|
91
91
|
"access": "public"
|
|
@@ -7,8 +7,7 @@ import { type EdgeConnection } from '@dxos/edge-client';
|
|
|
7
7
|
import { EdgeAgentStatus } from '@dxos/protocols';
|
|
8
8
|
import {
|
|
9
9
|
QueryAgentStatusResponse,
|
|
10
|
-
|
|
11
|
-
type QueryEdgeStatusResponse,
|
|
10
|
+
QueryEdgeStatusResponse,
|
|
12
11
|
type EdgeAgentService,
|
|
13
12
|
} from '@dxos/protocols/proto/dxos/client/services';
|
|
14
13
|
|
|
@@ -21,15 +20,19 @@ export class EdgeAgentServiceImpl implements EdgeAgentService {
|
|
|
21
20
|
private readonly _edgeConnection?: EdgeConnection,
|
|
22
21
|
) {}
|
|
23
22
|
|
|
24
|
-
// TODO(mykola): Reconcile with NetworkService.queryStatus.
|
|
25
23
|
queryEdgeStatus(): Stream<QueryEdgeStatusResponse> {
|
|
26
24
|
return new Stream(({ ctx, next }) => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
next({ status: QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED });
|
|
26
|
+
if (!this._edgeConnection) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
30
29
|
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
ctx.onDispose(
|
|
31
|
+
// TODO(wittjosiah): EdgeConnection should include a disconnected event as well.
|
|
32
|
+
this._edgeConnection.onReconnected(() => {
|
|
33
|
+
next({ status: QueryEdgeStatusResponse.EdgeStatus.CONNECTED });
|
|
34
|
+
}),
|
|
35
|
+
);
|
|
33
36
|
});
|
|
34
37
|
}
|
|
35
38
|
|
|
@@ -9,7 +9,6 @@ import { invariant } from '@dxos/invariant';
|
|
|
9
9
|
import {
|
|
10
10
|
Device,
|
|
11
11
|
DeviceKind,
|
|
12
|
-
EdgeStatus,
|
|
13
12
|
type DevicesService,
|
|
14
13
|
type QueryDevicesResponse,
|
|
15
14
|
} from '@dxos/protocols/proto/dxos/client/services';
|
|
@@ -43,10 +42,9 @@ export class DevicesServiceImpl implements DevicesService {
|
|
|
43
42
|
if (isMe) {
|
|
44
43
|
presence = Device.PresenceState.ONLINE;
|
|
45
44
|
} else if (profile.os?.toUpperCase() === 'EDGE') {
|
|
46
|
-
presence =
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
: Device.PresenceState.OFFLINE;
|
|
45
|
+
presence = this._edgeConnection?.isConnected
|
|
46
|
+
? Device.PresenceState.ONLINE
|
|
47
|
+
: Device.PresenceState.OFFLINE;
|
|
50
48
|
} else {
|
|
51
49
|
presence = peers.some((peer) => peer.identityKey.equals(key))
|
|
52
50
|
? Device.PresenceState.ONLINE
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
|
|
5
5
|
import { onTestFinished, describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
|
-
import { Event } from '@dxos/async';
|
|
8
7
|
import { Context } from '@dxos/context';
|
|
9
8
|
import { createDidFromIdentityKey, CredentialGenerator, verifyCredential } from '@dxos/credentials';
|
|
10
9
|
import {
|
|
@@ -23,7 +22,6 @@ import { Keyring } from '@dxos/keyring';
|
|
|
23
22
|
import { type PublicKey } from '@dxos/keys';
|
|
24
23
|
import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
|
|
25
24
|
import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
|
|
26
|
-
import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
|
|
27
25
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
28
26
|
import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
29
27
|
import { createStorage, StorageType } from '@dxos/random-access-storage';
|
|
@@ -109,22 +107,21 @@ describe('identity/identity', () => {
|
|
|
109
107
|
|
|
110
108
|
test('edge feed replicator', async () => {
|
|
111
109
|
let replicationStarted = false;
|
|
112
|
-
let
|
|
110
|
+
let isConnected = false;
|
|
113
111
|
const listeners: Array<() => void> = [];
|
|
114
112
|
const setup = await setupIdentity({
|
|
115
113
|
edgeConnection: {
|
|
116
|
-
statusChanged: new Event(),
|
|
117
|
-
get status() {
|
|
118
|
-
return status;
|
|
119
|
-
},
|
|
120
114
|
onReconnected: (listener) => {
|
|
121
|
-
if (
|
|
115
|
+
if (isConnected) {
|
|
122
116
|
listener();
|
|
123
117
|
} else {
|
|
124
118
|
listeners.push(listener);
|
|
125
119
|
}
|
|
126
120
|
return () => {};
|
|
127
121
|
},
|
|
122
|
+
get isConnected() {
|
|
123
|
+
return isConnected;
|
|
124
|
+
},
|
|
128
125
|
open: async () => {},
|
|
129
126
|
close: async () => {},
|
|
130
127
|
onMessage: (_: MessageListener): (() => void) => {
|
|
@@ -138,7 +135,7 @@ describe('identity/identity', () => {
|
|
|
138
135
|
|
|
139
136
|
await writeGenesisCredential(setup);
|
|
140
137
|
listeners.forEach((callback) => callback());
|
|
141
|
-
|
|
138
|
+
isConnected = true;
|
|
142
139
|
|
|
143
140
|
await expect.poll(() => replicationStarted).toBeTruthy();
|
|
144
141
|
});
|
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Stream } from '@dxos/codec-protobuf/stream';
|
|
6
|
-
import { type EdgeConnection } from '@dxos/edge-client';
|
|
7
6
|
import { type SignalManager } from '@dxos/messaging';
|
|
8
7
|
import { type SwarmNetworkManager } from '@dxos/network-manager';
|
|
9
8
|
import {
|
|
@@ -24,11 +23,10 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
24
23
|
constructor(
|
|
25
24
|
private readonly networkManager: SwarmNetworkManager,
|
|
26
25
|
private readonly signalManager: SignalManager,
|
|
27
|
-
private readonly edgeConnection?: EdgeConnection,
|
|
28
26
|
) {}
|
|
29
27
|
|
|
30
28
|
queryStatus() {
|
|
31
|
-
return new Stream<NetworkStatus>(({
|
|
29
|
+
return new Stream<NetworkStatus>(({ next }) => {
|
|
32
30
|
const update = () => {
|
|
33
31
|
next({
|
|
34
32
|
swarm: this.networkManager.connectionState,
|
|
@@ -37,9 +35,14 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
37
35
|
});
|
|
38
36
|
};
|
|
39
37
|
|
|
40
|
-
this.networkManager.connectionStateChanged.on(
|
|
41
|
-
this.signalManager.statusChanged?.on(
|
|
38
|
+
const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
|
|
39
|
+
const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
|
|
42
40
|
update();
|
|
41
|
+
|
|
42
|
+
return () => {
|
|
43
|
+
unsubscribeSwarm();
|
|
44
|
+
unsubscribeSignal?.();
|
|
45
|
+
};
|
|
43
46
|
});
|
|
44
47
|
}
|
|
45
48
|
|
|
@@ -60,12 +63,13 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
60
63
|
}
|
|
61
64
|
|
|
62
65
|
subscribeSwarmState(request: SubscribeSwarmStateRequest): Stream<SwarmResponse> {
|
|
63
|
-
return new Stream<SwarmResponse>(({
|
|
64
|
-
this.signalManager.swarmState?.on(
|
|
66
|
+
return new Stream<SwarmResponse>(({ next }) => {
|
|
67
|
+
const unsubscribe = this.signalManager.swarmState?.on((state) => {
|
|
65
68
|
if (request.topic.equals(state.swarmKey)) {
|
|
66
69
|
next(state);
|
|
67
70
|
}
|
|
68
71
|
});
|
|
72
|
+
return unsubscribe;
|
|
69
73
|
});
|
|
70
74
|
}
|
|
71
75
|
|
|
@@ -74,12 +78,14 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
74
78
|
}
|
|
75
79
|
|
|
76
80
|
subscribeMessages(peer: Peer): Stream<Message> {
|
|
77
|
-
return new Stream<Message>(({
|
|
78
|
-
this.signalManager.onMessage.on(
|
|
81
|
+
return new Stream<Message>(({ next }) => {
|
|
82
|
+
const unsubscribe = this.signalManager.onMessage.on((message) => {
|
|
79
83
|
if (message.recipient.peerKey === peer.peerKey) {
|
|
80
84
|
next(message);
|
|
81
85
|
}
|
|
82
86
|
});
|
|
87
|
+
|
|
88
|
+
return unsubscribe;
|
|
83
89
|
});
|
|
84
90
|
}
|
|
85
91
|
}
|
|
@@ -329,11 +329,7 @@ export class ClientServicesHost {
|
|
|
329
329
|
DataService: this._serviceContext.echoHost.dataService,
|
|
330
330
|
QueryService: this._serviceContext.echoHost.queryService,
|
|
331
331
|
|
|
332
|
-
NetworkService: new NetworkServiceImpl(
|
|
333
|
-
this._serviceContext.networkManager,
|
|
334
|
-
this._serviceContext.signalManager,
|
|
335
|
-
this._edgeConnection,
|
|
336
|
-
),
|
|
332
|
+
NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
|
|
337
333
|
|
|
338
334
|
LoggingService: this._loggingService,
|
|
339
335
|
TracingService: this._tracingService,
|
|
@@ -40,7 +40,7 @@ import {
|
|
|
40
40
|
type ObjectStructure,
|
|
41
41
|
type SpaceDoc,
|
|
42
42
|
} from '@dxos/echo-protocol';
|
|
43
|
-
import {
|
|
43
|
+
import { createObjectId, getTypeReference } from '@dxos/echo-schema';
|
|
44
44
|
import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
|
|
45
45
|
import { writeMessages, type FeedStore } from '@dxos/feed-store';
|
|
46
46
|
import { assertArgument, assertState, failedInvariant, invariant } from '@dxos/invariant';
|
|
@@ -349,7 +349,7 @@ export class DataSpaceManager extends Resource {
|
|
|
349
349
|
},
|
|
350
350
|
};
|
|
351
351
|
|
|
352
|
-
const propertiesId =
|
|
352
|
+
const propertiesId = createObjectId();
|
|
353
353
|
document.change((doc: SpaceDoc) => {
|
|
354
354
|
setDeep(doc, ['objects', propertiesId], properties);
|
|
355
355
|
});
|
|
@@ -14,7 +14,6 @@ import { createTestEdgeWsServer } from '@dxos/edge-client/testing';
|
|
|
14
14
|
import { FeedFactory, FeedStore, type FeedWrapper } from '@dxos/feed-store';
|
|
15
15
|
import { Keyring } from '@dxos/keyring';
|
|
16
16
|
import { SpaceId } from '@dxos/keys';
|
|
17
|
-
import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
|
|
18
17
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
19
18
|
import { createStorage } from '@dxos/random-access-storage';
|
|
20
19
|
import { openAndClose } from '@dxos/test-utils';
|
|
@@ -45,7 +44,7 @@ describe('EdgeFeedReplicator', () => {
|
|
|
45
44
|
const { endpoint, admitConnection, messageSink } = await createEdge();
|
|
46
45
|
const { messenger } = await createClient(endpoint);
|
|
47
46
|
admitConnection.wake();
|
|
48
|
-
await expect.poll(() => messenger.
|
|
47
|
+
await expect.poll(() => messenger.isConnected).toBeTruthy();
|
|
49
48
|
|
|
50
49
|
await attachReplicator(messenger);
|
|
51
50
|
await expect.poll(() => messageSink.length).toEqual(1);
|
|
@@ -19,7 +19,6 @@ import {
|
|
|
19
19
|
type Message as RouterMessage,
|
|
20
20
|
} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
|
|
21
21
|
import type { FeedBlock, ProtocolMessage } from '@dxos/protocols/feed-replication';
|
|
22
|
-
import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
|
|
23
22
|
import { ComplexMap, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from '@dxos/util';
|
|
24
23
|
|
|
25
24
|
export type EdgeFeedReplicatorParams = {
|
|
@@ -87,7 +86,7 @@ export class EdgeFeedReplicator extends Resource {
|
|
|
87
86
|
|
|
88
87
|
private async _handleReconnect() {
|
|
89
88
|
await this._resetConnection();
|
|
90
|
-
if (this._messenger.
|
|
89
|
+
if (this._messenger.isConnected) {
|
|
91
90
|
this._startReplication();
|
|
92
91
|
}
|
|
93
92
|
}
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const DXOS_VERSION = "0.8.2-
|
|
1
|
+
export const DXOS_VERSION = "0.8.2-staging.7ac8446";
|