Ucan-core refactor

package.json

@@ -5,83 +5,15 @@
   "author": "Daniel Holmgren <[email protected]>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/fission-suite/ucan"
+    "url": "https://github.com/ucan-wg/ts-ucan"
   },
   "homepage": "https://guide.fission.codes",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=15"
   },
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "yarn run dist",
-    "dev": "tsc --watch --module commonjs --outDir ./dist/cjs/ --sourceMap",
-    "dist": "yarn run dist:prep && yarn run dist:src && yarn run dist:cjs && yarn run dist:esm && yarn run dist:types && yarn run dist:pkg",
-    "dist:cjs": "tsc --project ./dist/ --module commonjs --outDir ./dist/cjs/ --sourceMap",
-    "dist:esm": "tsc --project ./dist/ --module es2020 --outDir ./dist/esm/ --sourceMap",
-    "dist:pkg": "node ./scripts/package.js",
-    "dist:prep": "copyfiles --error tsconfig.json ./dist/",
-    "dist:src": "copyfiles --error --up 1 \"./src/**/*\" ./dist/src/",
-    "dist:types": "tsc --project ./dist/ --emitDeclarationOnly --declaration --declarationDir ./dist/types/",
-    "lint": "eslint src/**/*.ts src/*.ts tests/**/*.ts tests/*.ts",
-    "prepare": "yarn build",
-    "publish-alpha": "yarn publish --tag alpha",
-    "publish-stable": "yarn publish --tag latest",
-    "test": "jest",
-    "test:watch": "jest --watch"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "types": "./dist/types/index.d.ts"
-    },
-    "./*.js": {
-      "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js",
-      "types": "./dist/types/*.d.ts"
-    },
-    "./*": {
-      "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js",
-      "types": "./dist/types/*.d.ts"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "index.d.ts": [
-        "dist/types/index.d.ts"
-      ],
-      "*": [
-        "dist/types/*"
-      ]
-    }
-  },
-  "files": [
-    "dist",
-    "docs",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
-  "dependencies": {
-    "@stablelib/ed25519": "^1.0.2",
-    "big-integer": "^1.6.51",
-    "one-webcrypto": "^1.0.3",
-    "uint8arrays": "^3.0.0"
-  },
-  "devDependencies": {
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.23",
-    "@typescript-eslint/eslint-plugin": "^5.18.0",
-    "@typescript-eslint/parser": "^5.18.0",
-    "copyfiles": "^2.4.1",
-    "eslint": "^8.12.0",
-    "fast-check": "^2.24.0",
-    "jest": "^27.5.1",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.3",
-    "yarn": "^1.22.18"
-  }
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ]
 }

packages/core/package.json

@@ -0,0 +1,85 @@
+{
+  "name": "@ucans/core",
+  "version": "0.9.1",
+  "description": "Core UCAN implementation",
+  "author": "Daniel Holmgren <[email protected]>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ucan-wg/ts-ucan"
+  },
+  "homepage": "https://guide.fission.codes",
+  "license": "Apache-2.0",
+  "engines": {
+    "node": ">=15"
+  },
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "yarn run dist",
+    "dev": "tsc --watch --module commonjs --outDir ./dist/cjs/ --sourceMap",
+    "dist": "yarn run dist:prep && yarn run dist:src && yarn run dist:cjs && yarn run dist:esm && yarn run dist:types && yarn run dist:pkg",
+    "dist:cjs": "tsc --project ./dist/ --module commonjs --outDir ./dist/cjs/ --sourceMap",
+    "dist:esm": "tsc --project ./dist/ --module es2020 --outDir ./dist/esm/ --sourceMap",
+    "dist:pkg": "node ../../scripts/package.js",
+    "dist:prep": "copyfiles --error ../../tsconfig.json ./dist/",
+    "dist:src": "copyfiles --error --up 1 \"./src/**/*\" ./dist/src/",
+    "dist:types": "tsc --project ./dist/ --emitDeclarationOnly --declaration --declarationDir ./dist/types/",
+    "lint": "eslint src/**/*.ts src/*.ts tests/**/*.ts tests/*.ts",
+    "prepare": "yarn build",
+    "publish-alpha": "yarn publish --tag alpha",
+    "publish-stable": "yarn publish --tag latest",
+    "test": "jest",
+    "test:watch": "jest --watch"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./dist/types/index.d.ts"
+    },
+    "./*.js": {
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js",
+      "types": "./dist/types/*.d.ts"
+    },
+    "./*": {
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js",
+      "types": "./dist/types/*.d.ts"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "index.d.ts": [
+        "dist/types/index.d.ts"
+      ],
+      "*": [
+        "dist/types/*"
+      ]
+    }
+  },
+  "files": [
+    "dist",
+    "docs",
+    "CHANGELOG.md",
+    "LICENSE",
+    "README.md"
+  ],
+  "dependencies": {
+    "uint8arrays": "^3.0.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.23",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
+    "@ucans/plugins": "*",
+    "copyfiles": "^2.4.1",
+    "eslint": "^8.12.0",
+    "fast-check": "^2.24.0",
+    "jest": "^27.5.1",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.3",
+    "yarn": "^1.22.18"
+  }
+}

src/builder.ts → packages/core/src/builder.ts

@@ -1,15 +1,14 @@
 import * as token from "./token.js"
 import * as util from "./util.js"
 
-import { Keypair, Fact, UcanPayload, isKeypair, Ucan } from "./types.js"
+import { Keypair, Fact, UcanPayload, isKeypair, Ucan, Didable } from "./types.js"
 import { Capability, isCapability } from "./capability/index.js"
 import { capabilityCanBeDelegated, DelegationSemantics, DelegationChain } from "./attenuation.js"
 import { Store } from "./store.js"
-import { publicKeyBytesToDid } from "./did/transformers.js"
 
 
 export interface BuildableState {
-  issuer: Keypair
+  issuer: Keypair & Didable
   audience: string
   expiration: number
 }
@@ -85,7 +84,7 @@ export class Builder<State extends Partial<BuildableState>> {
    *
    * The UCAN must be signed with the private key of the issuer to be valid.
    */
-  issuedBy(issuer: Keypair): Builder<State & { issuer: Keypair }> {
+  issuedBy(issuer: Keypair & Didable): Builder<State & { issuer: Keypair & Didable }> {
     if (!isKeypair(issuer)) {
       throw new TypeError(`Expected a Keypair, but got ${issuer}`)
     }
@@ -231,7 +230,7 @@ export class Builder<State extends Partial<BuildableState>> {
       })
     } else {
       const store: Store = storeOrProof
-      const issuer = publicKeyBytesToDid(this.state.issuer.publicKey, this.state.issuer.keyType)
+      const issuer = this.state.issuer.did()
       // we look up a proof that has our issuer as an audience
       const result = util.first(store.findWithCapability(issuer, requiredCapability, issuer))
       if (result != null) {
@@ -259,7 +258,7 @@ export class Builder<State extends Partial<BuildableState>> {
       throw new Error(`Builder is missing one of the required properties before it can be built: issuer, audience and expiration.`)
     }
     return token.buildPayload({
-      issuer: publicKeyBytesToDid(this.state.issuer.publicKey, this.state.issuer.keyType),
+      issuer: this.state.issuer.did(),
       audience: this.state.audience,
 
       expiration: this.state.expiration,

packages/core/src/did.ts

@@ -0,0 +1,64 @@
+import * as uint8arrays from "uint8arrays"
+
+import * as plugins from "./plugins.js"
+// import * as compression from "./pubkey-compress.js"
+// import * as rsa from "../crypto/rsa.js"
+// import { BASE58_DID_PREFIX, RSA_DID_PREFIX_OLD, magicBytes, parseMagicBytes, hasPrefix } from "./prefix.js"
+import { Encodings } from "./types.js"
+
+
+// DID → PUBLIC KEY
+
+
+/**
+ * Convert a DID (did:key) to a base64 public key.
+ */
+export function didToPublicKey(did: string, encoding: Encodings = "base64pad"): {
+  publicKey: string
+  jwtAlg: string
+} {
+  const { publicKey, jwtAlg } = didToPublicKeyBytes(did)
+  return {
+    publicKey: uint8arrays.toString(publicKey, encoding),
+    jwtAlg
+  }
+}
+
+/**
+ * Convert a DID (did:key) to the public key into bytes in SubjectPublicKeyInfo (spki) format.
+ *
+ * For consumption e.g. in the WebCrypto API.
+ */
+export function didToPublicKeyBytes(did: string): {
+  publicKey: Uint8Array
+  jwtAlg: string
+} {
+  return plugins.didToPublicKeyBytes(did)
+}
+
+
+
+// PUBLIC KEY → DID
+
+
+/**
+ * Convert a base64 public key to a DID (did:key).
+ */
+export function publicKeyToDid(
+  publicKey: string,
+  jwtAlg: string,
+  encoding: Encodings = "base64pad"
+): string {
+  const pubKeyBytes = uint8arrays.fromString(publicKey, encoding)
+  return publicKeyBytesToDid(pubKeyBytes, jwtAlg)
+}
+
+/**
+ * Convert a public key in bytes to a DID (did:key).
+ */
+export function publicKeyBytesToDid(
+  publicKeyBytes: Uint8Array,
+  jwtAlg: string,
+): string {
+  return plugins.publicKeyBytesToDid(publicKeyBytes, jwtAlg)
+}

src/index.ts → packages/core/src/index.ts

@@ -1,14 +1,11 @@
 export * from "./attenuation.js"
 export * from "./builder.js"
-export * from "./did.js"
-export * from "./keypair/ed25519.js"
-export * from "./keypair/rsa.js"
 export * from "./store.js"
 export * from "./token.js"
 export * from "./types.js"
 export * from "./verify.js"
+export * from "./plugins.js"
 
-export * as keypair from "./keypair/index.js"
 export * as capability from "./capability/index.js"
 
 export { Capability, EncodedCapability, isCapability } from "./capability/index.js"