Parse DAG-JSON CIDs (#496)

* Try parsing legacy skeleton CID

* Improve comment

* Write test for DAG-JSON cid

* Bump version

* Update changelog

* Improve CID test

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### V0.36.3
+
+Now parses DAG-JSON formatted CIDs.
+
 ### v0.36.2
 
 Allow symlinks to other file systems to be created.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webnative",
-  "version": "0.36.2",
+  "version": "0.36.3",
   "description": "Webnative SDK",
   "keywords": [
     "WebCrypto",

src/common/cid.node.test.ts

@@ -0,0 +1,14 @@
+import expect from "expect"
+import { decodeCID } from "./cid.js"
+
+
+describe("CIDs", () => {
+
+  it("decodes DAG-JSON cids", () => {
+    const CID_STRING = "bafkreicu646jao2xjpkbmk3buom6hmxsexmbwyju22k6wmtnky2ljisv3e"
+    const cidInstance = decodeCID({ "/": CID_STRING })
+
+    expect(cidInstance.toString()).toEqual(CID_STRING)
+  })
+
+})

src/common/cid.ts

@@ -30,6 +30,7 @@ export function decodeCID(val: CID | object | string): CID {
     return CID.create(val.version, val.code, val.multihash)
   }
 
+  // Older version of the above
   if (
     typeof val === "object" &&
     hasProp(val, "version") &&
@@ -43,6 +44,17 @@ export function decodeCID(val: CID | object | string): CID {
     return CID.create(val.version as Version, val.code, multihash)
   }
 
+  // Sometimes we can encounter a DAG-JSON encoded CID
+  // https://github.com/fission-codes/webnative/issues/459
+  // Related to the `ensureSkeletonStringCIDs` function in the `PrivateTree` class
+  if (
+    typeof val === "object" &&
+    hasProp(val, "/") &&
+    typeof val[ "/" ] === "string"
+  ) {
+    return CID.parse(val[ "/" ])
+  }
+
   // Unrecognisable CID
   throw new Error(`Could not decode CID: ${JSON.stringify(val)}`)
 }

src/common/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = "0.36.2"
+export const VERSION = "0.36.3"
 export const WASM_WNFS_VERSION = "0.1.7"