@kevisual/router 0.0.11 → 0.0.12

package/dist/router-sign.js

@@ -1,4 +1,4 @@
-import require$$4 from 'crypto';
+import require$$4 from 'node:crypto';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 

package/dist/router.js

@@ -1,34 +1,20 @@
-import { webcrypto } from 'node:crypto';
 import http from 'node:http';
 import https from 'node:https';
 import http2 from 'node:http2';
 import url from 'node:url';
-import { WebSocketServer } from 'ws';
 
 const urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
 
-const POOL_SIZE_MULTIPLIER = 128;
-let pool, poolOffset;
-function fillPool(bytes) {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    webcrypto.getRandomValues(pool);
-    poolOffset = 0;
-  } else if (poolOffset + bytes > pool.length) {
-    webcrypto.getRandomValues(pool);
-    poolOffset = 0;
-  }
-  poolOffset += bytes;
-}
-function nanoid(size = 21) {
-  fillPool((size |= 0));
+/* @ts-self-types="./index.d.ts" */
+let nanoid = (size = 21) => {
   let id = '';
-  for (let i = poolOffset - size; i < poolOffset; i++) {
-    id += urlAlphabet[pool[i] & 63];
+  let bytes = crypto.getRandomValues(new Uint8Array((size |= 0)));
+  while (size--) {
+    id += urlAlphabet[bytes[size] & 63];
   }
   return id
-}
+};
 
 /** 自定义错误 */
 class CustomError extends Error {
@@ -6835,6 +6821,24 @@ class Server {
     }
 }
 
+var browser;
+var hasRequiredBrowser;
+
+function requireBrowser () {
+	if (hasRequiredBrowser) return browser;
+	hasRequiredBrowser = 1;
+
+	browser = function () {
+	  throw new Error(
+	    'ws does not work in the browser. Browser clients must use the native ' +
+	      'WebSocket object'
+	  );
+	};
+	return browser;
+}
+
+var browserExports = requireBrowser();
+
 const parseIfJson = (input) => {
     try {
         // 尝试解析 JSON
@@ -6850,6 +6854,7 @@ const parseIfJson = (input) => {
     return input;
 };
 
+// @ts-type=ws
 class WsServerBase {
     wss;
     path;
@@ -6936,7 +6941,7 @@ class WsServerBase {
 class WsServer extends WsServerBase {
     server;
     constructor(server, opts) {
-        const wss = new WebSocketServer({ noServer: true });
+        const wss = new browserExports.WebSocketServer({ noServer: true });
         const path = server.path;
         super({ wss });
         this.server = server;

package/mod.ts

@@ -0,0 +1,13 @@
+import { Route, QueryRouter, QueryRouterServer } from './src/route.ts';
+
+export { App } from './src/app.ts';
+
+export { Route, QueryRouter, QueryRouterServer };
+
+export { Rule, Schema, createSchema } from './src/validator/index.ts';
+
+export type { RouteContext, RouteOpts } from './src/route.ts';
+
+export type { Run } from './src/route.ts';
+
+export { CustomError } from './src/result/error.ts';

package/package.json

@@ -1,9 +1,11 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "type": "module",
+  "main": "./dist/router.js",
+  "types": "./dist/router.d.ts",
   "scripts": {
     "build": "npm run clean && rollup -c",
     "build:app": "npm run build && rsync dist/*browser* ../deploy/dist",
@@ -12,12 +14,14 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "mod.ts"
   ],
   "keywords": [],
   "author": "abearxiong",
   "license": "MIT",
   "devDependencies": {
+    "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-typescript": "^12.1.2",
@@ -34,6 +38,7 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3",
+    "ws": "npm:@kevisual/ws",
     "xml2js": "^0.6.2",
     "zod": "^3.24.3"
   },
@@ -43,8 +48,7 @@
   },
   "dependencies": {
     "path-to-regexp": "^8.2.0",
-    "selfsigned": "^2.4.1",
-    "ws": "^8.18.1"
+    "selfsigned": "^2.4.1"
   },
   "publishConfig": {
     "access": "public"
@@ -52,27 +56,33 @@
   "exports": {
     ".": {
       "import": "./dist/router.js",
-      "require": "./dist/router.js"
+      "require": "./dist/router.js",
+      "types": "./dist/router.d.ts"
     },
     "./browser": {
       "import": "./dist/router-browser.js",
-      "require": "./dist/router-browser.js"
+      "require": "./dist/router-browser.js",
+      "types": "./dist/router-browser.d.ts"
     },
     "./sign": {
       "import": "./dist/router-sign.js",
-      "require": "./dist/router-sign.js"
+      "require": "./dist/router-sign.js",
+      "types": "./dist/router-sign.d.ts"
     },
     "./simple": {
       "import": "./dist/router-simple.js",
-      "require": "./dist/router-simple.js"
+      "require": "./dist/router-simple.js",
+      "types": "./dist/router-simple.d.ts"
     },
     "./simple-lib": {
       "import": "./dist/router-simple-lib.js",
-      "require": "./dist/router-simple-lib.js"
+      "require": "./dist/router-simple-lib.js",
+      "types": "./dist/router-simple-lib.d.ts"
     },
     "./mod.ts": {
-      "import": "./src/mod.ts",
-      "require": "./src/mod.ts"
+      "import": "./mod.ts",
+      "require": "./mod.ts",
+      "types": "./mod.d.ts"
     }
   }
 }

package/src/app.ts

@@ -101,3 +101,5 @@ export class App<T = {}, U = AppReqRes> {
     throw new CustomError(...args);
   }
 }
+
+export * from './browser.ts';

package/src/server/ws-server.ts

@@ -1,8 +1,10 @@
+// @ts-type=ws
 import { WebSocketServer } from 'ws';
 import type { WebSocket } from 'ws';
 import { Server } from './server.ts';
 import { parseIfJson } from '../utils/parse.ts';
 
+
 export const createWsServer = (server: Server) => {
   // 将 WebSocket 服务器附加到 HTTP 服务器
   const wss = new WebSocketServer({ server: server.server as any });

package/src/mod.ts

@@ -1,13 +0,0 @@
-import { Route, QueryRouter, QueryRouterServer } from './route.ts';
-
-export { App } from './app.ts';
-
-export { Route, QueryRouter, QueryRouterServer };
-
-export { Rule, Schema, createSchema } from './validator/index.ts';
-
-export type { RouteContext, RouteOpts } from './route.ts';
-
-export type { Run } from './route.ts';
-
-export { CustomError } from './result/error.ts';