@dxos/client-services 0.6.9-staging.8e43e2a → 0.6.10-main.e92b5eb

package/dist/lib/node/testing/index.cjs

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_HRG7HZ3L = require("../chunk-HRG7HZ3L.cjs");
+var import_chunk_52I42DSF = require("../chunk-52I42DSF.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -229,7 +229,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_HRG7HZ3L.ServiceContext) {
+  if (host instanceof import_chunk_52I42DSF.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -239,7 +239,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_HRG7HZ3L.ServiceContext) {
+  if (guest instanceof import_chunk_52I42DSF.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -249,7 +249,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_HRG7HZ3L.ClientServicesHost({
+  return new import_chunk_52I42DSF.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -268,7 +268,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_HRG7HZ3L.ServiceContext(storage, level, networkManager, signalManager, edgeConnection, {
+  return new import_chunk_52I42DSF.ServiceContext(storage, level, networkManager, signalManager, edgeConnection, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     },
@@ -378,7 +378,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_HRG7HZ3L.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_52I42DSF.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -393,9 +393,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_HRG7HZ3L.InvitationsManager(new import_chunk_HRG7HZ3L.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_52I42DSF.InvitationsManager(new import_chunk_52I42DSF.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_HRG7HZ3L.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_52I42DSF.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/types/src/packlets/devtools/feeds.d.ts

@@ -1,9 +1,11 @@
 import { Stream } from '@dxos/codec-protobuf';
+import { type SpaceManager } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
 import { type SubscribeToFeedsRequest, type SubscribeToFeedsResponse, type SubscribeToFeedBlocksRequest, type SubscribeToFeedBlocksResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
-export declare const subscribeToFeeds: ({ feedStore }: {
+export declare const subscribeToFeeds: ({ feedStore, spaceManager }: {
     feedStore: FeedStore<FeedMessage>;
+    spaceManager: SpaceManager;
 }, { feedKeys }: SubscribeToFeedsRequest) => Stream<SubscribeToFeedsResponse>;
 export declare const subscribeToFeedBlocks: ({ feedStore }: {
     feedStore: FeedStore<FeedMessage>;

package/dist/types/src/packlets/devtools/feeds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devtools/feeds.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAgB,KAAK,SAAS,EAAoB,MAAM,kBAAkB,CAAC;AAElF,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC7B,KAAK,4BAA4B,EACjC,KAAK,6BAA6B,EACnC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGxE,eAAO,MAAM,gBAAgB,kBACZ;IAAE,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;CAAE,gBACtC,uBAAuB,qCAmCtC,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB;IAAE,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;CAAE,0BACvB,4BAA4B,0CA6C1D,CAAC"}
+{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devtools/feeds.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAgB,KAAK,SAAS,EAAoB,MAAM,kBAAkB,CAAC;AAGlF,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC7B,KAAK,4BAA4B,EACjC,KAAK,6BAA6B,EACnC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAQxE,eAAO,MAAM,gBAAgB,gCACE;IAAE,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,gBAChF,uBAAuB,qCAuCtC,CAAC;AAmBF,eAAO,MAAM,qBAAqB,kBACjB;IAAE,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;CAAE,0BACvB,4BAA4B,0CAkD1D,CAAC"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.6.9-staging.8e43e2a";
+export declare const DXOS_VERSION = "0.6.10-main.e92b5eb";
 //# sourceMappingURL=version.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,0BAA0B,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,wBAAwB,CAAC"}

package/package.json

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

package/src/packlets/devtools/devtools.ts

@@ -132,7 +132,7 @@ export class DevtoolsServiceImpl implements DevtoolsHost {
   }
 
   subscribeToFeeds(request: SubscribeToFeedsRequest): Stream<SubscribeToFeedsResponse> {
-    return subscribeToFeeds({ feedStore: this.params.context.feedStore }, request);
+    return subscribeToFeeds(this.params.context, request);
   }
 
   subscribeToFeedBlocks(request: SubscribeToFeedBlocksRequest): Stream<SubscribeToFeedBlocksResponse> {

package/src/packlets/devtools/feeds.ts

@@ -4,8 +4,10 @@
 
 import { EventSubscriptions } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
+import { type SpaceManager } from '@dxos/echo-pipeline';
 import { FeedIterator, type FeedStore, type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
+import { log } from '@dxos/log';
 import {
   type SubscribeToFeedsRequest,
   type SubscribeToFeedsResponse,
@@ -15,13 +17,18 @@ import {
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { ComplexMap } from '@dxos/util';
 
+type FeedInfo = {
+  feed: FeedWrapper<FeedMessage>;
+  owner?: SubscribeToFeedsResponse.FeedOwner;
+};
+
 export const subscribeToFeeds = (
-  { feedStore }: { feedStore: FeedStore<FeedMessage> },
+  { feedStore, spaceManager }: { feedStore: FeedStore<FeedMessage>; spaceManager: SpaceManager },
   { feedKeys }: SubscribeToFeedsRequest,
 ) => {
   return new Stream<SubscribeToFeedsResponse>(({ next }) => {
     const subscriptions = new EventSubscriptions();
-    const feedMap = new ComplexMap<PublicKey, FeedWrapper<FeedMessage>>(PublicKey.hash);
+    const feedMap = new ComplexMap<PublicKey, FeedInfo>(PublicKey.hash);
 
     const update = () => {
       const { feeds } = feedStore;
@@ -29,18 +36,22 @@ export const subscribeToFeeds = (
         .filter((feed) => !feedKeys?.length || feedKeys.some((feedKey) => feedKey.equals(feed.key)))
         .forEach((feed) => {
           if (!feedMap.has(feed.key)) {
-            feedMap.set(feed.key, feed);
+            feedMap.set(feed.key, { feed });
             feed.on('close', update);
             subscriptions.add(() => feed.off('close', update));
           }
+          if (!feedMap.get(feed.key)?.owner) {
+            feedMap.get(feed.key)!.owner = findFeedOwner(spaceManager, feed.key);
+          }
         });
 
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => ({
+        feeds: Array.from(feedMap.values()).map(({ feed, owner }) => ({
           feedKey: feed.key,
           length: feed.properties.length,
           bytes: feed.core.byteLength,
           downloaded: feed.core.bitfield?.data.toBuffer() ?? new Uint8Array(),
+          owner,
         })),
       });
     };
@@ -54,6 +65,23 @@ export const subscribeToFeeds = (
   });
 };
 
+const findFeedOwner = (
+  spaceManager: SpaceManager,
+  feedKey: PublicKey,
+): SubscribeToFeedsResponse.FeedOwner | undefined => {
+  const feedInfo = [...spaceManager.spaces.values()]
+    .flatMap((space) => [...space.spaceState.feeds.values()])
+    .find((feed) => feed.key.equals(feedKey));
+  log.info('feeds', { feedInfo, key: feedKey.truncate(), allSpaces: spaceManager.spaces.size });
+  if (!feedInfo) {
+    return undefined;
+  }
+  return {
+    identity: feedInfo.assertion.identityKey,
+    device: feedInfo.assertion.deviceKey,
+  };
+};
+
 export const subscribeToFeedBlocks = (
   { feedStore }: { feedStore: FeedStore<FeedMessage> },
   { feedKey, maxBlocks = 10 }: SubscribeToFeedBlocksRequest,
@@ -71,6 +99,11 @@ export const subscribeToFeedBlocks = (
       }
 
       const update = async () => {
+        if (!feed.properties.length) {
+          next({ blocks: [] });
+          return;
+        }
+
         const iterator = new FeedIterator(feed);
         await iterator.open();
         const blocks = [];

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.6.9-staging.8e43e2a";
+export const DXOS_VERSION = "0.6.10-main.e92b5eb";