@kevisual/api 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "",
   "main": "mod.ts",
   "scripts": {
@@ -36,9 +36,10 @@
     "ws": "npm:@kevisual/ws"
   },
   "dependencies": {
-    "@kevisual/context": "^0.0.4",
+    "@kevisual/context": "^0.0.6",
     "@kevisual/js-filter": "^0.0.5",
     "@kevisual/load": "^0.0.6",
+    "@paralleldrive/cuid2": "^3.3.0",
     "es-toolkit": "^1.44.0",
     "eventemitter3": "^5.0.4",
     "fuse.js": "^7.1.0",
@@ -56,6 +57,7 @@
     "./proxy": "./query/query-proxy/index.ts",
     "./secret": "./query/query-secret/index.ts",
     "./resources": "./query/query-resources/index.ts",
+    "./utils-node": "./dist/utils-node.js",
     "./utils": "./dist/utils.js",
     "./query-secret": "./dist/query-secret.js",
     "./query-mark": "./dist/query-mark.js",

package/query/query-proxy/proxy.ts

@@ -62,7 +62,7 @@ export type RouterViewWorker = {
 } & RouteViewBase;
 
 /**
- * 去掉不需要保存都服务器的数据
+ * 去掉不需要保存的服务器的数据
  * @param item 
  * @returns 
  */
@@ -86,7 +86,7 @@ export const pickRouterViewData = (item: RouterViewItem) => {
   return rest
 }
 /**
- * 注入 js 的url地址，使用importScripts加载
+ * 注入 js 的url地址，使用 importScripts 加载
  */
 export type RouteViewPage = {
   type: 'page',
@@ -100,6 +100,9 @@ export type RouterViewQuery = {
   query: string,
   title: string
 }
+/**
+ * 后端存储结构
+ */
 export type RouterViewData = {
   data: { items: RouterViewItem[]; }
   views: RouterViewQuery[];
@@ -121,7 +124,7 @@ export class QueryProxy {
     this.initRouterViewQuery();
     this.emitter = new EventEmitter();
   }
-  getDefulatToken() {
+  private getDefulatToken() {
     try {
       if (typeof window !== 'undefined' && typeof window.localStorage !== 'undefined') {
         return localStorage.getItem('token') || undefined;
@@ -139,7 +142,7 @@ export class QueryProxy {
     });
   }
 
-  initRouterView(item: RouterViewItem) {
+  private initRouterView(item: RouterViewItem) {
     if (item.type === 'api' && item.api?.url) {
       const url = item.api.url;
       if (item?.api?.query) return item;
@@ -253,6 +256,7 @@ export class QueryProxy {
       console.debug(`注册路由: [${r.path}] ${r?.key}`, 'Context');
       let metadata = r.metadata || {};
       metadata.viewItem = item;
+      metadata.source = 'query-proxy-context';
       this.router.route({
         path: r.path,
         key: r.key || '',
@@ -268,7 +272,7 @@ export class QueryProxy {
   generateId() {
     return 'route_' + Math.random().toString(36).substring(2, 9);
   }
-  async callWorker(msg: any, viewItem: RouterViewWorker['worker']): Promise<Result> {
+  private async callWorker(msg: any, viewItem: RouterViewWorker['worker']): Promise<Result> {
     const that = this;
     const requestId = this.generateId();
     const worker = viewItem?.worker;
@@ -296,7 +300,7 @@ export class QueryProxy {
       });
     });
   }
-  async initWorker(item?: RouterViewWorker, initRoutes: boolean = true) {
+  private async initWorker(item?: RouterViewWorker, initRoutes: boolean = true) {
     const that = this;
     if (!item?.worker?.url) {
       console.warn('Worker URL not provided');
@@ -347,6 +351,7 @@ export class QueryProxy {
         console.debug(`注册路由: [${r.path}] ${r?.key}`, 'API');
         let metadata = r.metadata || {};
         metadata.viewItem = item;
+        metadata.source = 'query-proxy-worker';
         this.router.route({
           path: r.path,
           key: r.key || '',
@@ -364,7 +369,7 @@ export class QueryProxy {
       }
     }
   }
-  async initPage(item?: RouteViewPage) {
+  private async initPage(item?: RouteViewPage) {
     if (!item?.page?.url) {
       console.warn('Page地址未提供');
       return;
@@ -381,7 +386,7 @@ export class QueryProxy {
       return;
     }
   }
-  getQueryByViewId(viewId: string): string | undefined {
+  private getQueryByViewId(viewId: string): string | undefined {
     const view = this.views.find(v => v.id === viewId);
     if (view) {
       return view.query;
@@ -465,7 +470,7 @@ export class QueryProxy {
       item.response = res;
       return item;
     }
-    item.response = { code: 500, message: '无法处理的路由类型' };
+    item.response = { code: 500, message: '无法处理的路由类型', data: item };
     return item;
   }
 }
@@ -477,4 +482,15 @@ export type RouterItem = {
   description?: string;
   middleware?: string[];
   metadata?: Record<string, any>;
+}
+
+export const createViewData = (routerViewData: RouterViewItem | RouterViewItem[], data?: RouterViewData): RouterViewData => {
+  return {
+    views: [],
+    viewId: undefined,
+    data: {
+      items: Array.isArray(routerViewData) ? routerViewData : [routerViewData],
+    },
+    ...data
+  }
 }

package/query/query-proxy/router-api-proxy.ts

@@ -38,6 +38,7 @@ export const initApi = async (opts: {
       let metadata = r.metadata || {};
       metadata.viewItem = item;
       metadata.url = query.url;
+      metadata.source = 'query-proxy-api';
       router.route({
         path: r.path,
         key: r.key || '',

package/query/utils/random.ts

@@ -1,9 +1,12 @@
 import { customAlphabet } from 'nanoid';
+import { createId } from '@paralleldrive/cuid2';
 
 export const letter = 'abcdefghijklmnopqrstuvwxyz';
 export const number = '0123456789';
 const alphanumeric = `${letter}${number}`;
 export const alphanumericWithDash = `${alphanumeric}-`;
+
+export const cuid2 = createId;
 /**
  * 创建一个随机的字母字符串
  */
@@ -12,12 +15,12 @@ export const uuid = customAlphabet(letter);
 /** 
  * 创建一个随机的 id，包含字母和数字
  */
-export const nanoid = customAlphabet(alphanumeric, 10);
+export const nanoid = customAlphabet(alphanumeric, 16);
 
 /**
  * 创建一个随机的 id，包含字母、数字和短横线
  */
-export const nanoidWithDash = customAlphabet(alphanumericWithDash, 10);
+export const nanoidWithDash = customAlphabet(alphanumericWithDash, 16);
 
 /**
  * 创建一个随机的 id，以字母开头的字符串