@dxos/client-services 0.7.2 → 0.7.3-staging.971cd8d
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-K5O5LV2R.mjs → chunk-2DUFSBLX.mjs} +340 -422
- package/dist/lib/browser/chunk-2DUFSBLX.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-SPLKKUM4.cjs → chunk-S24QKMSU.cjs} +329 -411
- package/dist/lib/node/chunk-S24QKMSU.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-NSCBFSXO.mjs → chunk-2JS26IP4.mjs} +334 -416
- package/dist/lib/node-esm/chunk-2JS26IP4.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 +5 -2
- package/dist/types/src/packlets/agents/edge-agent-service.d.ts.map +1 -1
- package/dist/types/src/packlets/identity/identity-service.d.ts +1 -0
- package/dist/types/src/packlets/identity/identity-service.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/epoch-migrations.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 +28 -3
- package/src/packlets/identity/identity-service.ts +16 -1
- package/src/packlets/services/service-context.ts +4 -1
- package/src/packlets/services/service-host.ts +1 -1
- package/src/packlets/spaces/data-space-manager.ts +4 -13
- package/src/packlets/spaces/epoch-migrations.ts +3 -84
- package/src/version.ts +1 -5
- package/dist/lib/browser/chunk-K5O5LV2R.mjs.map +0 -7
- package/dist/lib/node/chunk-SPLKKUM4.cjs.map +0 -7
- package/dist/lib/node-esm/chunk-NSCBFSXO.mjs.map +0 -7
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
InvitationsManager,
|
|
7
7
|
ServiceContext,
|
|
8
8
|
SpaceInvitationProtocol
|
|
9
|
-
} from "../chunk-
|
|
9
|
+
} from "../chunk-2JS26IP4.mjs";
|
|
10
10
|
|
|
11
11
|
// packages/sdk/client-services/src/packlets/testing/credential-utils.ts
|
|
12
12
|
import { createCredential } from "@dxos/credentials";
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf';
|
|
2
|
-
import {
|
|
2
|
+
import { type EdgeConnection } from '@dxos/edge-client';
|
|
3
|
+
import { QueryAgentStatusResponse, QueryEdgeStatusResponse, type EdgeAgentService } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
4
|
import { type EdgeAgentManager } from './edge-agent-manager';
|
|
4
5
|
export declare class EdgeAgentServiceImpl implements EdgeAgentService {
|
|
5
6
|
private readonly _agentManagerProvider;
|
|
6
|
-
|
|
7
|
+
private readonly _edgeConnection?;
|
|
8
|
+
constructor(_agentManagerProvider: () => Promise<EdgeAgentManager>, _edgeConnection?: EdgeConnection | undefined);
|
|
9
|
+
queryEdgeStatus(): Stream<QueryEdgeStatusResponse>;
|
|
7
10
|
createAgent(): Promise<void>;
|
|
8
11
|
queryAgentStatus(): Stream<QueryAgentStatusResponse>;
|
|
9
12
|
}
|
|
@@ -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,sBAAsB,CAAC;
|
|
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,sBAAsB,CAAC;AAC9C,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"}
|
|
@@ -26,6 +26,7 @@ export declare class IdentityServiceImpl extends Resource implements IdentitySer
|
|
|
26
26
|
}>;
|
|
27
27
|
recoverIdentity(request: RecoverIdentityRequest): Promise<IdentityProto>;
|
|
28
28
|
signPresentation({ presentation, nonce }: SignPresentationRequest): Promise<Presentation>;
|
|
29
|
+
createAuthCredential(): Promise<import("@dxos/protocols/proto/dxos/halo/credentials").Credential>;
|
|
29
30
|
private _fixIdentityWithoutDefaultSpace;
|
|
30
31
|
}
|
|
31
32
|
//# sourceMappingURL=identity-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAE7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAGtG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,eAAe;IAExE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBALjB,gBAAgB,EAAE,eAAe,EACjC,gBAAgB,EAAE,2BAA2B,EAC7C,QAAQ,EAAE,OAAO,EACjB,yBAAyB,EAAE,MAAM,gBAAgB,EACjD,eAAe,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,CAAC,EACrE,gBAAgB,CAAC,GAAE,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA;cAKpE,KAAK;IAOxB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC;YAO9D,mBAAmB;IAOjC,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAS9C,OAAO,CAAC,YAAY;IAYd,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAO/D,oBAAoB;;;IAIpB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAMxE,gBAAgB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,IAAI,aAAa,EAC9B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAE7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAGtG,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIlD,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,eAAe;IAExE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBALjB,gBAAgB,EAAE,eAAe,EACjC,gBAAgB,EAAE,2BAA2B,EAC7C,QAAQ,EAAE,OAAO,EACjB,yBAAyB,EAAE,MAAM,gBAAgB,EACjD,eAAe,EAAE,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,QAAQ,CAAC,EACrE,gBAAgB,CAAC,GAAE,CAAC,OAAO,EAAE,eAAe,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,aAAA;cAKpE,KAAK;IAOxB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC;YAO9D,mBAAmB;IAOjC,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAS9C,OAAO,CAAC,YAAY;IAYd,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAO/D,oBAAoB;;;IAIpB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAMxE,gBAAgB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;IAYzF,oBAAoB;YAeZ,+BAA+B;CA6C9C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAS,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGlD,OAAO,EAEL,QAAQ,EAER,aAAa,EACb,YAAY,EAEb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAgB,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAe,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACpG,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAIjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EACL,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AACpF,OAAO,EAEL,KAAK,0BAA0B,EAC/B,kBAAkB,EAClB,kBAAkB,EAElB,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,KAAK,6BAA6B,EAAuB,MAAM,WAAW,CAAC;AAEtG,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAC5C,qBAAqB,EACrB,8BAA8B,GAAG,gCAAgC,CAClE,GACC,6BAA6B,GAAG;IAC9B,iCAAiC,CAAC,EAAE,0BAA0B,CAAC;IAC/D,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AACJ;;GAEG;AAGH,qBAEa,cAAe,SAAQ,QAAQ;aA+BxB,OAAO,EAAE,OAAO;aAChB,KAAK,EAAE,OAAO;aACd,cAAc,EAAE,mBAAmB;aACnC,aAAa,EAAE,aAAa;IAC5C,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;aAChB,cAAc,CAAC,EAAE,2BAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IArCjC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAe;IAExD,SAAgB,WAAW,gBAAiB;IAC5C,SAAgB,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAClD,SAAgB,OAAO,EAAE,OAAO,CAAC;IACjC,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C,SAAgB,eAAe,EAAE,eAAe,CAAC;IACjD,SAAgB,eAAe,EAAE,2BAA2B,CAAC;IAC7D,SAAgB,WAAW,EAAE,kBAAkB,CAAC;IAChD,SAAgB,kBAAkB,EAAE,kBAAkB,CAAC;IACvD,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAiC;IAClE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAiC;IAG/D,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAE3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAG9B;IAEJ,OAAO,CAAC,gBAAgB,CAAC,CAAsB;IAE/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGxC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,EACd,cAAc,EAAE,mBAAmB,EACnC,aAAa,EAAE,aAAa,EAC3B,eAAe,EAAE,cAAc,GAAG,SAAS,EAC3C,eAAe,EAAE,cAAc,GAAG,SAAS,EAC5C,cAAc,CAAC,EAAE,2BAA2B,YAAA,EAC3C,aAAa,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,YAAA;
|
|
1
|
+
{"version":3,"file":"service-context.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAA4B,MAAM,aAAa,CAAC;AAI9D,OAAO,EAAkB,QAAQ,EAAqB,MAAM,eAAe,CAAC;AAC5E,OAAO,EAGL,KAAK,gBAAgB,EAGtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,
|
|
1
|
+
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch-migrations.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/epoch-migrations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"epoch-migrations.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/epoch-migrations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,QAAQ,CAAC;IAEnB,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC;IACxC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAIF,eAAO,MAAM,iBAAiB,QAAe,OAAO,WAAW,gBAAgB,KAAG,OAAO,CAAC,eAAe,CAsCxG,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.7.
|
|
1
|
+
export declare const DXOS_VERSION = "0.7.3-staging.971cd8d";
|
|
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,0BAA0B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.3-staging.971cd8d",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -42,48 +42,48 @@
|
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"cbor-x": "^1.5.4",
|
|
44
44
|
"platform": "^1.3.6",
|
|
45
|
-
"@dxos/async": "0.7.
|
|
46
|
-
"@dxos/
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/context": "0.7.
|
|
51
|
-
"@dxos/credentials": "0.7.
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/echo-protocol": "0.7.
|
|
56
|
-
"@dxos/echo-pipeline": "0.7.
|
|
57
|
-
"@dxos/echo-schema": "0.7.
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/keyring": "0.7.
|
|
62
|
-
"@dxos/
|
|
63
|
-
"@dxos/keys": "0.7.
|
|
64
|
-
"@dxos/kv-store": "0.7.
|
|
65
|
-
"@dxos/lock-file": "0.7.
|
|
66
|
-
"@dxos/log": "0.7.
|
|
67
|
-
"@dxos/network-manager": "0.7.
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/random-access-storage": "0.7.
|
|
73
|
-
"@dxos/teleport": "0.7.
|
|
74
|
-
"@dxos/teleport-extension-object-sync": "0.7.
|
|
75
|
-
"@dxos/teleport-extension-gossip": "0.7.
|
|
76
|
-
"@dxos/
|
|
77
|
-
"@dxos/
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/
|
|
45
|
+
"@dxos/async": "0.7.3-staging.971cd8d",
|
|
46
|
+
"@dxos/automerge": "0.7.3-staging.971cd8d",
|
|
47
|
+
"@dxos/codec-protobuf": "0.7.3-staging.971cd8d",
|
|
48
|
+
"@dxos/config": "0.7.3-staging.971cd8d",
|
|
49
|
+
"@dxos/client-protocol": "0.7.3-staging.971cd8d",
|
|
50
|
+
"@dxos/context": "0.7.3-staging.971cd8d",
|
|
51
|
+
"@dxos/credentials": "0.7.3-staging.971cd8d",
|
|
52
|
+
"@dxos/crypto": "0.7.3-staging.971cd8d",
|
|
53
|
+
"@dxos/echo-db": "0.7.3-staging.971cd8d",
|
|
54
|
+
"@dxos/debug": "0.7.3-staging.971cd8d",
|
|
55
|
+
"@dxos/echo-protocol": "0.7.3-staging.971cd8d",
|
|
56
|
+
"@dxos/echo-pipeline": "0.7.3-staging.971cd8d",
|
|
57
|
+
"@dxos/echo-schema": "0.7.3-staging.971cd8d",
|
|
58
|
+
"@dxos/invariant": "0.7.3-staging.971cd8d",
|
|
59
|
+
"@dxos/edge-client": "0.7.3-staging.971cd8d",
|
|
60
|
+
"@dxos/feed-store": "0.7.3-staging.971cd8d",
|
|
61
|
+
"@dxos/keyring": "0.7.3-staging.971cd8d",
|
|
62
|
+
"@dxos/indexing": "0.7.3-staging.971cd8d",
|
|
63
|
+
"@dxos/keys": "0.7.3-staging.971cd8d",
|
|
64
|
+
"@dxos/kv-store": "0.7.3-staging.971cd8d",
|
|
65
|
+
"@dxos/lock-file": "0.7.3-staging.971cd8d",
|
|
66
|
+
"@dxos/log": "0.7.3-staging.971cd8d",
|
|
67
|
+
"@dxos/network-manager": "0.7.3-staging.971cd8d",
|
|
68
|
+
"@dxos/messaging": "0.7.3-staging.971cd8d",
|
|
69
|
+
"@dxos/node-std": "0.7.3-staging.971cd8d",
|
|
70
|
+
"@dxos/rpc": "0.7.3-staging.971cd8d",
|
|
71
|
+
"@dxos/protocols": "0.7.3-staging.971cd8d",
|
|
72
|
+
"@dxos/random-access-storage": "0.7.3-staging.971cd8d",
|
|
73
|
+
"@dxos/teleport": "0.7.3-staging.971cd8d",
|
|
74
|
+
"@dxos/teleport-extension-object-sync": "0.7.3-staging.971cd8d",
|
|
75
|
+
"@dxos/teleport-extension-gossip": "0.7.3-staging.971cd8d",
|
|
76
|
+
"@dxos/util": "0.7.3-staging.971cd8d",
|
|
77
|
+
"@dxos/timeframe": "0.7.3-staging.971cd8d",
|
|
78
|
+
"@dxos/websocket-rpc": "0.7.3-staging.971cd8d",
|
|
79
|
+
"@dxos/tracing": "0.7.3-staging.971cd8d"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@types/platform": "^1.3.4",
|
|
83
83
|
"@types/readable-stream": "^2.3.9",
|
|
84
84
|
"get-port-please": "^3.1.1",
|
|
85
|
-
"@dxos/signal": "0.7.
|
|
86
|
-
"@dxos/test-utils": "0.7.
|
|
85
|
+
"@dxos/signal": "0.7.3-staging.971cd8d",
|
|
86
|
+
"@dxos/test-utils": "0.7.3-staging.971cd8d"
|
|
87
87
|
},
|
|
88
88
|
"publishConfig": {
|
|
89
89
|
"access": "public"
|
|
@@ -3,15 +3,40 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Stream } from '@dxos/codec-protobuf';
|
|
6
|
+
import { type EdgeConnection } from '@dxos/edge-client';
|
|
6
7
|
import { EdgeAgentStatus } from '@dxos/protocols';
|
|
7
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
QueryAgentStatusResponse,
|
|
10
|
+
QueryEdgeStatusResponse,
|
|
11
|
+
type EdgeAgentService,
|
|
12
|
+
} from '@dxos/protocols/proto/dxos/client/services';
|
|
8
13
|
|
|
9
14
|
import { type EdgeAgentManager } from './edge-agent-manager';
|
|
10
15
|
|
|
16
|
+
// TODO(wittjosiah): This service is not currently exposed on the client api, it must be called directly.
|
|
11
17
|
export class EdgeAgentServiceImpl implements EdgeAgentService {
|
|
12
|
-
constructor(
|
|
18
|
+
constructor(
|
|
19
|
+
private readonly _agentManagerProvider: () => Promise<EdgeAgentManager>,
|
|
20
|
+
private readonly _edgeConnection?: EdgeConnection,
|
|
21
|
+
) {}
|
|
13
22
|
|
|
14
|
-
|
|
23
|
+
queryEdgeStatus(): Stream<QueryEdgeStatusResponse> {
|
|
24
|
+
return new Stream(({ ctx, next }) => {
|
|
25
|
+
next({ status: QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED });
|
|
26
|
+
if (!this._edgeConnection) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
|
|
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
|
+
);
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
async createAgent(): Promise<void> {
|
|
15
40
|
return (await this._agentManagerProvider()).createAgent();
|
|
16
41
|
}
|
|
17
42
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { Trigger, sleep } from '@dxos/async';
|
|
6
6
|
import { Stream } from '@dxos/codec-protobuf';
|
|
7
7
|
import { Resource } from '@dxos/context';
|
|
8
|
-
import { signPresentation } from '@dxos/credentials';
|
|
8
|
+
import { createCredential, signPresentation } from '@dxos/credentials';
|
|
9
9
|
import { invariant } from '@dxos/invariant';
|
|
10
10
|
import { type Keyring } from '@dxos/keyring';
|
|
11
11
|
import { log } from '@dxos/log';
|
|
@@ -111,6 +111,21 @@ export class IdentityServiceImpl extends Resource implements IdentityService {
|
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
+
async createAuthCredential() {
|
|
115
|
+
const identity = this._identityManager.identity;
|
|
116
|
+
|
|
117
|
+
invariant(identity, 'Identity not initialized.');
|
|
118
|
+
|
|
119
|
+
return await createCredential({
|
|
120
|
+
assertion: { '@type': 'dxos.halo.credentials.Auth' },
|
|
121
|
+
issuer: identity.identityKey,
|
|
122
|
+
subject: identity.identityKey,
|
|
123
|
+
chain: identity.deviceCredentialChain,
|
|
124
|
+
signingKey: identity.deviceKey,
|
|
125
|
+
signer: this._keyring,
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
|
|
114
129
|
private async _fixIdentityWithoutDefaultSpace(identity: Identity) {
|
|
115
130
|
let recodedDefaultSpace = false;
|
|
116
131
|
let foundDefaultSpace = false;
|
|
@@ -151,7 +151,10 @@ export class ServiceContext extends Resource {
|
|
|
151
151
|
this._acceptIdentity.bind(this),
|
|
152
152
|
);
|
|
153
153
|
|
|
154
|
-
this.echoHost = new EchoHost({
|
|
154
|
+
this.echoHost = new EchoHost({
|
|
155
|
+
kv: this.level,
|
|
156
|
+
peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
|
|
157
|
+
});
|
|
155
158
|
|
|
156
159
|
this._meshReplicator = new MeshEchoReplicator();
|
|
157
160
|
|
|
@@ -341,7 +341,7 @@ export class ClientServicesHost {
|
|
|
341
341
|
context: this._serviceContext,
|
|
342
342
|
}),
|
|
343
343
|
|
|
344
|
-
EdgeAgentService: new EdgeAgentServiceImpl(agentManagerProvider),
|
|
344
|
+
EdgeAgentService: new EdgeAgentServiceImpl(agentManagerProvider, this._edgeConnection),
|
|
345
345
|
});
|
|
346
346
|
|
|
347
347
|
await this._serviceContext.open(ctx);
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import { Event, synchronized, trackLeaks } from '@dxos/async';
|
|
6
6
|
import { type Doc } from '@dxos/automerge/automerge';
|
|
7
7
|
import { type AutomergeUrl, type DocHandle } from '@dxos/automerge/automerge-repo';
|
|
8
|
-
import { PropertiesType } from '@dxos/client-protocol';
|
|
8
|
+
import { PropertiesType, TYPE_PROPERTIES } from '@dxos/client-protocol';
|
|
9
9
|
import { LifecycleState, Resource, cancelWithContext } from '@dxos/context';
|
|
10
10
|
import {
|
|
11
11
|
createAdmissionCredentials,
|
|
@@ -15,7 +15,6 @@ import {
|
|
|
15
15
|
type MemberInfo,
|
|
16
16
|
} from '@dxos/credentials';
|
|
17
17
|
import {
|
|
18
|
-
convertLegacyReferences,
|
|
19
18
|
findInlineObjectOfType,
|
|
20
19
|
type EchoEdgeReplicator,
|
|
21
20
|
type EchoHost,
|
|
@@ -28,14 +27,8 @@ import {
|
|
|
28
27
|
type SpaceProtocol,
|
|
29
28
|
type SpaceProtocolSession,
|
|
30
29
|
} from '@dxos/echo-pipeline';
|
|
31
|
-
import {
|
|
32
|
-
|
|
33
|
-
SpaceDocVersion,
|
|
34
|
-
encodeReference,
|
|
35
|
-
type ObjectStructure,
|
|
36
|
-
type SpaceDoc,
|
|
37
|
-
} from '@dxos/echo-protocol';
|
|
38
|
-
import { TYPE_PROPERTIES, createObjectId, getTypeReference } from '@dxos/echo-schema';
|
|
30
|
+
import { SpaceDocVersion, encodeReference, type ObjectStructure, type SpaceDoc } from '@dxos/echo-protocol';
|
|
31
|
+
import { createObjectId, getTypeReference } from '@dxos/echo-schema';
|
|
39
32
|
import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
|
|
40
33
|
import { writeMessages, type FeedStore } from '@dxos/feed-store';
|
|
41
34
|
import { invariant } from '@dxos/invariant';
|
|
@@ -269,9 +262,7 @@ export class DataSpaceManager extends Resource {
|
|
|
269
262
|
return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
|
|
270
263
|
}
|
|
271
264
|
case SpaceDocVersion.LEGACY: {
|
|
272
|
-
|
|
273
|
-
const [_, properties] = findInlineObjectOfType(convertedDoc, LEGACY_TYPE_PROPERTIES) ?? [];
|
|
274
|
-
return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
|
|
265
|
+
throw new Error('Legacy space version is not supported');
|
|
275
266
|
}
|
|
276
267
|
|
|
277
268
|
default:
|
|
@@ -4,18 +4,9 @@
|
|
|
4
4
|
|
|
5
5
|
import type { AutomergeUrl } from '@dxos/automerge/automerge-repo';
|
|
6
6
|
import { type Context } from '@dxos/context';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
convertLegacyReferences,
|
|
10
|
-
convertLegacySpaceRootDoc,
|
|
11
|
-
findInlineObjectOfType,
|
|
12
|
-
type EchoHost,
|
|
13
|
-
} from '@dxos/echo-pipeline';
|
|
14
|
-
import { SpaceDocVersion, type SpaceDoc } from '@dxos/echo-protocol';
|
|
15
|
-
import { TYPE_PROPERTIES } from '@dxos/echo-schema';
|
|
7
|
+
import { type EchoHost } from '@dxos/echo-pipeline';
|
|
16
8
|
import { invariant } from '@dxos/invariant';
|
|
17
9
|
import type { PublicKey, SpaceId } from '@dxos/keys';
|
|
18
|
-
import { log } from '@dxos/log';
|
|
19
10
|
import { CreateEpochRequest } from '@dxos/protocols/proto/dxos/client/services';
|
|
20
11
|
|
|
21
12
|
export type MigrationContext = {
|
|
@@ -61,82 +52,10 @@ export const runEpochMigration = async (ctx: Context, context: MigrationContext)
|
|
|
61
52
|
return { newRoot: newRoot.url };
|
|
62
53
|
}
|
|
63
54
|
case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const currentRootUrl = context.currentRoot;
|
|
67
|
-
const rootHandle = await context.echoHost.loadDoc<SpaceDoc>(ctx, currentRootUrl as any, {
|
|
68
|
-
timeout: LOAD_DOC_TIMEOUT,
|
|
69
|
-
});
|
|
70
|
-
|
|
71
|
-
// Find properties object.
|
|
72
|
-
const objects = Object.entries((rootHandle.docSync() as SpaceDoc).objects!);
|
|
73
|
-
const properties = findInlineObjectOfType(rootHandle.docSync() as SpaceDoc, TYPE_PROPERTIES);
|
|
74
|
-
const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
|
|
75
|
-
invariant(properties, 'Properties not found');
|
|
76
|
-
|
|
77
|
-
// Create a new space doc with the properties object.
|
|
78
|
-
const newRoot = context.echoHost.createDoc({
|
|
79
|
-
...rootHandle.docSync(),
|
|
80
|
-
objects: Object.fromEntries([properties]),
|
|
81
|
-
});
|
|
82
|
-
invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
|
|
83
|
-
|
|
84
|
-
// Create new automerge documents for all objects.
|
|
85
|
-
const newLinks: [string, AutomergeUrl][] = [];
|
|
86
|
-
for (const [id, objData] of otherObjects) {
|
|
87
|
-
const handle = context.echoHost.createDoc<SpaceDoc>({
|
|
88
|
-
version: SpaceDocVersion.CURRENT,
|
|
89
|
-
access: {
|
|
90
|
-
spaceKey: context.spaceKey.toHex(),
|
|
91
|
-
},
|
|
92
|
-
objects: {
|
|
93
|
-
[id]: objData,
|
|
94
|
-
},
|
|
95
|
-
});
|
|
96
|
-
newLinks.push([id, handle.url]);
|
|
97
|
-
}
|
|
98
|
-
newRoot.change((doc: SpaceDoc) => {
|
|
99
|
-
doc.links ??= {};
|
|
100
|
-
for (const [id, url] of newLinks) {
|
|
101
|
-
doc.links[id] = url;
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
|
|
105
|
-
await context.echoHost.flush();
|
|
106
|
-
return {
|
|
107
|
-
newRoot: newRoot.url,
|
|
108
|
-
};
|
|
55
|
+
throw new Error('Migration not available');
|
|
109
56
|
}
|
|
110
57
|
case CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
|
|
111
|
-
|
|
112
|
-
const rootHandle = await context.echoHost.loadDoc<SpaceDoc>(ctx, currentRootUrl as any, {
|
|
113
|
-
timeout: LOAD_DOC_TIMEOUT,
|
|
114
|
-
});
|
|
115
|
-
invariant(rootHandle.docSync(), 'Root doc not found');
|
|
116
|
-
|
|
117
|
-
const newRootContent = await convertLegacySpaceRootDoc(structuredClone(rootHandle.docSync()!));
|
|
118
|
-
|
|
119
|
-
for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
|
|
120
|
-
try {
|
|
121
|
-
const handle = await context.echoHost.loadDoc(ctx, url as any, { timeout: LOAD_DOC_TIMEOUT });
|
|
122
|
-
invariant(handle.docSync());
|
|
123
|
-
const newDoc = await convertLegacyReferences(structuredClone(handle.docSync()!));
|
|
124
|
-
const migratedDoc = migrateDocument(handle.docSync(), newDoc);
|
|
125
|
-
const newHandle = context.echoHost.createDoc(migratedDoc, { preserveHistory: true });
|
|
126
|
-
newRootContent.links![id] = newHandle.url;
|
|
127
|
-
} catch (err) {
|
|
128
|
-
log.warn('Failed to migrate reference', { id, url, error: err });
|
|
129
|
-
delete newRootContent.links![id];
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
const migratedRoot = migrateDocument(rootHandle.docSync(), newRootContent);
|
|
134
|
-
const newRoot = context.echoHost.createDoc(migratedRoot, { preserveHistory: true });
|
|
135
|
-
|
|
136
|
-
await context.echoHost.flush();
|
|
137
|
-
return {
|
|
138
|
-
newRoot: newRoot.url,
|
|
139
|
-
};
|
|
58
|
+
throw new Error('Migration not available');
|
|
140
59
|
}
|
|
141
60
|
// TODO(dmaretskyi): This path doesn't seem to fit here. This is not a migration.
|
|
142
61
|
case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
|
package/src/version.ts
CHANGED