@ocap/mcrypto 1.28.5 → 1.28.7

package/README.md

@@ -11,7 +11,7 @@
 ```shell
 npm i @ocap/mcrypto -S
 # OR
-pnpm install @ocap/mcrypto
+bun install @ocap/mcrypto
 ```
 
 ### Sign/Verify

package/esm/crypter/aes-legacy.mjs

@@ -1,10 +1,10 @@
 import crypter_default from "../protocols/crypter.mjs";
-import * as AES from "crypto-js/aes.js";
+import AES from "crypto-js/aes.js";
+import encBase64 from "crypto-js/enc-base64.js";
+import encHex from "crypto-js/enc-hex.js";
 import encLatin1 from "crypto-js/enc-latin1.js";
 import encUtf8 from "crypto-js/enc-utf8.js";
 import encUtf16 from "crypto-js/enc-utf16.js";
-import encBase64 from "crypto-js/enc-base64.js";
-import encHex from "crypto-js/enc-hex.js";
 
 //#region src/crypter/aes-legacy.ts
 const encoders = {

package/esm/crypter/aes.mjs

@@ -2,7 +2,7 @@ import { encode } from "../encode.mjs";
 import sha3_default from "../hasher/sha3.mjs";
 import crypter_default from "../protocols/crypter.mjs";
 import { toBuffer } from "@ocap/util";
-import crypto from "crypto";
+import crypto from "node:crypto";
 
 //#region src/crypter/aes.ts
 var AesCrypter = class extends crypter_default {

package/esm/crypter/rsa.d.mts

@@ -1,6 +1,6 @@
 import _default$1 from "../protocols/crypter.mjs";
 import { BytesType, EncodingType } from "@ocap/util";
-import crypto from "crypto";
+import crypto from "node:crypto";
 
 //#region src/crypter/rsa.d.ts
 declare class RSACrypter extends _default$1 {

package/esm/crypter/rsa.mjs

@@ -1,7 +1,7 @@
 import { encode } from "../encode.mjs";
 import crypter_default from "../protocols/crypter.mjs";
 import { toBuffer } from "@ocap/util";
-import crypto from "crypto";
+import crypto from "node:crypto";
 
 //#region src/crypter/rsa.ts
 var RSACrypter = class extends crypter_default {

package/esm/hasher/keccak.mjs

@@ -26,7 +26,7 @@ var KeccakHasher = class {
 				let input = data;
 				try {
 					input = toUint8Array(data);
-				} catch (err) {}
+				} catch (_err) {}
 				return encode(`0x${hashFn(input, round)}`, encoding);
 			};
 		});

package/esm/hasher/sha2.mjs

@@ -29,7 +29,7 @@ var Sha2Hasher = class {
 				let inputBytes = input;
 				try {
 					inputBytes = toUint8Array(input);
-				} catch (err) {}
+				} catch (_err) {}
 				if (round === 1) return `0x${hasher().update(inputBytes).digest("hex")}`;
 				return hashFn(hashFn(inputBytes, 1), round - 1);
 			};

package/esm/hasher/sha3.mjs

@@ -26,7 +26,7 @@ var Sha3Hasher = class {
 				let input = data;
 				try {
 					input = toUint8Array(data);
-				} catch (err) {}
+				} catch (_err) {}
 				return encode(`0x${hashFn(input, round)}`, encoding);
 			};
 		});

package/esm/signer/ed25519.d.mts

@@ -9,7 +9,6 @@ import { BytesType, EncodingType, KeyPairType } from "@ocap/util";
  * @class Ed25519Signer
  */
 declare class Ed25519Signer extends _default$1 {
-  constructor();
   /**
    * @public
    * @typedefKeyPairType

package/esm/signer/ed25519.mjs

@@ -12,9 +12,6 @@ const ed25519 = tweetnacl.sign;
 * @class Ed25519Signer
 */
 var Ed25519Signer = class extends signer_default {
-	constructor() {
-		super();
-	}
 	/**
 	* @public
 	* @typedefKeyPairType

package/esm/signer/passkey.d.mts

@@ -11,10 +11,9 @@ import { BytesType, EncodingType, KeyPairType } from "@ocap/util";
  * @class PasskeySigner
  */
 declare class PasskeySigner extends _default$1 {
-  constructor();
-  genKeyPair(encoding?: EncodingType, userSeed?: BytesType): KeyPairType;
-  getPublicKey(sk: BytesType, encoding?: EncodingType): BytesType;
-  sign(message: BytesType, sk: BytesType, encoding?: EncodingType): BytesType;
+  genKeyPair(_encoding?: EncodingType, _userSeed?: BytesType): KeyPairType;
+  getPublicKey(_sk: BytesType, _encoding?: EncodingType): BytesType;
+  sign(_message: BytesType, _sk: BytesType, _encoding?: EncodingType): BytesType;
   /**
    * Verify if a signature is valid
    *

package/esm/signer/passkey.mjs

@@ -11,16 +11,13 @@ import { decodeClientDataJSON, isoBase64URL, isoUint8Array, toHash, verifySignat
 * @class PasskeySigner
 */
 var PasskeySigner = class extends signer_default {
-	constructor() {
-		super();
-	}
-	genKeyPair(encoding = "hex", userSeed) {
+	genKeyPair(_encoding = "hex", _userSeed) {
 		throw new Error("Not supported");
 	}
-	getPublicKey(sk, encoding = "hex") {
+	getPublicKey(_sk, _encoding = "hex") {
 		throw new Error("Not supported");
 	}
-	sign(message, sk, encoding = "hex") {
+	sign(_message, _sk, _encoding = "hex") {
 		throw new Error("Not supported");
 	}
 	/**

package/esm/signer/secp256k1.mjs

@@ -60,7 +60,7 @@ var Secp256k1Signer = class extends signer_default {
 		let msg = message;
 		try {
 			msg = toUint8Array(message);
-		} catch (err) {}
+		} catch (_err) {}
 		return encode(`0x${secp256k1.keyFromPrivate(toBuffer(sk)).sign(stripHexPrefix(msg), { canonical: true }).toDER("hex")}`, encoding);
 	}
 	/**
@@ -70,7 +70,7 @@ var Secp256k1Signer = class extends signer_default {
 		let msg = message;
 		try {
 			msg = toUint8Array(message);
-		} catch (err) {}
+		} catch (_err) {}
 		let pkBuffer = toBuffer(pk);
 		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Buffer.from([4]), pkBuffer]);
 		return secp256k1.keyFromPublic(pkBuffer).verify(stripHexPrefix(msg), stripHexPrefix(toHex(signature)));

package/lib/crypter/aes-legacy.cjs

@@ -3,16 +3,16 @@ const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
 const require_protocols_crypter = require('../protocols/crypter.cjs');
 let crypto_js_aes = require("crypto-js/aes");
 crypto_js_aes = require_rolldown_runtime.__toESM(crypto_js_aes);
+let crypto_js_enc_base64 = require("crypto-js/enc-base64");
+crypto_js_enc_base64 = require_rolldown_runtime.__toESM(crypto_js_enc_base64);
+let crypto_js_enc_hex = require("crypto-js/enc-hex");
+crypto_js_enc_hex = require_rolldown_runtime.__toESM(crypto_js_enc_hex);
 let crypto_js_enc_latin1 = require("crypto-js/enc-latin1");
 crypto_js_enc_latin1 = require_rolldown_runtime.__toESM(crypto_js_enc_latin1);
 let crypto_js_enc_utf8 = require("crypto-js/enc-utf8");
 crypto_js_enc_utf8 = require_rolldown_runtime.__toESM(crypto_js_enc_utf8);
 let crypto_js_enc_utf16 = require("crypto-js/enc-utf16");
 crypto_js_enc_utf16 = require_rolldown_runtime.__toESM(crypto_js_enc_utf16);
-let crypto_js_enc_base64 = require("crypto-js/enc-base64");
-crypto_js_enc_base64 = require_rolldown_runtime.__toESM(crypto_js_enc_base64);
-let crypto_js_enc_hex = require("crypto-js/enc-hex");
-crypto_js_enc_hex = require_rolldown_runtime.__toESM(crypto_js_enc_hex);
 
 //#region src/crypter/aes-legacy.ts
 const encoders = {
@@ -25,10 +25,10 @@ const encoders = {
 var AesCrypter = class extends require_protocols_crypter.default {
 	encrypt(message, secret) {
 		const text = typeof message === "string" ? message : JSON.stringify(message);
-		return crypto_js_aes.encrypt(text, secret).toString();
+		return crypto_js_aes.default.encrypt(text, secret).toString();
 	}
 	decrypt(cipher, secret, outputEncoding = "utf8") {
-		return crypto_js_aes.decrypt(cipher, secret).toString(encoders[outputEncoding]);
+		return crypto_js_aes.default.decrypt(cipher, secret).toString(encoders[outputEncoding]);
 	}
 };
 var aes_legacy_default = new AesCrypter();

package/lib/crypter/aes.cjs

@@ -4,21 +4,21 @@ const require_encode = require('../encode.cjs');
 const require_hasher_sha3 = require('../hasher/sha3.cjs');
 const require_protocols_crypter = require('../protocols/crypter.cjs');
 let _ocap_util = require("@ocap/util");
-let crypto = require("crypto");
-crypto = require_rolldown_runtime.__toESM(crypto);
+let node_crypto = require("node:crypto");
+node_crypto = require_rolldown_runtime.__toESM(node_crypto);
 
 //#region src/crypter/aes.ts
 var AesCrypter = class extends require_protocols_crypter.default {
 	encrypt(message, secret, encoding = "hex") {
 		const key = require_hasher_sha3.default.hash256(secret, 1, "buffer");
-		const cipher = crypto.default.createCipheriv("aes-256-ecb", key, "");
+		const cipher = node_crypto.default.createCipheriv("aes-256-ecb", key, "");
 		cipher.setAutoPadding(true);
 		const output = cipher.update((0, _ocap_util.toBuffer)(message));
 		return require_encode.encode(Buffer.concat([output, cipher.final()]), encoding);
 	}
 	decrypt(message, secret, encoding = "hex") {
 		const key = require_hasher_sha3.default.hash256(secret, 1, "buffer");
-		const decipher = crypto.default.createDecipheriv("aes-256-ecb", key, "");
+		const decipher = node_crypto.default.createDecipheriv("aes-256-ecb", key, "");
 		decipher.setAutoPadding(true);
 		const output = decipher.update((0, _ocap_util.toBuffer)(message));
 		return require_encode.encode(Buffer.concat([output, decipher.final()]), encoding);

package/lib/crypter/rsa.cjs

@@ -3,13 +3,13 @@ const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
 const require_encode = require('../encode.cjs');
 const require_protocols_crypter = require('../protocols/crypter.cjs');
 let _ocap_util = require("@ocap/util");
-let crypto = require("crypto");
-crypto = require_rolldown_runtime.__toESM(crypto);
+let node_crypto = require("node:crypto");
+node_crypto = require_rolldown_runtime.__toESM(node_crypto);
 
 //#region src/crypter/rsa.ts
 var RSACrypter = class extends require_protocols_crypter.default {
 	genKeyPair(length = 2048) {
-		return crypto.default.generateKeyPairSync("rsa", {
+		return node_crypto.default.generateKeyPairSync("rsa", {
 			modulusLength: length,
 			publicKeyEncoding: {
 				type: "spki",
@@ -22,10 +22,10 @@ var RSACrypter = class extends require_protocols_crypter.default {
 		});
 	}
 	encrypt(message, key, encoding = "hex") {
-		return require_encode.encode(crypto.default.publicEncrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
+		return require_encode.encode(node_crypto.default.publicEncrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
 	}
 	decrypt(message, key, encoding = "hex") {
-		return require_encode.encode(crypto.default.privateDecrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
+		return require_encode.encode(node_crypto.default.privateDecrypt(key, (0, _ocap_util.toBuffer)(message)), encoding);
 	}
 };
 var rsa_default = new RSACrypter();

package/lib/crypter/rsa.d.cts

@@ -1,6 +1,6 @@
 import _default$1 from "../protocols/crypter.cjs";
 import { BytesType, EncodingType } from "@ocap/util";
-import crypto from "crypto";
+import crypto from "node:crypto";
 
 //#region src/crypter/rsa.d.ts
 declare class RSACrypter extends _default$1 {

package/lib/hasher/keccak.cjs

@@ -29,7 +29,7 @@ var KeccakHasher = class {
 				let input = data;
 				try {
 					input = (0, _ocap_util.toUint8Array)(data);
-				} catch (err) {}
+				} catch (_err) {}
 				return require_encode.encode(`0x${hashFn(input, round)}`, encoding);
 			};
 		});

package/lib/hasher/sha2.cjs

@@ -30,7 +30,7 @@ var Sha2Hasher = class {
 				let inputBytes = input;
 				try {
 					inputBytes = (0, _ocap_util.toUint8Array)(input);
-				} catch (err) {}
+				} catch (_err) {}
 				if (round === 1) return `0x${hasher().update(inputBytes).digest("hex")}`;
 				return hashFn(hashFn(inputBytes, 1), round - 1);
 			};

package/lib/hasher/sha3.cjs

@@ -29,7 +29,7 @@ var Sha3Hasher = class {
 				let input = data;
 				try {
 					input = (0, _ocap_util.toUint8Array)(data);
-				} catch (err) {}
+				} catch (_err) {}
 				return require_encode.encode(`0x${hashFn(input, round)}`, encoding);
 			};
 		});

package/lib/signer/ed25519.cjs

@@ -16,9 +16,6 @@ const ed25519 = tweetnacl.default.sign;
 * @class Ed25519Signer
 */
 var Ed25519Signer = class extends require_protocols_signer.default {
-	constructor() {
-		super();
-	}
 	/**
 	* @public
 	* @typedefKeyPairType

package/lib/signer/ed25519.d.cts

@@ -9,7 +9,6 @@ import { BytesType, EncodingType, KeyPairType } from "@ocap/util";
  * @class Ed25519Signer
  */
 declare class Ed25519Signer extends _default$1 {
-  constructor();
   /**
    * @public
    * @typedefKeyPairType

package/lib/signer/passkey.cjs

@@ -13,16 +13,13 @@ let _simplewebauthn_server_helpers = require("@simplewebauthn/server/helpers");
 * @class PasskeySigner
 */
 var PasskeySigner = class extends require_protocols_signer.default {
-	constructor() {
-		super();
-	}
-	genKeyPair(encoding = "hex", userSeed) {
+	genKeyPair(_encoding = "hex", _userSeed) {
 		throw new Error("Not supported");
 	}
-	getPublicKey(sk, encoding = "hex") {
+	getPublicKey(_sk, _encoding = "hex") {
 		throw new Error("Not supported");
 	}
-	sign(message, sk, encoding = "hex") {
+	sign(_message, _sk, _encoding = "hex") {
 		throw new Error("Not supported");
 	}
 	/**

package/lib/signer/passkey.d.cts

@@ -11,10 +11,9 @@ import { BytesType, EncodingType, KeyPairType } from "@ocap/util";
  * @class PasskeySigner
  */
 declare class PasskeySigner extends _default$1 {
-  constructor();
-  genKeyPair(encoding?: EncodingType, userSeed?: BytesType): KeyPairType;
-  getPublicKey(sk: BytesType, encoding?: EncodingType): BytesType;
-  sign(message: BytesType, sk: BytesType, encoding?: EncodingType): BytesType;
+  genKeyPair(_encoding?: EncodingType, _userSeed?: BytesType): KeyPairType;
+  getPublicKey(_sk: BytesType, _encoding?: EncodingType): BytesType;
+  sign(_message: BytesType, _sk: BytesType, _encoding?: EncodingType): BytesType;
   /**
    * Verify if a signature is valid
    *

package/lib/signer/secp256k1.cjs

@@ -64,7 +64,7 @@ var Secp256k1Signer = class extends require_protocols_signer.default {
 		let msg = message;
 		try {
 			msg = (0, _ocap_util.toUint8Array)(message);
-		} catch (err) {}
+		} catch (_err) {}
 		return require_encode.encode(`0x${secp256k1.keyFromPrivate((0, _ocap_util.toBuffer)(sk)).sign((0, _ocap_util.stripHexPrefix)(msg), { canonical: true }).toDER("hex")}`, encoding);
 	}
 	/**
@@ -74,7 +74,7 @@ var Secp256k1Signer = class extends require_protocols_signer.default {
 		let msg = message;
 		try {
 			msg = (0, _ocap_util.toUint8Array)(message);
-		} catch (err) {}
+		} catch (_err) {}
 		let pkBuffer = (0, _ocap_util.toBuffer)(pk);
 		if (this.pkHasFormatPrefix === false && pkBuffer[0] !== 4 && pkBuffer.byteLength === 64) pkBuffer = Buffer.concat([Buffer.from([4]), pkBuffer]);
 		return secp256k1.keyFromPublic(pkBuffer).verify((0, _ocap_util.stripHexPrefix)(msg), (0, _ocap_util.stripHexPrefix)((0, _ocap_util.toHex)(signature)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/mcrypto",
-  "version": "1.28.5",
+  "version": "1.28.7",
   "type": "module",
   "description": "Crypto lib that provides signer,crypter,hasher interface",
   "keywords": [
@@ -48,27 +48,33 @@
     "esm"
   ],
   "devDependencies": {
-    "@arcblock/eslint-config-ts": "0.3.3",
+    "@ocap/e2e-test": "1.28.7",
     "@types/crypto-js": "^4.2.2",
     "@types/elliptic": "^6.4.18",
     "@types/node": "^22.7.5",
     "@types/randombytes": "^2.0.3",
-    "eslint": "^8.57.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.2.5",
     "tsdown": "^0.18.4",
     "type-fest": "^3.1.0",
-    "typescript": "^5.6.2",
-    "@ocap/e2e-test": "1.28.5"
+    "typescript": "^5.6.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ArcBlock/blockchain.git"
   },
+  "scripts": {
+    "lint": "biome check",
+    "lint:fix": "biome check --write",
+    "prepush": "CI=1 npm run test",
+    "test": "bun test",
+    "coverage": "npm run test -- --coverage",
+    "build": "tsdown",
+    "build:watch": "tsdown -w"
+  },
   "bugs": {
     "url": "https://github.com/ArcBlock/blockchain/issues"
   },
   "dependencies": {
+    "@ocap/util": "1.28.7",
     "@simplewebauthn/server": "^13.0.0",
     "bn.js": "5.2.2",
     "crypto-js": "^4.2.0",
@@ -78,20 +84,10 @@
     "interface": "^1.2.1",
     "js-sha3": "^0.8.0",
     "randombytes": "^2.1.0",
-    "tweetnacl": "^1.0.3",
-    "@ocap/util": "1.28.5"
+    "tweetnacl": "^1.0.3"
   },
   "resolutions": {
     "bn.js": "5.2.2",
     "elliptic": "6.5.3"
-  },
-  "scripts": {
-    "lint": "eslint src tests",
-    "lint:fix": "npm run lint -- --fix",
-    "prepush": "CI=1 npm run test",
-    "test": "jest --forceExit --detectOpenHandles",
-    "coverage": "npm run test -- --coverage",
-    "build": "tsdown",
-    "build:watch": "tsdown -w"
   }
-}
+}