@dxos/client-services 0.7.3-staging.cc8dd3e → 0.7.3
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-2IFJRELF.mjs → chunk-KRN6GUJU.mjs} +25 -13
- package/dist/lib/browser/{chunk-2IFJRELF.mjs.map → chunk-KRN6GUJU.mjs.map} +3 -3
- 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-ALAI4CDC.cjs → chunk-RDZO3VFF.cjs} +28 -16
- package/dist/lib/node/chunk-RDZO3VFF.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-2PCKHPU3.mjs → chunk-RRH6HPCT.mjs} +25 -13
- package/dist/lib/node-esm/{chunk-2PCKHPU3.mjs.map → chunk-RRH6HPCT.mjs.map} +3 -3
- 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-manager.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-manager.ts +14 -0
- package/src/version.ts +5 -1
- package/dist/lib/node/chunk-ALAI4CDC.cjs.map +0 -7
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
InvitationsManager,
|
|
7
7
|
ServiceContext,
|
|
8
8
|
SpaceInvitationProtocol
|
|
9
|
-
} from "../chunk-
|
|
9
|
+
} from "../chunk-RRH6HPCT.mjs";
|
|
10
10
|
|
|
11
11
|
// packages/sdk/client-services/src/packlets/testing/credential-utils.ts
|
|
12
12
|
import { createCredential } from "@dxos/credentials";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-agent-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/agents/edge-agent-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAA8B,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAuB,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"edge-agent-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/agents/edge-agent-manager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,EAA8B,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAuB,MAAM,iBAAiB,CAAC;AAEvE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAGjE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAMlD,MAAM,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAExC,qBAAa,gBAAiB,SAAQ,QAAQ;IAW1C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAbrB,kBAAkB,yBAAgC;IAEzD,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,YAAY,CAA8B;IAElD,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,qBAAqB,CAA2B;gBAGrC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,SAAS,EACtD,eAAe,EAAE,cAAc,GAAG,SAAS,EAC3C,iBAAiB,EAAE,gBAAgB,EACnC,SAAS,EAAE,QAAQ;IAKtC,IAAW,WAAW,IAAI,eAAe,GAAG,SAAS,CAEpD;IAED,IAAW,WAAW,wBAErB;IAGY,WAAW;cAyBC,KAAK;cA+BL,MAAM;cAKf,iBAAiB;IAuBjC;;;;OAIG;IACH,SAAS,CAAC,sBAAsB,CAAC,cAAc,EAAE,SAAS;IA0B1D,OAAO,CAAC,aAAa;CAStB"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.7.3
|
|
1
|
+
export declare const DXOS_VERSION = "0.7.3";
|
|
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":"AAIA,eAAO,MAAM,YAAY,UAAU,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.7.3
|
|
3
|
+
"version": "0.7.3",
|
|
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.3
|
|
46
|
-
"@dxos/client-protocol": "0.7.3
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/context": "0.7.3
|
|
51
|
-
"@dxos/credentials": "0.7.3
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/echo-
|
|
55
|
-
"@dxos/echo-
|
|
56
|
-
"@dxos/echo-
|
|
57
|
-
"@dxos/echo-
|
|
58
|
-
"@dxos/edge-client": "0.7.3
|
|
59
|
-
"@dxos/feed-store": "0.7.3
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/
|
|
62
|
-
"@dxos/
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/log": "0.7.3
|
|
67
|
-
"@dxos/
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/protocols": "0.7.3
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/teleport
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/tracing": "0.7.3
|
|
77
|
-
"@dxos/
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/
|
|
45
|
+
"@dxos/async": "0.7.3",
|
|
46
|
+
"@dxos/client-protocol": "0.7.3",
|
|
47
|
+
"@dxos/codec-protobuf": "0.7.3",
|
|
48
|
+
"@dxos/automerge": "0.7.3",
|
|
49
|
+
"@dxos/config": "0.7.3",
|
|
50
|
+
"@dxos/context": "0.7.3",
|
|
51
|
+
"@dxos/credentials": "0.7.3",
|
|
52
|
+
"@dxos/debug": "0.7.3",
|
|
53
|
+
"@dxos/crypto": "0.7.3",
|
|
54
|
+
"@dxos/echo-db": "0.7.3",
|
|
55
|
+
"@dxos/echo-pipeline": "0.7.3",
|
|
56
|
+
"@dxos/echo-protocol": "0.7.3",
|
|
57
|
+
"@dxos/echo-schema": "0.7.3",
|
|
58
|
+
"@dxos/edge-client": "0.7.3",
|
|
59
|
+
"@dxos/feed-store": "0.7.3",
|
|
60
|
+
"@dxos/keyring": "0.7.3",
|
|
61
|
+
"@dxos/indexing": "0.7.3",
|
|
62
|
+
"@dxos/invariant": "0.7.3",
|
|
63
|
+
"@dxos/keys": "0.7.3",
|
|
64
|
+
"@dxos/kv-store": "0.7.3",
|
|
65
|
+
"@dxos/lock-file": "0.7.3",
|
|
66
|
+
"@dxos/log": "0.7.3",
|
|
67
|
+
"@dxos/network-manager": "0.7.3",
|
|
68
|
+
"@dxos/node-std": "0.7.3",
|
|
69
|
+
"@dxos/messaging": "0.7.3",
|
|
70
|
+
"@dxos/protocols": "0.7.3",
|
|
71
|
+
"@dxos/random-access-storage": "0.7.3",
|
|
72
|
+
"@dxos/teleport": "0.7.3",
|
|
73
|
+
"@dxos/rpc": "0.7.3",
|
|
74
|
+
"@dxos/teleport-extension-gossip": "0.7.3",
|
|
75
|
+
"@dxos/timeframe": "0.7.3",
|
|
76
|
+
"@dxos/tracing": "0.7.3",
|
|
77
|
+
"@dxos/teleport-extension-object-sync": "0.7.3",
|
|
78
|
+
"@dxos/util": "0.7.3",
|
|
79
|
+
"@dxos/websocket-rpc": "0.7.3"
|
|
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.3
|
|
86
|
-
"@dxos/test-utils": "0.7.3
|
|
85
|
+
"@dxos/signal": "0.7.3",
|
|
86
|
+
"@dxos/test-utils": "0.7.3"
|
|
87
87
|
},
|
|
88
88
|
"publishConfig": {
|
|
89
89
|
"access": "public"
|
|
@@ -11,12 +11,14 @@ import { log } from '@dxos/log';
|
|
|
11
11
|
import { EdgeAgentStatus, EdgeCallFailedError } from '@dxos/protocols';
|
|
12
12
|
import { SpaceState } from '@dxos/protocols/proto/dxos/client/services';
|
|
13
13
|
import { type Runtime } from '@dxos/protocols/proto/dxos/config';
|
|
14
|
+
import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
|
|
14
15
|
|
|
15
16
|
import { type Identity } from '../identity';
|
|
16
17
|
import { type DataSpaceManager } from '../spaces';
|
|
17
18
|
|
|
18
19
|
const AGENT_STATUS_QUERY_RETRY_INTERVAL = 5000;
|
|
19
20
|
const AGENT_STATUS_QUERY_RETRY_JITTER = 1000;
|
|
21
|
+
const AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3000;
|
|
20
22
|
|
|
21
23
|
export type EdgeAgentManagerConfig = {};
|
|
22
24
|
|
|
@@ -138,17 +140,29 @@ export class EdgeAgentManager extends Resource {
|
|
|
138
140
|
* Instead, we stay in active polling mode while there are spaces where we don't see our agent's feed.
|
|
139
141
|
*/
|
|
140
142
|
protected _ensureAgentIsInSpaces(agentDeviceKey: PublicKey) {
|
|
143
|
+
let activePollingEnabled = false;
|
|
141
144
|
for (const space of this._dataSpaceManager.spaces.values()) {
|
|
145
|
+
if (space.getEdgeReplicationSetting() === EdgeReplicationSetting.DISABLED) {
|
|
146
|
+
space.notarizationPlugin.setActiveEdgePollingEnabled(false);
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
142
149
|
if ([SpaceState.SPACE_INACTIVE, SpaceState.SPACE_CLOSED].includes(space.state)) {
|
|
150
|
+
space.notarizationPlugin.setActiveEdgePollingEnabled(false);
|
|
143
151
|
continue;
|
|
144
152
|
}
|
|
145
153
|
const agentFeedNeedsNotarization = ![...space.inner.spaceState.feeds.values()].some((feed) =>
|
|
146
154
|
feed.assertion.deviceKey.equals(agentDeviceKey),
|
|
147
155
|
);
|
|
148
156
|
space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
|
|
157
|
+
activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
|
|
149
158
|
|
|
150
159
|
log.info('set active edge polling', { enabled: agentFeedNeedsNotarization, spaceId: space.id });
|
|
151
160
|
}
|
|
161
|
+
|
|
162
|
+
if (activePollingEnabled) {
|
|
163
|
+
// Check again to see if active edge polling can be disabled (agent feed is notarized in all the spaces)
|
|
164
|
+
scheduleTask(this._ctx, () => this._ensureAgentIsInSpaces(agentDeviceKey), AGENT_FEED_ADDED_CHECK_INTERVAL_MS);
|
|
165
|
+
}
|
|
152
166
|
}
|
|
153
167
|
|
|
154
168
|
private _updateStatus(status: EdgeAgentStatus, deviceKey: PublicKey | undefined) {
|
package/src/version.ts
CHANGED