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

package/dist/lib/browser/{chunk-XCOUT2K5.mjs → chunk-SQBUU2A7.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.5-labs.8a82073";
+var DXOS_VERSION = "0.7.5-labs.c0e040f";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -649,7 +649,7 @@ import { ClientServicesProviderResource } from "@dxos/client-protocol";
 import { ConfigResource } from "@dxos/config";
 import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR2 } from "@dxos/tracing";
-import { jsonKeyReplacer, nonNullable } from "@dxos/util";
+import { jsonKeyReplacer, isNonNullable } from "@dxos/util";
 var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
   static {
@@ -682,7 +682,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = TRACE_PROCESSOR2.findResourcesByAnnotation(ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(isNonNullable);
 };
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
@@ -2530,7 +2530,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     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) {
         log7("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
@@ -2545,7 +2545,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });
@@ -7159,6 +7159,18 @@ var EdgeAgentManager = class extends Resource6 {
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
     const deviceKey = PublicKey13.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      log22.info("agent was already added to HALO, ignoring response", {
+        response
+      }, {
+        F: __dxlog_file26,
+        L: 67,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: PublicKey13.fromHex(response.feedKey),
@@ -7167,7 +7179,7 @@ var EdgeAgentManager = class extends Resource6 {
     });
     log22("agent created", response, {
       F: __dxlog_file26,
-      L: 73,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7179,7 +7191,7 @@ var EdgeAgentManager = class extends Resource6 {
       isEnabled
     }, {
       F: __dxlog_file26,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7212,7 +7224,7 @@ var EdgeAgentManager = class extends Resource6 {
   async _fetchAgentStatus() {
     invariant18(this._edgeHttpClient, void 0, {
       F: __dxlog_file26,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._edgeHttpClient",
@@ -7222,7 +7234,7 @@ var EdgeAgentManager = class extends Resource6 {
     try {
       log22("fetching agent status", void 0, {
         F: __dxlog_file26,
-        L: 117,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7241,7 +7253,7 @@ var EdgeAgentManager = class extends Resource6 {
             err
           }, {
             F: __dxlog_file26,
-            L: 127,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7254,7 +7266,7 @@ var EdgeAgentManager = class extends Resource6 {
         retryAfterMs
       }, {
         F: __dxlog_file26,
-        L: 132,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7290,7 +7302,7 @@ var EdgeAgentManager = class extends Resource6 {
         spaceId: space.id
       }, {
         F: __dxlog_file26,
-        L: 159,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7310,7 +7322,7 @@ var EdgeAgentManager = class extends Resource6 {
       status
     }, {
       F: __dxlog_file26,
-      L: 175,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9165,4 +9177,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-XCOUT2K5.mjs.map
+//# sourceMappingURL=chunk-SQBUU2A7.mjs.map