oak-domain 5.1.9 → 5.1.10

package/lib/compiler/dependencyBuilder.js

@@ -461,7 +461,7 @@ function outputIntializeDev(cwd, dependencies, briefNames, sourceFile, printer,
             }
         });
         // startRoutine
-        if ((0, fs_1.existsSync)(join(destDir, 'routines', 'start'))) {
+        if ((0, fs_1.existsSync)(join(destDir, 'routines', 'start.js'))) {
             const variableName = `${briefNames[idx]}StartRoutines`;
             importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, factory.createIdentifier(variableName), undefined), factory.createStringLiteral(join(dep, destDirName, 'routines/start')), undefined));
             if (objectDict.startRoutines) {
@@ -583,11 +583,30 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
     if (dependencies.length > 0) {
         const importStatements = [];
         const fdNames = [];
+        const adNames = [];
         dependencies.forEach((dep, idx) => {
             const fdName = `${(0, string_1.firstLetterUpperCase)(briefNames[idx])}FeatureDict`;
-            importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("FeatureDict"), factory.createIdentifier(fdName))])), factory.createStringLiteral(dep), undefined));
+            const adName = `${(0, string_1.firstLetterUpperCase)(briefNames[idx])}AspectDict`;
+            // 导入FeatureDict和AspectDict
+            importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
+                factory.createImportSpecifier(false, factory.createIdentifier("FeatureDict"), factory.createIdentifier(fdName)),
+                factory.createImportSpecifier(false, factory.createIdentifier("AspectDict"), factory.createIdentifier(adName))
+            ])), factory.createStringLiteral(dep), undefined));
             fdNames.push(fdName);
+            adNames.push(adName);
         });
+        // 导入自己的AspectDict：import { AspectDict } from '../aspects/AspectDict';
+        importStatements.push(factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, factory.createIdentifier("AspectDict"), factory.createIdentifier("ProjectAspectDict"))])), factory.createStringLiteral("../aspects/AspectDict"), undefined), 
+        // import { createService } from 'oak-frontend-base/es/aspects/AspectService';
+        factory.createImportDeclaration(undefined, factory.createImportClause(false, undefined, factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier("createService"))])), factory.createStringLiteral("oak-frontend-base/es/aspects/AspectService"), undefined));
+        // 创建一个这样的type: type MergeAspectDict = ProjectAspectDict & GenernalAspectDict<EntityDict>;
+        // 除了ProjectAspectDict，还有其他的AspectDict，需要<EntityDict>参数
+        const adTypeDeclaration = factory.createTypeAliasDeclaration(undefined, factory.createIdentifier("MergeAspectDict"), undefined, factory.createIntersectionTypeNode([
+            factory.createTypeReferenceNode(factory.createIdentifier("ProjectAspectDict"), undefined),
+            ...adNames.map(ad => {
+                return factory.createTypeReferenceNode(factory.createIdentifier(ad), [factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined)]);
+            })
+        ]));
         let i = 0;
         while (true) {
             const stmt = statements[i];
@@ -599,7 +618,7 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
         const stmt3 = statements[i - 1], stmt4 = statements[i];
         (0, assert_1.default)(ts.isImportDeclaration(stmt3) && ts.isFunctionDeclaration(stmt4));
         const { name, parameters } = stmt4;
-        (0, assert_1.default)(ts.isIdentifier(name) && name.text === 'create' && parameters.length === 1);
+        (0, assert_1.default)(name && ts.isIdentifier(name) && name.text === 'create' && parameters.length === 1);
         const [param] = parameters;
         const { name: paramName, type } = param;
         (0, assert_1.default)(ts.isIdentifier(paramName) && paramName.text === 'features' && ts.isTypeReferenceNode(type));
@@ -611,9 +630,43 @@ function outputFeatureIndex(dependencies, briefNames, sourceFile, printer, filen
                 ]))
             ])
         });
+        const functionBlock = stmt4.body;
+        (0, assert_1.default)(functionBlock && ts.isBlock(functionBlock));
+        let returnI = 0;
+        while (true) {
+            const stmt = functionBlock.statements[returnI];
+            if (ts.isReturnStatement(stmt)) {
+                break;
+            }
+            returnI++;
+        }
+        // 在return之前，插入const aspect = createService<EntityDict, MergeAspectDict>(cache);
+        const aspectDeclaration = factory.createVariableStatement(undefined, factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("aspect"), undefined, undefined, factory.createCallExpression(factory.createIdentifier("createService"), [
+                factory.createTypeReferenceNode(factory.createIdentifier("EntityDict"), undefined),
+                factory.createTypeReferenceNode(factory.createIdentifier("MergeAspectDict"), undefined)
+            ], [factory.createIdentifier("cache")]))], ts.NodeFlags.Const));
+        const returnStmt = functionBlock.statements[returnI];
+        (0, assert_1.default)(returnStmt.expression && ts.isObjectLiteralExpression(returnStmt.expression));
+        // 在里面添加aspect
+        const { properties } = returnStmt.expression;
+        Object.assign(returnStmt.expression, {
+            properties: [
+                ...properties,
+                factory.createShorthandPropertyAssignment(factory.createIdentifier("aspect"))
+            ]
+        });
+        // 把aspectDeclaration 插入到return之前
+        const newFunctionStatements = [
+            ...functionBlock.statements.slice(0, returnI),
+            aspectDeclaration,
+            ...functionBlock.statements.slice(returnI)
+        ];
+        const newBlock = factory.createBlock(newFunctionStatements);
+        Object.assign(functionBlock, newBlock);
         statements2 = [
             ...statements.slice(0, i),
             ...importStatements,
+            adTypeDeclaration,
             ...statements.slice(i)
         ];
         if (isModule) {

package/lib/types/Configuration.d.ts

@@ -34,6 +34,9 @@ export type ServerConfiguration = {
         methods?: string[];
     };
     internalExceptionMask?: string;
+    koaBody?: {
+        maxFileSize?: number;
+    };
 };
 /**
  * 前后台访问配置
@@ -52,6 +55,7 @@ export type AccessConfiguration = {
         ssl?: boolean;
         path?: string;
     };
+    timeout?: number;
 };
 /**
  * 业务逻辑的通用配置

package/lib/types/Exception.d.ts

@@ -19,6 +19,9 @@ export declare class OakException<ED extends EntityDict & BaseEntityDict> extend
     tag2?: boolean;
     tag3?: any;
 }
+export declare class OakRequestTimeoutException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
+    constructor(message?: string);
+}
 export declare class OakMakeSureByMySelfException<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {
 }
 export declare class OakPartialSuccess<ED extends EntityDict & BaseEntityDict> extends OakException<ED> {

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.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.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 {
@@ -90,6 +90,13 @@ class OakException extends Error {
     tag3;
 }
 exports.OakException = OakException;
+// 请求超时
+class OakRequestTimeoutException extends OakException {
+    constructor(message) {
+        super(message || '请求超时');
+    }
+}
+exports.OakRequestTimeoutException = OakRequestTimeoutException;
 // 这个异常表示模块自己处理跨事务一致性，框架pass（在分布式数据传递时会用到）（backend-base老版本有使用先保留）
 class OakMakeSureByMySelfException extends OakException {
 }
@@ -495,6 +502,14 @@ function makeException(data) {
             e = new OakSocketConnectException(data.message);
             break;
         }
+        case 'OakPartialSuccess': {
+            e = new OakPartialSuccess(data.message);
+            break;
+        }
+        case 'OakRequestTimeoutException': {
+            e = new OakRequestTimeoutException(data.message);
+            break;
+        }
         default:
             return;
     }

package/lib/types/Sync.d.ts

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

package/lib/utils/SimpleConnector.d.ts

@@ -17,6 +17,7 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
     private serverSubscribePointUrl;
     private configuration;
     private makeException;
+    private timeout;
     constructor(configuration: AccessConfiguration, makeException: (exceptionData: any) => OakException<ED>);
     getCorsHeader(): string[];
     protected makeHeadersAndBody(name: string, data: any, context?: FrontCxt): Promise<{
@@ -82,4 +83,5 @@ export default class SimpleConnector<ED extends EntityDict & BaseEntityDict, Fro
         headers?: Record<string, string> | undefined;
     };
     getFullData(): Promise<{}>;
+    private fetchWithTimeout;
 }

package/lib/utils/SimpleConnector.js

@@ -18,9 +18,11 @@ class SimpleConnector {
     serverSubscribePointUrl;
     configuration;
     makeException;
+    timeout;
     constructor(configuration, makeException) {
         this.configuration = configuration;
-        const { routerPrefixes, http } = configuration;
+        const { routerPrefixes, http, timeout } = configuration;
+        this.timeout = timeout || 5000;
         const { ssl, hostname, port, path } = http;
         const protocol = ssl ? 'https:' : 'http:';
         let serverUrl = `${protocol}//${hostname}`;
@@ -108,11 +110,11 @@ class SimpleConnector {
         const { headers, body } = await this.makeHeadersAndBody(name, params, context);
         let response;
         try {
-            response = await global.fetch(this.serverAspectUrl, {
+            response = await this.fetchWithTimeout(this.serverAspectUrl, {
                 method: 'POST',
                 headers,
                 body,
-            });
+            }, this.timeout);
         }
         catch (err) {
             // fetch返回异常一定是网络异常
@@ -135,7 +137,7 @@ class SimpleConnector {
     async getSocketPoint() {
         let response;
         try {
-            response = await global.fetch(this.serverSubscribePointUrl);
+            response = await this.fetchWithTimeout(this.serverSubscribePointUrl, {}, this.timeout);
         }
         catch (err) {
             throw new types_1.OakNetworkException();
@@ -231,5 +233,29 @@ class SimpleConnector {
         console.error('前后台模式下暂时不支持此操作，请到数据库查看数据');
         return {};
     }
+    async fetchWithTimeout(url, options, timeout = 5000) {
+        if (typeof AbortController === 'undefined') {
+            return global.fetch(url, options);
+        }
+        const controller = new AbortController();
+        const signal = controller.signal;
+        // 设置超时
+        const timeoutId = setTimeout(() => {
+            controller.abort();
+        }, timeout);
+        // 发起 fetch 请求并传递 signal
+        return global.fetch(url, Object.assign({}, options, { signal }))
+            .then(response => {
+            clearTimeout(timeoutId); // 如果请求成功，清除超时
+            return response;
+        })
+            .catch(error => {
+            clearTimeout(timeoutId); // 如果请求失败，清除超时
+            if (error.name === 'AbortError') {
+                throw new types_1.OakRequestTimeoutException();
+            }
+            throw error; // 其他错误
+        });
+    }
 }
 exports.default = SimpleConnector;

package/lib/utils/geo.d.ts

@@ -2,3 +2,33 @@
  * 计算地球上两点之间的球面距离
  */
 export declare function getDistanceBetweenPoints(lat1: number, lon1: number, lat2: number, lon2: number): number;
+/**
+ * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+ * 即 百度 转 谷歌、高德
+ * @param bd_lon
+ * @param bd_lat
+ * @returns {*[]}
+ */
+export declare function bd09togcj02(coord: [number, number]): number[];
+/**
+ * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+ * 即谷歌、高德 转 百度
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+export declare function gcj02tobd09(coord: [number, number]): number[];
+/**
+ * WGS84转GCj02
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+export declare function wgs84togcj02(coord: [number, number]): number[];
+/**
+ * GCJ02 转换为 WGS84
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+export declare function gcj02towgs84(coord: [number, number]): number[];

package/lib/utils/geo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDistanceBetweenPoints = void 0;
+exports.gcj02towgs84 = exports.wgs84togcj02 = exports.gcj02tobd09 = exports.bd09togcj02 = exports.getDistanceBetweenPoints = void 0;
 /**
  * 计算地球上两点之间的球面距离
  */
@@ -22,3 +22,125 @@ function getDistanceBetweenPoints(lat1, lon1, lat2, lon2) {
     return d * 1000;
 }
 exports.getDistanceBetweenPoints = getDistanceBetweenPoints;
+//定义一些常量
+const x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+const PI = 3.1415926535897932384626;
+const a = 6378245.0;
+const ee = 0.00669342162296594323;
+function transformlat(lng, lat) {
+    let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+    return ret;
+}
+;
+function transformlng(lng, lat) {
+    let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+    return ret;
+}
+;
+/**
+ * 判断是否在国内，不在国内则不做偏移
+ * @param lng
+ * @param lat
+ * @returns {boolean}
+ */
+function out_of_china(lng, lat) {
+    // 纬度3.86~53.55,经度73.66~135.05 
+    return !(lng > 73.66 && lng < 135.05 && lat > 3.86 && lat < 53.55);
+}
+;
+/**
+ * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+ * 即 百度 转 谷歌、高德
+ * @param bd_lon
+ * @param bd_lat
+ * @returns {*[]}
+ */
+function bd09togcj02(coord) {
+    const [bd_lon, bd_lat] = coord;
+    const x = bd_lon - 0.0065;
+    const y = bd_lat - 0.006;
+    const z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_PI);
+    const theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_PI);
+    const gg_lng = z * Math.cos(theta);
+    const gg_lat = z * Math.sin(theta);
+    return [gg_lng, gg_lat];
+}
+exports.bd09togcj02 = bd09togcj02;
+;
+/**
+ * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+ * 即谷歌、高德 转 百度
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02tobd09(coord) {
+    const [lng, lat] = coord;
+    const z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+    const theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+    const bd_lng = z * Math.cos(theta) + 0.0065;
+    const bd_lat = z * Math.sin(theta) + 0.006;
+    return [bd_lng, bd_lat];
+}
+exports.gcj02tobd09 = gcj02tobd09;
+;
+/**
+ * WGS84转GCj02
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function wgs84togcj02(coord) {
+    const [lng, lat] = coord;
+    if (out_of_china(lng, lat)) {
+        return [lng, lat];
+    }
+    else {
+        let dlat = transformlat(lng - 105.0, lat - 35.0);
+        let dlng = transformlng(lng - 105.0, lat - 35.0);
+        const radlat = lat / 180.0 * PI;
+        let magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        const sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        const mglat = lat + dlat;
+        const mglng = lng + dlng;
+        return [mglng, mglat];
+    }
+}
+exports.wgs84togcj02 = wgs84togcj02;
+;
+/**
+ * GCJ02 转换为 WGS84
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02towgs84(coord) {
+    const [lng, lat] = coord;
+    if (out_of_china(lng, lat)) {
+        return [lng, lat];
+    }
+    else {
+        let dlat = transformlat(lng - 105.0, lat - 35.0);
+        let dlng = transformlng(lng - 105.0, lat - 35.0);
+        const radlat = lat / 180.0 * PI;
+        let magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        const sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        const mglat = lat + dlat;
+        const mglng = lng + dlng;
+        return [lng * 2 - mglng, lat * 2 - mglat];
+    }
+}
+exports.gcj02towgs84 = gcj02towgs84;
+;

package/package.json

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