@dxos/plugin-client 0.7.4-staging.f7e8224 → 0.7.5-main.499c70c

package/dist/lib/node/index.cjs

@@ -29,17 +29,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   ClientPlugin: () => ClientPlugin,
-  default: () => src_default,
-  parseClientPlugin: () => parseClientPlugin
+  default: () => src_default
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_XYLDQWFV = require("./chunk-XYLDQWFV.cjs");
+var import_chunk_NFO3ADQC = require("./chunk-NFO3ADQC.cjs");
+var import_chunk_RUA5KXVW = require("./chunk-RUA5KXVW.cjs");
 var import_react = __toESM(require("react"));
 var import_app_framework = require("@dxos/app-framework");
 var import_config = require("@dxos/config");
 var import_react2 = require("@dxos/echo-signals/react");
 var import_invariant = require("@dxos/invariant");
 var import_plugin_graph = require("@dxos/plugin-graph");
+var import_types = require("@dxos/plugin-observability/types");
 var import_react_client = require("@dxos/react-client");
 var import_react3 = __toESM(require("react"));
 var import_app_framework2 = require("@dxos/app-framework");
@@ -48,49 +49,40 @@ var import_react_ui = require("@dxos/react-ui");
 var import_react4 = require("@dxos/shell/react");
 var import_react5 = __toESM(require("react"));
 var import_app_framework3 = require("@dxos/app-framework");
+var import_types2 = require("@dxos/plugin-observability/types");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_react6 = require("@dxos/shell/react");
 var import_react7 = __toESM(require("react"));
 var import_react_ui3 = require("@dxos/react-ui");
+var IDENTITY_DIALOG = `${import_chunk_RUA5KXVW.CLIENT_PLUGIN}/IdentityDialog`;
 var IdentityDialog = (props) => {
-  const dispatch = (0, import_app_framework2.useIntentDispatcher)();
+  const { dispatchPromise: dispatch } = (0, import_app_framework2.useIntentDispatcher)();
   const client = (0, import_react_client2.useClient)();
-  const handleDone = (0, import_react3.useCallback)(() => dispatch({
-    action: import_app_framework2.LayoutAction.SET_LAYOUT,
-    data: {
-      element: "dialog",
-      state: false
-    }
-  }), [
+  const handleDone = (0, import_react3.useCallback)(() => dispatch((0, import_app_framework2.createIntent)(import_app_framework2.LayoutAction.SetLayout, {
+    element: "dialog",
+    state: false
+  })), [
     dispatch
   ]);
   const handleResetStorage = (0, import_react3.useCallback)(async () => {
     await client.reset();
-    await dispatch({
-      action: import_chunk_XYLDQWFV.ClientAction.RESET_STORAGE
-    });
+    await dispatch((0, import_app_framework2.createIntent)(import_chunk_NFO3ADQC.ClientAction.ResetStorage));
   }, [
     dispatch
   ]);
   const handleRecover = (0, import_react3.useCallback)(async () => {
     await client.reset();
-    await dispatch({
-      action: import_chunk_XYLDQWFV.ClientAction.RESET_STORAGE,
-      data: {
-        target: "recoverIdentity"
-      }
-    });
+    await dispatch((0, import_app_framework2.createIntent)(import_chunk_NFO3ADQC.ClientAction.ResetStorage, {
+      target: "recoverIdentity"
+    }));
   }, [
     dispatch
   ]);
   const handleJoinNewIdentity = (0, import_react3.useCallback)(async () => {
     await client.reset();
-    await dispatch({
-      action: import_chunk_XYLDQWFV.ClientAction.RESET_STORAGE,
-      data: {
-        target: "deviceInvitation"
-      }
-    });
+    await dispatch((0, import_app_framework2.createIntent)(import_chunk_NFO3ADQC.ClientAction.ResetStorage, {
+      target: "deviceInvitation"
+    }));
   }, [
     dispatch
   ]);
@@ -105,30 +97,22 @@ var IdentityDialog = (props) => {
     onJoinNewIdentity: handleJoinNewIdentity
   })));
 };
+var JOIN_DIALOG = `${import_chunk_RUA5KXVW.CLIENT_PLUGIN}/JoinDialog`;
 var JoinDialog = (props) => {
-  const dispatch = (0, import_app_framework3.useIntentDispatcher)();
-  const handleCancelResetStorage = (0, import_react5.useCallback)(() => dispatch({
-    plugin: import_chunk_XYLDQWFV.CLIENT_PLUGIN,
-    action: import_chunk_XYLDQWFV.ClientAction.SHARE_IDENTITY
-  }), [
+  const { dispatchPromise: dispatch } = (0, import_app_framework3.useIntentDispatcher)();
+  const handleCancelResetStorage = (0, import_react5.useCallback)(() => dispatch((0, import_app_framework3.createIntent)(import_chunk_NFO3ADQC.ClientAction.ShareIdentity)), [
     dispatch
   ]);
   const handleDone = (0, import_react5.useCallback)(async (result) => {
     if (result?.identityKey) {
       await Promise.all([
-        dispatch({
-          action: import_app_framework3.LayoutAction.SET_LAYOUT,
-          data: {
-            element: "dialog",
-            state: false
-          }
-        }),
-        dispatch({
-          action: import_chunk_XYLDQWFV.OBSERVABILITY_ACTION,
-          data: {
-            name: props.initialDisposition === "recover-identity" ? "identity.recover" : "identity.join"
-          }
-        })
+        dispatch((0, import_app_framework3.createIntent)(import_app_framework3.LayoutAction.SetLayout, {
+          element: "dialog",
+          state: false
+        })),
+        dispatch((0, import_app_framework3.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+          name: props.initialDisposition === "recover-identity" ? "identity.recover" : "identity.join"
+        }))
       ]);
     }
   }, [
@@ -147,21 +131,20 @@ var JoinDialog = (props) => {
     onDone: handleDone
   }));
 };
+var RECOVER_CODE_DIALOG = `${import_chunk_RUA5KXVW.CLIENT_PLUGIN}/RecoveryCodeDialog`;
 var RecoveryCodeDialog = ({ code }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_XYLDQWFV.CLIENT_PLUGIN);
+  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_RUA5KXVW.CLIENT_PLUGIN);
   const [confirmation, setConfirmation] = (0, import_react7.useState)(false);
   const handleConfirmation = (0, import_react7.useCallback)((checked) => setConfirmation(checked), []);
   return /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.AlertDialog.Content, {
     classNames: "bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
-  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.AlertDialog.Title, {
-    classNames: ""
-  }, t("recovery code dialog title")), /* @__PURE__ */ import_react7.default.createElement("p", {
+  }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.AlertDialog.Title, null, t("recovery code dialog title")), /* @__PURE__ */ import_react7.default.createElement("p", {
     className: "py-4"
   }, t("recovery code dialog description")), /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Clipboard.Provider, null, /* @__PURE__ */ import_react7.default.createElement(Code, {
-    value: code
-  })), /* @__PURE__ */ import_react7.default.createElement("p", {
-    className: "py-4"
-  }, t("recovery code dialog warning")), /* @__PURE__ */ import_react7.default.createElement("div", {
+    code
+  })), /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "flex flex-col py-4 gap-2"
+  }, /* @__PURE__ */ import_react7.default.createElement("p", null, t("recovery code dialog warning 1")), /* @__PURE__ */ import_react7.default.createElement("p", null, t("recovery code dialog warning 2"))), /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "flex items-center gap-2 pbe-4"
   }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Input.Root, null, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Input.Checkbox, {
     "data-testid": "recoveryCode.confirm",
@@ -177,32 +160,40 @@ var RecoveryCodeDialog = ({ code }) => {
     disabled: !confirmation
   }, t("continue label")))));
 };
-var Code = ({ value }) => {
+var Code = ({ code }) => {
+  const words = code.split(" ");
   return /* @__PURE__ */ import_react7.default.createElement("div", {
     className: "relative p-2 border border-separator rounded group"
   }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui3.Clipboard.IconButton, {
-    value,
+    value: code,
     classNames: "absolute top-2 right-2 invisible group-hover:visible"
-  }), /* @__PURE__ */ import_react7.default.createElement("code", {
-    className: "whitespace-pre-wrap"
-  }, value));
+  }), /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "grid grid-cols-4"
+  }, words.map((word, i) => /* @__PURE__ */ import_react7.default.createElement("div", {
+    key: i,
+    className: "flex items-center p-2 gap-2 items-center"
+  }, /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "w-4 text-xs text-center text-subdued"
+  }, i + 1), /* @__PURE__ */ import_react7.default.createElement("div", {
+    className: "text-sm"
+  }, word)))));
 };
 var translations_default = [
   {
     "en-US": {
-      [import_chunk_XYLDQWFV.CLIENT_PLUGIN]: {
+      [import_chunk_RUA5KXVW.CLIENT_PLUGIN]: {
         "open shell label": "Open HALO",
-        "recovery code dialog title": "Recovery Code",
+        "recovery code dialog title": "Account Recovery",
         "recovery code dialog description": "This is your identity recovery code, store it in a safe place. You can use it to recover your identity if you ever lose access to your devices.",
-        "recovery code dialog warning": "Please note: This code will not be displayed again and cannot be replaced. It is your private key for recovering DXOS data. Anyone with this key will also be able to gain access to your account.",
-        "recovery code confirmation label": "Confirm the code has been saved",
+        "recovery code dialog warning 1": "NOTE: This code will not be displayed again.",
+        "recovery code dialog warning 2": "It is your private key for recovering DXOS data. Anyone with this key will be able to gain access to your account.",
+        "recovery code confirmation label": "Please confirm you have saved the code.",
         "continue label": "Continue"
       }
     }
   }
 ];
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-client/src/ClientPlugin.tsx";
-var parseClientPlugin = (plugin) => (plugin?.provides).client instanceof import_react_client.Client ? plugin : void 0;
 var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitationParam = "deviceInvitationCode", onClientInitialized, onReady, onReset, ...options }) => {
   (0, import_react2.registerSignalsRuntime)();
   let client;
@@ -213,7 +204,7 @@ var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitation
     return baseUrl.toString();
   };
   return {
-    meta: import_chunk_XYLDQWFV.meta_default,
+    meta: import_chunk_RUA5KXVW.meta_default,
     initialize: async () => {
       const config = new import_config.Config(await (0, import_config.Storage)(), (0, import_config.Envs)(), (0, import_config.Local)(), (0, import_config.Defaults)());
       client = new import_react_client.Client({
@@ -240,7 +231,7 @@ var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitation
         }, children)
       };
     },
-    ready: async (plugins) => {
+    ready: async ({ plugins }) => {
       if (error) {
         throw error;
       }
@@ -252,47 +243,48 @@ var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitation
     provides: {
       translations: translations_default,
       surface: {
-        component: ({ data, role, ...rest }) => {
-          switch (role) {
-            case "dialog":
-              if (data.component === "dxos.org/plugin/client/IdentityDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(IdentityDialog, {
-                  ...data.subject,
-                  createInvitationUrl: createDeviceInvitationUrl
-                });
-              } else if (data.component === "dxos.org/plugin/client/JoinDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(JoinDialog, data.subject);
-              } else if (data.component === "dxos.org/plugin/client/RecoveryCodeDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(RecoveryCodeDialog, data.subject);
-              }
-              break;
-          }
-          return null;
-        }
+        definitions: () => [
+          (0, import_app_framework.createSurface)({
+            id: IDENTITY_DIALOG,
+            role: "dialog",
+            filter: (data) => data.component === IDENTITY_DIALOG,
+            component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(IdentityDialog, {
+              ...data.subject,
+              createInvitationUrl: createDeviceInvitationUrl
+            })
+          }),
+          (0, import_app_framework.createSurface)({
+            id: JOIN_DIALOG,
+            role: "dialog",
+            filter: (data) => data.component === JOIN_DIALOG,
+            component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(JoinDialog, data.subject)
+          }),
+          (0, import_app_framework.createSurface)({
+            id: RECOVER_CODE_DIALOG,
+            role: "dialog",
+            filter: (data) => data.component === RECOVER_CODE_DIALOG,
+            component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(RecoveryCodeDialog, data.subject)
+          })
+        ]
       },
       graph: {
         builder: (plugins) => {
-          const intentPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin);
-          const id = `${import_chunk_XYLDQWFV.CLIENT_PLUGIN}/open-shell`;
+          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatchPromise;
+          const id = `${import_chunk_RUA5KXVW.CLIENT_PLUGIN}/open-shell`;
           return (0, import_plugin_graph.createExtension)({
-            id: import_chunk_XYLDQWFV.CLIENT_PLUGIN,
+            id: import_chunk_RUA5KXVW.CLIENT_PLUGIN,
             filter: (node) => node.id === "root",
             actions: () => [
               {
                 id,
                 data: async () => {
-                  await intentPlugin?.provides.intent.dispatch([
-                    {
-                      plugin: import_chunk_XYLDQWFV.CLIENT_PLUGIN,
-                      action: import_chunk_XYLDQWFV.ClientAction.SHARE_IDENTITY
-                    }
-                  ]);
+                  await dispatch?.((0, import_app_framework.createIntent)(import_chunk_NFO3ADQC.ClientAction.ShareIdentity));
                 },
                 properties: {
                   label: [
                     "open shell label",
                     {
-                      ns: import_chunk_XYLDQWFV.CLIENT_PLUGIN
+                      ns: import_chunk_RUA5KXVW.CLIENT_PLUGIN
                     }
                   ],
                   icon: "ph--address-book--regular",
@@ -310,149 +302,108 @@ var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitation
         }
       },
       intent: {
-        resolver: async (intent) => {
-          switch (intent.action) {
-            case import_chunk_XYLDQWFV.ClientAction.CREATE_IDENTITY: {
-              const data = await client.halo.createIdentity();
-              return {
-                data,
-                intents: [
-                  [
-                    {
-                      action: import_chunk_XYLDQWFV.OBSERVABILITY_ACTION,
-                      data: {
-                        name: "identity.create"
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.JOIN_IDENTITY: {
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/client/JoinDialog",
-                        dialogBlockAlign: "start",
-                        subject: {
-                          initialInvitationCode: intent.data?.invitationCode,
-                          initialDisposition: "accept-halo-invitation"
-                        }
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.SHARE_IDENTITY: {
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/client/IdentityDialog",
-                        dialogBlockAlign: "start"
-                      }
-                    }
-                  ],
-                  [
-                    {
-                      action: import_chunk_XYLDQWFV.OBSERVABILITY_ACTION,
-                      data: {
-                        name: "identity.share"
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.RECOVER_IDENTITY: {
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/client/JoinDialog",
-                        dialogBlockAlign: "start",
-                        subject: {
-                          initialDisposition: "recover-identity"
-                        }
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.RESET_STORAGE: {
-              await onReset?.({
-                target: intent.data?.target
-              });
-              return {
-                data: true
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.CREATE_AGENT: {
-              (0, import_invariant.invariant)(client.services.services.EdgeAgentService, "Missing EdgeAgentService", {
-                F: __dxlog_file,
-                L: 283,
-                S: void 0,
-                A: [
-                  "client.services.services.EdgeAgentService",
-                  "'Missing EdgeAgentService'"
-                ]
-              });
-              await client.services.services.EdgeAgentService.createAgent(null, {
-                timeout: 1e4
-              });
-              return {
-                data: true
-              };
-            }
-            case import_chunk_XYLDQWFV.ClientAction.CREATE_RECOVERY_CODE: {
-              (0, import_invariant.invariant)(client.services.services.IdentityService, "IdentityService not available", {
-                F: __dxlog_file,
-                L: 289,
-                S: void 0,
-                A: [
-                  "client.services.services.IdentityService",
-                  "'IdentityService not available'"
-                ]
-              });
-              const { seedphrase } = await client.services.services.IdentityService.createRecoveryPhrase();
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        dialogBlockAlign: "start",
-                        dialogType: "alert",
-                        state: true,
-                        component: "dxos.org/plugin/client/RecoveryCodeDialog",
-                        subject: {
-                          code: seedphrase
-                        }
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-          }
-        }
+        resolvers: () => [
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.CreateIdentity, async () => {
+            const data = await client.halo.createIdentity();
+            return {
+              data,
+              intents: [
+                (0, import_app_framework.createIntent)(import_types.ObservabilityAction.SendEvent, {
+                  name: "identity.create"
+                })
+              ]
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.JoinIdentity, async (data) => {
+            return {
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  component: JOIN_DIALOG,
+                  dialogBlockAlign: "start",
+                  subject: {
+                    initialInvitationCode: data.invitationCode,
+                    initialDisposition: "accept-halo-invitation"
+                  }
+                })
+              ]
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.ShareIdentity, async () => {
+            return {
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  component: IDENTITY_DIALOG,
+                  dialogBlockAlign: "start"
+                }),
+                (0, import_app_framework.createIntent)(import_types.ObservabilityAction.SendEvent, {
+                  name: "identity.share"
+                })
+              ]
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.RecoverIdentity, async () => {
+            return {
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  component: JOIN_DIALOG,
+                  dialogBlockAlign: "start",
+                  subject: {
+                    initialDisposition: "recover-identity"
+                  }
+                })
+              ]
+            };
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.ResetStorage, async (data) => {
+            await onReset?.({
+              target: data.target
+            });
+            return {};
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.CreateAgent, async () => {
+            (0, import_invariant.invariant)(client.services.services.EdgeAgentService, "Missing EdgeAgentService", {
+              F: __dxlog_file,
+              L: 203,
+              S: void 0,
+              A: [
+                "client.services.services.EdgeAgentService",
+                "'Missing EdgeAgentService'"
+              ]
+            });
+            await client.services.services.EdgeAgentService.createAgent(null, {
+              timeout: 1e4
+            });
+          }),
+          (0, import_app_framework.createResolver)(import_chunk_NFO3ADQC.ClientAction.CreateRecoveryCode, async () => {
+            (0, import_invariant.invariant)(client.services.services.IdentityService, "IdentityService not available", {
+              F: __dxlog_file,
+              L: 207,
+              S: void 0,
+              A: [
+                "client.services.services.IdentityService",
+                "'IdentityService not available'"
+              ]
+            });
+            const { seedphrase } = await client.services.services.IdentityService.createRecoveryPhrase();
+            return {
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  dialogBlockAlign: "start",
+                  dialogType: "alert",
+                  state: true,
+                  component: RECOVER_CODE_DIALOG,
+                  subject: {
+                    code: seedphrase
+                  }
+                })
+              ]
+            };
+          })
+        ]
       }
     }
   };
@@ -460,7 +411,6 @@ var ClientPlugin = ({ appKey, invitationUrl = window.location.origin, invitation
 var src_default = ClientPlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ClientPlugin,
-  parseClientPlugin
+  ClientPlugin
 });
 //# sourceMappingURL=index.cjs.map