@beclab/olaresid 0.1.5 → 0.1.7

package/src/index.ts

@@ -38,12 +38,7 @@ export {
 	getDIDFromMnemonic,
 	generateDIDKeyData,
 	deriveDIDFromMnemonic,
-	getEd25519JwkFromMnemonic,
-	// Cross-platform encoding utilities
-	base64ToUint8Array,
-	uint8ArrayToHex,
-	hexToUint8Array,
-	uint8ArrayToBase64
+	getEd25519JwkFromMnemonic
 } from './business';
 
 type Domain = PackageDomain.Domain;

package/src/utils/crypto-utils.ts

@@ -6,13 +6,13 @@
  * compatibility across the entire Olares ecosystem.
  */
 
+import * as bip39 from 'bip39';
 import * as varint from 'varint';
 import { base58btc } from 'multiformats/bases/base58';
 import { base64url } from 'multiformats/bases/base64';
 
 // Browser globals type declaration
 declare const window: any;
-declare const atob: (input: string) => string;
 declare const btoa: (input: string) => string;
 
 export interface RSAPublicKeyData {
@@ -26,61 +26,6 @@ export interface DIDKeyData {
 	mnemonic: string;
 }
 
-// ============================================================================
-// Cross-platform encoding utilities (Browser + Node.js compatible)
-// ============================================================================
-
-/**
- * Convert base64 string to Uint8Array (cross-platform)
- * Works in both browser and Node.js environments
- * @param base64 base64 encoded string
- * @returns Uint8Array
- */
-export function base64ToUint8Array(base64: string): Uint8Array {
-	const binaryString = atob(base64);
-	const bytes = new Uint8Array(binaryString.length);
-	for (let i = 0; i < binaryString.length; i++) {
-		bytes[i] = binaryString.charCodeAt(i);
-	}
-	return bytes;
-}
-
-/**
- * Convert Uint8Array to hex string (cross-platform)
- * @param bytes Uint8Array to convert
- * @returns hex string without '0x' prefix
- */
-export function uint8ArrayToHex(bytes: Uint8Array): string {
-	return Array.from(bytes)
-		.map((b) => b.toString(16).padStart(2, '0'))
-		.join('');
-}
-
-/**
- * Convert hex string to Uint8Array (cross-platform)
- * @param hex hex string (with or without '0x' prefix)
- * @returns Uint8Array
- */
-export function hexToUint8Array(hex: string): Uint8Array {
-	const cleanHex = hex.startsWith('0x') ? hex.slice(2) : hex;
-	const bytes = new Uint8Array(cleanHex.length / 2);
-	for (let i = 0; i < cleanHex.length; i += 2) {
-		bytes[i / 2] = parseInt(cleanHex.slice(i, i + 2), 16);
-	}
-	return bytes;
-}
-
-/**
- * Convert Uint8Array to base64 string (cross-platform)
- * Works in both browser and Node.js environments
- * @param bytes Uint8Array to convert
- * @returns base64 encoded string
- */
-export function uint8ArrayToBase64(bytes: Uint8Array): string {
-	const binaryString = String.fromCharCode(...bytes);
-	return btoa(binaryString);
-}
-
 // ============================================================================
 // Trust Wallet Core Management
 // ============================================================================
@@ -107,9 +52,19 @@ async function loadWalletCore(): Promise<any> {
 	// Start loading
 	loadingPromise = (async () => {
 		try {
-			// Dynamic import works in both Node.js ESM and browser ESM
-			const { initWasm } = await import('@trustwallet/wallet-core');
-			walletCore = await initWasm();
+			// Check if running in browser or Node.js
+			if (
+				typeof window !== 'undefined' &&
+				typeof require === 'undefined'
+			) {
+				// Browser environment with ES modules
+				const { initWasm } = await import('@trustwallet/wallet-core');
+				walletCore = await initWasm();
+			} else {
+				// Node.js environment
+				const { initWasm } = require('@trustwallet/wallet-core');
+				walletCore = await initWasm();
+			}
 
 			walletCoreLoaded = true;
 			return walletCore;
@@ -129,38 +84,23 @@ async function loadWalletCore(): Promise<any> {
 // multicodec code for Ed25519 keys (0xed)
 const ED25519_CODEC_ID = varint.encode(parseInt('0xed', 16));
 
-/**
- * Simple mnemonic validation (checks word count)
- * @param mnemonic BIP39 mnemonic phrase
- * @returns true if mnemonic has valid word count (12, 15, 18, 21, or 24 words)
- */
-function validateMnemonic(mnemonic: string): boolean {
-	const words = mnemonic.trim().split(/\s+/);
-	const validWordCounts = [12, 15, 18, 21, 24];
-	return validWordCounts.includes(words.length);
-}
-
 // ============================================================================
 // Mnemonic and Key Derivation Functions
 // ============================================================================
 
 /**
- * Generate a random BIP39 mnemonic phrase using Trust Wallet Core
- * Works in both Node.js and browser environments
- *
+ * Generate a random BIP39 mnemonic phrase
  * @param wordCount Number of words (12, 15, 18, 21, or 24), default is 12
- * @returns A promise that resolves to a mnemonic phrase string
+ * @returns A mnemonic phrase string
  *
  * @example
  * ```typescript
- * const mnemonic = await generateMnemonic(12);
+ * const mnemonic = generateMnemonic(12);
  * console.log(mnemonic);
  * // Output: "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
  * ```
  */
-export async function generateMnemonic(
-	wordCount: number = 12
-): Promise<string> {
+export function generateMnemonic(wordCount: number = 12): string {
 	// Convert word count to entropy bits
 	// 12 words = 128 bits, 15 words = 160 bits, etc.
 	const strengthMap: Record<number, number> = {
@@ -178,14 +118,7 @@ export async function generateMnemonic(
 		);
 	}
 
-	// Ensure Wallet Core is loaded
-	const core = await loadWalletCore();
-	const { HDWallet } = core;
-
-	const wallet = HDWallet.create(strength, '');
-	const mnemonic = wallet.mnemonic();
-
-	return mnemonic;
+	return bip39.generateMnemonic(strength);
 }
 
 /**
@@ -205,10 +138,8 @@ export async function getEthereumAddressFromMnemonic(
 	mnemonic: string
 ): Promise<string> {
 	// Validate mnemonic
-	if (!validateMnemonic(mnemonic)) {
-		throw new Error(
-			'Invalid mnemonic phrase: must have 12, 15, 18, 21, or 24 words'
-		);
+	if (!bip39.validateMnemonic(mnemonic)) {
+		throw new Error('Invalid mnemonic phrase');
 	}
 
 	const core = await loadWalletCore();
@@ -236,10 +167,8 @@ export async function getEVMPrivateKeyFromMnemonic(
 	mnemonic: string
 ): Promise<string> {
 	// Validate mnemonic
-	if (!validateMnemonic(mnemonic)) {
-		throw new Error(
-			'Invalid mnemonic phrase: must have 12, 15, 18, 21, or 24 words'
-		);
+	if (!bip39.validateMnemonic(mnemonic)) {
+		throw new Error('Invalid mnemonic phrase');
 	}
 
 	const core = await loadWalletCore();
@@ -250,9 +179,9 @@ export async function getEVMPrivateKeyFromMnemonic(
 	// Get private key for Ethereum
 	const privateKeyData = wallet.getKeyForCoin(CoinType.ethereum);
 
-	// Convert to hex string with 0x prefix (cross-platform)
-	const privateKeyBytes = new Uint8Array(privateKeyData.data());
-	const privateKeyHex = '0x' + uint8ArrayToHex(privateKeyBytes);
+	// Convert to hex string with 0x prefix
+	const privateKeyHex =
+		'0x' + Buffer.from(privateKeyData.data()).toString('hex');
 
 	return privateKeyHex;
 }
@@ -301,10 +230,8 @@ async function getID(mnemonic: string): Promise<string> {
  */
 export async function getDIDFromMnemonic(mnemonic: string): Promise<string> {
 	// Validate mnemonic
-	if (!validateMnemonic(mnemonic)) {
-		throw new Error(
-			'Invalid mnemonic phrase: must have 12, 15, 18, 21, or 24 words'
-		);
+	if (!bip39.validateMnemonic(mnemonic)) {
+		throw new Error('Invalid mnemonic phrase');
 	}
 
 	const id = await getID(mnemonic);
@@ -351,10 +278,8 @@ export async function getEd25519JwkFromMnemonic(mnemonic: string): Promise<{
 	privateJwk: any;
 }> {
 	// Validate mnemonic
-	if (!validateMnemonic(mnemonic)) {
-		throw new Error(
-			'Invalid mnemonic phrase: must have 12, 15, 18, 21, or 24 words'
-		);
+	if (!bip39.validateMnemonic(mnemonic)) {
+		throw new Error('Invalid mnemonic phrase');
 	}
 
 	const core = await loadWalletCore();
@@ -375,7 +300,6 @@ export async function getEd25519JwkFromMnemonic(mnemonic: string): Promise<{
 	idBytes.set(publicKeyBytes, ED25519_CODEC_ID.length);
 	const id = base58btc.encode(idBytes);
 	const did = `did:key:${id}`;
-	const keyId = `${did}#${id}`;
 
 	// Base64url encode the keys
 	const x = base64url.baseEncode(publicKeyBytes);
@@ -387,7 +311,7 @@ export async function getEd25519JwkFromMnemonic(mnemonic: string): Promise<{
 		crv: 'Ed25519', // Curve: Ed25519
 		alg: 'EdDSA', // Algorithm: EdDSA
 		use: 'sig', // Use: signature
-		kid: keyId, // Key ID
+		kid: did, // DID
 		x: x // Public key parameter
 	};
 
@@ -418,10 +342,8 @@ export async function deriveDIDFromMnemonic(mnemonic: string): Promise<{
 	did: string;
 }> {
 	// Validate mnemonic once upfront
-	if (!validateMnemonic(mnemonic)) {
-		throw new Error(
-			'Invalid mnemonic phrase: must have 12, 15, 18, 21, or 24 words'
-		);
+	if (!bip39.validateMnemonic(mnemonic)) {
+		throw new Error('Invalid mnemonic phrase');
 	}
 
 	// Derive both in parallel for better performance
@@ -450,7 +372,7 @@ export async function deriveDIDFromMnemonic(mnemonic: string): Promise<{
 export async function generateDIDKeyData(
 	wordCount: number = 12
 ): Promise<DIDKeyData> {
-	const mnemonic = await generateMnemonic(wordCount);
+	const mnemonic = generateMnemonic(wordCount);
 	const { owner, did } = await deriveDIDFromMnemonic(mnemonic);
 
 	return {

package/examples/encoding-utils.ts

@@ -1,96 +0,0 @@
-/**
- * Test encoding utilities exported from olaresid
- */
-
-import {
-	base64ToUint8Array,
-	uint8ArrayToHex,
-	hexToUint8Array,
-	uint8ArrayToBase64
-} from '../src/index';
-
-async function main() {
-	console.log('============================================================');
-	console.log('Testing Cross-platform Encoding Utilities');
-	console.log(
-		'============================================================\n'
-	);
-
-	// Test data
-	const testString = 'Hello, Olares!';
-	const testBytes = new TextEncoder().encode(testString);
-
-	console.log('📝 Original text:', testString);
-	console.log('📦 Original bytes:', testBytes);
-	console.log('');
-
-	// Test 1: Uint8Array to Hex
-	console.log('🔄 Test 1: uint8ArrayToHex()');
-	console.log('------------------------------------------------------------');
-	const hexString = uint8ArrayToHex(testBytes);
-	console.log('✅ Hex string:', hexString);
-	console.log('');
-
-	// Test 2: Hex to Uint8Array
-	console.log('🔄 Test 2: hexToUint8Array()');
-	console.log('------------------------------------------------------------');
-	const bytesFromHex = hexToUint8Array(hexString);
-	console.log('✅ Bytes from hex:', bytesFromHex);
-	console.log(
-		'✅ Matches original:',
-		JSON.stringify(bytesFromHex) === JSON.stringify(testBytes)
-	);
-	console.log('');
-
-	// Test 3: Uint8Array to Base64
-	console.log('🔄 Test 3: uint8ArrayToBase64()');
-	console.log('------------------------------------------------------------');
-	const base64String = uint8ArrayToBase64(testBytes);
-	console.log('✅ Base64 string:', base64String);
-	console.log('');
-
-	// Test 4: Base64 to Uint8Array
-	console.log('🔄 Test 4: base64ToUint8Array()');
-	console.log('------------------------------------------------------------');
-	const bytesFromBase64 = base64ToUint8Array(base64String);
-	console.log('✅ Bytes from base64:', bytesFromBase64);
-	console.log(
-		'✅ Matches original:',
-		JSON.stringify(bytesFromBase64) === JSON.stringify(testBytes)
-	);
-	console.log('');
-
-	// Test 5: Round-trip conversion
-	console.log('🔄 Test 5: Round-trip conversion (hex)');
-	console.log('------------------------------------------------------------');
-	const hex1 = uint8ArrayToHex(testBytes);
-	const bytes1 = hexToUint8Array(hex1);
-	const hex2 = uint8ArrayToHex(bytes1);
-	console.log('✅ Round-trip hex successful:', hex1 === hex2);
-	console.log('');
-
-	console.log('🔄 Test 6: Round-trip conversion (base64)');
-	console.log('------------------------------------------------------------');
-	const b64_1 = uint8ArrayToBase64(testBytes);
-	const bytes2 = base64ToUint8Array(b64_1);
-	const b64_2 = uint8ArrayToBase64(bytes2);
-	console.log('✅ Round-trip base64 successful:', b64_1 === b64_2);
-	console.log('');
-
-	// Test 7: Hex with 0x prefix
-	console.log('🔄 Test 7: Hex with 0x prefix');
-	console.log('------------------------------------------------------------');
-	const hexWithPrefix = '0x' + hexString;
-	const bytesFromPrefixedHex = hexToUint8Array(hexWithPrefix);
-	console.log(
-		'✅ Can handle 0x prefix:',
-		JSON.stringify(bytesFromPrefixedHex) === JSON.stringify(testBytes)
-	);
-	console.log('');
-
-	console.log('============================================================');
-	console.log('✅ All encoding utility tests passed!');
-	console.log('============================================================');
-}
-
-main().catch(console.error);

package/examples/quasar-demo/.eslintrc.js

@@ -1,23 +0,0 @@
-module.exports = {
-	root: true,
-	parserOptions: {
-		parser: '@typescript-eslint/parser',
-		ecmaVersion: 2021
-	},
-	env: {
-		browser: true,
-		es2021: true,
-		node: true
-	},
-	extends: [
-		'plugin:vue/vue3-essential',
-		'eslint:recommended',
-		'@vue/typescript/recommended',
-		'prettier'
-	],
-	plugins: ['vue', '@typescript-eslint'],
-	rules: {
-		'@typescript-eslint/no-explicit-any': 'off',
-		'@typescript-eslint/no-unused-vars': 'warn'
-	}
-};

package/examples/quasar-demo/.quasar/app.js

@@ -1,43 +0,0 @@
-/* eslint-disable */
-/**
- * THIS FILE IS GENERATED AUTOMATICALLY.
- * DO NOT EDIT.
- *
- * You are probably looking on adding startup/initialization code.
- * Use "quasar new boot <name>" and add it there.
- * One boot file per concern. Then reference the file(s) in quasar.config.js > boot:
- * boot: ['file', ...] // do not add ".js" extension to it.
- *
- * Boot files are your "main.js"
- **/
-
-import { Quasar } from 'quasar';
-import { markRaw } from 'vue';
-import RootComponent from 'app/src/App.vue';
-
-import createRouter from 'app/src/router/index';
-
-export default async function (createAppFn, quasarUserOptions) {
-	// Create the app instance.
-	// Here we inject into it the Quasar UI, the router & possibly the store.
-	const app = createAppFn(RootComponent);
-
-	app.config.performance = true;
-
-	app.use(Quasar, quasarUserOptions);
-
-	const router = markRaw(
-		typeof createRouter === 'function'
-			? await createRouter({})
-			: createRouter
-	);
-
-	// Expose the app, the router and the store.
-	// Note that we are not mounting the app here, since bootstrapping will be
-	// different depending on whether we are in a browser or on the server.
-	return {
-		app,
-
-		router
-	};
-}

package/examples/quasar-demo/.quasar/client-entry.js

@@ -1,38 +0,0 @@
-/* eslint-disable */
-/**
- * THIS FILE IS GENERATED AUTOMATICALLY.
- * DO NOT EDIT.
- *
- * You are probably looking on adding startup/initialization code.
- * Use "quasar new boot <name>" and add it there.
- * One boot file per concern. Then reference the file(s) in quasar.config.js > boot:
- * boot: ['file', ...] // do not add ".js" extension to it.
- *
- * Boot files are your "main.js"
- **/
-
-import { createApp } from 'vue';
-
-import '@quasar/extras/roboto-font/roboto-font.css';
-
-import '@quasar/extras/material-icons/material-icons.css';
-
-// We load Quasar stylesheet file
-import 'quasar/dist/quasar.css';
-
-import 'src/css/app.scss';
-
-import createQuasarApp from './app.js';
-import quasarUserOptions from './quasar-user-options.js';
-
-console.info('[Quasar] Running SPA.');
-
-const publicPath = `/`;
-
-async function start({ app, router }) {
-	app.use(router);
-
-	app.mount('#q-app');
-}
-
-createQuasarApp(createApp, quasarUserOptions).then(start);

package/examples/quasar-demo/.quasar/client-prefetch.js

@@ -1,130 +0,0 @@
-/* eslint-disable */
-/**
- * THIS FILE IS GENERATED AUTOMATICALLY.
- * DO NOT EDIT.
- *
- * You are probably looking on adding startup/initialization code.
- * Use "quasar new boot <name>" and add it there.
- * One boot file per concern. Then reference the file(s) in quasar.config.js > boot:
- * boot: ['file', ...] // do not add ".js" extension to it.
- *
- * Boot files are your "main.js"
- **/
-
-import App from 'app/src/App.vue';
-let appPrefetch =
-	typeof App.preFetch === 'function'
-		? App.preFetch
-		: // Class components return the component options (and the preFetch hook) inside __c property
-		App.__c !== void 0 && typeof App.__c.preFetch === 'function'
-		? App.__c.preFetch
-		: false;
-
-function getMatchedComponents(to, router) {
-	const route = to
-		? to.matched
-			? to
-			: router.resolve(to).route
-		: router.currentRoute.value;
-
-	if (!route) {
-		return [];
-	}
-
-	const matched = route.matched.filter((m) => m.components !== void 0);
-
-	if (matched.length === 0) {
-		return [];
-	}
-
-	return Array.prototype.concat.apply(
-		[],
-		matched.map((m) => {
-			return Object.keys(m.components).map((key) => {
-				const comp = m.components[key];
-				return {
-					path: m.path,
-					c: comp
-				};
-			});
-		})
-	);
-}
-
-export function addPreFetchHooks({ router, publicPath }) {
-	// Add router hook for handling preFetch.
-	// Doing it after initial route is resolved so that we don't double-fetch
-	// the data that we already have. Using router.beforeResolve() so that all
-	// async components are resolved.
-	router.beforeResolve((to, from, next) => {
-		const urlPath = window.location.href.replace(
-				window.location.origin,
-				''
-			),
-			matched = getMatchedComponents(to, router),
-			prevMatched = getMatchedComponents(from, router);
-
-		let diffed = false;
-		const preFetchList = matched
-			.filter((m, i) => {
-				return (
-					diffed ||
-					(diffed =
-						!prevMatched[i] ||
-						prevMatched[i].c !== m.c ||
-						m.path.indexOf('/:') > -1) // does it has params?
-				);
-			})
-			.filter(
-				(m) =>
-					m.c !== void 0 &&
-					(typeof m.c.preFetch === 'function' ||
-						// Class components return the component options (and the preFetch hook) inside __c property
-						(m.c.__c !== void 0 &&
-							typeof m.c.__c.preFetch === 'function'))
-			)
-			.map((m) => (m.c.__c !== void 0 ? m.c.__c.preFetch : m.c.preFetch));
-
-		if (appPrefetch !== false) {
-			preFetchList.unshift(appPrefetch);
-			appPrefetch = false;
-		}
-
-		if (preFetchList.length === 0) {
-			return next();
-		}
-
-		let hasRedirected = false;
-		const redirect = (url) => {
-			hasRedirected = true;
-			next(url);
-		};
-		const proceed = () => {
-			if (hasRedirected === false) {
-				next();
-			}
-		};
-
-		preFetchList
-			.reduce(
-				(promise, preFetch) =>
-					promise.then(
-						() =>
-							hasRedirected === false &&
-							preFetch({
-								currentRoute: to,
-								previousRoute: from,
-								redirect,
-								urlPath,
-								publicPath
-							})
-					),
-				Promise.resolve()
-			)
-			.then(proceed)
-			.catch((e) => {
-				console.error(e);
-				proceed();
-			});
-	});
-}

package/examples/quasar-demo/.quasar/quasar-user-options.js

@@ -1,16 +0,0 @@
-/* eslint-disable */
-/**
- * THIS FILE IS GENERATED AUTOMATICALLY.
- * DO NOT EDIT.
- *
- * You are probably looking on adding startup/initialization code.
- * Use "quasar new boot <name>" and add it there.
- * One boot file per concern. Then reference the file(s) in quasar.config.js > boot:
- * boot: ['file', ...] // do not add ".js" extension to it.
- *
- * Boot files are your "main.js"
- **/
-
-import { Notify } from 'quasar';
-
-export default { config: { notify: {} }, plugins: { Notify } };

package/examples/quasar-demo/README.md

@@ -1,49 +0,0 @@
-# OlaresID Quasar Demo
-
-最简化的 Quasar 演示项目，展示如何在 Quasar 应用中使用 `@beclab/olaresid` 库。
-
-## 安装
-
-```bash
-# 进入项目目录
-cd did-system/packages/olaresid/examples/quasar-demo
-
-# 安装依赖
-npm install
-```
-
-## 运行
-
-```bash
-# 开发模式
-npm run dev
-```
-
-项目将在 `http://localhost:9001` 运行。
-
-## 项目结构
-
-```
-quasar-demo/
-├── src/
-│   ├── layouts/
-│   │   └── MainLayout.vue    # 主布局
-│   ├── pages/
-│   │   └── IndexPage.vue     # 首页（演示 OlaresID）
-│   ├── router/
-│   │   ├── index.ts          # 路由配置
-│   │   └── routes.ts         # 路由定义
-│   ├── css/
-│   │   └── app.scss          # 全局样式
-│   └── App.vue               # 根组件
-├── index.html                # HTML 模板
-├── package.json              # 依赖配置
-├── quasar.config.js          # Quasar 配置
-└── tsconfig.json             # TypeScript 配置
-```
-
-## 功能
-
--   显示 OlaresID 实例信息
--   测试域名查询功能
--   示例域名：`tw7613781.olares.com`

package/examples/quasar-demo/index.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>OlaresID Demo</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
-  </head>
-  <body>
-    <!-- quasar:entry-point -->
-  </body>
-</html>