@dxos/shell 0.4.10-main.c5e8686 → 0.4.10-main.c685d5c

package/src/panels/IdentityPanel/IdentityPanel.tsx

@@ -53,8 +53,8 @@ const IdentityHeading = ({
   const fallbackValue = keyToFallback(identity.identityKey);
   const { t } = useTranslation('os');
   const [displayName, setDisplayName] = useState(identity.profile?.displayName ?? '');
-  const [emoji, setEmoji] = useState<string>(getEmojiValue(identity));
-  const [hue, setHue] = useState<string>(getHueValue(identity));
+  const [emoji, setEmojiDirectly] = useState<string>(getEmojiValue(identity));
+  const [hue, setHueDirectly] = useState<string>(getHueValue(identity));
   const { textValue, setTextValue } = useClipboardContext();
   const identityHex = identity.identityKey.toHex();
   const copied = textValue === identityHex;
@@ -67,9 +67,15 @@ const IdentityHeading = ({
     return onUpdateProfile?.(nextProfile);
   };
 
-  useEffect(() => {
+  const setEmoji = (nextEmoji: string) => {
+    setEmojiDirectly(nextEmoji);
     void handleUpdateProfile();
-  }, [emoji, hue]);
+  };
+
+  const setHue = (nextHue: string) => {
+    setHueDirectly(nextHue);
+    void handleUpdateProfile();
+  };
 
   const isConnected = connectionState === ConnectionState.ONLINE;
 

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/stories/Invitations.e2e-stories.tsx

@@ -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-BhenUoML.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-BhenUoML.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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"}