@dxos/plugin-space 0.7.1 → 0.7.2-main.f1adc9f

package/src/SpacePlugin.tsx

@@ -27,7 +27,7 @@ import {
   resolvePlugin,
 } from '@dxos/app-framework';
 import { EventSubscriptions, type Trigger, type UnsubscribeCallback } from '@dxos/async';
-import { type HasId, isReactiveObject } from '@dxos/echo-schema';
+import { type HasId, isDeleted, isReactiveObject } from '@dxos/echo-schema';
 import { scheduledEffect } from '@dxos/echo-signals/core';
 import { invariant } from '@dxos/invariant';
 import { LocalStorageStore } from '@dxos/local-storage';
@@ -39,7 +39,7 @@ import { type Node, createExtension, memoize, toSignal } from '@dxos/plugin-grap
 import { ObservabilityAction } from '@dxos/plugin-observability/meta';
 import { type Client, PublicKey } from '@dxos/react-client';
 import {
-  type EchoReactiveObject,
+  type ReactiveEchoObject,
   Expando,
   Filter,
   type PropertiesTypeProps,
@@ -54,6 +54,9 @@ import {
   loadObjectReferences,
   parseId,
   FQ_ID_LENGTH,
+  SPACE_ID_LENGTH,
+  OBJECT_ID_LENGTH,
+  parseFullyQualifiedId,
 } from '@dxos/react-client/echo';
 import { type JoinPanelProps, osTranslations } from '@dxos/shell/react';
 import { ComplexMap, nonNullable, reduceGroupBy } from '@dxos/util';
@@ -62,7 +65,6 @@ import {
   AwaitingObject,
   CollectionMain,
   CollectionSection,
-  DefaultObjectSettings,
   JoinDialog,
   MenuFooter,
   PopoverRenameObject,
@@ -76,6 +78,7 @@ import {
   SyncStatus,
   SpaceSettingsDialog,
   type SpaceSettingsDialogProps,
+  DefaultObjectSettings,
 } from './components';
 import meta, { SPACE_PLUGIN, SpaceAction } from './meta';
 import translations from './translations';
@@ -252,17 +255,22 @@ export const SpacePlugin = ({
     subscriptions.add(
       scheduledEffect(
         () => ({
-          ids: openIds(location.active),
-          removed: location.closed ? [location.closed].flat() : [],
+          open: openIds(location.active, layout.layoutMode === 'solo' ? ['solo'] : ['main']),
+          closed: [...location.closed],
         }),
-        ({ ids, removed }) => {
+        ({ open, closed }) => {
           const send = () => {
             const spaces = client.spaces.get();
             const identity = client.halo.identity.get();
             if (identity && location.active) {
               // Group parts by space for efficient messaging.
-              const idsBySpace = reduceGroupBy(ids, (id) => {
-                const [spaceId] = id.split(':'); // TODO(burdon): Factor out.
+              const idsBySpace = reduceGroupBy(open, (id) => {
+                const [spaceId] = parseFullyQualifiedId(id);
+                return spaceId;
+              });
+
+              const removedBySpace = reduceGroupBy(closed, (id) => {
+                const [spaceId] = parseFullyQualifiedId(id);
                 return spaceId;
               });
 
@@ -273,7 +281,8 @@ export const SpacePlugin = ({
                 }
               }
 
-              for (const [spaceId, ids] of idsBySpace) {
+              for (const [spaceId, added] of idsBySpace) {
+                const removed = removedBySpace.get(spaceId) ?? [];
                 const space = spaces.find((space) => space.id === spaceId);
                 if (!space) {
                   continue;
@@ -283,9 +292,8 @@ export const SpacePlugin = ({
                   .postMessage('viewing', {
                     identityKey: identity.identityKey.toHex(),
                     attended: attention.attended ? [...attention.attended] : [],
-                    added: ids,
-                    // TODO(Zan): When we re-open a part, we should remove it from the removed list in the navigation plugin.
-                    removed: removed.filter((id) => !ids.includes(id)),
+                    added,
+                    removed,
                   })
                   // TODO(burdon): This seems defensive; why would this fail? Backoff interval.
                   .catch((err) => {
@@ -296,6 +304,7 @@ export const SpacePlugin = ({
           };
 
           send();
+          // Send at interval to allow peers to expire entries if they become disconnected.
           const interval = setInterval(() => send(), ACTIVE_NODE_BROADCAST_INTERVAL);
           return () => clearInterval(interval);
         },
@@ -312,7 +321,13 @@ export const SpacePlugin = ({
               const { added, removed, attended } = message.payload;
 
               const identityKey = PublicKey.safeFrom(message.payload.identityKey);
-              if (identityKey && Array.isArray(added) && Array.isArray(removed)) {
+              const currentIdentity = client.halo.identity.get();
+              if (
+                identityKey &&
+                !currentIdentity?.identityKey.equals(identityKey) &&
+                Array.isArray(added) &&
+                Array.isArray(removed)
+              ) {
                 added.forEach((id) => {
                   if (typeof id === 'string') {
                     if (!(id in state.values.viewersByObject)) {
@@ -571,6 +586,7 @@ export const SpacePlugin = ({
                   {
                     id: SPACES,
                     type: SPACES,
+                    cacheable: ['label', 'role'],
                     properties: {
                       label: ['spaces label', { ns: SPACE_PLUGIN }],
                       testId: 'spacePlugin.spaces',
@@ -679,39 +695,41 @@ export const SpacePlugin = ({
                     );
                 } catch {}
               },
-            }),
-
-            // Find an object by its fully qualified id.
-            createExtension({
-              id: `${SPACE_PLUGIN}/objects`,
               resolver: ({ id }) => {
-                const [spaceId, objectId] = id.split(':');
-                const space = client.spaces.get().find((space) => space.id === spaceId);
-                if (!space) {
+                if (id.length !== SPACE_ID_LENGTH) {
                   return;
                 }
 
-                const spaceState = toSignal(
-                  (onChange) => space.state.subscribe(() => onChange()).unsubscribe,
-                  () => space.state.get(),
-                  space.id,
+                const spaces = toSignal(
+                  (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
+                  () => client.spaces.get(),
                 );
-                if (spaceState !== SpaceState.SPACE_READY) {
+
+                const isReady = toSignal(
+                  (onChange) => client.spaces.isReady.subscribe(() => onChange()).unsubscribe,
+                  () => client.spaces.isReady.get(),
+                );
+
+                if (!spaces || !isReady) {
                   return;
                 }
 
-                const store = memoize(() => signal(space.db.getObjectById(objectId)), id);
-                memoize(() => {
-                  if (!store.value) {
-                    void space.db.loadObjectById(objectId).then((o) => (store.value = o));
-                  }
-                }, id);
-                const object = store.value;
-                if (!object) {
+                const space = spaces.find((space) => space.id === id);
+                if (!space) {
                   return;
                 }
 
-                return createObjectNode({ object, space, resolve, navigable: state.values.navigableCollections });
+                if (space.state.get() === SpaceState.SPACE_INACTIVE) {
+                  return false;
+                } else {
+                  return constructSpaceNode({
+                    space,
+                    navigable: state.values.navigableCollections,
+                    personal: space === client.spaces.default,
+                    namesCache: state.values.spaceNames,
+                    resolve,
+                  });
+                }
               },
             }),
 
@@ -765,22 +783,9 @@ export const SpacePlugin = ({
               },
             }),
 
-            // Create collection actions and action groups.
+            // Create nodes for objects in a collection or by its fully qualified id.
             createExtension({
-              id: `${SPACE_PLUGIN}/object-actions`,
-              filter: (node): node is Node<EchoReactiveObject<any>> => isEchoObject(node.data),
-              actionGroups: ({ node }) =>
-                constructObjectActionGroups({
-                  object: node.data,
-                  dispatch,
-                  navigable: state.values.navigableCollections,
-                }),
-              actions: ({ node }) => constructObjectActions({ node, dispatch }),
-            }),
-
-            // Create nodes for objects in collections.
-            createExtension({
-              id: `${SPACE_PLUGIN}/collection-objects`,
+              id: `${SPACE_PLUGIN}/objects`,
               filter: (node): node is Node<CollectionType> => node.data instanceof CollectionType,
               connector: ({ node }) => {
                 const collection = node.data;
@@ -796,6 +801,64 @@ export const SpacePlugin = ({
                   )
                   .filter(nonNullable);
               },
+              resolver: ({ id }) => {
+                if (id.length !== FQ_ID_LENGTH) {
+                  return;
+                }
+
+                const [spaceId, objectId] = id.split(':');
+                if (spaceId.length !== SPACE_ID_LENGTH && objectId.length !== OBJECT_ID_LENGTH) {
+                  return;
+                }
+
+                const space = client.spaces.get().find((space) => space.id === spaceId);
+                if (!space) {
+                  return;
+                }
+
+                const spaceState = toSignal(
+                  (onChange) => space.state.subscribe(() => onChange()).unsubscribe,
+                  () => space.state.get(),
+                  space.id,
+                );
+                if (spaceState !== SpaceState.SPACE_READY) {
+                  return;
+                }
+
+                const store = memoize(() => signal(space.db.getObjectById(objectId)), id);
+                memoize(() => {
+                  if (!store.value) {
+                    void space.db
+                      .query({ id: objectId })
+                      .first()
+                      .then((o) => (store.value = o))
+                      .catch((err) => log.catch(err, { objectId }));
+                  }
+                }, id);
+                const object = store.value;
+                if (!object) {
+                  return;
+                }
+
+                if (isDeleted(object)) {
+                  return false;
+                } else {
+                  return createObjectNode({ object, space, resolve, navigable: state.values.navigableCollections });
+                }
+              },
+            }),
+
+            // Create collection actions and action groups.
+            createExtension({
+              id: `${SPACE_PLUGIN}/object-actions`,
+              filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
+              actionGroups: ({ node }) =>
+                constructObjectActionGroups({
+                  object: node.data,
+                  dispatch,
+                  navigable: state.values.navigableCollections,
+                }),
+              actions: ({ node }) => constructObjectActions({ node, dispatch }),
             }),
 
             // Create nodes for object settings.
@@ -812,7 +875,13 @@ export const SpacePlugin = ({
 
                 const [subjectId] = id.split('~');
                 const { spaceId, objectId } = parseId(subjectId);
-                const space = client.spaces.get().find((space) => space.id === spaceId);
+                const spaces = toSignal(
+                  (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
+                  () => client.spaces.get(),
+                );
+                const space = spaces?.find(
+                  (space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY,
+                );
                 if (!objectId) {
                   const label = space
                     ? space.properties.name || ['unnamed space label', { ns: SPACE_PLUGIN }]
@@ -834,18 +903,7 @@ export const SpacePlugin = ({
                   };
                 }
 
-                const object = toSignal(
-                  (onChange) => {
-                    const timeout = setTimeout(async () => {
-                      await space?.db.loadObjectById(objectId);
-                      onChange();
-                    });
-
-                    return () => clearTimeout(timeout);
-                  },
-                  () => space?.db.getObjectById(objectId),
-                  subjectId,
-                );
+                const [object] = memoizeQuery(space, { id: objectId });
                 if (!object || !subjectId) {
                   return;
                 }

package/src/components/DefaultObjectSettings.tsx

@@ -4,13 +4,13 @@
 
 import React from 'react';
 
-import { type EchoReactiveObject } from '@dxos/react-client/echo';
+import { type ReactiveEchoObject } from '@dxos/react-client/echo';
 import { Input, useTranslation } from '@dxos/react-ui';
 
 import { SPACE_PLUGIN } from '../meta';
 
 export type DefaultObjectSettingsProps = {
-  object: EchoReactiveObject<any>;
+  object: ReactiveEchoObject<any>;
 };
 
 export const DefaultObjectSettings = ({ object }: DefaultObjectSettingsProps) => {

package/src/components/MenuFooter.tsx

@@ -5,14 +5,14 @@
 import { Planet } from '@phosphor-icons/react';
 import React from 'react';
 
-import { type EchoReactiveObject, getSpace } from '@dxos/client/echo';
+import { type ReactiveEchoObject, getSpace } from '@dxos/client/echo';
 import { useClient } from '@dxos/react-client';
 import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
 import { SPACE_PLUGIN } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
-export const MenuFooter = ({ object }: { object: EchoReactiveObject<any> }) => {
+export const MenuFooter = ({ object }: { object: ReactiveEchoObject<any> }) => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const client = useClient();
   const space = getSpace(object);

package/src/util.tsx

@@ -33,12 +33,13 @@ import {
   isEchoObject,
   isSpace,
   type Echo,
-  type EchoReactiveObject,
+  type ReactiveEchoObject,
   type FilterSource,
   type Query,
   type QueryOptions,
   type Space,
   SpaceState,
+  Filter,
 } from '@dxos/react-client/echo';
 
 import { SpaceAction, SPACE_PLUGIN } from './meta';
@@ -59,12 +60,16 @@ const EMPTY_ARRAY: never[] = [];
  * @param options
  * @returns
  */
-export const memoizeQuery = <T extends EchoReactiveObject<any>>(
+export const memoizeQuery = <T extends ReactiveEchoObject<any>>(
   spaceOrEcho?: Space | Echo,
   filter?: FilterSource<T>,
   options?: QueryOptions,
 ): T[] => {
-  const key = isSpace(spaceOrEcho) ? spaceOrEcho.id : undefined;
+  const key = JSON.stringify({
+    space: isSpace(spaceOrEcho) ? spaceOrEcho.id : undefined,
+    filter: Filter.from(filter).toProto(),
+  });
+
   const query = memoize(
     () =>
       isSpace(spaceOrEcho)
@@ -111,7 +116,7 @@ const getCollectionGraphNodePartials = ({
       // Change on disk.
       collection.objects = nextOrder.filter(isEchoObject);
     },
-    onTransferStart: (child: Node<EchoReactiveObject<any>>, index?: number) => {
+    onTransferStart: (child: Node<ReactiveEchoObject<any>>, index?: number) => {
       // TODO(wittjosiah): Support transfer between spaces.
       // const childSpace = getSpace(child.data);
       // if (space && childSpace && !childSpace.key.equals(space.key)) {
@@ -139,7 +144,7 @@ const getCollectionGraphNodePartials = ({
 
       // }
     },
-    onTransferEnd: (child: Node<EchoReactiveObject<any>>, destination: Node) => {
+    onTransferEnd: (child: Node<ReactiveEchoObject<any>>, destination: Node) => {
       // Remove child from origin collection.
       const index = collection.objects.indexOf(child.data);
       if (index > -1) {
@@ -155,7 +160,7 @@ const getCollectionGraphNodePartials = ({
       //   childSpace.db.remove(child.data);
       // }
     },
-    onCopy: async (child: Node<EchoReactiveObject<any>>, index?: number) => {
+    onCopy: async (child: Node<ReactiveEchoObject<any>>, index?: number) => {
       // Create clone of child and add to destination space.
       const newObject = await cloneObject(child.data, resolve, space);
       space.db.add(newObject);
@@ -200,6 +205,7 @@ export const constructSpaceNode = ({
   return {
     id: space.id,
     type: SPACE_TYPE,
+    cacheable: ['label', 'icon', 'role'],
     data: space,
     properties: {
       ...partials,
@@ -412,7 +418,7 @@ export const createObjectNode = ({
   navigable = false,
   resolve,
 }: {
-  object: EchoReactiveObject<any>;
+  object: ReactiveEchoObject<any>;
   space: Space;
   navigable?: boolean;
   resolve: MetadataResolver;
@@ -435,6 +441,7 @@ export const createObjectNode = ({
   return {
     id: fullyQualifiedId(object),
     type,
+    cacheable: ['label', 'icon', 'role'],
     data: object,
     properties: {
       ...partials,
@@ -454,7 +461,7 @@ export const constructObjectActionGroups = ({
   navigable,
   dispatch,
 }: {
-  object: EchoReactiveObject<any>;
+  object: ReactiveEchoObject<any>;
   navigable: boolean;
   dispatch: IntentDispatcher;
 }) => {
@@ -512,7 +519,7 @@ export const constructObjectActions = ({
   node,
   dispatch,
 }: {
-  node: Node<EchoReactiveObject<any>>;
+  node: Node<ReactiveEchoObject<any>>;
   dispatch: IntentDispatcher;
 }) => {
   const object = node.data;
@@ -601,9 +608,9 @@ export const getActiveSpace = (graph: Graph, active?: string) => {
  * @deprecated This is a temporary solution.
  */
 export const getNestedObjects = async (
-  object: EchoReactiveObject<any>,
+  object: ReactiveEchoObject<any>,
   resolve: MetadataResolver,
-): Promise<EchoReactiveObject<any>[]> => {
+): Promise<ReactiveEchoObject<any>[]> => {
   const type = getTypename(object);
   if (!type) {
     return [];
@@ -615,7 +622,7 @@ export const getNestedObjects = async (
     return [];
   }
 
-  const objects: EchoReactiveObject<any>[] = await loadReferences(object);
+  const objects: ReactiveEchoObject<any>[] = await loadReferences(object);
   const nested = await Promise.all(objects.map((object) => getNestedObjects(object, resolve)));
   return [...objects, ...nested.flat()];
 };