oak-domain 2.5.2 → 2.6.2

package/lib/utils/SimpleConnector.js

@@ -1,117 +1,134 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleConnector = void 0;
-var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-var stream_1 = require("stream");
-var 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),
-    };
-}
-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.makeException = makeException;
-        _this.contextBuilder = contextBuilder;
-        return _this;
-    }
-    SimpleConnector.prototype.callAspect = function (name, params, context) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cxtStr, _a, contentType, body, response, err, _b, exception, result, opRecords;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        cxtStr = context.toString();
-                        _a = makeContentTypeAndBody(params), contentType = _a.contentType, body = _a.body;
-                        return [4 /*yield*/, global.fetch(this.serverUrl, {
-                                method: 'POST',
-                                headers: {
-                                    'Content-Type': contentType,
-                                    'oak-cxt': cxtStr,
-                                    'oak-aspect': name,
-                                },
-                                body: body,
-                            })];
-                    case 1:
-                        response = _c.sent();
-                        if (response.status > 299) {
-                            err = new types_1.OakExternalException("\u7F51\u7EDC\u8BF7\u6C42\u8FD4\u56DE\u5F02\u5E38\uFF0Cstatus\u662F".concat(response.status));
-                            throw err;
-                        }
-                        return [4 /*yield*/, response.json()];
-                    case 2:
-                        _b = _c.sent(), exception = _b.exception, result = _b.result, opRecords = _b.opRecords;
-                        if (exception) {
-                            throw this.makeException(exception);
-                        }
-                        return [2 /*return*/, {
-                                result: result,
-                                opRecords: opRecords,
-                            }];
-                }
-            });
-        });
-    };
-    SimpleConnector.prototype.getRouter = function () {
-        return SimpleConnector.ROUTER;
-    };
-    SimpleConnector.prototype.parseRequest = function (headers, body, store) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var oakCxtStr, aspectName, context;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        oakCxtStr = headers["oak-cxt"], aspectName = headers["oak-aspect"];
-                        (0, assert_1.default)(typeof oakCxtStr === 'string' || oakCxtStr === undefined);
-                        (0, assert_1.default)(typeof aspectName === 'string');
-                        return [4 /*yield*/, this.contextBuilder(oakCxtStr)(store)];
-                    case 1:
-                        context = _a.sent();
-                        context.setHeaders(headers);
-                        return [2 /*return*/, {
-                                name: aspectName,
-                                params: body,
-                                context: context,
-                            }];
-                }
-            });
-        });
-    };
-    SimpleConnector.prototype.serializeResult = function (result, context, headers, body) {
-        if (result instanceof stream_1.Stream) {
-            return {
-                body: result,
-            };
-        }
-        return {
-            body: {
-                result: result,
-                opRecords: context.opRecords,
-            },
-        };
-    };
-    SimpleConnector.prototype.serializeException = function (exception, headers, body) {
-        return {
-            body: {
-                exception: exception.toString(),
-            },
-        };
-    };
-    SimpleConnector.ROUTER = '/aspect';
-    return SimpleConnector;
-}(types_1.Connector));
-exports.SimpleConnector = SimpleConnector;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleConnector = void 0;
+var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
+var stream_1 = require("stream");
+var 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),
+    };
+}
+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.makeException = makeException;
+        _this.contextBuilder = contextBuilder;
+        return _this;
+    }
+    SimpleConnector.prototype.callAspect = function (name, params, context) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var cxtStr, _a, contentType, body, response, err, message, responseType, _b, exception, result, opRecords, result;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        cxtStr = context.toString();
+                        _a = makeContentTypeAndBody(params), contentType = _a.contentType, body = _a.body;
+                        return [4 /*yield*/, global.fetch(this.serverUrl, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': contentType,
+                                    'oak-cxt': cxtStr,
+                                    'oak-aspect': name,
+                                },
+                                body: body,
+                            })];
+                    case 1:
+                        response = _c.sent();
+                        if (response.status > 299) {
+                            err = new types_1.OakExternalException("\u7F51\u7EDC\u8BF7\u6C42\u8FD4\u56DE\u5F02\u5E38\uFF0Cstatus\u662F".concat(response.status));
+                            throw err;
+                        }
+                        message = response.headers.get('oak-message');
+                        responseType = response.headers.get('Content-Type');
+                        if (!(responseType === null || responseType === void 0 ? void 0 : responseType.toLocaleLowerCase().match(/application\/json/i))) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        _b = _c.sent(), exception = _b.exception, result = _b.result, opRecords = _b.opRecords;
+                        if (exception) {
+                            throw this.makeException(exception);
+                        }
+                        return [2 /*return*/, {
+                                result: result,
+                                opRecords: opRecords,
+                                message: message,
+                            }];
+                    case 3:
+                        if (!(responseType === null || responseType === void 0 ? void 0 : responseType.toLocaleLowerCase().match(/application\/octet-stream/i))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, response.arrayBuffer()];
+                    case 4:
+                        result = _c.sent();
+                        return [2 /*return*/, {
+                                result: result,
+                                message: message,
+                            }];
+                    case 5: throw new Error("\u5C1A\u4E0D\u652F\u6301\u7684content-type\u7C7B\u578B".concat(responseType));
+                }
+            });
+        });
+    };
+    SimpleConnector.prototype.getRouter = function () {
+        return SimpleConnector.ROUTER;
+    };
+    SimpleConnector.prototype.parseRequest = function (headers, body, store) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var oakCxtStr, aspectName, context;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        oakCxtStr = headers["oak-cxt"], aspectName = headers["oak-aspect"];
+                        (0, assert_1.default)(typeof oakCxtStr === 'string' || oakCxtStr === undefined);
+                        (0, assert_1.default)(typeof aspectName === 'string');
+                        return [4 /*yield*/, this.contextBuilder(oakCxtStr)(store)];
+                    case 1:
+                        context = _a.sent();
+                        context.setHeaders(headers);
+                        return [2 /*return*/, {
+                                name: aspectName,
+                                params: body,
+                                context: context,
+                            }];
+                }
+            });
+        });
+    };
+    SimpleConnector.prototype.serializeResult = function (result, context, headers, body) {
+        if (result instanceof stream_1.Stream) {
+            return {
+                body: result,
+            };
+        }
+        return {
+            body: {
+                result: result,
+                opRecords: context.opRecords,
+            },
+            headers: {
+                'oak-message': context.getMessage(),
+            },
+        };
+    };
+    SimpleConnector.prototype.serializeException = function (exception, headers, body) {
+        return {
+            body: {
+                exception: exception.toString(),
+            },
+        };
+    };
+    SimpleConnector.ROUTER = '/aspect';
+    return SimpleConnector;
+}(types_1.Connector));
+exports.SimpleConnector = SimpleConnector;

package/lib/utils/assert.d.ts

@@ -1,5 +1,5 @@
-/**
- * 防止assert打包体积过大，从这里引用
- */
-import assert from 'assert';
-export { assert, };
+/**
+ * 防止assert打包体积过大，从这里引用
+ */
+import assert from 'assert';
+export { assert, };

package/lib/utils/assert.js

@@ -1,9 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-var tslib_1 = require("tslib");
-/**
- * 防止assert打包体积过大，从这里引用
- */
-var assert_1 = tslib_1.__importDefault(require("assert"));
-exports.assert = assert_1.default;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+var tslib_1 = require("tslib");
+/**
+ * 防止assert打包体积过大，从这里引用
+ */
+var assert_1 = tslib_1.__importDefault(require("assert"));
+exports.assert = assert_1.default;

package/lib/utils/concurrent.d.ts

@@ -1,15 +1,15 @@
-declare type Mode = 'S' | 'X';
-/**
- * 模拟一个读写锁，用于同步。
- * 注意，千万不要发生自己等自己
- */
-export declare class RWLock {
-    private readNumber;
-    private writeNumber;
-    private readWaiter;
-    private writeWaiter;
-    constructor();
-    acquire(mode: Mode): Promise<void>;
-    release(): void;
-}
-export {};
+declare type Mode = 'S' | 'X';
+/**
+ * 模拟一个读写锁，用于同步。
+ * 注意，千万不要发生自己等自己
+ */
+export declare class RWLock {
+    private readNumber;
+    private writeNumber;
+    private readWaiter;
+    private writeWaiter;
+    constructor();
+    acquire(mode: Mode): Promise<void>;
+    release(): void;
+}
+export {};

package/lib/utils/concurrent.js

@@ -1,89 +1,89 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RWLock = void 0;
-var tslib_1 = require("tslib");
-var assert_1 = tslib_1.__importDefault(require("assert"));
-/**
- * 模拟一个读写锁，用于同步。
- * 注意，千万不要发生自己等自己
- */
-var RWLock = /** @class */ (function () {
-    function RWLock() {
-        this.readNumber = 0;
-        this.writeNumber = 0;
-        this.readWaiter = [];
-        this.writeWaiter = [];
-    }
-    RWLock.prototype.acquire = function (mode) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var p, p;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(mode === 'S')) return [3 /*break*/, 4];
-                        _a.label = 1;
-                    case 1:
-                        if (!(this.writeNumber > 0)) return [3 /*break*/, 3];
-                        p = new Promise(function (resolve) { return _this.readWaiter.push(resolve); });
-                        return [4 /*yield*/, p];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 1];
-                    case 3:
-                        this.readNumber++;
-                        return [3 /*break*/, 7];
-                    case 4:
-                        if (!(this.writeNumber || this.readNumber)) return [3 /*break*/, 6];
-                        p = new Promise(function (resolve) { return _this.writeWaiter.push(resolve); });
-                        return [4 /*yield*/, p];
-                    case 5:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 6:
-                        this.writeNumber++;
-                        _a.label = 7;
-                    case 7: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    RWLock.prototype.release = function () {
-        var e_1, _a;
-        if (this.writeNumber) {
-            (0, assert_1.default)(this.writeNumber === 1);
-            this.writeNumber = 0;
-            if (this.readWaiter.length > 0) {
-                try {
-                    for (var _b = tslib_1.__values(this.readWaiter), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var f = _c.value;
-                        f(undefined);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                this.readWaiter = [];
-            }
-            else if (this.writeWaiter.length > 0) {
-                var f = this.writeWaiter.pop();
-                f(undefined);
-            }
-        }
-        else {
-            (0, assert_1.default)(this.readNumber > 0);
-            (0, assert_1.default)(this.readWaiter.length === 0);
-            this.readNumber--;
-            if (this.readNumber === 0) {
-                var f = this.writeWaiter.pop();
-                f && f(undefined);
-            }
-        }
-    };
-    return RWLock;
-}());
-exports.RWLock = RWLock;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RWLock = void 0;
+var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
+/**
+ * 模拟一个读写锁，用于同步。
+ * 注意，千万不要发生自己等自己
+ */
+var RWLock = /** @class */ (function () {
+    function RWLock() {
+        this.readNumber = 0;
+        this.writeNumber = 0;
+        this.readWaiter = [];
+        this.writeWaiter = [];
+    }
+    RWLock.prototype.acquire = function (mode) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p, p;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(mode === 'S')) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        if (!(this.writeNumber > 0)) return [3 /*break*/, 3];
+                        p = new Promise(function (resolve) { return _this.readWaiter.push(resolve); });
+                        return [4 /*yield*/, p];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 1];
+                    case 3:
+                        this.readNumber++;
+                        return [3 /*break*/, 7];
+                    case 4:
+                        if (!(this.writeNumber || this.readNumber)) return [3 /*break*/, 6];
+                        p = new Promise(function (resolve) { return _this.writeWaiter.push(resolve); });
+                        return [4 /*yield*/, p];
+                    case 5:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 6:
+                        this.writeNumber++;
+                        _a.label = 7;
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    RWLock.prototype.release = function () {
+        var e_1, _a;
+        if (this.writeNumber) {
+            (0, assert_1.default)(this.writeNumber === 1);
+            this.writeNumber = 0;
+            if (this.readWaiter.length > 0) {
+                try {
+                    for (var _b = tslib_1.__values(this.readWaiter), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var f = _c.value;
+                        f(undefined);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                this.readWaiter = [];
+            }
+            else if (this.writeWaiter.length > 0) {
+                var f = this.writeWaiter.pop();
+                f(undefined);
+            }
+        }
+        else {
+            (0, assert_1.default)(this.readNumber > 0);
+            (0, assert_1.default)(this.readWaiter.length === 0);
+            this.readNumber--;
+            if (this.readNumber === 0) {
+                var f = this.writeWaiter.pop();
+                f && f(undefined);
+            }
+        }
+    };
+    return RWLock;
+}());
+exports.RWLock = RWLock;

package/lib/utils/cron.d.ts

@@ -1 +1 @@
-export declare function schedule(cron: string, fn: (date: Date) => any): void;
+export declare function schedule(cron: string, fn: (date: Date) => any): void;

package/lib/utils/cron.js

@@ -1,18 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.schedule = void 0;
-var tslib_1 = require("tslib");
-var cronjs_matcher_1 = require("@datasert/cronjs-matcher");
-var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
-function schedule(cron, fn) {
-    var futureMatches = (0, cronjs_matcher_1.getFutureMatches)(cron, {
-        matchCount: 1,
-    });
-    var date = (0, dayjs_1.default)(futureMatches[0]);
-    var interval = date.diff((0, dayjs_1.default)(), 'ms');
-    setTimeout(function () {
-        fn(new Date());
-        schedule(cron, fn);
-    }, interval);
-}
-exports.schedule = schedule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schedule = void 0;
+var tslib_1 = require("tslib");
+var cronjs_matcher_1 = require("@datasert/cronjs-matcher");
+var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
+function schedule(cron, fn) {
+    var futureMatches = (0, cronjs_matcher_1.getFutureMatches)(cron, {
+        matchCount: 1,
+    });
+    var date = (0, dayjs_1.default)(futureMatches[0]);
+    var interval = date.diff((0, dayjs_1.default)(), 'ms');
+    setTimeout(function () {
+        fn(new Date());
+        schedule(cron, fn);
+    }, interval);
+}
+exports.schedule = schedule;

package/lib/utils/date.d.ts

@@ -1 +1 @@
-export declare function excelStringToDate(str: string | number): number | undefined;
+export declare function excelStringToDate(str: string | number): number | undefined;

package/lib/utils/date.js

@@ -1,18 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.excelStringToDate = void 0;
-var tslib_1 = require("tslib");
-var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
-function excelStringToDate(str) {
-    if (!str) {
-        return undefined;
-    }
-    if (typeof str === 'number') {
-        if (str < 100000) {
-            return (0, dayjs_1.default)((((str - 25569) * 24 - 8) * 3600) * 1000).valueOf(); // excel日期可能为1900-1-1至今的天数
-        }
-        return (0, dayjs_1.default)(str).valueOf();
-    }
-    return Date.parse(str);
-}
-exports.excelStringToDate = excelStringToDate;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.excelStringToDate = void 0;
+var tslib_1 = require("tslib");
+var dayjs_1 = tslib_1.__importDefault(require("dayjs"));
+function excelStringToDate(str) {
+    if (!str) {
+        return undefined;
+    }
+    if (typeof str === 'number') {
+        if (str < 100000) {
+            return (0, dayjs_1.default)((((str - 25569) * 24 - 8) * 3600) * 1000).valueOf(); // excel日期可能为1900-1-1至今的天数
+        }
+        return (0, dayjs_1.default)(str).valueOf();
+    }
+    return Date.parse(str);
+}
+exports.excelStringToDate = excelStringToDate;

package/lib/utils/geo.d.ts

@@ -1,4 +1,4 @@
-/**
- * 计算地球上两点之间的球面距离
- */
-export declare function getDistanceBetweenPoints(lat1: number, lon1: number, lat2: number, lon2: number): number;
+/**
+ * 计算地球上两点之间的球面距离
+ */
+export declare function getDistanceBetweenPoints(lat1: number, lon1: number, lat2: number, lon2: number): number;

package/lib/utils/geo.js

@@ -1,24 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDistanceBetweenPoints = void 0;
-/**
- * 计算地球上两点之间的球面距离
- */
-function getDistanceBetweenPoints(lat1, lon1, lat2, lon2) {
-    // 转为弧度
-    function toRadians(d) {
-        return d * Math.PI / 180;
-    }
-    var R = 6378137; // 地球长半径
-    var φ1 = toRadians(lat1);
-    var φ2 = toRadians(lat2);
-    var Δφ = toRadians(lat2 - lat1);
-    var Δλ = toRadians(lon2 - lon1);
-    var a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
-        Math.cos(φ1) * Math.cos(φ2) *
-            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
-    var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    var d = R * c;
-    return d * 1000;
-}
-exports.getDistanceBetweenPoints = getDistanceBetweenPoints;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDistanceBetweenPoints = void 0;
+/**
+ * 计算地球上两点之间的球面距离
+ */
+function getDistanceBetweenPoints(lat1, lon1, lat2, lon2) {
+    // 转为弧度
+    function toRadians(d) {
+        return d * Math.PI / 180;
+    }
+    var R = 6378137; // 地球长半径
+    var φ1 = toRadians(lat1);
+    var φ2 = toRadians(lat2);
+    var Δφ = toRadians(lat2 - lat1);
+    var Δλ = toRadians(lon2 - lon1);
+    var a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
+        Math.cos(φ1) * Math.cos(φ2) *
+            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
+    var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    var d = R * c;
+    return d * 1000;
+}
+exports.getDistanceBetweenPoints = getDistanceBetweenPoints;