Get default porter uris from github links

nucypher · Jul 25, 2024 · 23d7146 · 23d7146
1 parent f0027ab
commit 23d7146
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 11 deletions.
diff --git a/examples/pre/nextjs/src/app/page.tsx b/examples/pre/nextjs/src/app/page.tsx
@@ -109,7 +109,7 @@ function App() {
       provider,
       provider.getSigner(),
       domains.TESTNET,
-      getPorterUri(domains.TESTNET),
+      await getPorterUri(domains.TESTNET),
       policyParams,
     );
 

diff --git a/examples/pre/nodejs/src/index.ts b/examples/pre/nodejs/src/index.ts
@@ -73,7 +73,7 @@ const runExample = async () => {
     provider,
     signer,
     domains.TESTNET,
-    getPorterUri(domains.TESTNET),
+    await getPorterUri(domains.TESTNET),
     policyParams,
   );
 

diff --git a/examples/pre/react/src/App.tsx b/examples/pre/react/src/App.tsx
@@ -105,7 +105,7 @@ function App() {
       provider,
       provider.getSigner(),
       domains.TESTNET,
-      getPorterUri(domains.TESTNET),
+      await getPorterUri(domains.TESTNET),
       policyParams,
     );
 

diff --git a/examples/pre/webpack-5/src/index.ts b/examples/pre/webpack-5/src/index.ts
@@ -82,7 +82,7 @@ const runExample = async () => {
     provider,
     provider.getSigner(),
     domains.TESTNET,
-    getPorterUri(domains.TESTNET),
+    await getPorterUri(domains.TESTNET),
     policyParams,
   );
 

diff --git a/examples/taco/webpack-5/src/index.ts b/examples/taco/webpack-5/src/index.ts
@@ -5,7 +5,6 @@ import {
   EIP4361AuthProvider,
   encrypt,
   fromBytes,
-  getPorterUris,
   initialize,
   toBytes,
 } from '@nucypher/taco';

diff --git a/packages/shared/src/porter.ts b/packages/shared/src/porter.ts
@@ -23,6 +23,12 @@ const defaultPorterUri: Record<string, string> = {
   lynx: 'https://porter-lynx.nucypher.community',
 };
 
+const porterUriSource: Record<string, string> = {
+  mainnet: 'https://raw.githubusercontent.com/nucypher/nucypher-porter/main/pytest.ini',
+  tapir: 'https://raw.githubusercontent.com/nucypher/nucypher-porter/main/pytest.ini',
+  lynx: 'https://raw.githubusercontent.com/nucypher/nucypher-porter/main/pytest.ini',
+};
+
 export type Domain = keyof typeof defaultPorterUri;
 
 export const domains: Record<string, Domain> = {
@@ -31,20 +37,37 @@ export const domains: Record<string, Domain> = {
   MAINNET: 'mainnet',
 };
 
-export const getPorterUri = (domain: Domain): string => {
-  return getPorterUris(domain)[0];
+export const getPorterUri = async (domain: Domain): Promise<string> => {
+  return (await getPorterUris(domain))[0];
 };
 
-export const getPorterUris = (domain: Domain, porterUris: string[] = []): string[] => {
+export const getPorterUris = async (domain: Domain, porterUris: string[] = []): Promise<string[]> => {
   const fullList = [...porterUris];
   const uri = defaultPorterUri[domain];
   if (!uri) {
     throw new Error(`No default Porter URI found for domain: ${domain}`);
   }
   fullList.push(uri);
+  const urisFromSource = await getPorterUrisFromSource(domain);
+  fullList.push(...urisFromSource);
   return fullList;
 };
 
+export const getPorterUrisFromSource = async (domain: Domain): Promise<string[]> => {
+  const source = porterUriSource[domain];
+  if (!source) {
+    return [];
+  }
+  try {
+    const resp = await axios.get(source, {
+      responseType: 'blob',
+    });
+    return resp.data.split(/\r?\n/).filter(Boolean);
+  } catch (e) {
+    return [];
+  }
+};
+
 // /get_ursulas
 
 export type Ursula = {

diff --git a/packages/shared/test/porter.test.ts b/packages/shared/test/porter.test.ts
@@ -4,6 +4,9 @@ import {
   PorterClient,
   toHexString,
   Ursula,
+  getPorterUrisFromSource,
+  getPorterUris,
+  domains
 } from '../src';
 import { fakeUrsulas } from '@nucypher/test-utils';
 import { beforeAll, describe, expect, SpyInstance, it, vi } from 'vitest';
@@ -41,6 +44,23 @@ const mockGetUrsulas = (
   });
 };
 
+describe('getPorterUris', () => {
+  beforeAll(async () => {
+    await initialize();
+  });
+
+  it('Get URIs from source', async () => {
+    for (const domain of Object.values(domains)) {
+      const uris = await getPorterUrisFromSource(domain);
+      expect(uris.length).toBeGreaterThan(0);
+      const fullList = await getPorterUris(domain);
+      expect(fullList).toEqual(
+        expect.arrayContaining(uris)
+      );
+    }
+  });
+});
+
 describe('PorterClient', () => {
   beforeAll(async () => {
     await initialize();

diff --git a/packages/taco/README.md b/packages/taco/README.md
@@ -60,7 +60,7 @@ const decryptedMessage = await decrypt(
   web3Provider,
   domains.TESTNET,
   messageKit,
-  getPorterUri(domains.TESTNET),
+  await getPorterUri(domains.TESTNET),
   web3Provider.getSigner(),
 );
 ```

diff --git a/packages/taco/src/taco.ts b/packages/taco/src/taco.ts
@@ -130,7 +130,7 @@ export const encryptWithPublicKey = async (
  * Must match the `ritualId`.
  * @param {ThresholdMessageKit} messageKit - The kit containing the message to be decrypted
  * @param authProvider - The authentication provider that will be used to provide the authorization
- * @param {string} [porterUri] - The URI(s) for the Porter service. If not provided, a value will be obtained
+ * @param {string[]} [porterUri] - The URI(s) for the Porter service. If not provided, a value will be obtained
  * from the Domain
  * @param {Record<string, CustomContextParam>} [customParameters] - Optional custom parameters that may be required
  * depending on the condition used
@@ -148,7 +148,7 @@ export const decrypt = async (
   porterUris: string[] = [],
   customParameters?: Record<string, CustomContextParam>,
 ): Promise<Uint8Array> => {
-  const porterUrisFull: string[] = getPorterUris(domain, porterUris);
+  const porterUrisFull: string[] = await getPorterUris(domain, porterUris);
 
   const ritualId = await DkgCoordinatorAgent.getRitualIdFromPublicKey(
     provider,