@dxos/client-services 0.8.1 → 0.8.2-main.f081794
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-MHDASPY5.mjs → chunk-3JMPDE6D.mjs} +59 -69
- package/dist/lib/browser/chunk-3JMPDE6D.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-A2WCOW6P.cjs → chunk-OU5KJSPA.cjs} +231 -241
- package/dist/lib/node/chunk-OU5KJSPA.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-SK52YZK7.mjs → chunk-YG5ZNYRZ.mjs} +59 -69
- package/dist/lib/node-esm/chunk-YG5ZNYRZ.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 +3 -1
- 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 +8 -11
- package/src/packlets/devices/devices-service.ts +5 -3
- package/src/packlets/identity/identity.test.ts +9 -6
- package/src/packlets/network/network-service.ts +9 -15
- package/src/packlets/services/service-host.ts +5 -1
- package/src/packlets/spaces/edge-feed-replicator.test.ts +2 -1
- package/src/packlets/spaces/edge-feed-replicator.ts +2 -1
- package/src/version.ts +1 -5
- package/dist/lib/browser/chunk-MHDASPY5.mjs.map +0 -7
- package/dist/lib/node/chunk-A2WCOW6P.cjs.map +0 -7
- package/dist/lib/node-esm/chunk-SK52YZK7.mjs.map +0 -7
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
InvitationsManager,
|
|
7
7
|
ServiceContext,
|
|
8
8
|
SpaceInvitationProtocol
|
|
9
|
-
} from "../chunk-
|
|
9
|
+
} from "../chunk-YG5ZNYRZ.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, QueryEdgeStatusResponse, type EdgeAgentService } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
|
+
import { QueryAgentStatusResponse, type 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,EAExB,KAAK,uBAAuB,EAC5B,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;IAInD,eAAe,IAAI,MAAM,CAAC,uBAAuB,CAAC;IAW5C,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,EAGN,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;CAgF7C"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf/stream';
|
|
2
|
+
import { type EdgeConnection } from '@dxos/edge-client';
|
|
2
3
|
import { type SignalManager } from '@dxos/messaging';
|
|
3
4
|
import { type SwarmNetworkManager } from '@dxos/network-manager';
|
|
4
5
|
import { type SubscribeSwarmStateRequest, type NetworkService, type NetworkStatus, type UpdateConfigRequest } from '@dxos/protocols/proto/dxos/client/services';
|
|
@@ -7,7 +8,8 @@ import { type LeaveRequest, type JoinRequest, type Message, type QueryRequest }
|
|
|
7
8
|
export declare class NetworkServiceImpl implements NetworkService {
|
|
8
9
|
private readonly networkManager;
|
|
9
10
|
private readonly signalManager;
|
|
10
|
-
|
|
11
|
+
private readonly edgeConnection?;
|
|
12
|
+
constructor(networkManager: SwarmNetworkManager, signalManager: SignalManager, edgeConnection?: EdgeConnection | undefined);
|
|
11
13
|
queryStatus(): Stream<NetworkStatus>;
|
|
12
14
|
updateConfig(request: UpdateConfigRequest): Promise<void>;
|
|
13
15
|
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,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;
|
|
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,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,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;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;gBAFf,cAAc,EAAE,mBAAmB,EACnC,aAAa,EAAE,aAAa,EAC5B,cAAc,CAAC,EAAE,cAAc,YAAA;IAGlD,WAAW;IAgBL,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;IAUzE,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;CAS/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAA6C,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,EAAE,cAAc,EAAE,KAAK,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAmBrD,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,2BAA2B,CAAC;IACxC,aAAa,CAAC,EAAE,2BAA2B,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAEvE,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,UAAU,CAAC,CAA8B;IACjD,OAAO,CAAC,cAAc,CAAC,CAAyC;IAChE,OAAO,CAAC,eAAe,CAAC,CAA6B;IACrD,OAAO,CAAC,eAAe,CAAC,CAA6B;IAErD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA8B;IAC7D,OAAO,CAAC,2BAA2B,CAAqC;IAGxE,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,KAAK,CAAS;IAGtB,OAAO,CAAC,UAAU,CAAS;gBAEf,EACV,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,OAAO,EACP,KAAK,EAEL,OAAO,EACP,SAAS,EACT,aAAa,GACd,GAAE,wBAA6B;IAuDhC,IAAI,MAAM,YAET;IAED,IAAI,MAAM,uBAET;IAED,IAAI,OAAO,mBAEV;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IAqD9C,IAAI,CAAC,GAAG,EAAE,OAAO;
|
|
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;AAYrD,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.
|
|
1
|
+
export declare const DXOS_VERSION = "0.8.2-main.f081794";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,uBAAuB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.2-main.f081794",
|
|
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.
|
|
48
|
-
"@dxos/client-protocol": "0.8.
|
|
49
|
-
"@dxos/automerge": "0.8.
|
|
50
|
-
"@dxos/codec-protobuf": "0.8.
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/echo-
|
|
58
|
-
"@dxos/echo-protocol": "0.8.
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/
|
|
62
|
-
"@dxos/
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/keyring": "0.8.
|
|
65
|
-
"@dxos/kv-store": "0.8.
|
|
66
|
-
"@dxos/
|
|
67
|
-
"@dxos/
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/network-manager": "0.8.
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/random-access-storage": "0.8.
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/teleport": "0.8.
|
|
76
|
-
"@dxos/teleport-extension-
|
|
77
|
-
"@dxos/teleport-extension-
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/
|
|
80
|
-
"@dxos/
|
|
81
|
-
"@dxos/
|
|
47
|
+
"@dxos/async": "0.8.2-main.f081794",
|
|
48
|
+
"@dxos/client-protocol": "0.8.2-main.f081794",
|
|
49
|
+
"@dxos/automerge": "0.8.2-main.f081794",
|
|
50
|
+
"@dxos/codec-protobuf": "0.8.2-main.f081794",
|
|
51
|
+
"@dxos/config": "0.8.2-main.f081794",
|
|
52
|
+
"@dxos/credentials": "0.8.2-main.f081794",
|
|
53
|
+
"@dxos/context": "0.8.2-main.f081794",
|
|
54
|
+
"@dxos/debug": "0.8.2-main.f081794",
|
|
55
|
+
"@dxos/echo-db": "0.8.2-main.f081794",
|
|
56
|
+
"@dxos/crypto": "0.8.2-main.f081794",
|
|
57
|
+
"@dxos/echo-pipeline": "0.8.2-main.f081794",
|
|
58
|
+
"@dxos/echo-protocol": "0.8.2-main.f081794",
|
|
59
|
+
"@dxos/echo-schema": "0.8.2-main.f081794",
|
|
60
|
+
"@dxos/feed-store": "0.8.2-main.f081794",
|
|
61
|
+
"@dxos/indexing": "0.8.2-main.f081794",
|
|
62
|
+
"@dxos/edge-client": "0.8.2-main.f081794",
|
|
63
|
+
"@dxos/keys": "0.8.2-main.f081794",
|
|
64
|
+
"@dxos/keyring": "0.8.2-main.f081794",
|
|
65
|
+
"@dxos/kv-store": "0.8.2-main.f081794",
|
|
66
|
+
"@dxos/invariant": "0.8.2-main.f081794",
|
|
67
|
+
"@dxos/lock-file": "0.8.2-main.f081794",
|
|
68
|
+
"@dxos/log": "0.8.2-main.f081794",
|
|
69
|
+
"@dxos/messaging": "0.8.2-main.f081794",
|
|
70
|
+
"@dxos/network-manager": "0.8.2-main.f081794",
|
|
71
|
+
"@dxos/protocols": "0.8.2-main.f081794",
|
|
72
|
+
"@dxos/random-access-storage": "0.8.2-main.f081794",
|
|
73
|
+
"@dxos/rpc": "0.8.2-main.f081794",
|
|
74
|
+
"@dxos/node-std": "0.8.2-main.f081794",
|
|
75
|
+
"@dxos/teleport": "0.8.2-main.f081794",
|
|
76
|
+
"@dxos/teleport-extension-gossip": "0.8.2-main.f081794",
|
|
77
|
+
"@dxos/teleport-extension-object-sync": "0.8.2-main.f081794",
|
|
78
|
+
"@dxos/tracing": "0.8.2-main.f081794",
|
|
79
|
+
"@dxos/timeframe": "0.8.2-main.f081794",
|
|
80
|
+
"@dxos/websocket-rpc": "0.8.2-main.f081794",
|
|
81
|
+
"@dxos/util": "0.8.2-main.f081794"
|
|
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.
|
|
88
|
-
"@dxos/test-utils": "0.8.
|
|
87
|
+
"@dxos/signal": "0.8.2-main.f081794",
|
|
88
|
+
"@dxos/test-utils": "0.8.2-main.f081794"
|
|
89
89
|
},
|
|
90
90
|
"publishConfig": {
|
|
91
91
|
"access": "public"
|
|
@@ -7,7 +7,8 @@ import { type EdgeConnection } from '@dxos/edge-client';
|
|
|
7
7
|
import { EdgeAgentStatus } from '@dxos/protocols';
|
|
8
8
|
import {
|
|
9
9
|
QueryAgentStatusResponse,
|
|
10
|
-
|
|
10
|
+
EdgeStatus,
|
|
11
|
+
type QueryEdgeStatusResponse,
|
|
11
12
|
type EdgeAgentService,
|
|
12
13
|
} from '@dxos/protocols/proto/dxos/client/services';
|
|
13
14
|
|
|
@@ -20,19 +21,15 @@ export class EdgeAgentServiceImpl implements EdgeAgentService {
|
|
|
20
21
|
private readonly _edgeConnection?: EdgeConnection,
|
|
21
22
|
) {}
|
|
22
23
|
|
|
24
|
+
// TODO(mykola): Reconcile with NetworkService.queryStatus.
|
|
23
25
|
queryEdgeStatus(): Stream<QueryEdgeStatusResponse> {
|
|
24
26
|
return new Stream(({ ctx, next }) => {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
27
|
+
const update = () => {
|
|
28
|
+
next({ status: this._edgeConnection?.status ?? EdgeStatus.NOT_CONNECTED });
|
|
29
|
+
};
|
|
29
30
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
this._edgeConnection.onReconnected(() => {
|
|
33
|
-
next({ status: QueryEdgeStatusResponse.EdgeStatus.CONNECTED });
|
|
34
|
-
}),
|
|
35
|
-
);
|
|
31
|
+
this._edgeConnection?.statusChanged.on(ctx, update);
|
|
32
|
+
update();
|
|
36
33
|
});
|
|
37
34
|
}
|
|
38
35
|
|
|
@@ -9,6 +9,7 @@ import { invariant } from '@dxos/invariant';
|
|
|
9
9
|
import {
|
|
10
10
|
Device,
|
|
11
11
|
DeviceKind,
|
|
12
|
+
EdgeStatus,
|
|
12
13
|
type DevicesService,
|
|
13
14
|
type QueryDevicesResponse,
|
|
14
15
|
} from '@dxos/protocols/proto/dxos/client/services';
|
|
@@ -42,9 +43,10 @@ export class DevicesServiceImpl implements DevicesService {
|
|
|
42
43
|
if (isMe) {
|
|
43
44
|
presence = Device.PresenceState.ONLINE;
|
|
44
45
|
} else if (profile.os?.toUpperCase() === 'EDGE') {
|
|
45
|
-
presence =
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
presence =
|
|
47
|
+
this._edgeConnection?.status === EdgeStatus.CONNECTED
|
|
48
|
+
? Device.PresenceState.ONLINE
|
|
49
|
+
: Device.PresenceState.OFFLINE;
|
|
48
50
|
} else {
|
|
49
51
|
presence = peers.some((peer) => peer.identityKey.equals(key))
|
|
50
52
|
? Device.PresenceState.ONLINE
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
import { onTestFinished, describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
|
+
import { Event } from '@dxos/async';
|
|
7
8
|
import { Context } from '@dxos/context';
|
|
8
9
|
import { createDidFromIdentityKey, CredentialGenerator, verifyCredential } from '@dxos/credentials';
|
|
9
10
|
import {
|
|
@@ -22,6 +23,7 @@ import { Keyring } from '@dxos/keyring';
|
|
|
22
23
|
import { type PublicKey } from '@dxos/keys';
|
|
23
24
|
import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
|
|
24
25
|
import { MemoryTransportFactory, SwarmNetworkManager } from '@dxos/network-manager';
|
|
26
|
+
import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
|
|
25
27
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
26
28
|
import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
27
29
|
import { createStorage, StorageType } from '@dxos/random-access-storage';
|
|
@@ -107,21 +109,22 @@ describe('identity/identity', () => {
|
|
|
107
109
|
|
|
108
110
|
test('edge feed replicator', async () => {
|
|
109
111
|
let replicationStarted = false;
|
|
110
|
-
let
|
|
112
|
+
let status = EdgeStatus.NOT_CONNECTED;
|
|
111
113
|
const listeners: Array<() => void> = [];
|
|
112
114
|
const setup = await setupIdentity({
|
|
113
115
|
edgeConnection: {
|
|
116
|
+
statusChanged: new Event(),
|
|
117
|
+
get status() {
|
|
118
|
+
return status;
|
|
119
|
+
},
|
|
114
120
|
onReconnected: (listener) => {
|
|
115
|
-
if (
|
|
121
|
+
if (status === EdgeStatus.CONNECTED) {
|
|
116
122
|
listener();
|
|
117
123
|
} else {
|
|
118
124
|
listeners.push(listener);
|
|
119
125
|
}
|
|
120
126
|
return () => {};
|
|
121
127
|
},
|
|
122
|
-
get isConnected() {
|
|
123
|
-
return isConnected;
|
|
124
|
-
},
|
|
125
128
|
open: async () => {},
|
|
126
129
|
close: async () => {},
|
|
127
130
|
onMessage: (_: MessageListener): (() => void) => {
|
|
@@ -135,7 +138,7 @@ describe('identity/identity', () => {
|
|
|
135
138
|
|
|
136
139
|
await writeGenesisCredential(setup);
|
|
137
140
|
listeners.forEach((callback) => callback());
|
|
138
|
-
|
|
141
|
+
status = EdgeStatus.CONNECTED;
|
|
139
142
|
|
|
140
143
|
await expect.poll(() => replicationStarted).toBeTruthy();
|
|
141
144
|
});
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Stream } from '@dxos/codec-protobuf/stream';
|
|
6
|
+
import { type EdgeConnection } from '@dxos/edge-client';
|
|
6
7
|
import { type SignalManager } from '@dxos/messaging';
|
|
7
8
|
import { type SwarmNetworkManager } from '@dxos/network-manager';
|
|
8
9
|
import {
|
|
@@ -23,10 +24,11 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
23
24
|
constructor(
|
|
24
25
|
private readonly networkManager: SwarmNetworkManager,
|
|
25
26
|
private readonly signalManager: SignalManager,
|
|
27
|
+
private readonly edgeConnection?: EdgeConnection,
|
|
26
28
|
) {}
|
|
27
29
|
|
|
28
30
|
queryStatus() {
|
|
29
|
-
return new Stream<NetworkStatus>(({ next }) => {
|
|
31
|
+
return new Stream<NetworkStatus>(({ ctx, next }) => {
|
|
30
32
|
const update = () => {
|
|
31
33
|
next({
|
|
32
34
|
swarm: this.networkManager.connectionState,
|
|
@@ -35,14 +37,9 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
35
37
|
});
|
|
36
38
|
};
|
|
37
39
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
+
this.networkManager.connectionStateChanged.on(ctx, () => update());
|
|
41
|
+
this.signalManager.statusChanged?.on(ctx, () => update());
|
|
40
42
|
update();
|
|
41
|
-
|
|
42
|
-
return () => {
|
|
43
|
-
unsubscribeSwarm();
|
|
44
|
-
unsubscribeSignal?.();
|
|
45
|
-
};
|
|
46
43
|
});
|
|
47
44
|
}
|
|
48
45
|
|
|
@@ -63,13 +60,12 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
63
60
|
}
|
|
64
61
|
|
|
65
62
|
subscribeSwarmState(request: SubscribeSwarmStateRequest): Stream<SwarmResponse> {
|
|
66
|
-
return new Stream<SwarmResponse>(({ next }) => {
|
|
67
|
-
|
|
63
|
+
return new Stream<SwarmResponse>(({ ctx, next }) => {
|
|
64
|
+
this.signalManager.swarmState?.on(ctx, (state) => {
|
|
68
65
|
if (request.topic.equals(state.swarmKey)) {
|
|
69
66
|
next(state);
|
|
70
67
|
}
|
|
71
68
|
});
|
|
72
|
-
return unsubscribe;
|
|
73
69
|
});
|
|
74
70
|
}
|
|
75
71
|
|
|
@@ -78,14 +74,12 @@ export class NetworkServiceImpl implements NetworkService {
|
|
|
78
74
|
}
|
|
79
75
|
|
|
80
76
|
subscribeMessages(peer: Peer): Stream<Message> {
|
|
81
|
-
return new Stream<Message>(({ next }) => {
|
|
82
|
-
|
|
77
|
+
return new Stream<Message>(({ ctx, next }) => {
|
|
78
|
+
this.signalManager.onMessage.on(ctx, (message) => {
|
|
83
79
|
if (message.recipient.peerKey === peer.peerKey) {
|
|
84
80
|
next(message);
|
|
85
81
|
}
|
|
86
82
|
});
|
|
87
|
-
|
|
88
|
-
return unsubscribe;
|
|
89
83
|
});
|
|
90
84
|
}
|
|
91
85
|
}
|
|
@@ -329,7 +329,11 @@ export class ClientServicesHost {
|
|
|
329
329
|
DataService: this._serviceContext.echoHost.dataService,
|
|
330
330
|
QueryService: this._serviceContext.echoHost.queryService,
|
|
331
331
|
|
|
332
|
-
NetworkService: new NetworkServiceImpl(
|
|
332
|
+
NetworkService: new NetworkServiceImpl(
|
|
333
|
+
this._serviceContext.networkManager,
|
|
334
|
+
this._serviceContext.signalManager,
|
|
335
|
+
this._edgeConnection,
|
|
336
|
+
),
|
|
333
337
|
|
|
334
338
|
LoggingService: this._loggingService,
|
|
335
339
|
TracingService: this._tracingService,
|
|
@@ -14,6 +14,7 @@ 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';
|
|
17
18
|
import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
18
19
|
import { createStorage } from '@dxos/random-access-storage';
|
|
19
20
|
import { openAndClose } from '@dxos/test-utils';
|
|
@@ -44,7 +45,7 @@ describe('EdgeFeedReplicator', () => {
|
|
|
44
45
|
const { endpoint, admitConnection, messageSink } = await createEdge();
|
|
45
46
|
const { messenger } = await createClient(endpoint);
|
|
46
47
|
admitConnection.wake();
|
|
47
|
-
await expect.poll(() => messenger.
|
|
48
|
+
await expect.poll(() => messenger.status).toBe(EdgeStatus.CONNECTED);
|
|
48
49
|
|
|
49
50
|
await attachReplicator(messenger);
|
|
50
51
|
await expect.poll(() => messageSink.length).toEqual(1);
|
|
@@ -19,6 +19,7 @@ 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';
|
|
22
23
|
import { ComplexMap, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from '@dxos/util';
|
|
23
24
|
|
|
24
25
|
export type EdgeFeedReplicatorParams = {
|
|
@@ -86,7 +87,7 @@ export class EdgeFeedReplicator extends Resource {
|
|
|
86
87
|
|
|
87
88
|
private async _handleReconnect() {
|
|
88
89
|
await this._resetConnection();
|
|
89
|
-
if (this._messenger.
|
|
90
|
+
if (this._messenger.status === EdgeStatus.CONNECTED) {
|
|
90
91
|
this._startReplication();
|
|
91
92
|
}
|
|
92
93
|
}
|
package/src/version.ts
CHANGED