oak-domain 5.1.12 → 5.1.13

package/lib/store/CascadeStore.js

@@ -247,7 +247,8 @@ class CascadeStore extends RowStore_1.RowStore {
                 assignNecessaryProjectionAttrs(projectionNode, necessaryAttrs);
             }
             // 如果对象中指向一对多的Modi，此时加上指向Modi的projection
-            if (this.getSchema()[entity2].toModi) {
+            // 此逻辑关闭，用户自己撰写去取modi     by Xc 20241207
+            /* if (this.getSchema()[entity2].toModi) {
                 Object.assign(projectionNode, {
                     modi$entity: {
                         $entity: 'modi',
@@ -268,7 +269,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         },
                     }
                 });
-            }
+            } */
             // 如果对象上有relation关系，在此将本用户相关的relation和actionAuth全部取出
             // 还要将actionAuth上没有relation关系但destEntity为本对象的行也全部取出，这些是指向userId的可能路径
             // 放在这里有点怪异，暂先这样

package/lib/store/projection.d.ts

@@ -0,0 +1,2 @@
+import { Projection } from '../base-app-domain/Modi/Schema';
+export declare const fullModi: Projection;

package/lib/store/projection.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fullModi = void 0;
+exports.fullModi = {
+    id: 1,
+    targetEntity: 1,
+    entity: 1,
+    entityId: 1,
+    action: 1,
+    iState: 1,
+    data: 1,
+    filter: 1,
+    $$createAt$$: 1,
+    $$updateAt$$: 1,
+};

package/lib/store/relation.js

@@ -42,7 +42,7 @@ function judgeRelation(schema, entity, attr, allowUnrecognized) {
         }
         else {
             // 这种情况应该不会跑到
-            (0, assert_1.default)(false);
+            (0, assert_1.default)(false, `非法的属性名：[${attr}]`);
         }
     }
     else if ((attributes.hasOwnProperty(`${attr}Id`))) {

package/lib/types/Configuration.d.ts

@@ -65,6 +65,7 @@ export type AccessConfiguration = {
         path?: string;
     };
     timeout?: number;
+    clockDriftDuration?: number;
 };
 /**
  * 业务逻辑的通用配置
@@ -87,15 +88,3 @@ export type DependencyConfiguration = string[];
 export type RenderConfiguration<ED extends BaseEntityDict & EntityDict> = {
     styleDict: StyleDict<ED>;
 };
-/**
- * 编译环境配置
- */
-export type CompilerConfiguration = {
-    webpack?: {
-        resolve?: {
-            alias?: Record<string, string>;
-            fallback?: Record<string, string | false>;
-        };
-        extraOakModules?: (string | RegExp)[];
-    };
-};

package/lib/types/Exception.d.ts

@@ -77,6 +77,9 @@ export declare class OakServerProxyException<ED extends EntityDict & BaseEntityD
 }
 export declare class OakClockDriftException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
+export declare class OakSignatureVerificationException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+    constructor(message?: string);
+}
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
  *

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakClockDriftException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakRequestTimeoutException = exports.OakException = void 0;
+exports.makeException = exports.OakSocketConnectException = exports.OakExternalException = exports.OakPreConditionUnsetException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserInvisibleException = exports.OakUserUnpermittedException = exports.OakAttrCantUpdateException = exports.OakAttrNotNullException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakSignatureVerificationException = exports.OakClockDriftException = exports.OakServerProxyException = exports.OakNetworkException = exports.OakImportDataParseException = exports.OakUniqueViolationException = exports.OakUserException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakNoRelationDefException = exports.OakDataException = exports.OakPartialSuccess = exports.OakMakeSureByMySelfException = exports.OakRequestTimeoutException = exports.OakException = void 0;
 const relation_1 = require("../store/relation");
 const lodash_1 = require("../utils/lodash");
 class OakException extends Error {
@@ -188,6 +188,13 @@ exports.OakServerProxyException = OakServerProxyException;
 class OakClockDriftException extends OakException {
 }
 exports.OakClockDriftException = OakClockDriftException;
+// 验签失败
+class OakSignatureVerificationException extends OakException {
+    constructor(message) {
+        super(message || '验签失败');
+    }
+}
+exports.OakSignatureVerificationException = OakSignatureVerificationException;
 // 在系统更新数据时，以下三个异常应按规范依次抛出。
 /**
  * 数据不一致异常，系统认为现有的数据不允许相应的动作时抛此异常
@@ -510,6 +517,10 @@ function makeException(data) {
             e = new OakRequestTimeoutException(data.message);
             break;
         }
+        case 'OakSignatureVerificationException': {
+            e = new OakSignatureVerificationException(data.message);
+            break;
+        }
         default:
             return;
     }

package/lib/types/Sync.d.ts

@@ -77,6 +77,7 @@ export interface SyncRemoteConfig<ED extends EntityDict & BaseEntityDict, Cxt ex
         reason: Error;
     }, context: Cxt) => Promise<void>;
     timeout?: number;
+    clockDriftDuration?: number;
 }
 export interface SyncSelfConfigBase<ED extends EntityDict & BaseEntityDict> {
     endpoint?: string;

package/lib/utils/SimpleConnector.d.ts

@@ -18,6 +18,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
     private configuration;
     private makeException;
     private timeout;
+    private clockDriftDuration;
     constructor(configuration: AccessConfiguration, makeException: (exceptionData: any) => OakException<ED>);
     getCorsHeader(): string[];
     protected makeHeadersAndBody(name: string, data: any, context?: FrontCxt): Promise<{

package/lib/utils/SimpleConnector.js

@@ -19,10 +19,12 @@ class SimpleConnector {
     configuration;
     makeException;
     timeout;
+    clockDriftDuration;
     constructor(configuration, makeException) {
         this.configuration = configuration;
-        const { routerPrefixes, http, timeout } = configuration;
+        const { routerPrefixes, http, timeout, clockDriftDuration } = configuration;
         this.timeout = timeout || 5000;
+        this.clockDriftDuration = clockDriftDuration || 10000;
         const { ssl, hostname, port, path } = http;
         const protocol = ssl ? 'https:' : 'http:';
         let serverUrl = `${protocol}//${hostname}`;
@@ -77,7 +79,7 @@ class SimpleConnector {
     async parseAspectResult(response) {
         if (response.status > 299) {
             const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
-            throw err;
+            throw this.makeException(err);
         }
         const message = response.headers.get('oak-message');
         const responseType = response.headers.get('Content-Type') ||
@@ -118,10 +120,14 @@ class SimpleConnector {
         }
         catch (err) {
             // fetch返回异常一定是网络异常
+            let exception = err;
             if (err instanceof types_1.OakRequestTimeoutException) {
-                throw new types_1.OakNetworkException(`接口请求超时`);
+                exception = new types_1.OakNetworkException(`接口请求超时`);
             }
-            throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
+            else {
+                exception = new types_1.OakNetworkException(`接口请求时发生网络异常`);
+            }
+            throw this.makeException(exception);
         }
         return this.parseAspectResult(response);
     }
@@ -143,14 +149,18 @@ class SimpleConnector {
             response = await this.fetchWithTimeout(this.serverSubscribePointUrl, {}, this.timeout);
         }
         catch (err) {
+            let exception = err;
             if (err instanceof types_1.OakRequestTimeoutException) {
-                throw new types_1.OakNetworkException(`接口请求超时`);
+                exception = new types_1.OakNetworkException(`接口请求超时`);
+            }
+            else {
+                exception = new types_1.OakNetworkException(`接口请求时发生网络异常`);
             }
-            throw new types_1.OakNetworkException(`接口请求时发生网络异常`);
+            throw this.makeException(exception);
         }
         if (response.status > 299) {
             const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
-            throw err;
+            throw this.makeException(err);
         }
         const message = response.headers.get('oak-message');
         const responseType = response.headers.get('Content-Type') ||
@@ -219,10 +229,6 @@ class SimpleConnector {
      * @param headers
      */
     makeBridgeUrl(url, headers) {
-        // if (process.env.PROD !== 'true') {
-        //     console.warn('在development下无法通过bridge访问资源，将直接访问，可能失败', url);
-        //     return url;
-        // }
         const encodeUrl = encodeURIComponent(url);
         return `${this.serverBridgeUrl}?url=${encodeUrl}`;
     }

package/package.json

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