meet adr 006 (#134)

* peer dep

* restore init

* update injection

* rm logs

* rm wrong listener

* disconnect behavior

* chore: update penumbra-zone versions

* chore: changeset

---------

Co-authored-by: turbocrime <[email protected]>
Co-authored-by: Max Korsunov <[email protected]>

.changeset/witty-bags-work.md

@@ -0,0 +1,6 @@
+---
+'@repo/context': minor
+'chrome-extension': minor
+---
+
+Update packages

.gitignore

@@ -59,3 +59,6 @@ lerna-debug.log*
 # pack outputs
 penumbra-zone-*.tgz
 packages/*/package
+
+apps/extension/chromium-profile
+

apps/extension/package.json

@@ -21,7 +21,7 @@
     "@connectrpc/connect-web": "1.4.0",
     "@penumbra-labs/registry": "11.0.0",
     "@penumbra-zone/bech32m": "^6.1.1",
-    "@penumbra-zone/client": "^16.0.0",
+    "@penumbra-zone/client": "^17.0.0",
     "@penumbra-zone/crypto-web": "^20.0.0",
     "@penumbra-zone/getters": "^14.0.0",
     "@penumbra-zone/keys": "^4.2.1",
@@ -30,7 +30,7 @@
     "@penumbra-zone/query": "^25.0.0",
     "@penumbra-zone/services": "^28.0.0",
     "@penumbra-zone/storage": "^24.0.0",
-    "@penumbra-zone/transport-chrome": "^8.0.0",
+    "@penumbra-zone/transport-chrome": "^8.0.1",
     "@penumbra-zone/transport-dom": "^7.5.0",
     "@penumbra-zone/types": "^19.0.0",
     "@penumbra-zone/wasm": "^24.0.0",

apps/extension/public/manifest.json

@@ -17,11 +17,7 @@
   "content_scripts": [
     {
       "matches": ["https://*/*"],
-      "js": [
-        "injected-connection-port.js",
-        "injected-disconnect-listener.js",
-        "injected-request-listener.js"
-      ],
+      "js": ["injected-connection-port.js", "injected-request-listener.js"],
       "run_at": "document_start"
     },
     {

apps/extension/src/content-scripts/injected-connection-port.ts

@@ -2,43 +2,36 @@ import { CRSessionClient } from '@penumbra-zone/transport-chrome/session-client'
 import { PraxConnection } from '../message/prax';
 import { PraxMessage } from './message-event';
 
-// this script will init the page session upon instruction from an extension
-// worker. init does not arrive in direct response to an emitted message, it is
-// independent.
-
-// handler to listen for init command for this document
-const initOnce = (
-  req: unknown,
-  // content script message handlers are activated only by another
-  // script in the same extension using chrome.tabs.sendMessage
-  sender: chrome.runtime.MessageSender,
-  // this handler will only ever send an empty response
-  respond: (no?: never) => void,
-) => {
-  if (req !== PraxConnection.Init) {
-    // boolean return in handlers signals intent to respond
+const end = { [PRAX]: PraxConnection.End } satisfies PraxMessage<PraxConnection.End>;
+
+let port: MessagePort | undefined;
+
+chrome.runtime.onMessage.addListener(
+  (req: unknown, sender: chrome.runtime.MessageSender, respond: (no?: never) => void) => {
+    if (typeof req === 'string' && req in PraxConnection) {
+      if (sender.id !== PRAX) {
+        throw new Error(`Unexpected sender ${sender.id}`);
+      }
+      switch (req as PraxConnection) {
+        case PraxConnection.Init: {
+          port ??= CRSessionClient.init(PRAX);
+          window.postMessage({ [PRAX]: port } satisfies PraxMessage<MessagePort>, '/', [port]);
+          respond();
+          return true;
+        }
+        case PraxConnection.End: {
+          port = undefined;
+          window.postMessage(end, '/');
+          respond();
+          return true;
+        }
+        default:
+          return false;
+      }
+    }
     return false;
-  }
-
-  chrome.runtime.onMessage.removeListener(initOnce);
-
-  if (sender.id !== PRAX) {
-    throw new Error(`Unexpected sender ${sender.id}`);
-  }
-
-  // create session, post port to window where the injected global can catch it.
-  const port = CRSessionClient.init(PRAX);
-  window.postMessage({ [PRAX]: port } satisfies PraxMessage<MessagePort>, '/', [port]);
-
-  // handler is done
-  respond();
-
-  // boolean return in handlers signals intent to respond
-  return true;
-};
-
-// attach handler
-chrome.runtime.onMessage.addListener(initOnce);
+  },
+);
 
 // announce
 void chrome.runtime.sendMessage(PraxConnection.Init);