@dxos/client-services 0.7.5-labs.8a82073 → 0.7.5-labs.c0e040f

package/dist/lib/node-esm/testing/index.mjs

@@ -6,7 +6,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-YPF3TFCW.mjs";
+} from "../chunk-ITHI3PMG.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/types/src/packlets/agents/edge-agent-manager.d.ts.map

@@ -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;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"}
+{"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;cA+BC,KAAK;cA+BL,MAAM;cAKf,iBAAiB;IAuBjC;;;;OAIG;IACH,SAAS,CAAC,sBAAsB,CAAC,cAAc,EAAE,SAAS;IA0B1D,OAAO,CAAC,aAAa;CAStB"}

package/dist/types/src/packlets/diagnostics/diagnostics-collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics-collector.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/diagnostics/diagnostics-collector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,sBAAsB,EAAkC,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,KAAK,cAAc,EAAgC,MAAM,YAAY,CAAC;AAM/E,MAAM,WAAW,iCAAiC;IAChD,2BAA2B,IAAI,GAAG,CAAC;CACpC;AAED,MAAM,WAAW,kCAAkC;IACjD,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,IAAI,CAAC;CACd;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,CAA6C;WAEvD,OAAO,CACzB,MAAM,GAAE,MAAM,GAAG,MAAM,EAAkB,EACzC,QAAQ,GAAE,sBAAsB,GAAG,IAAkC,EACrE,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,GAAG,CAAC;CA2BhB"}
+{"version":3,"file":"diagnostics-collector.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/diagnostics/diagnostics-collector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,sBAAsB,EAAkC,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,KAAK,cAAc,EAAkC,MAAM,YAAY,CAAC;AAMjF,MAAM,WAAW,iCAAiC;IAChD,2BAA2B,IAAI,GAAG,CAAC;CACpC;AAED,MAAM,WAAW,kCAAkC;IACjD,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,IAAI,CAAC;CACd;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,CAA6C;WAEvD,OAAO,CACzB,MAAM,GAAE,MAAM,GAAG,MAAM,EAAkB,EACzC,QAAQ,GAAE,sBAAsB,GAAG,IAAkC,EACrE,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC,GAAG,CAAC;CA2BhB"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.7.5-labs.8a82073";
+export declare const DXOS_VERSION = "0.7.5-labs.c0e040f";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.7.5-labs.8a82073",
+  "version": "0.7.5-labs.c0e040f",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,48 +42,48 @@
   "dependencies": {
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.7.5-labs.8a82073",
-    "@dxos/automerge": "0.7.5-labs.8a82073",
-    "@dxos/client-protocol": "0.7.5-labs.8a82073",
-    "@dxos/codec-protobuf": "0.7.5-labs.8a82073",
-    "@dxos/context": "0.7.5-labs.8a82073",
-    "@dxos/config": "0.7.5-labs.8a82073",
-    "@dxos/credentials": "0.7.5-labs.8a82073",
-    "@dxos/crypto": "0.7.5-labs.8a82073",
-    "@dxos/debug": "0.7.5-labs.8a82073",
-    "@dxos/echo-db": "0.7.5-labs.8a82073",
-    "@dxos/echo-pipeline": "0.7.5-labs.8a82073",
-    "@dxos/echo-protocol": "0.7.5-labs.8a82073",
-    "@dxos/echo-schema": "0.7.5-labs.8a82073",
-    "@dxos/edge-client": "0.7.5-labs.8a82073",
-    "@dxos/indexing": "0.7.5-labs.8a82073",
-    "@dxos/invariant": "0.7.5-labs.8a82073",
-    "@dxos/feed-store": "0.7.5-labs.8a82073",
-    "@dxos/keyring": "0.7.5-labs.8a82073",
-    "@dxos/keys": "0.7.5-labs.8a82073",
-    "@dxos/kv-store": "0.7.5-labs.8a82073",
-    "@dxos/lock-file": "0.7.5-labs.8a82073",
-    "@dxos/messaging": "0.7.5-labs.8a82073",
-    "@dxos/node-std": "0.7.5-labs.8a82073",
-    "@dxos/log": "0.7.5-labs.8a82073",
-    "@dxos/network-manager": "0.7.5-labs.8a82073",
-    "@dxos/random-access-storage": "0.7.5-labs.8a82073",
-    "@dxos/protocols": "0.7.5-labs.8a82073",
-    "@dxos/rpc": "0.7.5-labs.8a82073",
-    "@dxos/teleport-extension-gossip": "0.7.5-labs.8a82073",
-    "@dxos/teleport-extension-object-sync": "0.7.5-labs.8a82073",
-    "@dxos/tracing": "0.7.5-labs.8a82073",
-    "@dxos/timeframe": "0.7.5-labs.8a82073",
-    "@dxos/teleport": "0.7.5-labs.8a82073",
-    "@dxos/websocket-rpc": "0.7.5-labs.8a82073",
-    "@dxos/util": "0.7.5-labs.8a82073"
+    "@dxos/async": "0.7.5-labs.c0e040f",
+    "@dxos/client-protocol": "0.7.5-labs.c0e040f",
+    "@dxos/automerge": "0.7.5-labs.c0e040f",
+    "@dxos/codec-protobuf": "0.7.5-labs.c0e040f",
+    "@dxos/config": "0.7.5-labs.c0e040f",
+    "@dxos/context": "0.7.5-labs.c0e040f",
+    "@dxos/crypto": "0.7.5-labs.c0e040f",
+    "@dxos/credentials": "0.7.5-labs.c0e040f",
+    "@dxos/echo-db": "0.7.5-labs.c0e040f",
+    "@dxos/echo-protocol": "0.7.5-labs.c0e040f",
+    "@dxos/debug": "0.7.5-labs.c0e040f",
+    "@dxos/echo-pipeline": "0.7.5-labs.c0e040f",
+    "@dxos/echo-schema": "0.7.5-labs.c0e040f",
+    "@dxos/edge-client": "0.7.5-labs.c0e040f",
+    "@dxos/feed-store": "0.7.5-labs.c0e040f",
+    "@dxos/invariant": "0.7.5-labs.c0e040f",
+    "@dxos/indexing": "0.7.5-labs.c0e040f",
+    "@dxos/keyring": "0.7.5-labs.c0e040f",
+    "@dxos/keys": "0.7.5-labs.c0e040f",
+    "@dxos/kv-store": "0.7.5-labs.c0e040f",
+    "@dxos/lock-file": "0.7.5-labs.c0e040f",
+    "@dxos/log": "0.7.5-labs.c0e040f",
+    "@dxos/messaging": "0.7.5-labs.c0e040f",
+    "@dxos/network-manager": "0.7.5-labs.c0e040f",
+    "@dxos/protocols": "0.7.5-labs.c0e040f",
+    "@dxos/random-access-storage": "0.7.5-labs.c0e040f",
+    "@dxos/rpc": "0.7.5-labs.c0e040f",
+    "@dxos/node-std": "0.7.5-labs.c0e040f",
+    "@dxos/teleport": "0.7.5-labs.c0e040f",
+    "@dxos/teleport-extension-object-sync": "0.7.5-labs.c0e040f",
+    "@dxos/timeframe": "0.7.5-labs.c0e040f",
+    "@dxos/teleport-extension-gossip": "0.7.5-labs.c0e040f",
+    "@dxos/tracing": "0.7.5-labs.c0e040f",
+    "@dxos/util": "0.7.5-labs.c0e040f",
+    "@dxos/websocket-rpc": "0.7.5-labs.c0e040f"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
     "get-port-please": "^3.1.1",
-    "@dxos/test-utils": "0.7.5-labs.8a82073",
-    "@dxos/signal": "0.7.5-labs.8a82073"
+    "@dxos/signal": "0.7.5-labs.c0e040f",
+    "@dxos/test-utils": "0.7.5-labs.c0e040f"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/agents/edge-agent-manager.ts

@@ -63,6 +63,12 @@ export class EdgeAgentManager extends Resource {
 
     const deviceKey = PublicKey.fromHex(response.deviceKey);
 
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      log.info('agent was already added to HALO, ignoring response', { response });
+      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
+
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: PublicKey.fromHex(response.feedKey),

package/src/packlets/diagnostics/diagnostics-collector.ts

@@ -6,7 +6,7 @@ import { type ClientServicesProvider, ClientServicesProviderResource } from '@dx
 import { type Config, ConfigResource } from '@dxos/config';
 import { GetDiagnosticsRequest } from '@dxos/protocols/proto/dxos/client/services';
 import { TRACE_PROCESSOR } from '@dxos/tracing';
-import { type JsonKeyOptions, jsonKeyReplacer, nonNullable } from '@dxos/util';
+import { type JsonKeyOptions, jsonKeyReplacer, isNonNullable } from '@dxos/util';
 
 import { createCollectDiagnosticsBroadcastSender } from './diagnostics-broadcast';
 
@@ -65,5 +65,5 @@ const findSystemServiceProvider = (): ClientServicesProvider | null => {
 
 const findConfigs = (): Config[] => {
   const configs = TRACE_PROCESSOR.findResourcesByAnnotation(ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(isNonNullable);
 };

package/src/packlets/spaces/data-space-manager.ts

@@ -503,7 +503,7 @@ export class DataSpaceManager extends Resource {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         log('not connecting EchoEdgeReplicator because of EdgeReplicationSetting', { spaceId: dataSpace.id });
@@ -511,7 +511,7 @@ export class DataSpaceManager extends Resource {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.7.5-labs.8a82073";
+export const DXOS_VERSION = "0.7.5-labs.c0e040f";