oak-domain 2.6.8 → 2.6.9

package/lib/types/Entity.d.ts

@@ -181,4 +181,5 @@ export declare type Configuration = {
     actionType?: ActionType;
     static?: boolean;
 };
+export declare type OtmKey<K extends string> = K | `${K}$${number}`;
 export {};

package/lib/utils/SimpleConnector.d.ts

@@ -4,8 +4,10 @@ import { AsyncContext, AsyncRowStore } from '../store/AsyncRowStore';
 import { SyncContext } from '../store/SyncRowStore';
 import { Connector, EntityDict, OakException } from "../types";
 export declare class SimpleConnector<ED extends EntityDict, BackCxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>> extends Connector<ED, BackCxt, FrontCxt> {
-    static ROUTER: string;
-    private serverUrl;
+    static ASPECT_ROUTER: string;
+    static BRIDGE_ROUTER: string;
+    private serverAspectUrl;
+    private serverBridgeUrl;
     private makeException;
     private contextBuilder;
     constructor(serverUrl: string, makeException: (exceptionData: any) => OakException<ED>, contextBuilder: (str: string | undefined) => (store: AsyncRowStore<ED, BackCxt>) => Promise<BackCxt>);
@@ -32,4 +34,15 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
         body: any;
         headers?: Record<string, any> | undefined;
     };
+    getBridgeRouter(): string;
+    /**
+     * 通过本地服务器桥接访问外部资源的url
+     * @param url
+     * @param headers
+     */
+    makeBridgeUrl(url: string, headers?: Record<string, string>): string;
+    parseBridgeRequestQuery(urlParams: string): {
+        url: string;
+        headers?: Record<string, string> | undefined;
+    };
 }

package/lib/utils/SimpleConnector.js

@@ -4,6 +4,7 @@ exports.SimpleConnector = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var stream_1 = require("stream");
+var url_1 = tslib_1.__importDefault(require("url"));
 var types_1 = require("../types");
 function makeContentTypeAndBody(data) {
     //
@@ -24,7 +25,8 @@ var SimpleConnector = /** @class */ (function (_super) {
     tslib_1.__extends(SimpleConnector, _super);
     function SimpleConnector(serverUrl, makeException, contextBuilder) {
         var _this = _super.call(this) || this;
-        _this.serverUrl = "".concat(serverUrl).concat(SimpleConnector.ROUTER);
+        _this.serverAspectUrl = "".concat(serverUrl).concat(SimpleConnector.ASPECT_ROUTER);
+        _this.serverBridgeUrl = "".concat(serverUrl).concat(SimpleConnector.BRIDGE_ROUTER);
         _this.makeException = makeException;
         _this.contextBuilder = contextBuilder;
         return _this;
@@ -37,7 +39,7 @@ var SimpleConnector = /** @class */ (function (_super) {
                     case 0:
                         cxtStr = context.toString();
                         _a = makeContentTypeAndBody(params), contentType = _a.contentType, body = _a.body;
-                        return [4 /*yield*/, global.fetch(this.serverUrl, {
+                        return [4 /*yield*/, global.fetch(this.serverAspectUrl, {
                                 method: 'POST',
                                 headers: Object.assign({
                                     'oak-cxt': cxtStr,
@@ -82,7 +84,7 @@ var SimpleConnector = /** @class */ (function (_super) {
         });
     };
     SimpleConnector.prototype.getRouter = function () {
-        return SimpleConnector.ROUTER;
+        return SimpleConnector.ASPECT_ROUTER;
     };
     SimpleConnector.prototype.parseRequest = function (headers, body, store) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -139,7 +141,40 @@ var SimpleConnector = /** @class */ (function (_super) {
             },
         };
     };
-    SimpleConnector.ROUTER = '/aspect';
+    SimpleConnector.prototype.getBridgeRouter = function () {
+        return SimpleConnector.BRIDGE_ROUTER;
+    };
+    /**
+     * 通过本地服务器桥接访问外部资源的url
+     * @param url
+     * @param headers
+     */
+    SimpleConnector.prototype.makeBridgeUrl = function (url, headers) {
+        // if (process.env.PROD !== 'true') {
+        //     console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
+        //     return url;
+        // }
+        var encodeUrl = encodeURIComponent(url);
+        // const urlParse = URL.parse(url, true);
+        // const { search } = urlParse as {
+        //     search: string;
+        // };
+        // if (headers) {
+        //     search.append('headers', JSON.stringify(headers));
+        // }
+        return "".concat(this.serverBridgeUrl, "?url=").concat(encodeUrl);
+    };
+    SimpleConnector.prototype.parseBridgeRequestQuery = function (urlParams) {
+        var search = new url_1.default.URLSearchParams(urlParams);
+        var url = search.get('url');
+        var headers = search.get('headers');
+        return {
+            url: url,
+            headers: headers && JSON.parse(headers),
+        };
+    };
+    SimpleConnector.ASPECT_ROUTER = '/aspect';
+    SimpleConnector.BRIDGE_ROUTER = '/bridge';
     return SimpleConnector;
 }(types_1.Connector));
 exports.SimpleConnector = SimpleConnector;

package/lib/utils/money.d.ts

@@ -2,4 +2,5 @@ declare const ToCent: (float: number) => number;
 declare const ToYuan: (int: number) => number;
 declare const StringToCent: (value: string, allowNegative?: true) => number | undefined;
 declare const CentToString: (value: number) => string | undefined;
-export { ToCent, ToYuan, StringToCent, CentToString, };
+declare const ThousandCont: (value: number) => string | undefined;
+export { ToCent, ToYuan, StringToCent, CentToString, ThousandCont };

package/lib/utils/money.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CentToString = exports.StringToCent = exports.ToYuan = exports.ToCent = void 0;
+exports.ThousandCont = exports.CentToString = exports.StringToCent = exports.ToYuan = exports.ToCent = void 0;
 var ToCent = function (float) {
     return Math.round(float * 100);
 };
@@ -22,3 +22,19 @@ var CentToString = function (value) {
     }
 };
 exports.CentToString = CentToString;
+var ThousandCont = function (value) {
+    var value1 = "".concat(value);
+    var numArr = value1.split('.');
+    value1 = numArr[0];
+    var result = '';
+    while (value1.length > 3) {
+        result = ',' + value1.slice(-3) + result;
+        value1 = value1.slice(0, value1.length - 3);
+    }
+    if (value1) {
+        result = value1 + result;
+    }
+    result = result + '.' + numArr[1];
+    return result;
+};
+exports.ThousandCont = ThousandCont;

package/lib/utils/version.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 版本比较
+ * @param curVersion 当前版本
+ * @param reqVersion 比较版本
+ * @returns
+ */
+export declare const compareVersion: (curVersion: string, reqVersion: string) => number;

package/lib/utils/version.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareVersion = void 0;
+/**
+ * 版本比较
+ * @param curVersion 当前版本
+ * @param reqVersion 比较版本
+ * @returns
+ */
+var compareVersion = function (curVersion, reqVersion) {
+    var v1 = curVersion.split('.');
+    var v2 = reqVersion.split('.');
+    for (var i = 0; i < Math.max(v1.length, v2.length); i++) {
+        var num1 = i < v1.length ? parseInt(v1[i], 10) : 0;
+        var num2 = i < v2.length ? parseInt(v2[i], 10) : 0;
+        if (num1 !== num2)
+            return num1 - num2;
+    }
+    return 0;
+};
+exports.compareVersion = compareVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.6.8",
+    "version": "2.6.9",
     "author": {
         "name": "XuChang"
     },

package/src/entities/ActionAuth.ts

@@ -0,0 +1,49 @@
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as Relation } from './Relation';
+
+type Actions = string[];
+
+export interface Schema extends EntityShape {
+    relation: Relation;
+    path: String<256>;
+    destEntity: String<32>;
+    deActions: Actions;
+};
+
+
+const indexes: Index<Schema>[] = [
+    {
+        name: 'index_relation_path',
+        attributes: [
+            {
+                name: 'relation',
+            },
+            {
+                name: 'path',
+            },
+        ],
+        config: {
+            unique: true,
+        },
+    },
+];
+
+const locale: LocaleDef<
+    Schema,
+    '',
+    '',
+    {}
+> = {
+    zh_CN: {
+        name: '用户授权',
+        attr: {
+            relation: '关系',
+            path: '路径',
+            destEntity: '目标对象',
+            deActions: '目标对象动作',
+        },
+    },
+};

package/src/entities/Relation.ts

@@ -0,0 +1,49 @@
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId: String<64>;        // 可以为空
+    name: String<32>;
+    display: String<32>;
+};
+
+
+const indexes: Index<Schema>[] = [
+    {
+        name: 'index_entity_entityId_name',
+        attributes: [
+            {
+                name: 'entity',
+            },
+            {
+                name: 'entityId',
+            },
+            {
+                name: 'name',
+            }
+        ],
+        config: {
+            unique: true,
+        },
+    },
+];
+
+const locale: LocaleDef<
+    Schema,
+    '',
+    '',
+    {}
+> = {
+    zh_CN: {
+        name: '用户授权',
+        attr: {
+            name: '关系',
+            entity: '目标对象',
+            entityId: '目标对象id',
+            display: '显示值',
+        },
+    },
+};

package/src/entities/RelationAuth.ts

@@ -0,0 +1,49 @@
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as Relation } from './Relation';
+
+type Relations = string[];
+
+export interface Schema extends EntityShape {
+    relation: Relation;
+    path: String<256>;
+    destEntity: String<32>;
+    deRelations: Relations;
+};
+
+
+const indexes: Index<Schema>[] = [
+    {
+        name: 'index_relation_path',
+        attributes: [
+            {
+                name: 'relation',
+            },
+            {
+                name: 'path',
+            },
+        ],
+        config: {
+            unique: true,
+        },
+    },
+];
+
+const locale: LocaleDef<
+    Schema,
+    '',
+    '',
+    {}
+> = {
+    zh_CN: {
+        name: '用户授权',
+        attr: {
+            relation: '关系',
+            path: '路径',
+            destEntity: '目标对象',
+            deRelations: '目标对象关系',
+        },
+    },
+};

package/src/entities/UserRelation.ts

@@ -0,0 +1,44 @@
+import { String } from '../types/DataType';
+import { LocaleDef } from '../types/Locale';
+import { EntityShape } from '../types/Entity';
+import { Index } from '../types/Storage';
+import { Schema as User } from './User';
+import { Schema as Relation } from './Relation';
+
+export interface Schema extends EntityShape {
+    user: User;
+    relation: Relation;
+};
+
+
+const indexes: Index<Schema>[] = [
+    {
+        name: 'index_user_relation',
+        attributes: [
+            {
+                name: 'user',
+            },
+            {
+                name: 'relation',
+            },
+        ],
+        config: {
+            unique: true,
+        },
+    },
+];
+
+const locale: LocaleDef<
+    Schema,
+    '',
+    '',
+    {}
+> = {
+    zh_CN: {
+        name: '用户对象关系',
+        attr: {
+            user: '关系',
+            relation: '目标关系',
+        },
+    },
+};

package/lib/checkers/SyncCheckExecutor.d.ts

@@ -1,9 +0,0 @@
-import { EntityDict } from '../types/Entity';
-import { EntityDict as BaseEntityDict } from '../base-app-domain';
-import { Checker, CheckerType } from '../types';
-import { SyncContext } from '../store/SyncRowStore';
-export default class SyncCheckerExecutor<ED extends EntityDict & BaseEntityDict, Cxt extends SyncContext<ED>> {
-    private checkerMap;
-    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
-    check<T extends keyof ED>(entity: T, operation: Omit<ED[T]['Operation'], 'id'>, context: Cxt, when?: 'before' | 'after', checkerTypes?: CheckerType[]): void;
-}

package/lib/checkers/SyncCheckExecutor.js

@@ -1,103 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-// 简化版的对checker的同步检查
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var types_1 = require("../types");
-var checker_1 = require("../store/checker");
-var filter_1 = require("../store/filter");
-var SyncCheckerExecutor = /** @class */ (function () {
-    function SyncCheckerExecutor() {
-        this.checkerMap = {};
-    }
-    SyncCheckerExecutor.prototype.registerChecker = function (checker) {
-        var _this = this;
-        var entity = checker.entity, action = checker.action, priority = checker.priority, type = checker.type, conditionalFilter = checker.conditionalFilter;
-        var _a = (0, checker_1.translateCheckerInSyncContext)(checker), fn = _a.fn, when = _a.when;
-        if (priority === undefined) {
-            priority = type === 'data' ? types_1.DATA_CHECKER_DEFAULT_PRIORITY : types_1.CHECKER_DEFAULT_PRIORITY;
-        }
-        var addCheckerMap = function (action2) {
-            var _a, _b, _c;
-            if (_this.checkerMap[entity] && _this.checkerMap[entity][action2]) {
-                var iter = 0;
-                var checkers = _this.checkerMap[entity][action2];
-                for (; iter < checkers.length; iter++) {
-                    if (priority <= checkers[iter].priority) {
-                        break;
-                    }
-                }
-                checkers.splice(iter, 0, {
-                    type: type,
-                    priority: priority,
-                    fn: fn,
-                    when: when,
-                    filter: conditionalFilter,
-                });
-            }
-            else if (_this.checkerMap[entity]) {
-                Object.assign(_this.checkerMap[entity], (_a = {},
-                    _a[action2] = [{
-                            type: type,
-                            priority: priority,
-                            fn: fn,
-                            when: when,
-                            filter: conditionalFilter,
-                        }],
-                    _a));
-            }
-            else {
-                Object.assign(_this.checkerMap, (_b = {},
-                    _b[entity] = (_c = {},
-                        _c[action2] = [{
-                                type: type,
-                                priority: priority,
-                                fn: fn,
-                                when: when,
-                                filter: conditionalFilter,
-                            }],
-                        _c),
-                    _b));
-            }
-        };
-        if (action instanceof Array) {
-            action.forEach(function (a) { return addCheckerMap(a); });
-        }
-        else {
-            addCheckerMap(action);
-        }
-    };
-    SyncCheckerExecutor.prototype.check = function (entity, operation, context, when, checkerTypes) {
-        var e_1, _a;
-        var action = operation.action;
-        var checkers = this.checkerMap[entity] && this.checkerMap[entity][action];
-        if (checkers) {
-            var checkers2 = checkers.filter(function (ele) { return (!checkerTypes || checkerTypes.includes(ele.type)) && (!when || ele.when === when); });
-            try {
-                for (var checkers2_1 = tslib_1.__values(checkers2), checkers2_1_1 = checkers2_1.next(); !checkers2_1_1.done; checkers2_1_1 = checkers2_1.next()) {
-                    var checker = checkers2_1_1.value;
-                    var filter = checker.filter;
-                    if (filter) {
-                        var filterr = typeof filter === 'function' ? filter(operation, context, {}) : filter;
-                        (0, assert_1.default)(!(filter instanceof Promise), "\u5BF9".concat(entity, "\u7684\u52A8\u4F5C").concat(action, "\u4E0A\u5B9A\u4E49\u7684checker\uFF0C\u5176filter\u8FD4\u56DE\u4E86Promise\uFF0C\u8BF7\u6CE8\u610F\u5C06\u540C\u6B65\u548C\u5F02\u6B65\u7684\u8FD4\u56DE\u533A\u5206\u5BF9\u5F85"));
-                        var isRepel = (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter, true);
-                        (0, assert_1.default)(typeof isRepel === 'boolean');
-                        if (isRepel) {
-                            continue;
-                        }
-                    }
-                    checker.fn(operation, context, {});
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (checkers2_1_1 && !checkers2_1_1.done && (_a = checkers2_1.return)) _a.call(checkers2_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-        }
-    };
-    return SyncCheckerExecutor;
-}());
-exports.default = SyncCheckerExecutor;