@kevisual/router 0.0.50 → 0.0.51

package/auto.ts

@@ -0,0 +1,19 @@
+import { loadTS, getMatchFiles } from './src/auto/load-ts.ts';
+import { listenSocket } from './src/auto/listen-sock.ts';
+import { Route, QueryRouter, QueryRouterServer } from './src/route.ts';
+
+export { Route, QueryRouter, QueryRouterServer };
+
+export const App = QueryRouterServer;
+
+export { createSchema } from './src/validator/index.ts';
+export type { Rule } from './src/validator/rule.ts';
+export type { RouteContext, RouteOpts } from './src/route.ts';
+
+export type { Run } from './src/route.ts';
+
+export { CustomError } from './src/result/error.ts';
+
+export { listenSocket, loadTS, getMatchFiles };
+
+export { autoCall } from './src/auto/call-sock.ts';

package/dist/router-browser.d.ts

@@ -297,6 +297,8 @@ declare class QueryRouter {
         emitter?: any;
         timeout?: number;
         getList?: boolean;
+        force?: boolean;
+        filter?: (route: Route) => boolean;
     }): Promise<void>;
 }
 type QueryRouterServerOpts = {

package/dist/router-browser.js

@@ -644,7 +644,7 @@ class QueryRouter {
     wait(params, opts) {
         const getList = opts?.getList ?? true;
         if (getList) {
-            this.createRouteList();
+            this.createRouteList(opts?.force ?? false, opts?.filter);
         }
         return listenProcess({ app: this, params, ...opts });
     }

package/dist/router-sign.js

@@ -13469,14 +13469,132 @@ function requireSelfsigned () {
 	  }
 	}
 
-	function getSigningAlgorithm(key) {
-	  const hashAlg = getAlgorithmName(key);
+	function getSigningAlgorithm(hashKey, keyType) {
+	  const hashAlg = getAlgorithmName(hashKey);
+	  if (keyType === 'ec') {
+	    return {
+	      name: "ECDSA",
+	      hash: hashAlg
+	    };
+	  }
+	  return {
+	    name: "RSASSA-PKCS1-v1_5",
+	    hash: hashAlg
+	  };
+	}
+
+	function getKeyAlgorithm(options) {
+	  const keyType = options.keyType || 'rsa';
+	  const hashAlg = getAlgorithmName(options.algorithm || 'sha1');
+
+	  if (keyType === 'ec') {
+	    const curve = options.curve || 'P-256';
+	    return {
+	      name: "ECDSA",
+	      namedCurve: curve
+	    };
+	  }
+
 	  return {
 	    name: "RSASSA-PKCS1-v1_5",
+	    modulusLength: options.keySize || 2048,
+	    publicExponent: new Uint8Array([1, 0, 1]),
 	    hash: hashAlg
 	  };
 	}
 
+	// Build extensions array from options or use defaults
+	// Supports the old node-forge extension format for backwards compatibility
+	function buildExtensions(userExtensions, commonName) {
+	  if (!userExtensions || userExtensions.length === 0) {
+	    // Default extensions
+	    return [
+	      new BasicConstraintsExtension(false, undefined, true),
+	      new KeyUsagesExtension(KeyUsageFlags.digitalSignature | KeyUsageFlags.keyEncipherment, true),
+	      new ExtendedKeyUsageExtension([ExtendedKeyUsage.serverAuth, ExtendedKeyUsage.clientAuth], false),
+	      new SubjectAlternativeNameExtension([
+	        { type: 'dns', value: commonName },
+	        ...(commonName === 'localhost' ? [{ type: 'ip', value: '127.0.0.1' }] : [])
+	      ], false)
+	    ];
+	  }
+
+	  // Convert user extensions from node-forge format to @peculiar/x509 format
+	  const extensions = [];
+
+	  for (const ext of userExtensions) {
+	    const critical = ext.critical || false;
+
+	    switch (ext.name) {
+	      case 'basicConstraints':
+	        extensions.push(new BasicConstraintsExtension(
+	          ext.cA || false,
+	          ext.pathLenConstraint,
+	          critical
+	        ));
+	        break;
+
+	      case 'keyUsage':
+	        let flags = 0;
+	        if (ext.digitalSignature) flags |= KeyUsageFlags.digitalSignature;
+	        if (ext.nonRepudiation || ext.contentCommitment) flags |= KeyUsageFlags.nonRepudiation;
+	        if (ext.keyEncipherment) flags |= KeyUsageFlags.keyEncipherment;
+	        if (ext.dataEncipherment) flags |= KeyUsageFlags.dataEncipherment;
+	        if (ext.keyAgreement) flags |= KeyUsageFlags.keyAgreement;
+	        if (ext.keyCertSign) flags |= KeyUsageFlags.keyCertSign;
+	        if (ext.cRLSign) flags |= KeyUsageFlags.cRLSign;
+	        if (ext.encipherOnly) flags |= KeyUsageFlags.encipherOnly;
+	        if (ext.decipherOnly) flags |= KeyUsageFlags.decipherOnly;
+	        extensions.push(new KeyUsagesExtension(flags, critical));
+	        break;
+
+	      case 'extKeyUsage':
+	        const usages = [];
+	        if (ext.serverAuth) usages.push(ExtendedKeyUsage.serverAuth);
+	        if (ext.clientAuth) usages.push(ExtendedKeyUsage.clientAuth);
+	        if (ext.codeSigning) usages.push(ExtendedKeyUsage.codeSigning);
+	        if (ext.emailProtection) usages.push(ExtendedKeyUsage.emailProtection);
+	        if (ext.timeStamping) usages.push(ExtendedKeyUsage.timeStamping);
+	        extensions.push(new ExtendedKeyUsageExtension(usages, critical));
+	        break;
+
+	      case 'subjectAltName':
+	        const altNames = (ext.altNames || []).map(alt => {
+	          // node-forge type values:
+	          // 1 = email (rfc822Name)
+	          // 2 = DNS
+	          // 6 = URI
+	          // 7 = IP
+	          switch (alt.type) {
+	            case 1: // email
+	              return { type: 'email', value: alt.value };
+	            case 2: // DNS
+	              return { type: 'dns', value: alt.value };
+	            case 6: // URI
+	              return { type: 'url', value: alt.value };
+	            case 7: // IP
+	              return { type: 'ip', value: alt.ip || alt.value };
+	            default:
+	              // Try to infer type from properties
+	              if (alt.ip) return { type: 'ip', value: alt.ip };
+	              if (alt.dns) return { type: 'dns', value: alt.dns };
+	              if (alt.email) return { type: 'email', value: alt.email };
+	              if (alt.uri || alt.url) return { type: 'url', value: alt.uri || alt.url };
+	              return { type: 'dns', value: alt.value };
+	          }
+	        });
+	        extensions.push(new SubjectAlternativeNameExtension(altNames, critical));
+	        break;
+
+	      default:
+	        // Skip unknown extensions with a warning
+	        console.warn(`Unknown extension "${ext.name}" ignored`);
+	    }
+	  }
+
+	  return extensions;
+	}
+
 	// Convert attributes from node-forge format to X509 name format
 	function convertAttributes(attrs) {
 	  const nameMap = {
@@ -13495,50 +13613,67 @@ function requireSelfsigned () {
 	  }).join(', ');
 	}
 
+	// Map Node.js curve names to Web Crypto curve names
+	function normalizeECCurve(curveName) {
+	  const curveMap = {
+	    'prime256v1': 'P-256',
+	    'secp384r1': 'P-384',
+	    'secp521r1': 'P-521',
+	    'P-256': 'P-256',
+	    'P-384': 'P-384',
+	    'P-521': 'P-521'
+	  };
+	  return curveMap[curveName] || curveName;
+	}
+
+	// Get EC curve from key object
+	function getECCurve(keyObject) {
+	  const details = keyObject.asymmetricKeyDetails;
+	  if (details && details.namedCurve) {
+	    return normalizeECCurve(details.namedCurve);
+	  }
+	  return 'P-256'; // default
+	}
+
 	// Convert PEM key to CryptoKey
-	async function importPrivateKey(pemKey, algorithm) {
-	  // Support both PKCS#8 and PKCS#1 (RSA) formats
-	  const pkcs8Match = pemKey.match(/-----BEGIN PRIVATE KEY-----([\s\S]*?)-----END PRIVATE KEY-----/);
-	  const rsaMatch = pemKey.match(/-----BEGIN RSA PRIVATE KEY-----([\s\S]*?)-----END RSA PRIVATE KEY-----/);
-
-	  if (pkcs8Match) {
-	    const pemContents = pkcs8Match[1].replace(/\s/g, '');
-	    const binaryDer = Buffer.from(pemContents, 'base64');
-	    return await crypto.subtle.importKey(
-	      'pkcs8',
-	      binaryDer,
-	      {
-	        name: 'RSASSA-PKCS1-v1_5',
-	        hash: getAlgorithmName(algorithm),
-	      },
-	      true,
-	      ['sign']
-	    );
-	  } else if (rsaMatch) {
-	    // PKCS#1 RSA key - need to convert using Node.js crypto
-	    const keyObject = nodeCrypto.createPrivateKey(pemKey);
-	    const pkcs8Pem = keyObject.export({ type: 'pkcs8', format: 'pem' });
-	    const pemContents = pkcs8Pem
-	      .replace(/-----BEGIN PRIVATE KEY-----/, '')
-	      .replace(/-----END PRIVATE KEY-----/, '')
-	      .replace(/\s/g, '');
-	    const binaryDer = Buffer.from(pemContents, 'base64');
-	    return await crypto.subtle.importKey(
-	      'pkcs8',
-	      binaryDer,
-	      {
-	        name: 'RSASSA-PKCS1-v1_5',
-	        hash: getAlgorithmName(algorithm),
-	      },
-	      true,
-	      ['sign']
-	    );
+	async function importPrivateKey(pemKey, algorithm, keyType) {
+	  // Auto-detect key type if not provided
+	  const keyObject = nodeCrypto.createPrivateKey(pemKey);
+	  const detectedKeyType = keyObject.asymmetricKeyType;
+	  const actualKeyType = keyType || detectedKeyType;
+
+	  // Convert to PKCS#8 format
+	  const pkcs8Pem = keyObject.export({ type: 'pkcs8', format: 'pem' });
+	  const pemContents = pkcs8Pem
+	    .replace(/-----BEGIN PRIVATE KEY-----/, '')
+	    .replace(/-----END PRIVATE KEY-----/, '')
+	    .replace(/\s/g, '');
+	  const binaryDer = Buffer.from(pemContents, 'base64');
+
+	  let importAlgorithm;
+	  if (actualKeyType === 'ec') {
+	    const curve = getECCurve(keyObject);
+	    importAlgorithm = {
+	      name: 'ECDSA',
+	      namedCurve: curve
+	    };
 	  } else {
-	    throw new Error('Unsupported private key format. Expected PKCS#8 or PKCS#1 RSA key.');
+	    importAlgorithm = {
+	      name: 'RSASSA-PKCS1-v1_5',
+	      hash: getAlgorithmName(algorithm)
+	    };
 	  }
+
+	  return await crypto.subtle.importKey(
+	    'pkcs8',
+	    binaryDer,
+	    importAlgorithm,
+	    true,
+	    ['sign']
+	  );
 	}
 
-	async function importPublicKey(pemKey, algorithm) {
+	async function importPublicKey(pemKey, algorithm, keyType, curve) {
 	  const pemContents = pemKey
 	    .replace(/-----BEGIN PUBLIC KEY-----/, '')
 	    .replace(/-----END PUBLIC KEY-----/, '')
@@ -13546,13 +13681,23 @@ function requireSelfsigned () {
 
 	  const binaryDer = Buffer.from(pemContents, 'base64');
 
+	  let importAlgorithm;
+	  if (keyType === 'ec') {
+	    importAlgorithm = {
+	      name: 'ECDSA',
+	      namedCurve: curve
+	    };
+	  } else {
+	    importAlgorithm = {
+	      name: 'RSASSA-PKCS1-v1_5',
+	      hash: getAlgorithmName(algorithm)
+	    };
+	  }
+
 	  return await crypto.subtle.importKey(
 	    'spki',
 	    binaryDer,
-	    {
-	      name: 'RSASSA-PKCS1-v1_5',
-	      hash: getAlgorithmName(algorithm),
-	    },
+	    importAlgorithm,
 	    true,
 	    ['verify']
 	  );
@@ -13604,29 +13749,22 @@ function requireSelfsigned () {
 	  ];
 
 	  const subjectName = convertAttributes(attrs);
-	  const signingAlg = getSigningAlgorithm(options.algorithm);
+	  const keyType = options.keyType || 'rsa';
+	  const signingAlg = getSigningAlgorithm(options.algorithm, keyType);
 
 	  // Extract common name for SAN extension
 	  const commonNameAttr = attrs.find(attr => attr.name === 'commonName' || attr.shortName === 'CN');
 	  const commonName = commonNameAttr ? commonNameAttr.value : 'localhost';
 
 	  // Build extensions array
-	  const extensions = [
-	    new BasicConstraintsExtension(false, undefined, true),
-	    new KeyUsagesExtension(KeyUsageFlags.digitalSignature | KeyUsageFlags.keyEncipherment, true),
-	    new ExtendedKeyUsageExtension([ExtendedKeyUsage.serverAuth, ExtendedKeyUsage.clientAuth], false),
-	    new SubjectAlternativeNameExtension([
-	      { type: 'dns', value: commonName },
-	      ...(commonName === 'localhost' ? [{ type: 'ip', value: '127.0.0.1' }] : [])
-	    ], false)
-	  ];
+	  const extensions = buildExtensions(options.extensions, commonName);
 
 	  let cert;
 
 	  if (ca) {
 	    // Generate certificate signed by CA
 	    const caCert = new X509Certificate(ca.cert);
-	    const caPrivateKey = await importPrivateKey(ca.key, options.algorithm || "sha256");
+	    const caPrivateKey = await importPrivateKey(ca.key, options.algorithm || "sha256", keyType);
 
 	    cert = await X509CertificateGenerator.create({
 	      serialNumber: serialHex,
@@ -13711,14 +13849,19 @@ function requireSelfsigned () {
 	    const clientKeySize = clientOpts.keySize || options.clientCertificateKeySize || 2048;
 	    const clientAlgorithm = clientOpts.algorithm || options.algorithm || "sha1";
 	    const clientCN = clientOpts.cn || options.clientCertificateCN || "John Doe jdoe123";
+	    // Client cert uses same key type and curve as main cert by default
+	    const clientKeyType = clientOpts.keyType || keyType;
+	    const clientCurve = clientOpts.curve || options.curve || 'P-256';
+
+	    const clientKeyAlg = getKeyAlgorithm({
+	      keyType: clientKeyType,
+	      keySize: clientKeySize,
+	      algorithm: clientAlgorithm,
+	      curve: clientCurve
+	    });
 
 	    const clientKeyPair = await crypto.subtle.generateKey(
-	      {
-	        name: "RSASSA-PKCS1-v1_5",
-	        modulusLength: clientKeySize,
-	        publicExponent: new Uint8Array([1, 0, 1]),
-	        hash: getAlgorithmName(clientAlgorithm),
-	      },
+	      clientKeyAlg,
 	      true,
 	      ["sign", "verify"]
 	    );
@@ -13749,8 +13892,8 @@ function requireSelfsigned () {
 	    const clientSubjectName = convertAttributes(clientAttrs);
 	    const issuerName = convertAttributes(attrs);
 
-	    // Signing algorithm for client cert (can differ from main cert)
-	    const clientSigningAlg = getSigningAlgorithm(clientAlgorithm);
+	    // Signing algorithm for client cert - uses main key type since signed by root
+	    const clientSigningAlg = getSigningAlgorithm(clientAlgorithm, keyType);
 
 	    // Create client cert signed by root key
 	    const clientCertRaw = await X509CertificateGenerator.create({
@@ -13808,13 +13951,17 @@ function requireSelfsigned () {
 	 *
 	 * @param {CertificateField[]} attrs Attributes used for subject.
 	 * @param {object} options
-	 * @param {number} [options.keySize=2048] the size for the private key in bits
+	 * @param {string} [options.keyType="rsa"] Key type: "rsa" or "ec" (elliptic curve)
+	 * @param {number} [options.keySize=2048] the size for the private key in bits (RSA only)
+	 * @param {string} [options.curve="P-256"] The elliptic curve to use: "P-256", "P-384", or "P-521" (EC only)
 	 * @param {object} [options.extensions] additional extensions for the certificate
 	 * @param {string} [options.algorithm="sha1"] The signature algorithm sha256, sha384, sha512 or sha1
 	 * @param {Date} [options.notBeforeDate=new Date()] The date before which the certificate should not be valid
 	 * @param {Date} [options.notAfterDate] The date after which the certificate should not be valid (default: notBeforeDate + 365 days)
 	 * @param {boolean|object} [options.clientCertificate=false] Generate client cert signed by the original key. Can be `true` for defaults or an options object.
-	 * @param {number} [options.clientCertificate.keySize=2048] Key size for the client certificate in bits
+	 * @param {number} [options.clientCertificate.keySize=2048] Key size for the client certificate in bits (RSA only)
+	 * @param {string} [options.clientCertificate.keyType] Key type for client cert (defaults to main keyType)
+	 * @param {string} [options.clientCertificate.curve] Elliptic curve for client cert (EC only)
 	 * @param {string} [options.clientCertificate.algorithm] Signature algorithm for client cert (defaults to options.algorithm or "sha1")
 	 * @param {string} [options.clientCertificate.cn="John Doe jdoe123"] Client certificate's common name
 	 * @param {Date} [options.clientCertificate.notBeforeDate=new Date()] The date before which the client certificate should not be valid
@@ -13831,25 +13978,22 @@ function requireSelfsigned () {
 	  attrs = attrs || undefined;
 	  options = options || {};
 
-	  const keySize = options.keySize || 2048;
+	  const keyType = options.keyType || 'rsa';
+	  const curve = options.curve || 'P-256';
 
 	  let keyPair;
 
 	  if (options.keyPair) {
 	    // Import existing key pair
 	    keyPair = {
-	      privateKey: await importPrivateKey(options.keyPair.privateKey, options.algorithm || "sha1"),
-	      publicKey: await importPublicKey(options.keyPair.publicKey, options.algorithm || "sha1")
+	      privateKey: await importPrivateKey(options.keyPair.privateKey, options.algorithm || "sha1", keyType),
+	      publicKey: await importPublicKey(options.keyPair.publicKey, options.algorithm || "sha1", keyType, curve)
 	    };
 	  } else {
-	    // Generate new key pair
+	    // Generate new key pair using appropriate algorithm
+	    const keyAlg = getKeyAlgorithm(options);
 	    keyPair = await crypto.subtle.generateKey(
-	      {
-	        name: "RSASSA-PKCS1-v1_5",
-	        modulusLength: keySize,
-	        publicExponent: new Uint8Array([1, 0, 1]),
-	        hash: getAlgorithmName(options.algorithm || "sha1"),
-	      },
+	      keyAlg,
 	      true,
 	      ["sign", "verify"]
 	    );

package/dist/router.d.ts

@@ -303,6 +303,8 @@ declare class QueryRouter {
         emitter?: any;
         timeout?: number;
         getList?: boolean;
+        force?: boolean;
+        filter?: (route: Route) => boolean;
     }): Promise<void>;
 }
 type QueryRouterServerOpts = {

package/dist/router.js

@@ -666,7 +666,7 @@ class QueryRouter {
     wait(params, opts) {
         const getList = opts?.getList ?? true;
         if (getList) {
-            this.createRouteList();
+            this.createRouteList(opts?.force ?? false, opts?.filter);
         }
         return listenProcess({ app: this, params, ...opts });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.50",
+  "version": "0.0.51",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -15,15 +15,16 @@
   "files": [
     "dist",
     "src",
+    "auto.ts",
     "mod.ts"
   ],
   "keywords": [],
   "author": "abearxiong",
   "license": "MIT",
-  "packageManager": "pnpm@10.26.0",
+  "packageManager": "pnpm@10.26.2",
   "devDependencies": {
     "@kevisual/local-proxy": "^0.0.8",
-    "@kevisual/query": "^0.0.32",
+    "@kevisual/query": "^0.0.33",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-commonjs": "29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
@@ -35,7 +36,7 @@
     "@types/xml2js": "^0.4.14",
     "cookie": "^1.1.1",
     "nanoid": "^5.1.6",
-    "rollup": "^4.53.5",
+    "rollup": "^4.54.0",
     "rollup-plugin-dts": "^6.3.0",
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
@@ -52,7 +53,7 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.3.0",
-    "selfsigned": "^5.2.0",
+    "selfsigned": "^5.4.0",
     "send": "^1.2.1"
   },
   "publishConfig": {

package/src/route.ts

@@ -576,10 +576,16 @@ export class QueryRouter {
    * -- .on
    * -- .send
    */
-  wait(params?: { path?: string; key?: string; payload?: any }, opts?: { emitter?: any, timeout?: number, getList?: boolean }) {
+  wait(params?: { path?: string; key?: string; payload?: any }, opts?: {
+    emitter?: any,
+    timeout?: number,
+    getList?: boolean
+    force?: boolean
+    filter?: (route: Route) => boolean
+  }) {
     const getList = opts?.getList ?? true;
     if (getList) {
-      this.createRouteList();
+      this.createRouteList(opts?.force ?? false, opts?.filter);
     }
     return listenProcess({ app: this, params, ...opts });
   }

package/src/server/parse-xml.ts

@@ -1,6 +1,34 @@
 import xml2js from 'xml2js';
-
-export const parseXml = async (req: any): Promise<any> => {
+import { isBun } from '../utils/is-engine.ts';
+import http from 'http';
+export const xms2jsParser = async (data: string): Promise<any> => {
+  try {
+    // 使用xml2js解析XML
+    const xml = await xml2js.parseStringPromise(data);
+    return xml;
+  } catch (error) {
+    console.error('XML解析错误:', error);
+    return null;
+  }
+}
+export const parseXml = async (req: http.IncomingMessage): Promise<any> => {
+  if (isBun) {
+    // @ts-ignore
+    const body = req.body;
+    let xmlString = '';
+    if (body) {
+      xmlString = body;
+    }
+    if (!xmlString) {
+      // @ts-ignore
+      xmlString = await req.bun?.request?.text?.();
+    }
+    if (xmlString) {
+      return await xms2jsParser(xmlString)
+    }
+    console.error('没有读取到请求体');
+    return null;
+  }
   return await new Promise((resolve) => {
     // 读取请求数据
     let data = '';
@@ -12,15 +40,8 @@ export const parseXml = async (req: any): Promise<any> => {
     // 当请求结束时处理数据
     req.on('end', () => {
       try {
-        // 使用xml2js解析XML
-        xml2js.parseString(data, function (err, result) {
-          if (err) {
-            console.error('XML解析错误:', err);
-            resolve(null);
-          } else {
-            const jsonString = JSON.stringify(result);
-            resolve(jsonString);
-          }
+        xms2jsParser(data).then((result) => {
+          resolve(result);
         });
       } catch (error) {
         console.error('处理请求时出错:', error);