From 3955ff2c292379ba473ed341a8d00a51fb54d839 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Sat, 1 Apr 2023 12:51:11 -0400
Subject: [PATCH] *Create getCID helper and have all api calls use it

---
 src/index.ts | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index c32a914..643edfc 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -238,7 +238,10 @@ async function handleStat(aq: ActiveQuery) {
     aq.respond(
       JSON.parse(
         JSON.stringify(
-          await fs.stat(aq.callerInput.cid, aq.callerInput.options ?? {})
+          await fs.stat(
+            getCID(aq.callerInput.cid),
+            aq.callerInput.options ?? {}
+          )
         )
       )
     );
@@ -260,7 +263,10 @@ async function handleLs(aq: ActiveQuery) {
     aborted = true;
   });
 
-  const iterable = fs.ls(aq.callerInput.cid, aq.callerInput.options ?? {});
+  const iterable = fs.ls(
+    getCID(aq.callerInput.cid),
+    aq.callerInput.options ?? {}
+  );
 
   for await (const item of iterable) {
     if (aborted) {
@@ -286,7 +292,10 @@ async function handleCat(aq: ActiveQuery) {
     aborted = true;
   });
 
-  const iterable = fs.cat(aq.callerInput.cid, aq.callerInput.options ?? {});
+  const iterable = fs.cat(
+    getCID(aq.callerInput.cid),
+    aq.callerInput.options ?? {}
+  );
 
   for await (const chunk of iterable) {
     if (aborted) {
@@ -315,20 +324,13 @@ async function handleIpnsResolve(aq: ActiveQuery) {
     return;
   }
 
-  const prefix = substr(aq.callerInput.cid, 0, 1);
-
-  if (!(prefix in basesByPrefix)) {
-    aq.reject("invalid multibase found in CID");
-    return;
-  }
-
-  const base = basesByPrefix[prefix];
-  const cid = CID.parse(aq.callerInput.cid, base);
-
   try {
     return aq.respond(
       (
-        await IPNS.resolve(peerIdFromCID(cid), aq.callerInput?.options)
+        await IPNS.resolve(
+          peerIdFromCID(getCID(aq.callerInput.cid)),
+          aq.callerInput?.options
+        )
       ).asCID.toString()
     );
   } catch (e: any) {
@@ -336,6 +338,17 @@ async function handleIpnsResolve(aq: ActiveQuery) {
   }
 }
 
+function getCID(cid: string): CID {
+  const prefix = substr(cid, 0, 1);
+
+  if (!(prefix in basesByPrefix)) {
+    throw new Error("invalid multibase found in CID");
+  }
+
+  const base = basesByPrefix[prefix];
+  return CID.parse(cid, base);
+}
+
 async function handleGetActivePeers(aq: ActiveQuery) {
   await ready();