@dxos/shell 0.5.1-main.ff7d242 → 0.5.1-next.0ef769d

package/dist/types/src/translations/locales/en-US.d.ts

@@ -135,5 +135,6 @@ export declare const os: {
     'create agent label': string;
     'destroy agent label': string;
     'agent device label': string;
+    'shell fallback title': string;
 };
 //# sourceMappingURL=en-US.d.ts.map

package/dist/types/src/translations/locales/en-US.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"en-US.d.ts","sourceRoot":"","sources":["../../../../../src/translations/locales/en-US.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4Id,CAAC"}
+{"version":3,"file":"en-US.d.ts","sourceRoot":"","sources":["../../../../../src/translations/locales/en-US.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Id,CAAC"}

package/dist/types/src/translations/locales/en-US.js

@@ -87,14 +87,14 @@ exports.os = {
     'auth code message': 'Enter the following auth code on the joining device.',
     'display name input label': 'Display name',
     'display name input placeholder': 'Enter a display name',
-    'invite one label': 'Invite one',
+    'invite one label': 'Single-use invitation',
     'invite one description': 'Only one user may join.',
-    'invite one qr label': 'Single-use',
+    'invite one qr label': 'Single-use invitation',
     'invite one list item label': 'Active single-use invitation',
-    'invite many label': 'Invite many',
+    'invite many label': 'Standing invitation',
     'invite many description': 'Anyone with the link can join.',
-    'invite many qr label': 'Multiple-use',
-    'invite many list item label': 'Active multiple-use invitation',
+    'invite many qr label': 'Standing invitation',
+    'invite many list item label': 'Active standing invitation',
     'invite options label': 'Change the active invite option.',
     'reset in progress label': 'Resetting...',
     'confirm label': 'Confirm',
@@ -141,5 +141,6 @@ exports.os = {
     'create agent label': 'Start an agent',
     'destroy agent label': 'Shut down agent',
     'agent device label': 'Your agent',
+    'shell fallback title': 'Shell failed to connect',
 };
 //# sourceMappingURL=en-US.js.map

package/dist/types/src/translations/locales/en-US.js.map

@@ -1 +1 @@
-{"version":3,"file":"en-US.js","sourceRoot":"","sources":["../../../../../src/translations/locales/en-US.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"en-US.js","sourceRoot":"","sources":["../../../../../src/translations/locales/en-US.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/shell",
-  "version": "0.5.1-main.ff7d242",
+  "version": "0.5.1-next.0ef769d",
   "description": "DXOS’s OS experiences",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,19 +42,18 @@
     "react-qr-rounded": "^1.0.0",
     "url-join": "^5.0.0",
     "xstate": "^4.37.0",
-    "@dxos/async": "0.5.1-main.ff7d242",
-    "@dxos/client-protocol": "0.5.1-main.ff7d242",
-    "@dxos/debug": "0.5.1-main.ff7d242",
-    "@dxos/display-name": "0.5.1-main.ff7d242",
-    "@dxos/invariant": "0.5.1-main.ff7d242",
-    "@dxos/client-services": "0.5.1-main.ff7d242",
-    "@dxos/log": "0.5.1-main.ff7d242",
-    "@dxos/react-client": "0.5.1-main.ff7d242",
-    "@dxos/react-ui": "0.5.1-main.ff7d242",
-    "@dxos/react-ui-theme": "0.5.1-main.ff7d242",
-    "@dxos/react-ui-types": "0.5.1-main.ff7d242",
-    "@dxos/rpc-tunnel": "0.5.1-main.ff7d242",
-    "@dxos/util": "0.5.1-main.ff7d242"
+    "@dxos/debug": "0.5.1-next.0ef769d",
+    "@dxos/async": "0.5.1-next.0ef769d",
+    "@dxos/client-services": "0.5.1-next.0ef769d",
+    "@dxos/display-name": "0.5.1-next.0ef769d",
+    "@dxos/invariant": "0.5.1-next.0ef769d",
+    "@dxos/log": "0.5.1-next.0ef769d",
+    "@dxos/react-ui": "0.5.1-next.0ef769d",
+    "@dxos/client-protocol": "0.5.1-next.0ef769d",
+    "@dxos/react-ui-theme": "0.5.1-next.0ef769d",
+    "@dxos/react-ui-types": "0.5.1-next.0ef769d",
+    "@dxos/util": "0.5.1-next.0ef769d",
+    "@dxos/rpc-tunnel": "0.5.1-next.0ef769d"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -65,17 +64,19 @@
     "react-dom": "^18.2.0",
     "vite": "^5.2.9",
     "vite-plugin-turbosnap": "^1.0.2",
-    "@dxos/config": "0.5.1-main.ff7d242",
-    "@dxos/random": "0.5.1-main.ff7d242",
-    "@dxos/protocols": "0.5.1-main.ff7d242",
-    "@dxos/react-ui-theme": "0.5.1-main.ff7d242",
-    "@dxos/storybook-utils": "0.5.1-main.ff7d242",
-    "@dxos/react-async": "0.5.1-main.ff7d242"
+    "@dxos/config": "0.5.1-next.0ef769d",
+    "@dxos/protocols": "0.5.1-next.0ef769d",
+    "@dxos/random": "0.5.1-next.0ef769d",
+    "@dxos/react-async": "0.5.1-next.0ef769d",
+    "@dxos/react-ui-theme": "0.5.1-next.0ef769d",
+    "@dxos/storybook-utils": "0.5.1-next.0ef769d",
+    "@dxos/react-client": "0.5.1-next.0ef769d"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.0.5",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "@dxos/react-client": "0.5.1-next.0ef769d"
   },
   "publishConfig": {
     "access": "public"

package/src/composites/Shell/Shell.tsx

@@ -5,7 +5,14 @@
 import React, { useEffect, useState } from 'react';
 
 import { log } from '@dxos/log';
-import { type LayoutRequest, ShellDisplay, ShellLayout, type ShellRuntime, useClient } from '@dxos/react-client';
+import {
+  type LayoutRequest,
+  ShellDisplay,
+  ShellLayout,
+  type ShellRuntime,
+  useClient,
+  type InvitationUrlRequest,
+} from '@dxos/react-client';
 import { useSpace } from '@dxos/react-client/echo';
 
 import { IdentityDialog } from '../IdentityDialog';
@@ -13,19 +20,43 @@ import { JoinDialog } from '../JoinDialog';
 import { SpaceDialog } from '../SpaceDialog';
 import { StatusDialog } from '../StatusDialog';
 
-export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: string }) => {
+export const Shell = ({ runtime }: { runtime: ShellRuntime }) => {
   const [{ layout, invitationCode, spaceKey, target }, setLayout] = useState<LayoutRequest>({
     layout: runtime.layout,
     invitationCode: runtime.invitationCode,
     spaceKey: runtime.spaceKey,
     target: runtime.target,
   });
+  const [{ invitationUrl, deviceInvitationParam, spaceInvitationParam }, setInvitationUrl] =
+    useState<InvitationUrlRequest>({
+      invitationUrl: runtime.invitationUrl,
+      deviceInvitationParam: runtime.deviceInvitationParam,
+      spaceInvitationParam: runtime.spaceInvitationParam,
+    });
 
   const client = useClient();
   const space = useSpace(spaceKey);
 
+  const createDeviceInvitationUrl = (invitationCode: string) => {
+    const baseUrl = new URL(invitationUrl);
+    baseUrl.searchParams.set(deviceInvitationParam, invitationCode);
+    return baseUrl.toString();
+  };
+
+  const createSpaceInvitationUrl = (invitationCode: string) => {
+    const baseUrl = new URL(invitationUrl);
+    baseUrl.searchParams.set(spaceInvitationParam, invitationCode);
+    return baseUrl.toString();
+  };
+
   useEffect(() => {
-    return runtime.layoutUpdate.on((request) => setLayout(request));
+    const unsubscribeLayout = runtime.layoutUpdate.on((request) => setLayout(request));
+    const unsubscribeInvitationUrl = runtime.invitationUrlUpdate.on((request) => setInvitationUrl(request));
+
+    return () => {
+      unsubscribeLayout();
+      unsubscribeInvitationUrl();
+    };
   }, [runtime]);
 
   useEffect(() => {
@@ -66,7 +97,7 @@ export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: stri
     case ShellLayout.EDIT_PROFILE:
       return (
         <IdentityDialog
-          createInvitationUrl={(invitationCode) => `${origin}?deviceInvitationCode=${invitationCode}`}
+          createInvitationUrl={createDeviceInvitationUrl}
           onResetStorage={async () => {
             runtime.setLayout({ layout: ShellLayout.STATUS });
             await client.reset();
@@ -90,7 +121,7 @@ export const Shell = ({ runtime, origin }: { runtime: ShellRuntime; origin: stri
         <SpaceDialog
           space={space}
           target={target}
-          createInvitationUrl={(invitationCode) => `${origin}?spaceInvitationCode=${invitationCode}`}
+          createInvitationUrl={createSpaceInvitationUrl}
           onDone={async () => {
             await runtime.setAppContext({ display: ShellDisplay.NONE });
             runtime.setLayout({ layout: ShellLayout.DEFAULT });

package/src/composites/Shell/ShellContext.tsx

@@ -153,7 +153,7 @@ export const ShellProvider = ({
     <>
       {shellRuntime && (
         <div className={mx(display === ShellDisplay.NONE ? 'hidden' : '')}>
-          <Shell runtime={shellRuntime} origin={window.location.origin} />
+          <Shell runtime={shellRuntime} />
         </div>
       )}
 

package/src/composites/Shell/memory-shell-runtime.ts

@@ -4,25 +4,40 @@
 
 import { Event } from '@dxos/async';
 import {
+  ShellLayout,
   type AppContextRequest,
+  type InvitationUrlRequest,
   type LayoutRequest,
   type PublicKey,
-  ShellLayout,
   type ShellRuntime,
 } from '@dxos/react-client';
 
 // TODO(wittjosiah): Remove?
 export class MemoryShellRuntime implements ShellRuntime {
   readonly layoutUpdate = new Event<LayoutRequest>();
+  readonly invitationUrlUpdate = new Event<InvitationUrlRequest>();
   readonly contextUpdate = new Event<AppContextRequest>();
   private _layout: ShellLayout;
   private _invitationCode?: string;
   private _spaceKey?: PublicKey;
+  private _invitationUrl: string;
+  private _deviceInvitationParam: string;
+  private _spaceInvitationParam: string;
 
-  constructor({ layout, invitationCode, spaceKey }: Partial<LayoutRequest> & Partial<AppContextRequest> = {}) {
+  constructor({
+    layout,
+    invitationCode,
+    spaceKey,
+    invitationUrl,
+    deviceInvitationParam,
+    spaceInvitationParam,
+  }: Partial<LayoutRequest> & Partial<AppContextRequest> & Partial<InvitationUrlRequest> = {}) {
     this._layout = layout ?? ShellLayout.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
+    this._invitationUrl = invitationUrl ?? window.location.origin;
+    this._deviceInvitationParam = deviceInvitationParam ?? 'deviceInvitationCode';
+    this._spaceInvitationParam = spaceInvitationParam ?? 'spaceInvitationCode';
   }
 
   get layout() {
@@ -37,6 +52,18 @@ export class MemoryShellRuntime implements ShellRuntime {
     return this._spaceKey;
   }
 
+  get invitationUrl() {
+    return this._invitationUrl;
+  }
+
+  get deviceInvitationParam() {
+    return this._deviceInvitationParam;
+  }
+
+  get spaceInvitationParam() {
+    return this._spaceInvitationParam;
+  }
+
   setLayout(request: LayoutRequest) {
     this._layout = request.layout;
     this._invitationCode = request.invitationCode;
@@ -44,6 +71,13 @@ export class MemoryShellRuntime implements ShellRuntime {
     this.layoutUpdate.emit(request);
   }
 
+  setInvitationUrl(request: InvitationUrlRequest) {
+    this._invitationUrl = request.invitationUrl;
+    this._deviceInvitationParam = request.deviceInvitationParam;
+    this._spaceInvitationParam = request.spaceInvitationParam;
+    this.invitationUrlUpdate.emit(request);
+  }
+
   async setAppContext(context: AppContextRequest) {
     this.contextUpdate.emit(context);
   }

package/src/composites/Shell/run-shell.tsx

@@ -7,8 +7,16 @@ import { createRoot } from 'react-dom/client';
 
 import { DEFAULT_CLIENT_CHANNEL, DEFAULT_SHELL_CHANNEL } from '@dxos/client-protocol';
 import { ShellRuntimeImpl } from '@dxos/client-services';
-import { Client, ClientContext, ClientServicesProxy, Config, SystemStatus } from '@dxos/react-client';
-import { ThemeProvider, Tooltip } from '@dxos/react-ui';
+import {
+  AgentHostingProvider,
+  Client,
+  ClientContext,
+  ClientServicesProxy,
+  Config,
+  ShellDisplay,
+  SystemStatus,
+} from '@dxos/react-client';
+import { Button, Dialog, ThemeProvider, Tooltip, useTranslation } from '@dxos/react-ui';
 import { defaultTx } from '@dxos/react-ui-theme';
 import { createIFramePort } from '@dxos/rpc-tunnel';
 
@@ -17,22 +25,55 @@ import { ClipboardProvider } from '../../components';
 import { osTranslations } from '../../translations';
 
 export const runShell = async (config: Config = new Config()) => {
-  const services = new ClientServicesProxy(createIFramePort({ channel: DEFAULT_CLIENT_CHANNEL }));
-  const client = new Client({ config, services });
+  // If runtime fails to open then the shell will not be openable.
   const runtime = new ShellRuntimeImpl(createIFramePort({ channel: DEFAULT_SHELL_CHANNEL }));
-  await Promise.all([runtime.open(), client.initialize()]);
-
-  createRoot(document.getElementById('root')!).render(
-    <StrictMode>
-      <ThemeProvider tx={defaultTx} resourceExtensions={[osTranslations]}>
-        <ClientContext.Provider value={{ client, status: SystemStatus.ACTIVE }}>
-          <ClipboardProvider>
-            <Tooltip.Provider>
-              <Shell runtime={runtime} origin={location.origin} />
-            </Tooltip.Provider>
-          </ClipboardProvider>
-        </ClientContext.Provider>
-      </ThemeProvider>
-    </StrictMode>,
+  await runtime.open();
+
+  try {
+    const services = new ClientServicesProxy(createIFramePort({ channel: DEFAULT_CLIENT_CHANNEL }));
+    const client = new Client({ config, services });
+    await client.initialize();
+
+    createRoot(document.getElementById('root')!).render(
+      <StrictMode>
+        <ThemeProvider tx={defaultTx} resourceExtensions={[osTranslations]}>
+          <ClientContext.Provider value={{ client, status: SystemStatus.ACTIVE }}>
+            <ClipboardProvider>
+              <Tooltip.Provider>
+                <AgentHostingProvider>
+                  <Shell runtime={runtime} />
+                </AgentHostingProvider>
+              </Tooltip.Provider>
+            </ClipboardProvider>
+          </ClientContext.Provider>
+        </ThemeProvider>
+      </StrictMode>,
+    );
+  } catch {
+    // If shell's client fails to initialize, ensure that the shell is still closeable.
+    createRoot(document.getElementById('root')!).render(
+      <StrictMode>
+        <ThemeProvider tx={defaultTx} resourceExtensions={[osTranslations]}>
+          <Fallback onClose={() => runtime.setAppContext({ display: ShellDisplay.NONE })} />
+        </ThemeProvider>
+      </StrictMode>,
+    );
+  }
+};
+
+const Fallback = ({ onClose }: { onClose?: () => void }) => {
+  const { t } = useTranslation('os');
+
+  return (
+    <Dialog.Root modal open onOpenChange={() => onClose?.()}>
+      <Dialog.Overlay>
+        <Dialog.Content>
+          <Dialog.Title>{t('shell fallback title')}</Dialog.Title>
+          <Dialog.Close asChild onClick={() => onClose?.()}>
+            <Button variant='primary'>{t('close label')}</Button>
+          </Dialog.Close>
+        </Dialog.Content>
+      </Dialog.Overlay>
+    </Dialog.Root>
   );
 };

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -235,7 +235,7 @@ export const IdentityPanel = ({
   const devices = useDevices();
   const identity = useIdentity();
   const invitations = useHaloInvitations();
-  const agentProps = useAgentHandlers({ client, identity, invitations });
+  const agentProps = useAgentHandlers({ identity, invitations });
   if (!identity) {
     log.error('IdentityPanel rendered with no active identity.');
     return null;

package/src/panels/IdentityPanel/steps/IdentityActionChooser.tsx

@@ -5,7 +5,7 @@
 import React, { useCallback } from 'react';
 
 import { log } from '@dxos/log';
-import { useAgentHostingProviderClient, useClient } from '@dxos/react-client';
+import { useAgentHostingClient, useClient } from '@dxos/react-client';
 import { useHaloInvitations } from '@dxos/react-client/halo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 
@@ -18,7 +18,7 @@ export const IdentityActionChooser = (props: IdentityPanelStepProps) => {
   const { send } = props;
   const client = useClient();
   const invitations = useHaloInvitations();
-  const agentHostingProviderClient = useAgentHostingProviderClient(client.config);
+  const agentHostingProviderClient = useAgentHostingClient();
   const onInvitationEvent = useCallback((invitation: Invitation) => {
     const invitationCode = InvitationEncoder.encode(invitation);
     if (invitation.state === Invitation.State.CONNECTING) {

package/src/panels/IdentityPanel/useAgentHandlers.ts

@@ -7,23 +7,22 @@ import { useCallback, useEffect, useState } from 'react';
 import { type CancellableInvitation } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { useAgentHostingProviderClient, type Client } from '@dxos/react-client';
+import { useAgentHostingClient, useClient } from '@dxos/react-client';
 import { type Identity } from '@dxos/react-client/halo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 
 export const useAgentHandlers = ({
-  client,
   invitations,
   identity,
 }: {
-  client: Client;
   invitations: CancellableInvitation[];
   identity: Identity | null;
 }) => {
   const [validationMessage, setValidationMessage] = useState('');
   const [agentStatus, setAgentStatus] = useState('');
   const [agentActive, setAgentActive] = useState(false);
-  const agentHostingProviderClient = useAgentHostingProviderClient(client.config);
+  const agentHostingProviderClient = useAgentHostingClient();
+  const client = useClient();
 
   useEffect(() => {
     const fetchAgentStatus = async () => {

package/src/panels/JoinPanel/JoinPanel.tsx

@@ -60,7 +60,7 @@ export const JoinPanelImpl = (props: JoinPanelImplProps) => {
           <Viewport.View classNames={stepStyles} id='reset storage confirmation'>
             <ConfirmResetComponent
               send={send}
-              active={activeView === 'reset identity confirmation'}
+              active={activeView === 'reset storage confirmation'}
               onCancel={onCancelResetStorage}
               onConfirm={onConfirmResetStorage}
             />
@@ -222,7 +222,7 @@ export const JoinPanel = ({
       case joinState.matches({ choosingIdentity: 'choosingAuthMethod' }):
         return 'addition method chooser';
       case joinState.matches('resettingIdentity'):
-        return 'reset identity confirmation';
+        return 'reset storage confirmation';
       case joinState.matches({ choosingIdentity: 'creatingIdentity' }):
         return 'create identity input';
       case joinState.matches({ choosingIdentity: 'recoveringIdentity' }):

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

@@ -73,8 +73,8 @@ export const SpaceManager = (props: SpaceManagerProps) => {
       icon: UsersThree,
       onClick: useCallback(() => {
         const invitation = space.share?.({
-          type: Invitation.Type.INTERACTIVE,
-          authMethod: Invitation.AuthMethod.NONE,
+          type: Invitation.Type.DELEGATED,
+          authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
           multiUse: true,
           target,
         });
@@ -83,22 +83,6 @@ export const SpaceManager = (props: SpaceManagerProps) => {
         }
       }, [space]),
     },
-    // inviteNonPersistent: {
-    //   label: 'Invite one (nonpersistent)',
-    //   description: 'Only one user may join. Invitation does not resume if client is restarted.',
-    //   icon: UserPlus,
-    //   onClick: useCallback(() => {
-    //     const invitation = space.share?.({
-    //       type: Invitation.Type.INTERACTIVE,
-    //       authMethod: Invitation.AuthMethod.SHARED_SECRET,
-    //       persistent: false,
-    //       target,
-    //     });
-    //     if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== 'production') {
-    //       invitation.subscribe(onInvitationEvent);
-    //     }
-    //   }, [space]),
-    // },
   };
 
   return <SpaceManagerImpl {...props} invitations={invitations} inviteActions={inviteActions} />;

package/src/steps/InvitationManager.tsx

@@ -53,6 +53,9 @@ export const InvitationManager = ({
   const showAuthCode = statusValue === 3;
   const emoji = hexToEmoji(id);
   const activeView = useMemo(() => {
+    if (multiUse) {
+      return 'showing qr';
+    }
     switch (true) {
       case statusValue === 5:
       case statusValue < 0:

package/src/translations/locales/en-US.ts

@@ -85,14 +85,14 @@ export const os = {
   'auth code message': 'Enter the following auth code on the joining device.',
   'display name input label': 'Display name',
   'display name input placeholder': 'Enter a display name',
-  'invite one label': 'Invite one',
+  'invite one label': 'Single-use invitation',
   'invite one description': 'Only one user may join.',
-  'invite one qr label': 'Single-use',
+  'invite one qr label': 'Single-use invitation',
   'invite one list item label': 'Active single-use invitation',
-  'invite many label': 'Invite many',
+  'invite many label': 'Standing invitation',
   'invite many description': 'Anyone with the link can join.',
-  'invite many qr label': 'Multiple-use',
-  'invite many list item label': 'Active multiple-use invitation',
+  'invite many qr label': 'Standing invitation',
+  'invite many list item label': 'Active standing invitation',
   'invite options label': 'Change the active invite option.',
   'reset in progress label': 'Resetting...',
   'confirm label': 'Confirm',
@@ -142,4 +142,5 @@ export const os = {
   'create agent label': 'Start an agent',
   'destroy agent label': 'Shut down agent',
   'agent device label': 'Your agent',
+  'shell fallback title': 'Shell failed to connect',
 };

package/dist/bundle/index-Ba9TfOfV.mjs

@@ -1,110 +0,0 @@
-import { T as d, E as p, c as u, e as l, W as _, l as a, a as f } from "./index-DaiI_12x.mjs";
-var m = "/home/runner/work/dxos/dxos/packages/core/mesh/websocket-rpc/src/token-auth.ts", k = class extends _ {
-  constructor(t, e) {
-    const r = l.from(e).toString("base64").replace(/=*$/, ""), s = [
-      `base64url.bearer.authorization.dxos.org.${r}`
-    ];
-    super(t, s), a("encodedToken", {
-      encodedToken: r
-    }, {
-      F: m,
-      L: 55,
-      S: this,
-      C: (c, o) => c(...o)
-    });
-  }
-};
-function w(t, e, r, s) {
-  var c = arguments.length, o = c < 3 ? e : s === null ? s = Object.getOwnPropertyDescriptor(e, r) : s, i;
-  if (typeof Reflect == "object" && typeof Reflect.decorate == "function")
-    o = Reflect.decorate(t, e, r, s);
-  else
-    for (var h = t.length - 1; h >= 0; h--)
-      (i = t[h]) && (o = (c < 3 ? i(o) : c > 3 ? i(e, r, o) : i(e, r)) || o);
-  return c > 3 && o && Object.defineProperty(e, r, o), o;
-}
-var n = "/home/runner/work/dxos/dxos/packages/core/mesh/websocket-rpc/src/client.ts", g = class {
-  constructor(t) {
-    this._params = t, this._connectTrigger = new d(), this.connected = new p(), this.disconnected = new p(), this.error = new p(), this._rpc = u({
-      requested: this._params.requested,
-      exposed: this._params.exposed,
-      handlers: this._params.handlers,
-      port: {
-        send: (e) => {
-          this._socket.send(e);
-        },
-        subscribe: (e) => {
-          this._socket.onmessage = async (r) => {
-            typeof Blob < "u" && r.data instanceof Blob ? e(l.from(await r.data.arrayBuffer())) : e(r.data);
-          };
-        }
-      }
-    });
-  }
-  get url() {
-    return this._params.url;
-  }
-  async open() {
-    this._params.authenticationToken ? this._socket = new k(this._params.url, this._params.authenticationToken) : this._socket = new _(this._params.url), this._socket.onopen = async () => {
-      a("Socket open", void 0, {
-        F: n,
-        L: 61,
-        S: this,
-        C: (t, e) => t(...e)
-      });
-      try {
-        await this._rpc.open(), a(`RPC open ${this._params.url}`, void 0, {
-          F: n,
-          L: 64,
-          S: this,
-          C: (t, e) => t(...e)
-        }), this.connected.emit(), this._connectTrigger.wake();
-      } catch (t) {
-        this.error.emit(t);
-      }
-    }, this._socket.onclose = async () => {
-      a(`Disconnected ${this._params.url}`, void 0, {
-        F: n,
-        L: 73,
-        S: this,
-        C: (t, e) => t(...e)
-      }), this.disconnected.emit(), await this.close();
-    }, this._socket.onerror = (t) => {
-      a.error(t.message ?? "Socket error", {
-        url: this._params.url
-      }, {
-        F: n,
-        L: 80,
-        S: this,
-        C: (r, s) => r(...s)
-      });
-      const e = t.error ?? new Error(t.message);
-      this.error.emit(e), this._connectTrigger.throw(e);
-    }, await this._connectTrigger.wait();
-  }
-  async close() {
-    var t, e;
-    try {
-      await ((t = this._rpc) == null ? void 0 : t.close());
-    } catch (r) {
-      a.catch(r, void 0, {
-        F: n,
-        L: 93,
-        S: this,
-        C: (s, c) => s(...c)
-      });
-    }
-    (e = this._socket) == null || e.close();
-  }
-  get rpc() {
-    return this._rpc.rpc;
-  }
-};
-w([
-  f
-], g.prototype, "url", null);
-export {
-  k as WebSocketWithTokenAuth,
-  g as WebsocketRpcClient
-};
-//# sourceMappingURL=index-Ba9TfOfV.mjs.map