Merge pull request #1559 from polywrap/0.9-retries-in-ipfs-resolver

0.9 feat: add retries to ipfs resolver plugin

Author: dOrgJelli

packages/js/client-config-builder/src/bundles/default-client-config.ts

@@ -40,6 +40,12 @@ export const getDefaultClientConfig = (
           fallbackProviders: defaultIpfsProviders.slice(1),
         },
       },
+      {
+        uri: new Uri("wrap://ens/ipfs-resolver.polywrap.eth"),
+        env: {
+          retries: { tryResolveUri: 1, getFile: 1 },
+        },
+      },
     ],
     redirects: [
       {

packages/js/plugins/uri-resolvers/ipfs-resolver/src/index.ts

@@ -33,7 +33,8 @@ export class IpfsResolverPlugin extends Module<NoConfig> {
 
     let manifest: Bytes | undefined;
 
-    try {
+    let attempts = (this.env.retries?.tryResolveUri ?? 0) + 1;
+    while (attempts-- > 0) {
       const manifestResult = await Ipfs_Module.cat(
         {
           cid: `${args.path}/${manifestSearchPattern}`,
@@ -45,63 +46,35 @@ export class IpfsResolverPlugin extends Module<NoConfig> {
         _client
       );
 
-      if (manifestResult.ok) {
+      if (manifestResult.ok && manifestResult.value?.length) {
         manifest = Buffer.from(manifestResult.value);
+        return { uri: null, manifest };
       }
-    } catch (e) {
-      // TODO: logging
-      // https://github.com/polywrap/monorepo/issues/33
     }
 
-    return { uri: null, manifest: manifest ?? null };
+    return { uri: null, manifest: null };
   }
 
   public async getFile(
     args: Args_getFile,
     client: Client
   ): Promise<Bytes | null> {
-    try {
-      let provider: string | undefined = undefined;
-
-      if (!this.env.skipCheckIfExists) {
-        const resolveResult = await Ipfs_Module.resolve(
-          {
-            cid: args.path,
-            options: {
-              timeout: this.env.timeouts?.checkIfExists,
-              disableParallelRequests: this.env.disableParallelRequests,
-            },
-          },
-          client
-        );
-
-        if (!resolveResult.ok || !resolveResult.value) {
-          return null;
-        }
-
-        provider = resolveResult.value.provider;
-      }
-
+    let attempts = (this.env.retries?.getFile ?? 0) + 1;
+    while (attempts-- > 0) {
       const catResult = await Ipfs_Module.cat(
         {
           cid: args.path,
           options: {
-            provider: provider,
             timeout: this.env.timeouts?.getFile,
             disableParallelRequests: this.env.disableParallelRequests,
           },
         },
         client
       );
-
-      if (!catResult.ok) {
-        return null;
-      }
-
-      return catResult.value;
-    } catch (e) {
-      return null;
+      if (catResult.ok) return catResult.value;
     }
+
+    return null;
   }
 
   private static isCID(cid: string): boolean {

packages/js/plugins/uri-resolvers/ipfs-resolver/src/schema.graphql

@@ -7,11 +7,16 @@ type Timeouts {
   tryResolveUri: UInt32,
 }
 
+type Retries {
+    getFile: UInt32
+    tryResolveUri: UInt32
+}
+
 type Env {
     """
-    Determines whether the plugin should try to resolve a file (check for its existence) or immediately get the file
+    Re-attempt resolution on failure
     """
-    skipCheckIfExists: Boolean,
+    retries: Retries
     """
     Timeouts for methods
     """