feat(db-proxy): remove deprecated api: ruler, rulerv1, tests, entry;

labring · Oct 19, 2021 · 4be2479 · 4be2479
1 parent 03e6ed4
commit 4be2479
Show file tree

Hide file tree

Showing 59 changed files with 69 additions and 2,367 deletions.
diff --git a/packages/database-proxy/package.json b/packages/database-proxy/package.json
@@ -5,7 +5,7 @@
   "main": "./dist",
   "scripts": {
     "test-all": "mocha tests/**/*test.js",
-    "test-units": "mocha tests/units/*",
+    "test-units": "mocha tests/units/**",
     "test": "npm run test-units",
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -w",

diff --git a/packages/database-proxy/src/dbi/request.ts b/packages/database-proxy/src/dbi/request.ts
@@ -1,7 +1,9 @@
-import { ActionType } from "../types"
+
 import { Proxy } from "../proxy"
 import { RequestInterface } from 'database-ql'
 import { AccessorInterface } from ".."
+import { QueryParam, ResponseStruct } from "database-ql/dist/commonjs/interface"
+import { ActionType } from "database-ql/dist/commonjs/constant"
 
 export class Request implements RequestInterface {
 
@@ -11,14 +13,16 @@ export class Request implements RequestInterface {
     this.accessor = accessor
   }
 
-  async send(action: ActionType, data: any): Promise<any> {
+  async send(action: ActionType, data: QueryParam): Promise<ResponseStruct> {
     const accessor = this.accessor
-    const params = Proxy.parse(action, data)
+    const params = Proxy.parse(action as any, data)
     const ret = await accessor.execute(params)
 
     return {
       code: 0,
-      data: ret
+      data: ret,
+      error: undefined,
+      requestId: undefined
     }
   }
 }
diff --git a/packages/database-proxy/src/index.ts b/packages/database-proxy/src/index.ts
@@ -1,7 +1,6 @@
 
 export * from './proxy'
 export * from './policy'
-export * from './ruler'
 export * from './accessor'
 export * from './types'
 export * from './processor'

diff --git a/packages/database-proxy/src/policy/index.ts b/packages/database-proxy/src/policy/index.ts
@@ -2,4 +2,12 @@ import { Policy } from './policy'
 
 export * from './interface'
 
-export { Policy }
+
+export {
+  Policy,
+
+  /**
+   * Ruler 为别名，为了兼容老版本命名
+   */
+  Policy as Ruler
+}
diff --git a/packages/database-proxy/src/policy/policy.ts b/packages/database-proxy/src/policy/policy.ts
@@ -6,7 +6,6 @@ import * as BUILT_IN_VALIDATORS from '../validators'
 import { AccessorInterface } from '../accessor'
 import { DefaultLogger, LoggerInterface } from '../logger'
 import { PermissionRule, PolicyInterface, ValidateError, ValidateResult } from './interface'
-import { PermissionType as PermissionTypeV1 } from '../ruler/ruler_v1'
 
 /**
  * 访问规则结构： 
@@ -20,6 +19,15 @@ import { PermissionType as PermissionTypeV1 } from '../ruler/ruler_v1'
  *       ->  watch:  PermissionRule[]
  */
 
+
+export enum PermissionTypeV1 {
+  READ = '.read',
+  UPDATE = '.update',
+  ADD = '.add',
+  REMOVE = '.remove',
+  COUNT = '.count'
+}
+
 export enum PermissionType {
   READ = 'read',
   UPDATE = 'update',
@@ -99,7 +107,7 @@ export class Policy implements PolicyInterface {
   }
 
   /**
-   * 加载 rules in josn
+   * 加载 rules in json
    * @param rules any
    * @returns 
    */

diff --git a/packages/database-proxy/src/ruler/index.ts b/packages/database-proxy/src/ruler/index.ts