cleanup

penumbra-zone · Jul 15, 2024 · 87d69ef · 87d69ef
1 parent 47067e0
commit 87d69ef
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 43 deletions.
diff --git a/apps/minifront/src/prax.ts b/apps/minifront/src/prax.ts
@@ -1,22 +1,19 @@
 import { createPromiseClient, PromiseClient, Transport } from '@connectrpc/connect';
+import { getPenumbraManifest } from '@penumbra-zone/client';
 import {
+  assertProvider,
   assertProviderConnected,
   assertProviderManifest,
-  getPenumbraPort,
-  syncCreatePenumbraChannelTransport,
-} from '@penumbra-zone/client/create';
+} from '@penumbra-zone/client/assert';
+import { createPenumbraChannelTransportSync } from '@penumbra-zone/client/create';
 import { jsonOptions, PenumbraService } from '@penumbra-zone/protobuf';
 
 const prax_id = 'lkpmkhpnhknhmibgnmmhdhgdilepfghe';
 const prax_origin = `chrome-extension://${prax_id}`;
 
 export const getPraxOrigin = () => prax_origin;
 
-export const getPraxManifest = async () => {
-  const { manifest } = await assertProviderManifest(prax_origin);
-  const requestManifest = await fetch(manifest);
-  return (await requestManifest.json()) as unknown;
-};
+export const getPraxManifest = () => getPenumbraManifest(prax_origin);
 
 export const isPraxConnected = () => {
   try {
@@ -29,7 +26,7 @@ export const isPraxConnected = () => {
 
 export const isPraxInstalled = async () => {
   try {
-    await assertProviderManifest();
+    await assertProviderManifest(prax_origin);
     return true;
   } catch {
     return false;
@@ -40,16 +37,10 @@ export const throwIfPraxNotConnected = () => assertProviderConnected(prax_origin
 
 export const throwIfPraxNotInstalled = async () => assertProviderManifest(prax_origin);
 
-export const getPraxPort = () => getPenumbraPort(prax_origin);
-
-export const requestPraxAccess = () => getPraxPort();
-
-export const praxTransportOptions = {
-  jsonOptions,
-  getPort: getPraxPort,
-};
+export const requestPraxAccess = () => assertProvider(prax_origin).then(p => p.request());
 
-export const createPraxTransport = () => syncCreatePenumbraChannelTransport(prax_origin);
+export const createPraxTransport = () =>
+  createPenumbraChannelTransportSync(prax_origin, { jsonOptions });
 
 let praxTransport: Transport | undefined;
 export const createPraxClient = <T extends PenumbraService>(service: T): PromiseClient<T> =>

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -12,11 +12,11 @@ declare global {
 }
 
 /** Synchronously return the specified provider, without verifying anything. */
-export const getPenumbraProviderUnsafe = (penumbraOrigin: string) =>
+export const getPenumbraUnsafe = (penumbraOrigin: string) =>
   window[PenumbraSymbol]?.[penumbraOrigin];
 
 /** Return the specified provider after confirming presence of its manifest. */
-export const getPenumbraProvider = (penumbraOrigin: string) => assertProvider(penumbraOrigin);
+export const getPenumbra = (penumbraOrigin: string) => assertProvider(penumbraOrigin);
 
 /** Return the specified provider's manifest. */
 export const getPenumbraManifest = async (
@@ -41,6 +41,7 @@ export const getAllPenumbraManifests = (): Record<
     ]),
   );
 
+export * from './error.js';
 export type { PenumbraManifest } from './manifest.js';
 export type { PenumbraProvider } from './provider.js';
 export { PenumbraState } from './state.js';

diff --git a/packages/react/eslint.config.mjs b/packages/react/eslint.config.mjs
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -8,7 +8,9 @@
     "build": "tsc --build --verbose",
     "clean": "rm -rfv dist *.tsbuildinfo package penumbra-zone-*.tgz",
     "dev:pack": "tsc-watch --onSuccess \"$npm_execpath pack\"",
-    "lint": "eslint src"
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
+    "lint:strict": "tsc --noEmit && eslint src --max-warnings 0"
   },
   "files": [
     "dist"

diff --git a/packages/react/src/components/penumbra-context-provider.tsx b/packages/react/src/components/penumbra-context-provider.tsx
@@ -1,14 +1,14 @@
 import { getPenumbraManifest, PenumbraProvider, PenumbraState } from '@penumbra-zone/client';
+import { assertProviderRecord } from '@penumbra-zone/client/assert';
 import { isPenumbraStateEvent } from '@penumbra-zone/client/event';
-import { useCallback, useEffect, useMemo, useState, type ReactNode } from 'react';
-import { PenumbraContext, penumbraContext } from '../penumbra-context.js';
 import { PenumbraManifest } from '@penumbra-zone/client/manifest';
+import { jsonOptions } from '@penumbra-zone/protobuf';
 import {
   ChannelTransportOptions,
   createChannelTransport,
 } from '@penumbra-zone/transport-dom/create';
-import { jsonOptions } from '@penumbra-zone/protobuf';
-import { assertProviderRecord } from '@penumbra-zone/client/assert';
+import { useCallback, useEffect, useMemo, useState, type ReactNode } from 'react';
+import { PenumbraContext, penumbraContext } from '../penumbra-context.js';
 
 type PenumbraContextProviderProps = {
   children?: ReactNode;
@@ -66,7 +66,7 @@ export const PenumbraContextProvider = ({
       .catch(setFailure);
 
     return () => ac.abort();
-  }, [providerOrigin, penumbra, providerManifest, setProviderManifest]);
+  }, [failure, penumbra, providerManifest, providerOrigin, setFailure, setProviderManifest]);
 
   // attach state event listener
   useEffect(() => {
@@ -94,7 +94,7 @@ export const PenumbraContextProvider = ({
       { signal: ac.signal },
     );
     return () => ac.abort();
-  }, [penumbra, penumbra.addEventListener, providerManifest, failure]);
+  }, [failure, penumbra, penumbra.addEventListener, providerManifest, providerOrigin, setFailure]);
 
   // request effect
   useEffect(() => {
@@ -110,7 +110,15 @@ export const PenumbraContextProvider = ({
           break;
       }
     }
-  }, [makeApprovalRequest, providerState, penumbra.request, providerManifest, failure]);
+  }, [
+    failure,
+    makeApprovalRequest,
+    penumbra,
+    penumbra.request,
+    providerManifest,
+    providerState,
+    setFailure,
+  ]);
 
   // connect effect
   useEffect(() => {
@@ -135,7 +143,15 @@ export const PenumbraContextProvider = ({
           break;
       }
     }
-  }, [makeApprovalRequest, providerState, penumbra.connect, providerManifest, failure]);
+  }, [
+    failure,
+    makeApprovalRequest,
+    penumbra,
+    penumbra.connect,
+    providerManifest,
+    providerState,
+    setFailure,
+  ]);
 
   const createdContext: PenumbraContext = useMemo(
     () => ({
@@ -170,9 +186,12 @@ export const PenumbraContextProvider = ({
     }),
     [
       failure,
-      penumbra.connect,
+      penumbra.addEventListener,
       penumbra.connect,
       penumbra.disconnect,
+      penumbra.removeEventListener,
+      penumbra.request,
+      providerConnected,
       providerManifest,
       providerOrigin,
       providerPort,