@dxos/shell 0.4.10-main.b9b4602 → 0.4.10-main.bf49328

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/shell",
-  "version": "0.4.10-main.b9b4602",
+  "version": "0.4.10-main.bf49328",
   "description": "DXOS’s OS experiences",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,34 +42,35 @@
     "react-qr-rounded": "^1.0.0",
     "url-join": "^5.0.0",
     "xstate": "^4.37.0",
-    "@dxos/async": "0.4.10-main.b9b4602",
-    "@dxos/debug": "0.4.10-main.b9b4602",
-    "@dxos/client-protocol": "0.4.10-main.b9b4602",
-    "@dxos/display-name": "0.4.10-main.b9b4602",
-    "@dxos/client-services": "0.4.10-main.b9b4602",
-    "@dxos/invariant": "0.4.10-main.b9b4602",
-    "@dxos/log": "0.4.10-main.b9b4602",
-    "@dxos/react-ui": "0.4.10-main.b9b4602",
-    "@dxos/react-client": "0.4.10-main.b9b4602",
-    "@dxos/react-ui-theme": "0.4.10-main.b9b4602",
-    "@dxos/react-ui-types": "0.4.10-main.b9b4602",
-    "@dxos/rpc-tunnel": "0.4.10-main.b9b4602",
-    "@dxos/util": "0.4.10-main.b9b4602"
+    "@dxos/client-protocol": "0.4.10-main.bf49328",
+    "@dxos/debug": "0.4.10-main.bf49328",
+    "@dxos/client-services": "0.4.10-main.bf49328",
+    "@dxos/async": "0.4.10-main.bf49328",
+    "@dxos/display-name": "0.4.10-main.bf49328",
+    "@dxos/invariant": "0.4.10-main.bf49328",
+    "@dxos/log": "0.4.10-main.bf49328",
+    "@dxos/react-client": "0.4.10-main.bf49328",
+    "@dxos/react-ui": "0.4.10-main.bf49328",
+    "@dxos/react-ui-theme": "0.4.10-main.bf49328",
+    "@dxos/rpc-tunnel": "0.4.10-main.bf49328",
+    "@dxos/react-ui-types": "0.4.10-main.bf49328",
+    "@dxos/util": "0.4.10-main.bf49328"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.0.5",
+    "@phosphor-icons/react": "^2.1.5",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^4.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "vite": "^5.1.7",
+    "vite": "^5.2.9",
     "vite-plugin-turbosnap": "^1.0.2",
-    "@dxos/react-async": "0.4.10-main.b9b4602",
-    "@dxos/config": "0.4.10-main.b9b4602",
-    "@dxos/random": "0.4.10-main.b9b4602",
-    "@dxos/react-ui-theme": "0.4.10-main.b9b4602",
-    "@dxos/storybook-utils": "0.4.10-main.b9b4602"
+    "@dxos/config": "0.4.10-main.bf49328",
+    "@dxos/random": "0.4.10-main.bf49328",
+    "@dxos/react-async": "0.4.10-main.bf49328",
+    "@dxos/storybook-utils": "0.4.10-main.bf49328",
+    "@dxos/react-ui-theme": "0.4.10-main.bf49328",
+    "@dxos/protocols": "0.4.10-main.bf49328"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.0.5",

package/src/components/InvitationList/InvitationListItem.tsx

@@ -96,14 +96,14 @@ export const InvitationListItemImpl = ({
   ...props
 }: InvitationListItemImplProps) => {
   const { t } = useTranslation('os');
-  const { cancel, status: invitationStatus, invitationCode, authCode, type } = propsInvitationStatus;
+  const { cancel, status: invitationStatus, invitationCode, authCode, multiUse } = propsInvitationStatus;
 
   const isCancellable = !(
     [Invitation.State.ERROR, Invitation.State.TIMEOUT, Invitation.State.CANCELLED].indexOf(invitationStatus) >= 0
   );
 
   const showShare =
-    type === Invitation.Type.MULTIUSE ||
+    multiUse ||
     [Invitation.State.INIT, Invitation.State.CONNECTING, Invitation.State.CONNECTED].indexOf(invitationStatus) >= 0;
 
   const showAuthCode = invitationStatus === Invitation.State.READY_FOR_AUTHENTICATION;
@@ -147,9 +147,9 @@ export const InvitationListItemImpl = ({
       classNames={['flex gap-2 pis-3 pie-1 items-center relative', props.classNames]}
     >
       <ListItem.Heading classNames='sr-only'>
-        {t(type === Invitation.Type.MULTIUSE ? 'invite many list item label' : 'invite one list item label')}
+        {t(multiUse ? 'invite many list item label' : 'invite one list item label')}
       </ListItem.Heading>
-      {type === Invitation.Type.MULTIUSE && (
+      {multiUse && (
         <AvatarStackEffect status={avatarStatus} animation={avatarAnimation} reverseEffects={reverseEffects} />
       )}
       <Tooltip.Root>
@@ -162,7 +162,7 @@ export const InvitationListItemImpl = ({
         </Avatar.Root>
         <Tooltip.Portal>
           <Tooltip.Content side='left' classNames='z-[70]'>
-            {t(type === Invitation.Type.MULTIUSE ? 'invite many qr label' : 'invite one qr label')}
+            {t(multiUse ? 'invite many qr label' : 'invite one qr label')}
             <Tooltip.Arrow />
           </Tooltip.Content>
         </Tooltip.Portal>

package/src/panels/IdentityPanel/useAgentHandlers.ts

@@ -67,7 +67,11 @@ export const useAgentHandlers = ({
     invitations.forEach((invitation) => invitation.cancel());
 
     // TODO(nf): do this work in the hosting provider client?
-    const invitation = client.halo.share({ type: Invitation.Type.MULTIUSE, authMethod: Invitation.AuthMethod.NONE });
+    const invitation = client.halo.share({
+      type: Invitation.Type.INTERACTIVE,
+      authMethod: Invitation.AuthMethod.NONE,
+      multiUse: true,
+    });
 
     invitation.subscribe(handleAgentCreate);
   };

package/src/panels/SpacePanel/steps/SpaceManager.tsx

@@ -59,6 +59,7 @@ export const SpaceManager = (props: SpaceManagerProps) => {
         const invitation = space.share?.({
           type: Invitation.Type.INTERACTIVE,
           authMethod: Invitation.AuthMethod.SHARED_SECRET,
+          multiUse: false,
           target,
         });
         if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
@@ -72,8 +73,9 @@ export const SpaceManager = (props: SpaceManagerProps) => {
       icon: UsersThree,
       onClick: useCallback(() => {
         const invitation = space.share?.({
-          type: Invitation.Type.MULTIUSE,
+          type: Invitation.Type.INTERACTIVE,
           authMethod: Invitation.AuthMethod.NONE,
+          multiUse: true,
           target,
         });
         if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {

package/src/playwright/invitations.spec.ts

@@ -15,7 +15,9 @@ test.describe('Invitations', () => {
   let manager: InvitationsManager;
 
   // TODO(wittjosiah): Storybook takes a bit to be ready for testing against.
-  test.beforeAll(async ({ browser }) => {
+  test.beforeAll(async ({ browser, browserName }) => {
+    // TODO(wittjosiah): Storybook is broken in Safari/Webkit.
+    test.skip(browserName === 'webkit');
     test.setTimeout(60_000);
     manager = new InvitationsManager(browser);
     await manager.init();

package/src/steps/InvitationManager.tsx

@@ -6,7 +6,7 @@ import { Check, X } from '@phosphor-icons/react';
 import React, { useMemo } from 'react';
 import { QR } from 'react-qr-rounded';
 
-import { type InvitationStatus, Invitation } from '@dxos/react-client/invitations';
+import { type InvitationStatus } from '@dxos/react-client/invitations';
 import { useId, useTranslation } from '@dxos/react-ui';
 import { descriptionText, getSize, mx } from '@dxos/react-ui-theme';
 import { hexToEmoji } from '@dxos/util';
@@ -43,13 +43,13 @@ export const InvitationManager = ({
   active,
   send,
   status,
-  type,
+  multiUse,
   authCode,
   id = '0',
 }: InvitationManagerProps) => {
   const { t } = useTranslation('os');
   const qrLabel = useId('invitation-manager__qr-code');
-  const statusValue = type === Invitation.Type.MULTIUSE ? 0 : invitationStatusValue.get(status!) ?? 0;
+  const statusValue = multiUse ? 0 : invitationStatusValue.get(status!) ?? 0;
   const showAuthCode = statusValue === 3;
   const emoji = hexToEmoji(id);
   const activeView = useMemo(() => {
@@ -69,7 +69,7 @@ export const InvitationManager = ({
         <Viewport.Views>
           <InvitationManagerView id='showing qr' emoji={emoji}>
             <p className='text-sm mlb-1 font-normal text-center'>
-              {t(type === Invitation.Type.MULTIUSE ? 'invite many qr label' : 'invite one qr label')}
+              {t(multiUse ? 'invite many qr label' : 'invite one qr label')}
             </p>
             <div role='none' className={mx(descriptionText, 'is-full max-is-[14rem] relative')}>
               <QR

package/src/stories/Invitations.e2e-stories.tsx

@@ -10,7 +10,7 @@ import React, { useMemo, useState } from 'react';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
-import { type Space, type SpaceMember, SpaceProxy, useSpaces } from '@dxos/react-client/echo';
+import { type Space, type SpaceMember, useSpaces } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { ConnectionState, useNetworkStatus } from '@dxos/react-client/mesh';
@@ -36,7 +36,7 @@ const Panel = ({ id, panel, setPanel }: { id: number; panel?: PanelType; setPane
   const spaces = useSpaces();
 
   useMemo(() => {
-    if (panel instanceof SpaceProxy) {
+    if (panel && typeof panel !== 'string') {
       (window as any)[`peer${id}CreateSpaceInvitation`] = (options?: Partial<Invitation>) => {
         const invitation = panel.share(options);
 
@@ -50,7 +50,7 @@ const Panel = ({ id, panel, setPanel }: { id: number; panel?: PanelType; setPane
     }
   }, [panel]);
 
-  if (panel instanceof SpaceProxy) {
+  if (panel && typeof panel !== 'string') {
     return <SpacePanel space={panel} createInvitationUrl={createInvitationUrl} />;
   }
 
@@ -216,6 +216,9 @@ const Invitations = (args: { id: number; count: number }) => {
   );
 };
 
+// TODO(wittjosiah): This story fails to start in Safari/Webkit.
+//   The issue appears to be related to dynamic imports during client initialization.
+//   This does not seem to be a problem in other browsers nor in Safari in the app.
 export const Default = {
   render: (args: { id: number }) => (
     <ClipboardProvider>

package/src/testing/shell-manager.ts

@@ -75,7 +75,7 @@ export class ShellManager extends ScopedShellManager {
     await this.shell.getByTestId('device-list-item-current.options').click();
     await this.shell.getByTestId('device-list-item-current.join-existing').click();
     await this.shell.getByTestId('join-new-identity.reset-identity-input').fill('CONFIRM');
-    await this.shell.getByTestId('join-new-identity.reset-identity-input-confirm').click();
+    await this.shell.getByTestId('join-new-identity.reset-identity-confirm').click();
     await this.inputInvitation('device', invitationCode, this.shell);
   }
 
@@ -117,7 +117,8 @@ export class ShellManager extends ScopedShellManager {
 
   private async _onConsoleMessage(message: ConsoleMessage) {
     try {
-      const json = JSON.parse(message.text());
+      const text = message.text();
+      const json = JSON.parse(text.slice(text.indexOf('{')));
       if (json.invitationCode) {
         this._invitationCode.wake(json.invitationCode);
       }

package/dist/bundle/index-D-K0uxrm.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-D-K0uxrm.mjs","sources":["../../../../core/mesh/websocket-rpc/dist/lib/browser/index.mjs"],"sourcesContent":["import \"@dxos/node-std/globals\";\n\n// inject-globals:@inject-globals\nimport {\n  global,\n  Buffer,\n  process\n} from \"@dxos/node-std/inject-globals\";\n\n// packages/core/mesh/websocket-rpc/src/client.ts\nimport WebSocket from \"isomorphic-ws\";\nimport { Event, Trigger } from \"@dxos/async\";\nimport { log, logInfo } from \"@dxos/log\";\nimport { createProtoRpcPeer } from \"@dxos/rpc\";\nfunction _ts_decorate(decorators, target, key, desc) {\n  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n  if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\")\n    r = Reflect.decorate(decorators, target, key, desc);\n  else\n    for (var i = decorators.length - 1; i >= 0; i--)\n      if (d = decorators[i])\n        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n  return c > 3 && r && Object.defineProperty(target, key, r), r;\n}\nvar __dxlog_file = \"/home/runner/work/dxos/dxos/packages/core/mesh/websocket-rpc/src/client.ts\";\nvar WebsocketRpcClient = class {\n  constructor(_params) {\n    this._params = _params;\n    this._connectTrigger = new Trigger();\n    this.connected = new Event();\n    this.disconnected = new Event();\n    this.error = new Event();\n    this._rpc = createProtoRpcPeer({\n      requested: this._params.requested,\n      exposed: this._params.exposed,\n      handlers: this._params.handlers,\n      port: {\n        send: (msg) => {\n          this._socket.send(msg);\n        },\n        subscribe: (cb) => {\n          this._socket.onmessage = async (msg) => {\n            if (typeof Blob !== \"undefined\" && msg.data instanceof Blob) {\n              cb(Buffer.from(await msg.data.arrayBuffer()));\n            } else {\n              cb(msg.data);\n            }\n          };\n        }\n      }\n    });\n  }\n  get url() {\n    return this._params.url;\n  }\n  async open() {\n    this._socket = new WebSocket(this._params.url);\n    this._socket.onopen = async () => {\n      log(\"Socket open\", void 0, {\n        F: __dxlog_file,\n        L: 55,\n        S: this,\n        C: (f, a) => f(...a)\n      });\n      try {\n        await this._rpc.open();\n        log(`RPC open ${this._params.url}`, void 0, {\n          F: __dxlog_file,\n          L: 58,\n          S: this,\n          C: (f, a) => f(...a)\n        });\n        this.connected.emit();\n        this._connectTrigger.wake();\n      } catch (err) {\n        this.error.emit(err);\n      }\n    };\n    this._socket.onclose = async () => {\n      log(`Disconnected ${this._params.url}`, void 0, {\n        F: __dxlog_file,\n        L: 67,\n        S: this,\n        C: (f, a) => f(...a)\n      });\n      this.disconnected.emit();\n      await this.close();\n    };\n    this._socket.onerror = (event) => {\n      log.error(event.message ?? \"Socket error\", {\n        url: this._params.url\n      }, {\n        F: __dxlog_file,\n        L: 73,\n        S: this,\n        C: (f, a) => f(...a)\n      });\n      const error = event.error ?? new Error(event.message);\n      this.error.emit(error);\n      this._connectTrigger.throw(error);\n    };\n    await this._connectTrigger.wait();\n  }\n  async close() {\n    try {\n      await this._rpc?.close();\n    } catch (err) {\n      log.catch(err, void 0, {\n        F: __dxlog_file,\n        L: 86,\n        S: this,\n        C: (f, a) => f(...a)\n      });\n    }\n    this._socket?.close();\n  }\n  get rpc() {\n    return this._rpc.rpc;\n  }\n};\n_ts_decorate([\n  logInfo\n], WebsocketRpcClient.prototype, \"url\", null);\n\n// packages/core/mesh/websocket-rpc/src/server.ts\nimport WebSocket2 from \"isomorphic-ws\";\nimport { log as log2 } from \"@dxos/log\";\nimport { createProtoRpcPeer as createProtoRpcPeer2 } from \"@dxos/rpc\";\nvar __dxlog_file2 = \"/home/runner/work/dxos/dxos/packages/core/mesh/websocket-rpc/src/server.ts\";\nvar WebsocketRpcServer = class {\n  constructor(_params) {\n    this._params = _params;\n  }\n  async open() {\n    this._server = new WebSocket2.Server({\n      ...this._params\n    });\n    this._server.on(\"connection\", async (socket, request) => {\n      log2(\"connection\", {\n        request\n      }, {\n        F: __dxlog_file2,\n        L: 34,\n        S: this,\n        C: (f, a) => f(...a)\n      });\n      const info = {\n        request\n      };\n      const { onOpen, onClose, ...options } = await this._params.onConnection(info);\n      const rpc = createProtoRpcPeer2({\n        ...options,\n        port: {\n          send: (msg) => {\n            socket.send(msg);\n          },\n          subscribe: (cb) => {\n            socket.onmessage = async (msg) => {\n              if (typeof Blob !== \"undefined\" && msg.data instanceof Blob) {\n                cb(Buffer.from(await msg.data.arrayBuffer()));\n              } else {\n                cb(msg.data);\n              }\n            };\n          }\n        }\n      });\n      await rpc.open();\n      await onOpen?.(rpc);\n      socket.onclose = async () => {\n        await onClose?.(rpc);\n        await rpc.close();\n      };\n    });\n  }\n  async close() {\n    this._server?.close();\n  }\n};\nexport {\n  WebsocketRpcClient,\n  WebsocketRpcServer\n};\n//# sourceMappingURL=index.mjs.map\n"],"names":["_ts_decorate","decorators","target","key","desc","r","d","i","__dxlog_file","WebsocketRpcClient","_params","Trigger","Event","createProtoRpcPeer","msg","cb","Buffer","WebSocket","log","f","a","err","event","error","_a","_b","logInfo"],"mappings":"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"}