Big restructure

packages/crypto/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@tensamin/crypto",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "exports": {
+    "./context": "./src/context.tsx",
+    "./worker": "./src/worker.ts"
+  },
+  "scripts": {
+    "format": "bunx prettier --write .",
+    "lint": "eslint src",
+    "build": "tsc -p tsconfig.json --noEmit"
+  },
+  "dependencies": {
+    "@noble/curves": "^2.0.1",
+    "@tensamin/ui": "workspace:*",
+    "comlink": "^4.4.2",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0"
+  }
+}

packages/crypto/src/context.tsx

@@ -0,0 +1,103 @@
+import * as React from "react";
+import * as Comlink from "comlink";
+import Loading from "@tensamin/ui/screens/loading";
+
+export const context = React.createContext<contextType | undefined>(undefined);
+
+export default function Provider(props: { children: React.ReactNode }) {
+  const apiRef = React.useRef<ApiRef | null>(null);
+  const [isWorkerReady, setIsWorkerReady] = React.useState(false);
+
+  const { encrypt, decrypt, get_shared_secret } = React.useMemo(
+    () => createCryptoActions(() => apiRef.current),
+    [],
+  );
+
+  React.useEffect(() => {
+    const worker = new Worker(new URL("./worker.ts", import.meta.url), {
+      type: "module",
+    });
+
+    apiRef.current = Comlink.wrap(worker);
+    setIsWorkerReady(true);
+
+    return () => {
+      apiRef.current = null;
+      worker.terminate();
+      setIsWorkerReady(false);
+    };
+  }, []);
+
+  if (!isWorkerReady) {
+    return <Loading progress={10} />;
+  }
+
+  return (
+    <context.Provider value={{ encrypt, decrypt, get_shared_secret }}>
+      {props.children}
+    </context.Provider>
+  );
+}
+
+type contextType = {
+  decrypt: (secret: string, data: string) => Promise<string>;
+  encrypt: (secret: string, data: string) => Promise<string>;
+  get_shared_secret: (
+    ownPrivateKey: string,
+    ownPublicKey: string,
+    otherPublicKey: string,
+  ) => Promise<string>;
+};
+
+type ApiRef = {
+  encrypt: (secret: string, message: string) => Promise<string>;
+  decrypt: (secret: string, encryptedMessage: string) => Promise<string>;
+  get_shared_secret: (
+    own_private_key: string,
+    own_public_key: string,
+    other_public_key: string,
+  ) => Promise<string>;
+};
+
+export function createCryptoActions(
+  getApiRef: () => ApiRef | null,
+): contextType {
+  const encrypt = async (secret: string, message: string): Promise<string> => {
+    const apiRef = getApiRef();
+    if (!apiRef) throw new Error("API not initialized");
+    return await apiRef.encrypt(secret, message);
+  };
+
+  const decrypt = async (
+    secret: string,
+    encryptedMessage: string,
+  ): Promise<string> => {
+    const apiRef = getApiRef();
+    if (!apiRef) throw new Error("API not initialized");
+    return await apiRef.decrypt(secret, encryptedMessage);
+  };
+
+  const get_shared_secret = async (
+    own_private_key: string,
+    own_public_key: string,
+    other_public_key: string,
+  ): Promise<string> => {
+    const apiRef = getApiRef();
+    if (!apiRef) throw new Error("API not initialized");
+    return await apiRef.get_shared_secret(
+      own_private_key,
+      own_public_key,
+      other_public_key,
+    );
+  };
+
+  return { encrypt, decrypt, get_shared_secret };
+}
+
+export function useCrypto(): contextType {
+  const ctx = React.useContext(context);
+  if (!ctx) {
+    throw new Error("useCrypto must be used within a CryptoProvider");
+  }
+  return ctx;
+}

packages/crypto/src/worker.ts

@@ -0,0 +1,364 @@
+import * as Comlink from "comlink";
+
+type Base64URLString = string;
+
+type JWK = {
+  kty: string;
+  crv: string;
+  x?: string;
+  d?: string;
+};
+
+const textEncoder = new TextEncoder();
+const crypto = globalThis.crypto;
+
+export async function encrypt(
+  password: string,
+  input: string,
+): Promise<string> {
+  const sharedSecret = new Uint8Array(
+    password.match(/.{1,2}/g)!.map((byte) => parseInt(byte, 16)),
+  );
+
+  const hkdfKey = await crypto.subtle.importKey(
+    "raw",
+    sharedSecret,
+    "HKDF",
+    false,
+    ["deriveBits"],
+  );
+
+  const okm = await crypto.subtle.deriveBits(
+    {
+      name: "HKDF",
+      hash: "SHA-256",
+      salt: new Uint8Array([]),
+      info: textEncoder.encode("x448-aes-gcm-no-overhead"),
+    },
+    hkdfKey,
+    44 * 8,
+  );
+
+  const okmBytes = new Uint8Array(okm);
+  const keyBytes = okmBytes.slice(0, 32);
+  const nonce = okmBytes.slice(32, 44);
+
+  const aesKey = await crypto.subtle.importKey(
+    "raw",
+    keyBytes,
+    { name: "AES-GCM" },
+    false,
+    ["encrypt"],
+  );
+
+  const encryptedBuffer = await crypto.subtle.encrypt(
+    { name: "AES-GCM", iv: nonce },
+    aesKey,
+    textEncoder.encode(input),
+  );
+
+  return btoa(String.fromCharCode(...new Uint8Array(encryptedBuffer)));
+}
+
+export async function decrypt(
+  password: string,
+  input: Base64URLString | string,
+): Promise<string> {
+  const sharedSecret = new Uint8Array(
+    password.match(/.{1,2}/g)!.map((byte) => parseInt(byte, 16)),
+  );
+
+  const ciphertext = Uint8Array.from(atob(input), (c) => c.charCodeAt(0));
+
+  const hkdfKey = await crypto.subtle.importKey(
+    "raw",
+    sharedSecret,
+    "HKDF",
+    false,
+    ["deriveBits"],
+  );
+
+  const okm = await crypto.subtle.deriveBits(
+    {
+      name: "HKDF",
+      hash: "SHA-256",
+      salt: new Uint8Array([]),
+      info: textEncoder.encode("x448-aes-gcm-no-overhead"),
+    },
+    hkdfKey,
+    44 * 8,
+  );
+
+  const okmBytes = new Uint8Array(okm);
+  const keyBytes = okmBytes.slice(0, 32);
+  const nonce = okmBytes.slice(32, 44);
+
+  const aesKey = await crypto.subtle.importKey(
+    "raw",
+    keyBytes,
+    { name: "AES-GCM" },
+    false,
+    ["decrypt"],
+  );
+
+  const decryptedBuffer = await crypto.subtle.decrypt(
+    {
+      name: "AES-GCM",
+      iv: nonce,
+    },
+    aesKey,
+    ciphertext,
+  );
+
+  return new TextDecoder().decode(decryptedBuffer);
+}
+
+export async function get_shared_secret(
+  own_private_key: string,
+  own_public_key: string,
+  other_public_key: string,
+): Promise<string> {
+  const other_jwk: JWK = { kty: "OKP", crv: "X448", x: other_public_key };
+  const own_jwk: JWK = {
+    kty: "OKP",
+    crv: "X448",
+    x: own_public_key,
+    d: own_private_key,
+  };
+
+  const bytesToHex = (u8: Uint8Array): string =>
+    Array.from(u8, (b) => b.toString(16).padStart(2, "0")).join("");
+
+  const b64ToBytes = (s: Base64URLString): Uint8Array => {
+    const bin = atob(s);
+    const out = new Uint8Array(bin.length);
+    for (let i = 0; i < bin.length; i++) out[i] = bin.charCodeAt(i);
+    return out;
+  };
+
+  const b64uToBytes = (s: Base64URLString): Uint8Array => {
+    const b64 =
+      s.replace(/-/g, "+").replace(/_/g, "/") + "===".slice((s.length + 3) % 4);
+    return b64ToBytes(b64);
+  };
+
+  const bytesToB64u = (u8: Uint8Array): string => {
+    const b64 = btoa(String.fromCharCode(...u8));
+    return b64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+  };
+
+  const decodeBase64Auto = (s: string): Uint8Array =>
+    /[-_]/.test(s) ? b64uToBytes(s) : b64ToBytes(s);
+
+  const readTLV = (view: Uint8Array, off: number) => {
+    const tag = view[off++];
+    if (off >= view.length) throw new Error("DER: truncated");
+    let len = view[off++];
+    if (len & 0x80) {
+      const n = len & 0x7f;
+      if (n === 0) throw new Error("DER: indefinite length not supported");
+      if (off + n > view.length) throw new Error("DER: truncated length");
+      len = 0;
+      for (let i = 0; i < n; i++) len = (len << 8) | view[off++];
+    }
+    const start = off;
+    const end = off + len;
+    if (end > view.length) throw new Error("DER: content truncated");
+    return { tag, len, start, end };
+  };
+
+  const ensureOidX448 = (view: Uint8Array, start: number): boolean => {
+    const oid = readTLV(view, start);
+    if (oid.tag !== 0x06) return false;
+    const len = oid.end - oid.start;
+    if (len !== 3) return false;
+    return (
+      view[oid.start] === 0x2b &&
+      view[oid.start + 1] === 0x65 &&
+      view[oid.start + 2] === 0x6f
+    );
+  };
+
+  const extractRawX448FromSPKI = (spkiBytes: Uint8Array): Uint8Array => {
+    const view = spkiBytes;
+    const outer = readTLV(view, 0);
+    if (outer.tag !== 0x30) throw new Error("SPKI: expected SEQUENCE");
+    const alg = readTLV(view, outer.start);
+    if (alg.tag !== 0x30) throw new Error("SPKI: expected AlgorithmIdentifier");
+    if (!ensureOidX448(view, alg.start)) throw new Error("SPKI: not X448");
+    const bitstr = readTLV(view, alg.end);
+    if (bitstr.tag !== 0x03) throw new Error("SPKI: expected BIT STRING");
+    const unusedBits = view[bitstr.start];
+    if (unusedBits !== 0x00) throw new Error("SPKI: unexpected unused bits");
+    const raw = view.subarray(bitstr.start + 1, bitstr.end);
+    if (raw.length !== 56)
+      throw new Error("SPKI: X448 public key must be 56 bytes");
+    return raw;
+  };
+
+  const extractRawX448FromPKCS8 = (pkcs8Bytes: Uint8Array): Uint8Array => {
+    const view = pkcs8Bytes;
+    const outer = readTLV(view, 0);
+    if (outer.tag !== 0x30) throw new Error("PKCS8: expected SEQUENCE");
+    let off = outer.start;
+
+    const version = readTLV(view, off);
+    if (version.tag !== 0x02)
+      throw new Error("PKCS8: expected version INTEGER");
+    off = version.end;
+
+    const alg = readTLV(view, off);
+    if (alg.tag !== 0x30)
+      throw new Error("PKCS8: expected AlgorithmIdentifier");
+    if (!ensureOidX448(view, alg.start)) throw new Error("PKCS8: not X448");
+    off = alg.end;
+
+    const priv = readTLV(view, off);
+    if (priv.tag !== 0x04)
+      throw new Error("PKCS8: expected privateKey OCTET STRING");
+    let raw = view.subarray(priv.start, priv.end);
+
+    // Some encoders nest another OCTET STRING inside
+    if (raw[0] === 0x04) {
+      const inner = readTLV(raw, 0);
+      if (inner.tag === 0x04) {
+        raw = raw.subarray(inner.start, inner.end);
+      }
+    }
+    if (raw.length !== 56)
+      throw new Error("PKCS8: X448 private key must be 56 bytes");
+    return raw;
+  };
+
+  const normalizeOkpX448Jwk = (jwk: JWK, label: string): JWK => {
+    if (!jwk || jwk.kty !== "OKP" || jwk.crv !== "X448") {
+      throw new Error(`${label}: expected OKP JWK with crv "X448"`);
+    }
+    const out = { ...jwk };
+
+    if (out.x) {
+      const xBytes = decodeBase64Auto(out.x);
+      let rawX: Uint8Array;
+      try {
+        rawX = extractRawX448FromSPKI(xBytes);
+      } catch {
+        if (xBytes.length !== 56) {
+          throw new Error(
+            `${label}: "x" is not a valid X448 SPKI or raw 56-byte key`,
+          );
+        }
+        rawX = xBytes;
+      }
+      out.x = bytesToB64u(rawX);
+    }
+
+    if (out.d) {
+      const dBytes = decodeBase64Auto(out.d);
+      let rawD: Uint8Array;
+      try {
+        rawD = extractRawX448FromPKCS8(dBytes);
+      } catch {
+        if (dBytes.length !== 56) {
+          throw new Error(
+            `${label}: "d" is not a valid X448 PKCS#8 or raw 56-byte key`,
+          );
+        }
+        rawD = dBytes;
+      }
+      out.d = bytesToB64u(rawD);
+    }
+
+    return out;
+  };
+
+  const getSubtle = () => globalThis.crypto?.subtle;
+
+  {
+    /*
+    const hkdfAesGcmFromShared = async (
+      sharedSecret: BufferSource,
+      infoStr: string
+    ): Promise<CryptoKey> => {
+      const subtle = getSubtle();
+      if (!subtle) throw new Error("WebCrypto subtle not available");
+      const info = textEncoder.encode(infoStr);
+      const baseKey = await subtle.importKey(
+        "raw",
+        sharedSecret,
+        "HKDF",
+        false,
+        ["deriveKey"]
+      );
+      return await subtle.deriveKey(
+        {
+          name: "HKDF",
+          hash: "SHA-256",
+          salt: new Uint8Array(0),
+          info,
+        },
+        baseKey,
+        { name: "AES-GCM", length: 256 },
+        false,
+        ["encrypt", "decrypt"]
+      );
+    };
+    */
+  }
+
+  const myJwk: JWK = normalizeOkpX448Jwk(own_jwk, "own_jwk");
+  const peerJwk: JWK = normalizeOkpX448Jwk(other_jwk, "other_jwk");
+
+  const subtle = getSubtle();
+  //const infoStr = `ECDH-X448-AES-GCM-v1|my=${myJwk.x}|peer=${peerJwk.x}`;
+
+  if (subtle) {
+    const algorithms = [{ name: "ECDH", namedCurve: "X448" }, { name: "X448" }];
+
+    for (const algorithm of algorithms) {
+      try {
+        const [myPriv, peerPub] = await Promise.all([
+          subtle.importKey("jwk", myJwk, algorithm, false, ["deriveBits"]),
+          subtle.importKey("jwk", peerJwk, algorithm, false, []),
+        ]);
+
+        const sharedBits = await subtle.deriveBits(
+          { name: algorithm.name, public: peerPub },
+          myPriv,
+          448,
+        );
+
+        const sharedSecret = new Uint8Array(sharedBits);
+        //const aeadKey = await hkdfAesGcmFromShared(sharedSecret, infoStr);
+
+        return bytesToHex(sharedSecret);
+      } catch {
+        // Browser doesn't support this algorithm, try next or fall through to software fallback
+      }
+    }
+  }
+
+  const { d: dMyB64u } = myJwk;
+  //const { x: xMyB64u, d: dMyB64u } = myJwk;
+  const { x: xPeerB64u } = peerJwk;
+
+  if (!dMyB64u || !xPeerB64u) {
+    return "Failed to get shared secret due to missing keys";
+  }
+
+  const [dRaw, xRawPeer] = [b64uToBytes(dMyB64u), b64uToBytes(xPeerB64u)];
+  if (dRaw.length !== 56 || xRawPeer.length !== 56) {
+    return "Failed to get shared secret due to invalid key lengths";
+  }
+
+  const { x448 } = await import("@noble/curves/ed448.js");
+  const sharedSecret = new Uint8Array(x448.getSharedSecret(dRaw, xRawPeer));
+  //const aeadKey = await hkdfAesGcmFromShared(sharedSecret, infoStr);
+
+  return bytesToHex(sharedSecret);
+}
+
+Comlink.expose({
+  encrypt,
+  decrypt,
+  get_shared_secret,
+});

packages/crypto/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "skipLibCheck": true,
+    "noEmit": true
+  },
+  "include": ["src"]
+}