suanpan_node_sdk 2.3.0-beta.1 → 2.3.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/index.d.ts +3 -7
- package/dist/api/index.js +3 -37
- package/dist/api/index.js.map +1 -1
- package/dist/core/common/constant.d.ts +1 -0
- package/dist/core/common/constant.js +2 -1
- package/dist/core/common/constant.js.map +1 -1
- package/dist/core/common/logger.d.ts +3 -0
- package/dist/core/common/logger.js +13 -0
- package/dist/core/common/logger.js.map +1 -0
- package/dist/core/event/index.d.ts +4 -4
- package/dist/core/event/index.js +9 -4
- package/dist/core/event/index.js.map +1 -1
- package/dist/core/logger/index.d.ts +2 -0
- package/dist/core/logger/index.js +15 -0
- package/dist/core/logger/index.js.map +1 -0
- package/dist/core/logger/interface.d.ts +7 -0
- package/dist/core/logger/interface.js +3 -0
- package/dist/core/logger/interface.js.map +1 -0
- package/dist/core/{logkit/index.d.ts → logger/logkit.d.ts} +6 -12
- package/dist/core/{logkit/index.js → logger/logkit.js} +8 -8
- package/dist/core/logger/logkit.js.map +1 -0
- package/dist/core/logger/winston.d.ts +15 -0
- package/dist/core/logger/winston.js +59 -0
- package/dist/core/logger/winston.js.map +1 -0
- package/dist/core/message/channel/message-channel.d.ts +19 -0
- package/dist/core/message/channel/message-channel.js +116 -0
- package/dist/core/message/channel/message-channel.js.map +1 -0
- package/dist/core/message/channel.d.ts +11 -6
- package/dist/core/message/channel.js +8 -0
- package/dist/core/message/channel.js.map +1 -1
- package/dist/core/message/channelFactory.d.ts +2 -2
- package/dist/core/message/channelFactory.js +2 -2
- package/dist/core/message/channelFactory.js.map +1 -1
- package/dist/core/message/helper.d.ts +12 -0
- package/dist/core/message/helper.js +54 -0
- package/dist/core/message/helper.js.map +1 -0
- package/dist/core/message/index.d.ts +0 -1
- package/dist/core/message/index.js +0 -1
- package/dist/core/message/index.js.map +1 -1
- package/dist/core/message/message.d.ts +9 -12
- package/dist/core/message/message.js +8 -50
- package/dist/core/message/message.js.map +1 -1
- package/dist/core/message/messageBuilder.d.ts +5 -5
- package/dist/core/message/messageBuilder.js.map +1 -1
- package/dist/core/message/messageListener.d.ts +2 -2
- package/dist/core/message/messageListener.js +4 -3
- package/dist/core/message/messageListener.js.map +1 -1
- package/dist/core/message/mq/redis.d.ts +4 -7
- package/dist/core/message/mq/redis.js +24 -59
- package/dist/core/message/mq/redis.js.map +1 -1
- package/dist/core/pubsub/index.d.ts +3 -0
- package/dist/core/pubsub/index.js +11 -0
- package/dist/core/pubsub/index.js.map +1 -0
- package/dist/core/pubsub/test.d.ts +1 -0
- package/dist/core/pubsub/test.js +95 -0
- package/dist/core/pubsub/test.js.map +1 -0
- package/dist/core/script/index.d.ts +4 -0
- package/dist/core/script/index.js +6 -0
- package/dist/core/script/index.js.map +1 -0
- package/dist/core/script/script-babel/babel.js +2 -2
- package/dist/core/script/script-babel/babel.js.map +1 -1
- package/dist/core/script/script-context.js +7 -7
- package/dist/core/script/script-context.js.map +1 -1
- package/dist/core/script/script-front.js +14 -14
- package/dist/core/script/script-front.js.map +1 -1
- package/dist/core/script/script-manager.js +16 -16
- package/dist/core/script/script-manager.js.map +1 -1
- package/dist/core/storage/{wrapperStorage.d.ts → factory.d.ts} +0 -5
- package/dist/core/storage/{wrapperStorage.js → factory.js} +2 -13
- package/dist/core/storage/factory.js.map +1 -0
- package/dist/core/storage/index.d.ts +2 -2
- package/dist/core/storage/index.js +2 -2
- package/dist/core/storage/index.js.map +1 -1
- package/dist/core/storage/internal.d.ts +6 -0
- package/dist/core/storage/internal.js +16 -0
- package/dist/core/storage/internal.js.map +1 -0
- package/dist/core/storage/minioStorage.d.ts +2 -2
- package/dist/core/storage/minioStorage.js +1 -1
- package/dist/core/storage/minioStorage.js.map +1 -1
- package/dist/core/storage/objectStorage.d.ts +2 -2
- package/dist/core/storage/ossStorage.d.ts +2 -2
- package/dist/core/storage/storageLogger.d.ts +10 -3
- package/dist/core/storage/storageLogger.js +71 -50
- package/dist/core/storage/storageLogger.js.map +1 -1
- package/dist/core/storage/storagePath.d.ts +1 -1
- package/dist/core/storage/storagePath.js.map +1 -1
- package/dist/core/storage/test.d.ts +1 -0
- package/dist/core/storage/test.js +37 -0
- package/dist/core/storage/test.js.map +1 -0
- package/dist/core/{service/port.d.ts → utils/helper.d.ts} +1 -1
- package/dist/core/{service/port.js → utils/helper.js} +11 -11
- package/dist/core/utils/helper.js.map +1 -0
- package/dist/core/utils/http.js +3 -3
- package/dist/core/utils/http.js.map +1 -1
- package/dist/core/utils/index.d.ts +1 -1
- package/dist/core/utils/index.js +5 -5
- package/dist/core/utils/index.js.map +1 -1
- package/dist/core/web/app.js +3 -3
- package/dist/core/web/app.js.map +1 -1
- package/dist/core/web/server.js +8 -8
- package/dist/core/web/server.js.map +1 -1
- package/dist/main.d.ts +0 -3
- package/dist/main.js +30 -5
- package/dist/main.js.map +1 -1
- package/dist/types/conmonTypes.d.ts +0 -13
- package/dist/types/conmonTypes.js +1 -8
- package/dist/types/conmonTypes.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/loggerTypes.d.ts +18 -0
- package/dist/types/loggerTypes.js +12 -0
- package/dist/types/loggerTypes.js.map +1 -0
- package/dist/types/storageTypes.d.ts +27 -7
- package/dist/types/streamTypes.d.ts +8 -8
- package/package.json +1 -1
- package/dist/core/common/log.d.ts +0 -4
- package/dist/core/common/log.js +0 -39
- package/dist/core/common/log.js.map +0 -1
- package/dist/core/logkit/index.js.map +0 -1
- package/dist/core/message/messageChain.d.ts +0 -9
- package/dist/core/message/messageChain.js +0 -30
- package/dist/core/message/messageChain.js.map +0 -1
- package/dist/core/message/mq/index.d.ts +0 -9
- package/dist/core/message/mq/index.js +0 -51
- package/dist/core/message/mq/index.js.map +0 -1
- package/dist/core/service/port.js.map +0 -1
- package/dist/core/storage/storageFlusher.d.ts +0 -9
- package/dist/core/storage/storageFlusher.js +0 -52
- package/dist/core/storage/storageFlusher.js.map +0 -1
- package/dist/core/storage/wrapperStorage.js.map +0 -1
package/dist/api/index.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
1
|
export * from '../types';
|
|
2
|
-
export * from '../core/
|
|
2
|
+
export * from '../core/logger';
|
|
3
|
+
export * from '../core/script';
|
|
3
4
|
export * from '../core/message';
|
|
4
|
-
export * from '../core/parameter';
|
|
5
|
-
export * from '../core/logkit';
|
|
6
5
|
export * from '../core/storage';
|
|
7
|
-
|
|
8
|
-
export declare const ScriptManagement: {
|
|
9
|
-
ScriptManager: typeof ScriptManager;
|
|
10
|
-
};
|
|
6
|
+
export * from '../core/parameter';
|
package/dist/api/index.js
CHANGED
|
@@ -6,48 +6,14 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
7
|
o[k2] = m[k];
|
|
8
8
|
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
9
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
10
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
11
|
};
|
|
17
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
18
|
-
if (mod && mod.__esModule) return mod;
|
|
19
|
-
var result = {};
|
|
20
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
21
|
-
__setModuleDefault(result, mod);
|
|
22
|
-
return result;
|
|
23
|
-
};
|
|
24
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
25
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
26
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
27
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
28
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
29
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
30
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
31
|
-
});
|
|
32
|
-
};
|
|
33
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
34
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
35
|
-
};
|
|
36
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
|
-
exports.ScriptManagement = void 0;
|
|
38
13
|
__exportStar(require("../types"), exports);
|
|
39
|
-
__exportStar(require("../core/
|
|
14
|
+
__exportStar(require("../core/logger"), exports);
|
|
15
|
+
__exportStar(require("../core/script"), exports);
|
|
40
16
|
__exportStar(require("../core/message"), exports);
|
|
41
|
-
__exportStar(require("../core/parameter"), exports);
|
|
42
|
-
__exportStar(require("../core/logkit"), exports);
|
|
43
17
|
__exportStar(require("../core/storage"), exports);
|
|
44
|
-
|
|
45
|
-
exports.ScriptManagement = { ScriptManager: script_manager_1.ScriptManager };
|
|
46
|
-
const util = __importStar(require("../core/utils"));
|
|
47
|
-
const server_1 = __importDefault(require("../core/web/server"));
|
|
48
|
-
if (process.env.DISABLE_IMPLICIT_BEHAVIOR !== 'true' && util.isDesktop() && !util.isDesktopMaster()) {
|
|
49
|
-
(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
50
|
-
yield server_1.default.setup();
|
|
51
|
-
}))();
|
|
52
|
-
}
|
|
18
|
+
__exportStar(require("../core/parameter"), exports);
|
|
53
19
|
//# sourceMappingURL=index.js.map
|
package/dist/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,oDAAkC"}
|
|
@@ -4,3 +4,4 @@ export declare const APP_NODE_SDK_PORT_CONFIG = "app.predict.appNodeSDKPort";
|
|
|
4
4
|
export declare const DEFAULT_NODE_SDK_PORT = 8002;
|
|
5
5
|
export declare const USER_MASTER = "user-master";
|
|
6
6
|
export declare const COMMAND_FILTER_KEYS: string[];
|
|
7
|
+
export declare const PORT_IN_REG: RegExp;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.COMMAND_FILTER_KEYS = exports.USER_MASTER = exports.DEFAULT_NODE_SDK_PORT = exports.APP_NODE_SDK_PORT_CONFIG = exports.APP_NODE_TYPE_CONFIG = exports.SP_USER_SIGN_VERSION = void 0;
|
|
3
|
+
exports.PORT_IN_REG = exports.COMMAND_FILTER_KEYS = exports.USER_MASTER = exports.DEFAULT_NODE_SDK_PORT = exports.APP_NODE_SDK_PORT_CONFIG = exports.APP_NODE_TYPE_CONFIG = exports.SP_USER_SIGN_VERSION = void 0;
|
|
4
4
|
exports.SP_USER_SIGN_VERSION = 'v1';
|
|
5
5
|
exports.APP_NODE_TYPE_CONFIG = 'app.nodeType';
|
|
6
6
|
exports.APP_NODE_SDK_PORT_CONFIG = 'app.predict.appNodeSDKPort';
|
|
@@ -48,4 +48,5 @@ exports.COMMAND_FILTER_KEYS = [
|
|
|
48
48
|
'__mode',
|
|
49
49
|
'sdkStatus'
|
|
50
50
|
];
|
|
51
|
+
exports.PORT_IN_REG = /^in[1-9][0-9]*$/;
|
|
51
52
|
//# sourceMappingURL=constant.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/core/common/constant.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,wBAAwB,GAAG,4BAA4B,CAAC;AACxD,QAAA,qBAAqB,GAAG,IAAI,CAAC;AAC7B,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,mBAAmB,GAAG;IACjC,gBAAgB;IAChB,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,mBAAmB;IACnB,mBAAmB;IACnB,8BAA8B;IAC9B,oCAAoC;IACpC,SAAS;IACT,eAAe;IACf,eAAe;IACf,+BAA+B;IAC/B,qBAAqB;IACrB,cAAc;IACd,wBAAwB;IACxB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,0BAA0B;IAC1B,SAAS;IACT,cAAc;IACd,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,kBAAkB;IAClB,kBAAkB;IAClB,sBAAsB;IACtB,yBAAyB;IACzB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,0BAA0B;IAC1B,GAAG;IACH,IAAI;IACJ,OAAO;IACP,OAAO;IACP,SAAS;IACT,QAAQ;IACR,WAAW;CACZ,CAAC"}
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/core/common/constant.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,wBAAwB,GAAG,4BAA4B,CAAC;AACxD,QAAA,qBAAqB,GAAG,IAAI,CAAC;AAC7B,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,mBAAmB,GAAG;IACjC,gBAAgB;IAChB,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,mBAAmB;IACnB,mBAAmB;IACnB,8BAA8B;IAC9B,oCAAoC;IACpC,SAAS;IACT,eAAe;IACf,eAAe;IACf,+BAA+B;IAC/B,qBAAqB;IACrB,cAAc;IACd,wBAAwB;IACxB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,0BAA0B;IAC1B,SAAS;IACT,cAAc;IACd,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,kBAAkB;IAClB,kBAAkB;IAClB,sBAAsB;IACtB,yBAAyB;IACzB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,0BAA0B;IAC1B,GAAG;IACH,IAAI;IACJ,OAAO;IACP,OAAO;IACP,SAAS;IACT,QAAQ;IACR,WAAW;CACZ,CAAC;AAEW,QAAA,WAAW,GAAG,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const environment_1 = require("../parameter/environment");
|
|
4
|
+
const winston_1 = require("../logger/winston");
|
|
5
|
+
const types_1 = require("../../types");
|
|
6
|
+
const defaultLogger = new winston_1.WinstonLogger({
|
|
7
|
+
console: {
|
|
8
|
+
enable: true,
|
|
9
|
+
level: environment_1.Environment.spConfig.debug ? types_1.LogLevelEnum.DEBUG : types_1.LogLevelEnum.INFO
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
exports.default = defaultLogger;
|
|
13
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/core/common/logger.ts"],"names":[],"mappings":";;AAAA,0DAAuD;AACvD,+CAAkD;AAClD,uCAA2C;AAI3C,MAAM,aAAa,GAAY,IAAI,uBAAa,CAAC;IAC/C,OAAO,EAAE;QACP,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,yBAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAY,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAY,CAAC,IAAI;KAC3E;CACF,CAAC,CAAC;AAEH,kBAAe,aAAa,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare class
|
|
3
|
-
message:
|
|
1
|
+
import type { InputMessage } from '../message/message';
|
|
2
|
+
export declare class MessageReceivedEvent {
|
|
3
|
+
message: InputMessage;
|
|
4
4
|
static NAME: string;
|
|
5
|
-
constructor(message:
|
|
5
|
+
constructor(message: InputMessage);
|
|
6
6
|
}
|
package/dist/core/event/index.js
CHANGED
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
3
|
+
exports.MessageReceivedEvent = void 0;
|
|
4
|
+
// import type { AppEvent } from '../message/channel/event-channel';
|
|
5
|
+
class MessageReceivedEvent {
|
|
5
6
|
constructor(message) {
|
|
6
7
|
this.message = message;
|
|
7
8
|
}
|
|
8
9
|
}
|
|
9
|
-
exports.
|
|
10
|
-
|
|
10
|
+
exports.MessageReceivedEvent = MessageReceivedEvent;
|
|
11
|
+
MessageReceivedEvent.NAME = 'message:received';
|
|
12
|
+
// export class EventReceivedEvent {
|
|
13
|
+
// public static NAME: 'event:received'
|
|
14
|
+
// constructor(public event: AppEvent) { }
|
|
15
|
+
// }
|
|
11
16
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/event/index.ts"],"names":[],"mappings":";;;AACA,MAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/event/index.ts"],"names":[],"mappings":";;;AACA,oEAAoE;AACpE,MAAa,oBAAoB;IAE/B,YAAmB,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;;AAF9C,oDAGC;AAFe,yBAAI,GAAG,kBAAkB,CAAA;AAIzC,oCAAoC;AACpC,yCAAyC;AACzC,4CAA4C;AAC5C,IAAI"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
__exportStar(require("./logkit"), exports);
|
|
14
|
+
__exportStar(require("./interface"), exports);
|
|
15
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,8CAA4B"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export interface ILogger {
|
|
2
|
+
debug(message?: any, ...optionalParams: any[]): void;
|
|
3
|
+
info(message?: any, ...optionalParams: any[]): void;
|
|
4
|
+
warn(message?: any, ...optionalParams: any[]): void;
|
|
5
|
+
error(message?: any, ...optionalParams: any[]): void;
|
|
6
|
+
[x: string]: any;
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/core/logger/interface.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import type { ILogger } from './interface';
|
|
2
|
+
export declare class EventLogger implements ILogger {
|
|
2
3
|
private static TRACE;
|
|
3
4
|
private static DEBUG;
|
|
4
5
|
private static INFO;
|
|
@@ -13,21 +14,14 @@ export declare class EventLogger {
|
|
|
13
14
|
private _getRequestUrl;
|
|
14
15
|
private _generateConnectOpts;
|
|
15
16
|
private constructor();
|
|
16
|
-
emitToLogkit
|
|
17
|
-
buildEventLog
|
|
18
|
-
|
|
19
|
-
level: any;
|
|
20
|
-
time: string;
|
|
21
|
-
data: {
|
|
22
|
-
node: any;
|
|
23
|
-
};
|
|
24
|
-
}[];
|
|
25
|
-
parseTitleIfNecessary(title: any): any;
|
|
17
|
+
private emitToLogkit;
|
|
18
|
+
private buildEventLog;
|
|
19
|
+
private parseTitleIfNecessary;
|
|
26
20
|
trace(title: string): void;
|
|
27
21
|
debug(title: string): void;
|
|
28
22
|
info(title: string): void;
|
|
29
23
|
warn(title: string): void;
|
|
30
24
|
error(title: string): void;
|
|
31
|
-
log
|
|
25
|
+
private log;
|
|
32
26
|
query(): Promise<unknown>;
|
|
33
27
|
}
|
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.EventLogger = void 0;
|
|
16
16
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
17
|
const socket_io_client_1 = __importDefault(require("socket.io-client"));
|
|
18
|
-
const
|
|
18
|
+
const logger_1 = __importDefault(require("../common/logger"));
|
|
19
19
|
const environment_1 = require("../parameter/environment");
|
|
20
20
|
const suanpan_1 = require("../utils/suanpan");
|
|
21
21
|
class EventLogger {
|
|
@@ -30,10 +30,10 @@ class EventLogger {
|
|
|
30
30
|
};
|
|
31
31
|
const uri = this._getRequestUrl(environment_1.Environment.logkit.uri, environment_1.Environment.logkit.namespace);
|
|
32
32
|
this._socket = socket_io_client_1.default(uri, this._generateConnectOpts());
|
|
33
|
-
this._socket.on('connect', () =>
|
|
34
|
-
this._socket.on('error', (...args) => {
|
|
35
|
-
this._socket.on('disconnect', (...args) => {
|
|
36
|
-
this._socket.on('connect_error', (...args) => {
|
|
33
|
+
this._socket.on('connect', () => logger_1.default.info('connected to logkit'));
|
|
34
|
+
this._socket.on('error', (...args) => { logger_1.default.error('error', args); });
|
|
35
|
+
this._socket.on('disconnect', (...args) => { logger_1.default.warn('disconnect', args); });
|
|
36
|
+
this._socket.on('connect_error', (...args) => { logger_1.default.error('connect_error', args); });
|
|
37
37
|
this._minLevel = this._levelToInt(environment_1.Environment.logkit.logLevel);
|
|
38
38
|
}
|
|
39
39
|
static get Instance() {
|
|
@@ -90,7 +90,7 @@ class EventLogger {
|
|
|
90
90
|
}
|
|
91
91
|
if (lodash_1.default.isError(title)) {
|
|
92
92
|
// output error on the command line and oss
|
|
93
|
-
|
|
93
|
+
logger_1.default.error(title);
|
|
94
94
|
return title.message;
|
|
95
95
|
}
|
|
96
96
|
return title;
|
|
@@ -109,7 +109,7 @@ class EventLogger {
|
|
|
109
109
|
}
|
|
110
110
|
const eventTitle = this.parseTitleIfNecessary(title);
|
|
111
111
|
this.emitToLogkit(environment_1.Environment.logkit.eventName, environment_1.Environment.stream.appId, this.buildEventLog(eventTitle, level))
|
|
112
|
-
.catch(error =>
|
|
112
|
+
.catch(error => logger_1.default.error(error));
|
|
113
113
|
}
|
|
114
114
|
query() {
|
|
115
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -123,4 +123,4 @@ EventLogger.DEBUG = 'DEBUG';
|
|
|
123
123
|
EventLogger.INFO = 'INFO';
|
|
124
124
|
EventLogger.WARN = 'WARN';
|
|
125
125
|
EventLogger.ERROR = 'ERROR';
|
|
126
|
-
//# sourceMappingURL=
|
|
126
|
+
//# sourceMappingURL=logkit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logkit.js","sourceRoot":"","sources":["../../../src/core/logger/logkit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import winston from 'winston';
|
|
2
|
+
import { LoggerOptions, LevelWeight } from '../../types';
|
|
3
|
+
import type { ILogger } from './interface';
|
|
4
|
+
export declare class WinstonLogger implements ILogger {
|
|
5
|
+
protected readonly levelWeight: LevelWeight;
|
|
6
|
+
private _logger;
|
|
7
|
+
constructor(options?: LoggerOptions);
|
|
8
|
+
protected addConsoleHandler(options: winston.transports.ConsoleTransportOptions): this;
|
|
9
|
+
protected addFileHandler(options: winston.transports.FileTransportOptions): this;
|
|
10
|
+
debug(msg: string): void;
|
|
11
|
+
http(msg: string): void;
|
|
12
|
+
info(msg: string): void;
|
|
13
|
+
warn(msg: string): void;
|
|
14
|
+
error(msg: string): void;
|
|
15
|
+
}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.WinstonLogger = void 0;
|
|
7
|
+
const winston_1 = __importDefault(require("winston"));
|
|
8
|
+
const types_1 = require("../../types");
|
|
9
|
+
const format = winston_1.default.format.combine(winston_1.default.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
|
|
10
|
+
// winston.format.colorize({ level: true, colors }),
|
|
11
|
+
winston_1.default.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`));
|
|
12
|
+
class WinstonLogger {
|
|
13
|
+
constructor(options = {}) {
|
|
14
|
+
this.levelWeight = {
|
|
15
|
+
[types_1.LogLevelEnum.ERROR]: 0,
|
|
16
|
+
[types_1.LogLevelEnum.WARN]: 1,
|
|
17
|
+
[types_1.LogLevelEnum.INFO]: 2,
|
|
18
|
+
[types_1.LogLevelEnum.DEBUG]: 3
|
|
19
|
+
};
|
|
20
|
+
this._logger = winston_1.default.createLogger({ format, levels: this.levelWeight });
|
|
21
|
+
const { console = { enable: false }, file = { enable: false } } = options;
|
|
22
|
+
if (console.enable) {
|
|
23
|
+
this.addConsoleHandler({ level: console.level });
|
|
24
|
+
}
|
|
25
|
+
if (file.enable) {
|
|
26
|
+
this.addFileHandler({ level: file.level, filename: file.path });
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
addConsoleHandler(options) {
|
|
30
|
+
this._logger.add(new winston_1.default.transports.Console(options));
|
|
31
|
+
return this;
|
|
32
|
+
}
|
|
33
|
+
addFileHandler(options) {
|
|
34
|
+
this._logger.add(new winston_1.default.transports.File(options));
|
|
35
|
+
return this;
|
|
36
|
+
}
|
|
37
|
+
debug(msg) {
|
|
38
|
+
this._logger.debug(msg);
|
|
39
|
+
}
|
|
40
|
+
http(msg) {
|
|
41
|
+
this._logger.http(msg);
|
|
42
|
+
}
|
|
43
|
+
info(msg) {
|
|
44
|
+
this._logger.info(msg);
|
|
45
|
+
}
|
|
46
|
+
warn(msg) {
|
|
47
|
+
this._logger.warn(msg);
|
|
48
|
+
}
|
|
49
|
+
error(msg) {
|
|
50
|
+
this._logger.error(msg);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.WinstonLogger = WinstonLogger;
|
|
54
|
+
// const logger = new WinstonLogger({
|
|
55
|
+
// console: { enable: true, level: LogLevelEnum.DEBUG },
|
|
56
|
+
// file: { enable: true, level: LogLevelEnum.ERROR, path: '/Users/ellison/suanpan-node-sdk/test.log' }
|
|
57
|
+
// });
|
|
58
|
+
// logger.info('ddd');
|
|
59
|
+
//# sourceMappingURL=winston.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"winston.js","sourceRoot":"","sources":["../../../src/core/logger/winston.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,uCAAuE;AAGvE,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,OAAO,CACnC,iBAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;AAC3D,oDAAoD;AACpD,iBAAO,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO,EAAE,CAC7D,CACF,CAAC;AAEF,MAAa,aAAa;IAWxB,YAAY,UAAyB,EAAE;QATpB,gBAAW,GAAgB;YAC5C,CAAC,oBAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,CAAC,oBAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,CAAC,oBAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,CAAC,oBAAY,CAAC,KAAK,CAAC,EAAE,CAAC;SACxB,CAAC;QAKA,IAAI,CAAC,OAAO,GAAG,iBAAO,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1E,MAAM,EACJ,OAAO,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAC3B,IAAI,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EACzB,GAAG,OAAO,CAAC;QAEZ,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;SAClD;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SACjE;IACH,CAAC;IAES,iBAAiB,CAAC,OAAmD;QAC7E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAES,cAAc,CAAC,OAAgD;QACvE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF;AAvDD,sCAuDC;AAED,qCAAqC;AACrC,0DAA0D;AAC1D,wGAAwG;AACxG,MAAM;AAEN,sBAAsB"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import * as events from 'events';
|
|
3
|
+
import type { OutputData } from '../../../types';
|
|
4
|
+
import type { InputMessage, OutputMessage } from '../message';
|
|
5
|
+
import type { MessageHandler, SubscribableChannel } from '../channel';
|
|
6
|
+
declare type HandlerReturnType = void | Promise<void> | OutputData<string> | Promise<OutputData<string>>;
|
|
7
|
+
export declare type Handler = MessageHandler<InputMessage, HandlerReturnType>;
|
|
8
|
+
export declare class StreamMessageChannel extends events.EventEmitter implements SubscribableChannel<InputMessage, OutputMessage, Handler> {
|
|
9
|
+
private fromQueue;
|
|
10
|
+
private toQueue;
|
|
11
|
+
private _client;
|
|
12
|
+
constructor(fromQueue: string, toQueue: string);
|
|
13
|
+
private queueMessageCallback;
|
|
14
|
+
receiveMessage(): Promise<InputMessage>;
|
|
15
|
+
subscribe(handler: Handler): void;
|
|
16
|
+
unSubscribe(handler: Handler): void;
|
|
17
|
+
sendMessage(message: OutputMessage): Promise<void>;
|
|
18
|
+
}
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
+
};
|
|
33
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
+
exports.StreamMessageChannel = void 0;
|
|
35
|
+
require("lodash");
|
|
36
|
+
const events = __importStar(require("events"));
|
|
37
|
+
const logger_1 = __importDefault(require("../../common/logger"));
|
|
38
|
+
const redis_1 = require("../mq/redis");
|
|
39
|
+
const logkit_1 = require("../../logger/logkit");
|
|
40
|
+
const helper_1 = require("../helper");
|
|
41
|
+
const messageBuilder_1 = require("../messageBuilder");
|
|
42
|
+
const event_1 = require("../../event");
|
|
43
|
+
class StreamMessageChannel extends events.EventEmitter {
|
|
44
|
+
constructor(fromQueue, toQueue) {
|
|
45
|
+
super();
|
|
46
|
+
this.fromQueue = fromQueue;
|
|
47
|
+
this.toQueue = toQueue;
|
|
48
|
+
this.queueMessageCallback = (qMessage) => __awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
if (qMessage.data) {
|
|
50
|
+
const requestStream = qMessage.data;
|
|
51
|
+
const inputMessage = helper_1.MessageUtils.fromRequestStream(requestStream);
|
|
52
|
+
this.emit(event_1.MessageReceivedEvent.NAME, new event_1.MessageReceivedEvent(inputMessage));
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
logger_1.default.warn(`Received queueMessage: ${JSON.stringify(qMessage)}`);
|
|
56
|
+
logger_1.default.warn('Received message from the redis queue, but the data is empty.');
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
this._client = redis_1.RedisClient.Instance;
|
|
60
|
+
this._client.subscribeQueue(this.fromQueue, this.queueMessageCallback);
|
|
61
|
+
}
|
|
62
|
+
receiveMessage() {
|
|
63
|
+
return new Promise((resolve, reject) => {
|
|
64
|
+
this.once(event_1.MessageReceivedEvent.NAME, (event) => {
|
|
65
|
+
resolve(event.message);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
subscribe(handler) {
|
|
70
|
+
this.addListener(event_1.MessageReceivedEvent.NAME, (event) => __awaiter(this, void 0, void 0, function* () {
|
|
71
|
+
const requestMessage = event.message;
|
|
72
|
+
try {
|
|
73
|
+
const result = yield handler(requestMessage);
|
|
74
|
+
if (result) {
|
|
75
|
+
const responseMessage = messageBuilder_1.MessageBuilder
|
|
76
|
+
.fromMessageHeaders(requestMessage)
|
|
77
|
+
.withPayload(result)
|
|
78
|
+
.build();
|
|
79
|
+
yield this.sendMessage(responseMessage);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch (e) {
|
|
83
|
+
logkit_1.EventLogger.Instance.error(e);
|
|
84
|
+
const errorResponseStream = helper_1.MessageUtils.toErrorResponseStream(requestMessage, e.message);
|
|
85
|
+
yield this._client.sendMessage(this.toQueue, errorResponseStream);
|
|
86
|
+
throw e;
|
|
87
|
+
}
|
|
88
|
+
}));
|
|
89
|
+
}
|
|
90
|
+
unSubscribe(handler) {
|
|
91
|
+
// * removeListener method will remove the most recently added instance
|
|
92
|
+
this.removeAllListeners(event_1.MessageReceivedEvent.NAME);
|
|
93
|
+
}
|
|
94
|
+
sendMessage(message) {
|
|
95
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
96
|
+
const responseStream = helper_1.MessageUtils.toResponseStream(message);
|
|
97
|
+
yield this._client.sendMessage(this.toQueue, responseStream);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
exports.StreamMessageChannel = StreamMessageChannel;
|
|
102
|
+
// const ee = new events.EventEmitter();
|
|
103
|
+
// function pong() {
|
|
104
|
+
// console.log('pong');
|
|
105
|
+
// }
|
|
106
|
+
// ee.on('ping', pong);
|
|
107
|
+
// ee.once('ping', pong);
|
|
108
|
+
// ee.removeListener('ping', pong); will remove the most recently added instance
|
|
109
|
+
// ee.emit('ping');
|
|
110
|
+
// ee.emit('ping');
|
|
111
|
+
// TODO:
|
|
112
|
+
// 1. connect -> channel -> ...
|
|
113
|
+
// 2. messagebuilder todo
|
|
114
|
+
// 3. message header 传递
|
|
115
|
+
// 4. channel.in1.onMessage()
|
|
116
|
+
//# sourceMappingURL=message-channel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message-channel.js","sourceRoot":"","sources":["../../../../src/core/message/channel/message-channel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
export interface MessageChannel {
|
|
5
|
-
receiveMessage(): Promise<
|
|
6
|
-
|
|
1
|
+
export interface MessageChannel<T> {
|
|
2
|
+
sendMessage(message: T): Promise<void>;
|
|
3
|
+
}
|
|
4
|
+
export interface PollableChannel<T, R> extends MessageChannel<R> {
|
|
5
|
+
receiveMessage(): Promise<T>;
|
|
6
|
+
receiveMessage(timeout: number): Promise<T | null>;
|
|
7
|
+
}
|
|
8
|
+
export declare type MessageHandler<T, R> = (message: T) => R;
|
|
9
|
+
export interface SubscribableChannel<T, R, H> extends PollableChannel<T, R> {
|
|
10
|
+
subscribe(handler: H): void;
|
|
11
|
+
unSubscribe(handler: H): void;
|
|
7
12
|
}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
// SubscribableChannel consumerChannel = new ExecutorSubscribableChannel();
|
|
4
|
+
// consumerChannel.subscribe(new MessageHandler() {
|
|
5
|
+
// @Override
|
|
6
|
+
// public void handleMessage(Message<?> message) throws MessagingException {
|
|
7
|
+
// messagePayload = (String) message.getPayload();
|
|
8
|
+
// logger.info("Received message: {}", messagePayload);
|
|
9
|
+
// }
|
|
10
|
+
// });
|
|
3
11
|
//# sourceMappingURL=channel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/core/message/channel.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"channel.js","sourceRoot":"","sources":["../../../src/core/message/channel.ts"],"names":[],"mappings":";;AAgBA,2EAA2E;AAC3E,mDAAmD;AACnD,gBAAgB;AAChB,gFAAgF;AAChF,0DAA0D;AAC1D,+DAA+D;AAC/D,QAAQ;AACR,MAAM"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { StreamMessageChannel } from './channel/message-channel';
|
|
2
2
|
export declare class MessageChannelFactory {
|
|
3
|
-
static createMessageChannel():
|
|
3
|
+
static createMessageChannel(): StreamMessageChannel;
|
|
4
4
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MessageChannelFactory = void 0;
|
|
4
|
-
const
|
|
4
|
+
const message_channel_1 = require("./channel/message-channel");
|
|
5
5
|
class MessageChannelFactory {
|
|
6
6
|
static createMessageChannel() {
|
|
7
|
-
return new
|
|
7
|
+
return new message_channel_1.StreamMessageChannel('', '');
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.MessageChannelFactory = MessageChannelFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channelFactory.js","sourceRoot":"","sources":["../../../src/core/message/channelFactory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"channelFactory.js","sourceRoot":"","sources":["../../../src/core/message/channelFactory.ts"],"names":[],"mappings":";;;AAAA,+DAAiE;AACjE,MAAa,qBAAqB;IAChC,MAAM,CAAC,oBAAoB;QACzB,OAAO,IAAI,sCAAoB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;CACF;AAJD,sDAIC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { InputMessage, OutputMessage } from './message';
|
|
2
|
+
import type { RequestStream, ResponseStream } from '../../types';
|
|
3
|
+
export declare class MessageUtils {
|
|
4
|
+
/**
|
|
5
|
+
* @param data JSON Object
|
|
6
|
+
* @returns JSON Object with the same key as param @param data
|
|
7
|
+
*/
|
|
8
|
+
private static _serializeIfNecessary;
|
|
9
|
+
static fromRequestStream(request: RequestStream): InputMessage;
|
|
10
|
+
static toResponseStream(message: OutputMessage): ResponseStream;
|
|
11
|
+
static toErrorResponseStream(message: InputMessage, errorMessage: string): ResponseStream;
|
|
12
|
+
}
|