oak-domain 3.0.2 → 3.0.4

package/lib/types/Trigger.d.ts

@@ -4,6 +4,7 @@ import { AsyncContext } from "../store/AsyncRowStore";
 import { SyncContext } from "../store/SyncRowStore";
 import { EntityDict, OperateOption } from "../types/Entity";
 import { EntityShape } from "../types/Entity";
+export type ModiTurn = 'create' | 'apply' | 'both';
 /**
  * 优先级越小，越早执行。定义在1～99之间
  */
@@ -11,6 +12,9 @@ export declare const TRIGGER_MIN_PRIORITY = 1;
 export declare const TRIGGER_DEFAULT_PRIORITY = 25;
 export declare const TRIGGER_MAX_PRIORITY = 50;
 export declare const CHECKER_MAX_PRIORITY = 99;
+/**
+ * logical可能会更改row和data的值，应当最先执行，data和row不能修改相关的值，如果要修改，手动置priority小一点以确保安全
+ */
 export declare const CHECKER_PRIORITY_MAP: Record<CheckerType, number>;
 interface TriggerBase<ED extends EntityDict, T extends keyof ED> {
     checkerType?: CheckerType;
@@ -20,19 +24,23 @@ interface TriggerBase<ED extends EntityDict, T extends keyof ED> {
 }
 export interface CreateTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: 'create';
+    mt?: ModiTurn;
     check?: (operation: ED[T]['Create']) => boolean;
-    fn: (event: {
-        operation: ED[T]['Create'];
-    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
 export interface CreateTriggerInTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends CreateTriggerBase<ED, T, Cxt> {
     when: 'before' | 'after';
+    fn: (event: {
+        operation: ED[T]['Create'];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
 export interface CreateTriggerCrossTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends CreateTriggerBase<ED, T, Cxt> {
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
+    fn: (event: {
+        rows: ED[T]['OpSchema'][];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-export declare type CreateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTriggerInTxn<ED, T, Cxt> | CreateTriggerCrossTxn<ED, T, Cxt>;
+export type CreateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTriggerInTxn<ED, T, Cxt> | CreateTriggerCrossTxn<ED, T, Cxt>;
 /**
  * update trigger如果带有filter，说明只对存在限定条件的行起作用。此时系统在进行相应动作时，
  * 会判定当前动作的filter条件和trigger所定义的filter是否有交集（即有同时满足两个条件的行）
@@ -41,20 +49,24 @@ export declare type CreateTrigger<ED extends EntityDict, T extends keyof ED, Cxt
 export interface UpdateTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: Exclude<ED[T]['Action'], GenericAction> | 'update' | Array<Exclude<ED[T]['Action'], GenericAction> | 'update'>;
     attributes?: keyof ED[T]['OpSchema'] | Array<keyof ED[T]['OpSchema']>;
+    mt?: ModiTurn;
     check?: (operation: ED[T]['Update']) => boolean;
-    fn: (event: {
-        operation: ED[T]['Update'];
-    }, context: Cxt, option: OperateOption) => Promise<number> | number;
     filter?: ED[T]['Update']['filter'] | ((operation: ED[T]['Update'], context: Cxt, option: OperateOption) => ED[T]['Update']['filter'] | Promise<ED[T]['Update']['filter']>);
 }
 export interface UpdateTriggerInTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends UpdateTriggerBase<ED, T, Cxt> {
     when: 'before' | 'after';
+    fn: (event: {
+        operation: ED[T]['Update'];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
 export interface UpdateTriggerCrossTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends UpdateTriggerBase<ED, T, Cxt> {
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
+    fn: (event: {
+        rows: ED[T]['OpSchema'][];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-export declare type UpdateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = UpdateTriggerInTxn<ED, T, Cxt> | UpdateTriggerCrossTxn<ED, T, Cxt>;
+export type UpdateTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = UpdateTriggerInTxn<ED, T, Cxt> | UpdateTriggerCrossTxn<ED, T, Cxt>;
 /**
  * 同update trigger一样，remove trigger如果带有filter，说明只对存在限定条件的行起作用。此时系统在进行相应动作时，
  * 会判定当前动作的filter条件和trigger所定义的filter是否有交集（即有同时满足两个条件的行）
@@ -62,20 +74,24 @@ export declare type UpdateTrigger<ED extends EntityDict, T extends keyof ED, Cxt
  */
 export interface RemoveTriggerBase<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends TriggerBase<ED, T> {
     action: 'remove';
+    mt?: ModiTurn;
     check?: (operation: ED[T]['Remove']) => boolean;
-    fn: (event: {
-        operation: ED[T]['Remove'];
-    }, context: Cxt, option: OperateOption) => Promise<number> | number;
     filter?: ED[T]['Remove']['filter'] | ((operation: ED[T]['Remove'], context: Cxt, option: OperateOption) => ED[T]['Remove']['filter'] | Promise<ED[T]['Remove']['filter']>);
 }
 export interface RemoveTriggerInTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends RemoveTriggerBase<ED, T, Cxt> {
     when: 'before' | 'after';
+    fn: (event: {
+        operation: ED[T]['Remove'];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
 export interface RemoveTriggerCrossTxn<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> extends RemoveTriggerBase<ED, T, Cxt> {
     when: 'commit';
     strict?: 'takeEasy' | 'makeSure';
+    fn: (event: {
+        rows: ED[T]['OpSchema'][];
+    }, context: Cxt, option: OperateOption) => Promise<number> | number;
 }
-export declare type RemoveTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = RemoveTriggerInTxn<ED, T, Cxt> | RemoveTriggerCrossTxn<ED, T, Cxt>;
+export type RemoveTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = RemoveTriggerInTxn<ED, T, Cxt> | RemoveTriggerCrossTxn<ED, T, Cxt>;
 export interface SelectTriggerBase<ED extends EntityDict, T extends keyof ED> extends TriggerBase<ED, T> {
     action: 'select';
 }
@@ -96,8 +112,8 @@ export interface SelectTriggerAfter<ED extends EntityDict, T extends keyof ED, C
         result: Partial<ED[T]['Schema']>[];
     }, context: Cxt, params?: SelectOption) => Promise<number> | number;
 }
-export declare type SelectTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = SelectTriggerBefore<ED, T, Cxt> | SelectTriggerAfter<ED, T, Cxt>;
-export declare type Trigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTrigger<ED, T, Cxt> | UpdateTrigger<ED, T, Cxt> | RemoveTrigger<ED, T, Cxt> | SelectTrigger<ED, T, Cxt>;
+export type SelectTrigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = SelectTriggerBefore<ED, T, Cxt> | SelectTriggerAfter<ED, T, Cxt>;
+export type Trigger<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED> | SyncContext<ED>> = CreateTrigger<ED, T, Cxt> | UpdateTrigger<ED, T, Cxt> | RemoveTrigger<ED, T, Cxt> | SelectTrigger<ED, T, Cxt>;
 export interface TriggerEntityShape extends EntityShape {
     $$triggerData$$?: {
         name: string;

package/lib/types/Trigger.js

@@ -8,12 +8,16 @@ exports.TRIGGER_MIN_PRIORITY = 1;
 exports.TRIGGER_DEFAULT_PRIORITY = 25;
 exports.TRIGGER_MAX_PRIORITY = 50;
 exports.CHECKER_MAX_PRIORITY = 99;
+/**
+ * logical可能会更改row和data的值，应当最先执行，data和row不能修改相关的值，如果要修改，手动置priority小一点以确保安全
+ */
 exports.CHECKER_PRIORITY_MAP = {
+    logical: 33,
     row: 51,
     data: 61,
+    logicalData: 61,
     relation: 71,
-    logicalRelation: 72,
-    logical: 73,
+    logicalRelation: 71,
 };
 ;
 ;

package/lib/types/Watcher.d.ts

@@ -1,6 +1,6 @@
 import { AsyncContext } from "../store/AsyncRowStore";
 import { EntityDict, OperationResult } from "./Entity";
-declare type ActionData<ED extends EntityDict, T extends keyof ED> = ED[T]['Update']['data'] | ED[T]['Remove']['data'];
+type ActionData<ED extends EntityDict, T extends keyof ED> = ED[T]['Update']['data'] | ED[T]['Remove']['data'];
 export interface BBWatcher<ED extends EntityDict, T extends keyof ED> {
     name: string;
     entity: T;
@@ -15,5 +15,5 @@ export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extend
     projection: ED[T]['Selection']['data'] | (() => Promise<ED[T]['Selection']['data']>);
     fn: (context: Cxt, data: Partial<ED[T]['Schema']>[]) => Promise<OperationResult<ED>>;
 }
-export declare type Watcher<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> = BBWatcher<ED, T> | WBWatcher<ED, T, Cxt>;
+export type Watcher<ED extends EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>> = BBWatcher<ED, T> | WBWatcher<ED, T, Cxt>;
 export {};

package/lib/types/index.d.ts

@@ -22,3 +22,4 @@ export * from './Endpoint';
 export * from './Style';
 export * from './EntityDesc';
 export * from './Environment';
+export * from './Locale';

package/lib/types/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./Action"), exports);
 tslib_1.__exportStar(require("./Aspect"), exports);
 tslib_1.__exportStar(require("./Auth"), exports);
@@ -25,3 +25,4 @@ tslib_1.__exportStar(require("./Endpoint"), exports);
 tslib_1.__exportStar(require("./Style"), exports);
 tslib_1.__exportStar(require("./EntityDesc"), exports);
 tslib_1.__exportStar(require("./Environment"), exports);
+tslib_1.__exportStar(require("./Locale"), exports);

package/lib/types/schema/DataTypes.d.ts

@@ -1,28 +1,28 @@
 /**
  * Column types used for @PrimaryGeneratedColumn() decorator.
  */
-export declare type PrimaryGeneratedColumnType = "int" | "int2" | "int4" | "int8" | "integer" | "tinyint" | "smallint" | "mediumint" | "bigint" | "dec" | "decimal" | "smalldecimal" | "fixed" | "numeric" | "number";
+export type PrimaryGeneratedColumnType = "int" | "int2" | "int4" | "int8" | "integer" | "tinyint" | "smallint" | "mediumint" | "bigint" | "dec" | "decimal" | "smalldecimal" | "fixed" | "numeric" | "number";
 /**
  * Column types where spatial properties are used.
  */
-export declare type SpatialColumnType = "geometry" | "geography" | "st_geometry" | "st_point";
+export type SpatialColumnType = "geometry" | "geography" | "st_geometry" | "st_point";
 /**
  * Column types where precision and scale properties are used.
  */
-export declare type WithPrecisionColumnType = "float" | "double" | "dec" | "decimal" | "smalldecimal" | "fixed" | "numeric" | "real" | "double precision" | "number" | "datetime" | "datetime2" | "datetimeoffset" | "time" | "time with time zone" | "time without time zone" | "timestamp" | "timestamp without time zone" | "timestamp with time zone" | "timestamp with local time zone";
+export type WithPrecisionColumnType = "float" | "double" | "dec" | "decimal" | "smalldecimal" | "fixed" | "numeric" | "real" | "double precision" | "number" | "datetime" | "datetime2" | "datetimeoffset" | "time" | "time with time zone" | "time without time zone" | "timestamp" | "timestamp without time zone" | "timestamp with time zone" | "timestamp with local time zone";
 /**
  * Column types where column length is used.
  */
-export declare type WithLengthColumnType = "character varying" | "varying character" | "char varying" | "nvarchar" | "national varchar" | "character" | "native character" | "varchar" | "char" | "nchar" | "national char" | "varchar2" | "nvarchar2" | "alphanum" | "shorttext" | "raw" | "binary" | "varbinary" | "string";
-export declare type WithWidthColumnType = "tinyint" | "smallint" | "mediumint" | "int" | "bigint";
+export type WithLengthColumnType = "character varying" | "varying character" | "char varying" | "nvarchar" | "national varchar" | "character" | "native character" | "varchar" | "char" | "nchar" | "national char" | "varchar2" | "nvarchar2" | "alphanum" | "shorttext" | "raw" | "binary" | "varbinary" | "string";
+export type WithWidthColumnType = "tinyint" | "smallint" | "mediumint" | "int" | "bigint";
 /**
  * All other regular column types.
  */
-export declare type SimpleColumnType = "simple-array" | "simple-json" | "simple-enum" | "int2" | "integer" | "int4" | "int8" | "int64" | "unsigned big int" | "float" | "float4" | "float8" | "smallmoney" | "money" | "boolean" | "bool" | "tinyblob" | "tinytext" | "mediumblob" | "mediumtext" | "blob" | "text" | "ntext" | "citext" | "hstore" | "longblob" | "longtext" | "alphanum" | "shorttext" | "bytes" | "bytea" | "long" | "raw" | "long raw" | "bfile" | "clob" | "nclob" | "image" | "timetz" | "timestamptz" | "timestamp with local time zone" | "smalldatetime" | "date" | "interval year to month" | "interval day to second" | "interval" | "year" | "seconddate" | "point" | "line" | "lseg" | "box" | "circle" | "path" | "polygon" | "geography" | "geometry" | "linestring" | "multipoint" | "multilinestring" | "multipolygon" | "geometrycollection" | "st_geometry" | "st_point" | "int4range" | "int8range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "enum" | "set" | "cidr" | "inet" | "macaddr" | "bit" | "bit varying" | "varbit" | "tsvector" | "tsquery" | "uuid" | "xml" | "json" | "jsonb" | "varbinary" | "hierarchyid" | "sql_variant" | "rowid" | "urowid" | "uniqueidentifier" | "rowversion" | "array" | "cube" | "ltree" | "object" | "array" | "function" | "sequence";
+export type SimpleColumnType = "simple-array" | "simple-json" | "simple-enum" | "int2" | "integer" | "int4" | "int8" | "int64" | "unsigned big int" | "float" | "float4" | "float8" | "smallmoney" | "money" | "boolean" | "bool" | "tinyblob" | "tinytext" | "mediumblob" | "mediumtext" | "blob" | "text" | "ntext" | "citext" | "hstore" | "longblob" | "longtext" | "alphanum" | "shorttext" | "bytes" | "bytea" | "long" | "raw" | "long raw" | "bfile" | "clob" | "nclob" | "image" | "timetz" | "timestamptz" | "timestamp with local time zone" | "smalldatetime" | "date" | "interval year to month" | "interval day to second" | "interval" | "year" | "seconddate" | "point" | "line" | "lseg" | "box" | "circle" | "path" | "polygon" | "geography" | "geometry" | "linestring" | "multipoint" | "multilinestring" | "multipolygon" | "geometrycollection" | "st_geometry" | "st_point" | "int4range" | "int8range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "enum" | "set" | "cidr" | "inet" | "macaddr" | "bit" | "bit varying" | "varbit" | "tsvector" | "tsquery" | "uuid" | "xml" | "json" | "jsonb" | "varbinary" | "hierarchyid" | "sql_variant" | "rowid" | "urowid" | "uniqueidentifier" | "rowversion" | "array" | "cube" | "ltree" | "object" | "array" | "function" | "sequence";
 /**
  * Any column type column can be.
  */
-export declare type DataType = WithPrecisionColumnType | WithLengthColumnType | WithWidthColumnType | SpatialColumnType | SimpleColumnType;
+export type DataType = WithPrecisionColumnType | WithLengthColumnType | WithWidthColumnType | SpatialColumnType | SimpleColumnType;
 export interface DataTypeParams {
     length?: number;
     width?: number;

package/lib/utils/SimpleConnector.d.ts

@@ -1,16 +1,25 @@
 /// <reference types="node" />
 import { IncomingHttpHeaders } from "http";
-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> {
+import { Connector, EntityDict, OakException, OpRecord } from "../types";
+type ServerOption = {
+    protocol: string;
+    hostname: string;
+    port?: number;
+    apiPath?: string;
+};
+export declare class SimpleConnector<ED extends EntityDict, FrontCxt extends SyncContext<ED>> implements Connector<ED, FrontCxt> {
     static ASPECT_ROUTER: string;
     static BRIDGE_ROUTER: string;
+    static SUBSCRIBE_ROUTER: string;
+    static SUBSCRIBE_POINT_ROUTER: string;
+    static ENDPOINT_ROUTER: string;
     private serverAspectUrl;
     private serverBridgeUrl;
+    private serverSubscribePointUrl;
+    private option;
     private makeException;
-    private contextBuilder;
-    constructor(serverUrl: string, makeException: (exceptionData: any) => OakException<ED>, contextBuilder: (str: string | undefined) => (store: AsyncRowStore<ED, BackCxt>) => Promise<BackCxt>);
+    constructor(option: ServerOption, makeException: (exceptionData: any) => OakException<ED>);
     callAspect(name: string, params: any, context: FrontCxt): Promise<{
         result: any;
         opRecords: any;
@@ -21,12 +30,18 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
         opRecords?: undefined;
     }>;
     getRouter(): string;
-    parseRequest(headers: IncomingHttpHeaders, body: any, store: AsyncRowStore<ED, BackCxt>): Promise<{
-        name: string;
-        params: any;
-        context: BackCxt;
+    getSubscribeRouter(): string;
+    getSubscribePointRouter(): string;
+    getSubscribePoint(): Promise<{
+        url: any;
+        path: any;
     }>;
-    serializeResult(result: any, context: BackCxt, headers: IncomingHttpHeaders, body: any): Promise<{
+    getEndpointRouter(): string;
+    parseRequestHeaders(headers: IncomingHttpHeaders): {
+        contextString: string | undefined;
+        aspectName: string;
+    };
+    serializeResult(result: any, opRecords: OpRecord<ED>[], headers: IncomingHttpHeaders, body: any, message?: string): Promise<{
         body: any;
         headers?: Record<string, any> | undefined;
     }>;
@@ -46,3 +61,4 @@ export declare class SimpleConnector<ED extends EntityDict, BackCxt extends Asyn
         headers?: Record<string, string> | undefined;
     };
 }
+export {};

package/lib/utils/SimpleConnector.js

@@ -1,13 +1,12 @@
 "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 url_1 = tslib_1.__importDefault(require("url"));
-var types_1 = require("../types");
+const tslib_1 = require("tslib");
+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 {
@@ -21,160 +20,187 @@ function makeContentTypeAndBody(data) {
         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.serverAspectUrl = "".concat(serverUrl).concat(SimpleConnector.ASPECT_ROUTER);
-        _this.serverBridgeUrl = "".concat(serverUrl).concat(SimpleConnector.BRIDGE_ROUTER);
-        _this.makeException = makeException;
-        _this.contextBuilder = contextBuilder;
-        return _this;
+class SimpleConnector {
+    static ASPECT_ROUTER = '/aspect';
+    static BRIDGE_ROUTER = '/bridge';
+    static SUBSCRIBE_ROUTER = '/subscribe';
+    static SUBSCRIBE_POINT_ROUTER = '/subscribePoint';
+    static ENDPOINT_ROUTER = '/endpoint';
+    serverAspectUrl;
+    serverBridgeUrl;
+    serverSubscribePointUrl;
+    option;
+    makeException;
+    constructor(option, makeException) {
+        this.option = option;
+        const { protocol, hostname, port, apiPath } = option;
+        let serverUrl = `${protocol}//${hostname}`;
+        if (typeof port === 'number') {
+            serverUrl += `:${port}`;
+        }
+        if (apiPath) {
+            (0, assert_1.default)(apiPath.startsWith('/'), 'apiPath前缀必须存在/');
+            serverUrl += apiPath;
+        }
+        this.serverAspectUrl = `${serverUrl}${SimpleConnector.ASPECT_ROUTER}`;
+        this.serverBridgeUrl = `${serverUrl}${SimpleConnector.BRIDGE_ROUTER}`;
+        this.serverSubscribePointUrl = `${serverUrl}${SimpleConnector.SUBSCRIBE_POINT_ROUTER}`;
+        this.makeException = makeException;
     }
-    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.serverAspectUrl, {
-                                method: 'POST',
-                                headers: Object.assign({
-                                    'oak-cxt': cxtStr,
-                                    'oak-aspect': name,
-                                }, contentType && {
-                                    'Content-Type': contentType,
-                                }),
-                                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') || 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));
-                }
+    async callAspect(name, params, context) {
+        const cxtStr = 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,
             });
-        });
-    };
-    SimpleConnector.prototype.getRouter = function () {
+        }
+        catch (err) {
+            // fetch返回异常一定是网络异常
+            throw new types_1.OakNetworkException();
+        }
+        if (response.status > 299) {
+            const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
+            throw err;
+        }
+        const message = response.headers.get('oak-message');
+        const responseType = response.headers.get('Content-Type') ||
+            response.headers.get('content-type');
+        if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
+            const { exception, result, opRecords } = await response.json();
+            if (exception) {
+                throw this.makeException(exception);
+            }
+            return {
+                result,
+                opRecords,
+                message,
+            };
+        }
+        else if (responseType
+            ?.toLocaleLowerCase()
+            .match(/application\/octet-stream/i)) {
+            const result = await response.arrayBuffer();
+            return {
+                result,
+                message,
+            };
+        }
+        else {
+            throw new Error(`尚不支持的content-type类型${responseType}`);
+        }
+    }
+    getRouter() {
         return SimpleConnector.ASPECT_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) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (result instanceof stream_1.Stream || result instanceof Buffer) {
-                            return [2 /*return*/, {
-                                    body: result,
-                                }];
-                        }
-                        return [4 /*yield*/, context.refineOpRecords()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, {
-                                body: {
-                                    result: result,
-                                    opRecords: context.opRecords,
-                                },
-                                headers: {
-                                    'oak-message': context.getMessage(),
-                                },
-                            }];
-                }
-            });
-        });
-    };
-    SimpleConnector.prototype.serializeException = function (exception, headers, body) {
+    }
+    getSubscribeRouter() {
+        return SimpleConnector.SUBSCRIBE_ROUTER;
+    }
+    getSubscribePointRouter() {
+        return SimpleConnector.SUBSCRIBE_POINT_ROUTER;
+    }
+    async getSubscribePoint() {
+        let response;
+        try {
+            response = await global.fetch(this.serverSubscribePointUrl);
+        }
+        catch (err) {
+            throw new types_1.OakNetworkException();
+        }
+        if (response.status > 299) {
+            const err = new types_1.OakServerProxyException(`网络请求返回status是${response.status}`);
+            throw err;
+        }
+        const message = response.headers.get('oak-message');
+        const responseType = response.headers.get('Content-Type') ||
+            response.headers.get('content-type');
+        if (responseType?.toLocaleLowerCase().match(/application\/json/i)) {
+            const { url, path, port, namespace } = await response.json();
+            let url2 = url || `${this.option.protocol}//${this.option.hostname}`;
+            (0, assert_1.default)(port);
+            url2 += `:${port}`;
+            if (namespace) {
+                url2 += namespace;
+            }
+            return {
+                url: url2,
+                path,
+            };
+        }
+        else {
+            throw new Error(`尚不支持的content-type类型${responseType}`);
+        }
+    }
+    getEndpointRouter() {
+        return SimpleConnector.ENDPOINT_ROUTER;
+    }
+    parseRequestHeaders(headers) {
+        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,
+        };
+    }
+    async serializeResult(result, opRecords, headers, body, message) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer) {
+            return {
+                body: result,
+                headers: {
+                    'oak-message': message,
+                },
+            };
+        }
+        return {
+            body: {
+                result,
+                opRecords,
+            },
+            headers: {
+                'oak-message': message,
+            },
+        };
+    }
+    serializeException(exception, headers, body) {
         return {
             body: {
                 exception: exception.toString(),
             },
         };
-    };
-    SimpleConnector.prototype.getBridgeRouter = function () {
+    }
+    getBridgeRouter() {
         return SimpleConnector.BRIDGE_ROUTER;
-    };
+    }
     /**
      * 通过本地服务器桥接访问外部资源的url
      * @param url
      * @param headers
      */
-    SimpleConnector.prototype.makeBridgeUrl = function (url, headers) {
+    makeBridgeUrl(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');
+        const encodeUrl = encodeURIComponent(url);
+        return `${this.serverBridgeUrl}?url=${encodeUrl}`;
+    }
+    parseBridgeRequestQuery(urlParams) {
+        const search = new url_1.default.URLSearchParams(urlParams);
+        const url = search.get('url');
+        const headers = search.get('headers');
         return {
-            url: 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/assert.js

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

package/lib/utils/concurrent.d.ts

@@ -1,4 +1,4 @@
-declare type Mode = 'S' | 'X';
+type Mode = 'S' | 'X';
 /**
  * 模拟一个读写锁，用于同步。
  * 注意，千万不要发生自己等自己