oak-domain 4.2.2 → 4.2.3

package/lib/store/CascadeStore.js

@@ -1308,6 +1308,7 @@ class CascadeStore extends RowStore_1.RowStore {
                         if (!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi'].includes(entity) && ids.length > 0) {
                             // 按照框架要求生成Oper和OperEntity这两个内置的对象
                             (0, assert_1.default)(operId);
+                            const operatorId = context.getCurrentUserId(true);
                             const createOper = {
                                 id: 'dummy',
                                 action: 'create',
@@ -1317,6 +1318,7 @@ class CascadeStore extends RowStore_1.RowStore {
                                     data,
                                     targetEntity: entity,
                                     bornAt,
+                                    operatorId,
                                     operEntity$oper: {
                                         id: 'dummy',
                                         action: 'create',

package/lib/store/checker.js

@@ -152,7 +152,7 @@ function translateCheckerInSyncContext(checker) {
                 if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter, true)) {
                     return;
                 }
-                const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg);
+                const e = new Exception_1.OakRowInconsistencyException(undefined, errMsg || 'row checker condition illegal');
                 throw e;
             };
             return {
@@ -402,7 +402,7 @@ function checkAttributeLegal(schema, entity, data) {
                 case 'enum': {
                     (0, assert_1.default)(enumeration);
                     if (!enumeration.includes(data[attr])) {
-                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not in enumberation');
+                        throw new Exception_1.OakInputIllegalException(entity, [attr], 'not in enumeration');
                     }
                     break;
                 }

package/lib/types/Connector.d.ts

@@ -10,9 +10,10 @@ export interface Connector<ED extends EntityDict, FrontCxt extends SyncContext<E
         message?: string | null;
     }>;
     getRouter: () => string;
-    parseRequestHeaders: (headers: IncomingHttpHeaders) => {
+    parseRequest: (headers: IncomingHttpHeaders, body?: any, files?: any) => {
         contextString?: string;
         aspectName: string;
+        data?: any;
     };
     serializeResult: (result: any, opRecords: OpRecord<ED>[], headers: IncomingHttpHeaders, body: any, message?: string) => Promise<{
         body: any;

package/lib/types/Sync.d.ts

@@ -32,14 +32,13 @@ export interface PushEntityDef<ED extends EntityDict & BaseEntityDict, T extends
     recursive?: boolean;
     relationName?: string;
     actions?: ED[T]['Action'][];
+    /**
+     * 同步结果回调，根据接口的幂等原理，同步一定要完全成功再回调
+     */
     onSynchronized?: (result: {
         action: ED[T]['Action'];
         data: ED[T]['Operation']['data'];
-        result: Array<{
-            userId: string;
-            rowIds: string[];
-            error?: Error;
-        }>;
+        rowIds: string[];
     }, context: Cxt) => Promise<void>;
 }
 export interface SyncRemoteConfigBase<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> {

package/lib/utils/SimpleConnector.d.ts

@@ -20,6 +20,22 @@ export declare class SimpleConnector<ED extends EntityDict, FrontCxt extends Syn
     private option;
     private makeException;
     constructor(option: ServerOption, makeException: (exceptionData: any) => OakException<ED>);
+    protected makeHeadersAndBody(name: string, data: any, context?: FrontCxt): Promise<{
+        headers: Record<string, string>;
+        body: FormData;
+    } | {
+        headers: HeadersInit;
+        body: string;
+    }>;
+    protected parseAspectResult(response: Response): Promise<{
+        result: any;
+        opRecords: any;
+        message: string | null;
+    } | {
+        result: ArrayBuffer;
+        message: string | null;
+        opRecords?: undefined;
+    }>;
     callAspect(name: string, params: any, context?: FrontCxt): Promise<{
         result: any;
         opRecords: any;
@@ -37,9 +53,10 @@ export declare class SimpleConnector<ED extends EntityDict, FrontCxt extends Syn
         path: any;
     }>;
     getEndpointRouter(): string;
-    parseRequestHeaders(headers: IncomingHttpHeaders): {
+    parseRequest(headers: IncomingHttpHeaders, body?: any, files?: any): {
         contextString: string | undefined;
         aspectName: string;
+        data: any;
     };
     serializeResult(result: any, opRecords: OpRecord<ED>[], headers: IncomingHttpHeaders, body: any, message?: string): Promise<{
         body: any;

package/lib/utils/SimpleConnector.js

@@ -6,20 +6,6 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const stream_1 = require("stream");
 const url_1 = tslib_1.__importDefault(require("url"));
 const types_1 = require("../types");
-function makeContentTypeAndBody(data) {
-    if (process.env.OAK_PLATFORM !== 'wechatMp') {
-        if (data instanceof FormData) {
-            return {
-                // contentType: 'multipart/form-data',
-                body: data,
-            };
-        }
-    }
-    return {
-        contentType: 'application/json',
-        body: JSON.stringify(data),
-    };
-}
 class SimpleConnector {
     static ASPECT_ROUTER = '/aspect';
     static BRIDGE_ROUTER = '/bridge';
@@ -47,26 +33,30 @@ class SimpleConnector {
         this.serverSubscribePointUrl = `${serverUrl}${SimpleConnector.SUBSCRIBE_POINT_ROUTER}`;
         this.makeException = makeException;
     }
-    async callAspect(name, params, context) {
+    async makeHeadersAndBody(name, data, context) {
         const cxtStr = context ? await context.toString() : '{}';
-        const { contentType, body } = makeContentTypeAndBody(params);
-        let response;
-        try {
-            response = await global.fetch(this.serverAspectUrl, {
-                method: 'POST',
-                headers: Object.assign({
-                    'oak-cxt': cxtStr,
-                    'oak-aspect': name,
-                }, contentType && {
-                    'Content-Type': contentType,
-                }),
-                body,
-            });
-        }
-        catch (err) {
-            // fetch返回异常一定是网络异常
-            throw new types_1.OakNetworkException(`请求[${this.serverAspectUrl}]，发生网络异常`);
+        const headers = {
+            'oak-cxt': cxtStr,
+            'oak-aspect': name,
+        };
+        if (process.env.OAK_PLATFORM !== 'wechatMp') {
+            if (data instanceof FormData) {
+                return {
+                    headers,
+                    body: data,
+                };
+            }
         }
+        return {
+            headers: {
+                'Content-Type': 'application/json',
+                ...headers,
+            },
+            body: JSON.stringify(data),
+        };
+    }
+    ;
+    async parseAspectResult(response) {
         if (response.status > 299) {
             const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
             throw err;
@@ -98,6 +88,22 @@ class SimpleConnector {
             throw new Error(`尚不支持的content-type类型${responseType}`);
         }
     }
+    async callAspect(name, params, context) {
+        const { headers, body } = await this.makeHeadersAndBody(name, params, context);
+        let response;
+        try {
+            response = await global.fetch(this.serverAspectUrl, {
+                method: 'POST',
+                headers,
+                body,
+            });
+        }
+        catch (err) {
+            // fetch返回异常一定是网络异常
+            throw new types_1.OakNetworkException(`请求[${this.serverAspectUrl}]，发生网络异常`);
+        }
+        return this.parseAspectResult(response);
+    }
     getRouter() {
         return SimpleConnector.ASPECT_ROUTER;
     }
@@ -142,13 +148,18 @@ class SimpleConnector {
     getEndpointRouter() {
         return SimpleConnector.ENDPOINT_ROUTER;
     }
-    parseRequestHeaders(headers) {
+    parseRequest(headers, body, files) {
         const { 'oak-cxt': oakCxtStr, 'oak-aspect': aspectName } = headers;
         (0, assert_1.default)(typeof oakCxtStr === 'string' || oakCxtStr === undefined);
         (0, assert_1.default)(typeof aspectName === 'string');
         return {
             contextString: oakCxtStr,
             aspectName,
+            /*  data: !files ? body : {
+                 data: body,
+                 files,
+             }, */ // 下个版本再改
+            data: files ? Object.assign({}, body, files) : body,
         };
     }
     async serializeResult(result, opRecords, headers, body, message) {

package/package.json

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