@vex-chat/crypto 1.0.11-rc.11 → 1.1.0-rc.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { decode as decodeBase64, encode as encodeBase64 } from "@stablelib/base64";
 import { decode as encodeUTF8, encode as decodeUTF8 } from "@stablelib/utf8";
-import { IBaseMsg } from "@vex-chat/types";
+import type { IBaseMsg } from "@vex-chat/types";
 import ed2curve from "ed2curve";
 /**
  * Provides an interface that can map an ed25519 keypair to its equivalent
@@ -24,7 +24,7 @@ export declare class XUtils {
      *
      * @returns True if equal, else false.
      */
-    static bytesEqual(buf1: ArrayBufferLike, buf2: ArrayBufferLike): boolean;
+    static bytesEqual(buf1: Uint8Array | ArrayBuffer, buf2: Uint8Array | ArrayBuffer): boolean;
     /**
      * Returns a six bit Uint8Array representation of an integer.
      * The integer must be positive, and it must be able to be stored

package/dist/index.js

@@ -1,77 +1,32 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.xConstants = exports.XUtils = exports.XKeyConvert = void 0;
-exports.xMnemonic = xMnemonic;
-exports.xHMAC = xHMAC;
-exports.xMakeNonce = xMakeNonce;
-exports.xKDF = xKDF;
-exports.xHash = xHash;
-exports.xDH = xDH;
-exports.xConcat = xConcat;
-exports.xEncode = xEncode;
-const base64_1 = require("@stablelib/base64");
-const utf8_1 = require("@stablelib/utf8");
-const bip39 = __importStar(require("bip39"));
-const node_crypto_1 = require("node:crypto");
-const ed2curve_1 = __importDefault(require("ed2curve"));
-const fs_1 = __importDefault(require("fs"));
-const node_crypto_2 = require("node:crypto");
-const msgpackr_1 = require("msgpackr");
-const tweetnacl_1 = __importDefault(require("tweetnacl"));
-const packer = new msgpackr_1.Packr({
-    useRecords: false,
-    moreTypes: true,
-});
+import { decode as decodeBase64, encode as encodeBase64, } from "@stablelib/base64";
+import { decode as encodeUTF8, encode as decodeUTF8 } from "@stablelib/utf8";
+import * as bip39 from "bip39";
+import { createHash, createHmac, pbkdf2Sync, randomBytes } from "node:crypto";
+import ed2curve from "ed2curve";
+import { writeFileSync, readFileSync } from "node:fs";
+import { hkdfSync } from "node:crypto";
+import { Packr } from "msgpackr";
+import nacl from "tweetnacl";
+// msgpackr with useRecords:false emits standard msgpack (no nonstandard record extension).
+// moreTypes:false keeps the extension set to only what other decoders understand.
+// pack() returns Node Buffer (tight view) so consumers like axios send the correct bytes.
+const packer = new Packr({ useRecords: false, moreTypes: false });
+const msgpackEncode = packer.pack.bind(packer);
+const msgpackDecode = packer.unpack.bind(packer);
 /**
  * Provides an interface that can map an ed25519 keypair to its equivalent
  * X25519 keypair.
  */
-exports.XKeyConvert = ed2curve_1.default;
+export const XKeyConvert = ed2curve;
 /**
  * Provides several methods that are useful in working with bytes and
  * vex messages.
  */
-class XUtils {
-    static encodeUTF8 = utf8_1.decode;
-    static decodeUTF8 = utf8_1.encode;
-    static encodeBase64 = base64_1.encode;
-    static decodeBase64 = base64_1.decode;
+export class XUtils {
+    static encodeUTF8 = encodeUTF8;
+    static decodeUTF8 = decodeUTF8;
+    static encodeBase64 = encodeBase64;
+    static decodeBase64 = decodeBase64;
     /**
      * Checks if two buffer-like objects are equal.
      *
@@ -81,13 +36,13 @@ class XUtils {
      * @returns True if equal, else false.
      */
     static bytesEqual(buf1, buf2) {
-        if (buf1.byteLength !== buf2.byteLength) {
+        const a = buf1 instanceof Uint8Array ? buf1 : new Uint8Array(buf1);
+        const b = buf2 instanceof Uint8Array ? buf2 : new Uint8Array(buf2);
+        if (a.byteLength !== b.byteLength) {
             return false;
         }
-        const dv1 = new Int8Array(buf1);
-        const dv2 = new Int8Array(buf2);
-        for (let i = 0; i !== buf1.byteLength; i++) {
-            if (dv1[i] !== dv2[i]) {
+        for (let i = 0; i !== a.byteLength; i++) {
+            if (a[i] !== b[i]) {
                 return false;
             }
         }
@@ -129,9 +84,8 @@ class XUtils {
      */
     static unpackMessage(msg) {
         const msgp = Uint8Array.from(msg);
-        const msgh = msgp.slice(0, exports.xConstants.HEADER_SIZE);
-        // UPDATED: Use msgpackr
-        const msgb = packer.unpack(msgp.slice(exports.xConstants.HEADER_SIZE));
+        const msgh = msgp.slice(0, xConstants.HEADER_SIZE);
+        const msgb = msgpackDecode(msgp.slice(xConstants.HEADER_SIZE));
         return [msgh, msgb];
     }
     /**
@@ -141,8 +95,7 @@ class XUtils {
      * @returns the packed message.
      */
     static packMessage(msg, header) {
-        // UPDATED: Use msgpackr
-        const msgb = packer.pack(msg);
+        const msgb = msgpackEncode(msg);
         const msgh = header || XUtils.emptyHeader();
         return xConcat(msgh, msgb);
     }
@@ -152,7 +105,7 @@ class XUtils {
      * @returns The empty header.
      */
     static emptyHeader() {
-        return new Uint8Array(exports.xConstants.HEADER_SIZE);
+        return new Uint8Array(xConstants.HEADER_SIZE);
     }
     /**
      * Encrypts a secret key with a password and saves it as a file.
@@ -167,15 +120,15 @@ class XUtils {
         const UNENCRYPTED_SIGNKEY = XUtils.decodeHex(keyToSave);
         const OFFSET = 1000;
         // generate random amount of iterations using Native Crypto
-        const rand = (0, node_crypto_1.randomBytes)(2);
+        const rand = randomBytes(2);
         const N1 = rand[0];
         const N2 = rand[1];
         const iterations = iterationOverride ? iterationOverride : N1 * N2 + OFFSET;
         const ITERATIONS = XUtils.numberToUint8Arr(iterations);
         const PKBDF_SALT = xMakeNonce();
-        const ENCRYPTION_KEY = (0, node_crypto_1.pbkdf2Sync)(password, PKBDF_SALT, iterations, 32, "sha512");
+        const ENCRYPTION_KEY = pbkdf2Sync(password, PKBDF_SALT, iterations, 32, "sha512");
         const NONCE = xMakeNonce();
-        const ENCRYPTED_SIGNKEY = tweetnacl_1.default.secretbox(UNENCRYPTED_SIGNKEY, NONCE, new Uint8Array(ENCRYPTION_KEY));
+        const ENCRYPTED_SIGNKEY = nacl.secretbox(UNENCRYPTED_SIGNKEY, NONCE, new Uint8Array(ENCRYPTION_KEY));
         const result = new Uint8Array(ITERATIONS.length +
             PKBDF_SALT.length +
             NONCE.length +
@@ -188,7 +141,7 @@ class XUtils {
         result.set(NONCE, offset);
         offset += NONCE.length;
         result.set(ENCRYPTED_SIGNKEY, offset);
-        fs_1.default.writeFileSync(path, result);
+        writeFileSync(path, result);
     };
     /**
      * Decrypts and returns a secret key stored in a file with saveKeyFile().
@@ -197,13 +150,13 @@ class XUtils {
      * @param password The password the file was encrypted with.
      */
     static loadKeyFile = (path, password) => {
-        const keyFile = Uint8Array.from(fs_1.default.readFileSync(path));
+        const keyFile = Uint8Array.from(readFileSync(path));
         const ITERATIONS = XUtils.uint8ArrToNumber(keyFile.slice(0, 6));
         const PKBDF_SALT = keyFile.slice(6, 30);
         const ENCRYPTION_NONCE = keyFile.slice(30, 54);
         const ENCRYPTED_KEY = keyFile.slice(54);
-        const DERIVED_KEY = (0, node_crypto_1.pbkdf2Sync)(password, PKBDF_SALT, ITERATIONS, 32, "sha512");
-        const DECRYPTED_SIGNKEY = tweetnacl_1.default.secretbox.open(ENCRYPTED_KEY, ENCRYPTION_NONCE, new Uint8Array(DERIVED_KEY));
+        const DERIVED_KEY = pbkdf2Sync(password, PKBDF_SALT, ITERATIONS, 32, "sha512");
+        const DECRYPTED_SIGNKEY = nacl.secretbox.open(ENCRYPTED_KEY, ENCRYPTION_NONCE, new Uint8Array(DERIVED_KEY));
         if (!DECRYPTED_SIGNKEY) {
             throw new Error("Decryption failed. Wrong password?");
         }
@@ -231,14 +184,13 @@ class XUtils {
         return bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, "0"), "");
     }
 }
-exports.XUtils = XUtils;
 /**
  * Gets a word list representation of a byte sequence.
  *
  * @param entropy The bytes to derive the wordlist from.
  * @param wordList Optional, override the wordlist. See bip39 docs for details.
  */
-function xMnemonic(entropy, wordList) {
+export function xMnemonic(entropy, wordList) {
     return bip39.entropyToMnemonic(Buffer.from(entropy), wordList);
 }
 /**
@@ -247,9 +199,9 @@ function xMnemonic(entropy, wordList) {
  * @param msg the message to create the HMAC of
  * @param SK the secret key to create the HMAC with
  */
-function xHMAC(msg, SK) {
-    const packedMsg = packer.pack(msg);
-    const hmacGen = (0, node_crypto_1.createHmac)("sha256", Buffer.from(SK));
+export function xHMAC(msg, SK) {
+    const packedMsg = msgpackEncode(msg);
+    const hmacGen = createHmac("sha256", Buffer.from(SK));
     hmacGen.update(packedMsg);
     const hmac = Uint8Array.from(hmacGen.digest());
     return hmac;
@@ -257,7 +209,7 @@ function xHMAC(msg, SK) {
 /**
  * Constants for vex.
  */
-exports.xConstants = {
+export const xConstants = {
     CURVE: "X25519",
     HASH: "SHA-512",
     KEY_LENGTH: 32,
@@ -268,8 +220,8 @@ exports.xConstants = {
 /**
  * Returns a 24 byte random nonce of cryptographic quality.
  */
-function xMakeNonce() {
-    return tweetnacl_1.default.randomBytes(24);
+export function xMakeNonce() {
+    return nacl.randomBytes(24);
 }
 /**
  * Derives a 32 byte secret key from some initial key material.
@@ -286,8 +238,8 @@ function xMakeNonce() {
 //         })
 //     );
 // }
-function xKDF(IKM) {
-    return new Uint8Array((0, node_crypto_2.hkdfSync)("sha512", IKM, xMakeSalt(exports.xConstants.CURVE), exports.xConstants.INFO, exports.xConstants.KEY_LENGTH));
+export function xKDF(IKM) {
+    return new Uint8Array(hkdfSync("sha512", IKM, xMakeSalt(xConstants.CURVE), xConstants.INFO, xConstants.KEY_LENGTH));
 }
 /**
  * Hashes some data.
@@ -295,8 +247,8 @@ function xKDF(IKM) {
  * @param data the data to hash.
  * @returns The hash of the data.
  */
-function xHash(data) {
-    const hash = (0, node_crypto_1.createHash)("sha512");
+export function xHash(data) {
+    const hash = createHash("sha512");
     return hash.update(data).digest("hex");
 }
 /**
@@ -307,15 +259,15 @@ function xHash(data) {
  * @param theirPublicKey Their public key
  * @returns The derived shared secret, SK.
  */
-function xDH(myPrivateKey, theirPublicKey) {
-    return tweetnacl_1.default.box.before(theirPublicKey, myPrivateKey);
+export function xDH(myPrivateKey, theirPublicKey) {
+    return nacl.box.before(theirPublicKey, myPrivateKey);
 }
 /**
  * Concatanates multiple Uint8Arrays.
  *
  * @param arrays As many Uint8Arrays as you would like to concatanate.
  */
-function xConcat(...arrays) {
+export function xConcat(...arrays) {
     const totalLength = arrays.reduce((acc, value) => acc + value.length, 0);
     if (!arrays.length) {
         return new Uint8Array();
@@ -336,7 +288,7 @@ function xConcat(...arrays) {
  * ittle-endian encoding of the u-coordinate. See [rfc 7748](https://www.ietf.org/rfc/rfc7748.txt) for more
  * details.
  */
-function xEncode(curveType, publicKey) {
+export function xEncode(curveType, publicKey) {
     if (publicKey.length !== 32) {
         throw new Error("Invalid key length, received key of length " +
             publicKey.length +

package/package.json

@@ -1,23 +1,34 @@
 {
   "name": "@vex-chat/crypto",
-  "version": "1.0.11-rc.11",
+  "version": "1.1.0-rc.1",
   "description": "Crypto primitives for Vex",
+  "type": "module",
+  "sideEffects": false,
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
   "author": "Extra <extrahash@protonmail.com>",
   "license": "AGPL-3.0-or-later",
   "scripts": {
     "build": "rimraf dist && tsc",
-    "prepack": "yarn build",
+    "prepack": "npm run build",
     "prettier": "prettier '**/*.{ts,tsx,json,md}' --ignore-path .gitignore --write",
     "lint": "eslint src/**/*.ts",
     "lint-fix": "eslint src/**/*.ts --fix",
-    "push": "yarn build && yalc push",
-    "prepublish": "yarn build",
-    "test": "npx jest --runInBand --forceExit"
+    "prepublish": "npm run build",
+    "test": "vitest run"
   },
   "peerDependencies": {
-    "typescript": ">=5.9.0"
+    "@vex-chat/types": "^1.0.0-rc.1",
+    "typescript": ">=5.9.0 || >=6.0.0"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -25,34 +36,29 @@
     }
   },
   "dependencies": {
-    "@stablelib/base64": "^1.0.1",
-    "@stablelib/utf8": "^1.0.1",
-    "@vex-chat/types": "1.0.0-rc.0",
+    "msgpackr": "1.11.8",
+    "@stablelib/base64": "^2.0.1",
+    "@stablelib/utf8": "^2.1.0",
     "bip39": "^3.1.0",
     "ed2curve": "^0.3.0",
-    "msgpackr": "^1.10.1",
-    "tweetnacl": "^1.0.3",
-    "uuid": "^9.0.0"
+    "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
     "@types/create-hmac": "^1.1.3",
     "@types/ed2curve": "^0.2.4",
-    "@types/jest": "^30.0.0",
-    "@types/lodash": "^4.17.21",
-    "@types/node": "^22.15.3",
+    "@types/node": "^24.12.2",
     "@typescript-eslint/eslint-plugin": "^8.57.1",
     "@typescript-eslint/parser": "^8.57.1",
+    "@vex-chat/types": "^1.0.0-rc.1",
     "eslint": "^10.1.0",
     "eslint-config-prettier": "^9.0.0",
     "husky": "^9.0.0",
-    "jest": "^30.3.0",
     "lint-staged": "^15.2.0",
-    "lodash": "^4.17.23",
     "prettier": "^3.2.0",
     "rimraf": "^6.1.3",
-    "ts-jest": "^29.4.6",
-    "typescript": "^5.9.0"
+    "typescript": "^6.0.2",
+    "vitest": "^3.0.0"
   },
   "lint-staged": {
     "src/**/*.{ts}": [
@@ -63,14 +69,12 @@
     "type": "git",
     "url": "git+https://github.com/vex-chat/libvex-js.git"
   },
-  "resolutions": {
-    "minimatch": "^9.0.7",
-    "flatted": "^3.4.2",
-    "ajv": "^6.14.0",
-    "lodash": "^4.17.21"
-  },
   "bugs": {
     "url": "https://github.com/vex-chat/libvex-js/issues"
   },
-  "homepage": "https://github.com/vex-chat/libvex-js#readme"
+  "homepage": "https://github.com/vex-chat/libvex-js#readme",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  }
 }

package/.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in the changesets repo](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

package/.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "public",
-  "baseBranch": "master",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}

package/.changeset/migrate-to-native-crypto.md

@@ -1,5 +0,0 @@
----
-"@vex-chat/crypto": major
----
-
-Migrate to msgpackr and native node:crypto, replacing msgpack-lite, create-hmac, sha.js, pbkdf2, and futoin-hkdf with built-in Node.js crypto primitives. Add release tooling with changesets, mise, and updated CI workflows.

package/.changeset/pre.json

@@ -1,10 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "rc",
-  "initialVersions": {
-    "@vex-chat/crypto": "0.8.0"
-  },
-  "changesets": [
-    "migrate-to-native-crypto"
-  ]
-}

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# @vex-chat/crypto
-
-## 1.0.0-rc.0
-
-### Major Changes
-
-- 19b36ca: Migrate to msgpackr and native node:crypto, replacing msgpack-lite, create-hmac, sha.js, pbkdf2, and futoin-hkdf with built-in Node.js crypto primitives. Add release tooling with changesets, mise, and updated CI workflows.

package/RELEASING.md

@@ -1,85 +0,0 @@
-# Releasing @vex-chat/crypto
-
-This repo uses [Changesets](https://github.com/changesets/changesets) for versioning and publishing.
-
-## Dependency Chain
-
-```
-@vex-chat/types
-  └─ @vex-chat/crypto    ← you are here
-      └─ @vex-chat/libvex
-          └─ vex-desktop
-```
-
-**Publish types first** if it has changes, then publish crypto.
-
-## Day-to-Day Workflow
-
-### 1. Work on a feature branch
-
-```bash
-git checkout -b my-feature
-# ... make changes ...
-```
-
-### 2. Add a changeset before pushing
-
-```bash
-npx changeset
-```
-
-This prompts you to:
-- Select the package (`@vex-chat/crypto`)
-- Choose bump type (patch / minor / major)
-- Write a short summary of the change
-
-It creates a file in `.changeset/` — commit it with your code.
-
-### 3. Push and open a PR
-
-```bash
-git add .
-git commit -m "my feature"
-git push -u origin my-feature
-```
-
-### 4. Merge to master
-
-After merge, the **Release** GitHub Action will:
-1. Detect pending changesets
-2. Open a **"chore: version packages"** PR with bumped version + updated CHANGELOG.md
-3. When you merge that PR, it publishes to npm automatically
-
-```
-
-## Release Candidates
-
-```bash
-npx changeset pre enter rc    # enter RC mode
-npx changeset version          # produces e.g. 0.9.0-rc.0
-npx changeset publish          # publishes with --tag rc
-
-# ... more changes + changesets ...
-npx changeset version          # produces 0.9.0-rc.1
-npx changeset publish
-
-# ready for stable:
-npx changeset pre exit
-npx changeset version          # produces 0.9.0
-npx changeset publish          # publishes as @latest
-```
-
-## GitHub Secrets Required
-
-- `NPM_TOKEN` — npm access token with publish permission for `@vex-chat` scope
-- `GITHUB_TOKEN` — provided automatically by GitHub Actions
-
-## Local Development
-
-You can still use `yalc` for local cross-repo development:
-
-```bash
-yarn push   # builds and pushes to yalc for local consumers
-```
-
-When publishing for real, changesets handles versioning — yalc is just for local dev loops.

package/jest.config.js

@@ -1,16 +0,0 @@
-module.exports = {
-  roots: ["<rootDir>/src"],
-  testMatch: [
-    "**/__tests__/**/*.+(ts|tsx|js)",
-    "**/?(*.)+(spec|test).+(ts|tsx|js)",
-  ],
-  transform: {
-    "^.+\\.(ts|tsx)$": [
-      "ts-jest",
-      {
-        diagnostics: false,
-        isolatedModules: true,
-      },
-    ],
-  },
-};

package/mise.toml

@@ -1,3 +0,0 @@
-[tools]
-node = "20"
-"npm:yarn" = "latest"

package/tsdoc.json

@@ -1,34 +0,0 @@
-{
-    "tags": {
-        "allowUnknownTags": true
-    },
-    "plugins": [
-        "plugins/markdown",
-        "/home/ender/.npm/_npx/229717/lib/node_modules/tsdoc/template/plugins/TSDoc.js"
-    ],
-    "opts": {
-        "template": "/home/ender/.npm/_npx/229717/lib/node_modules/tsdoc/template",
-        "recurse": "true"
-    },
-    "templates": {
-        "cleverLinks": false,
-        "monospaceLinks": false
-    },
-    "source": {
-        "includePattern": "(\\.d)?\\.ts$"
-    },
-    "markdown": {
-        "parser": "gfm",
-        "hardwrap": true
-    },
-    "tsdoc": {
-        "source": "/home/ender/code/crypto-js/src/",
-        "destination": "/home/ender/code/crypto-js/docs",
-        "tutorials": "",
-        "systemName": "crypto-js",
-        "footer": "",
-        "copyright": "crypto-js Copyright © 2020 ender.",
-        "outputSourceFiles": true,
-        "commentsOnly": true
-    }
-}