suanpan_node_sdk 2.2.2 → 2.3.0-beta
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/core/common/log.d.ts +4 -3
- package/dist/core/common/log.js +31 -8
- package/dist/core/common/log.js.map +1 -1
- package/dist/core/logkit/index.js +3 -3
- package/dist/core/logkit/index.js.map +1 -1
- package/dist/core/parameter/environment.d.ts +1 -0
- package/dist/core/parameter/environment.js +1 -0
- package/dist/core/parameter/environment.js.map +1 -1
- package/dist/core/service/port.d.ts +0 -3
- package/dist/core/service/port.js +5 -68
- package/dist/core/service/port.js.map +1 -1
- package/dist/core/storage/minioStorage.d.ts +4 -5
- package/dist/core/storage/minioStorage.js +30 -25
- package/dist/core/storage/minioStorage.js.map +1 -1
- package/dist/core/storage/objectStorage.d.ts +5 -5
- package/dist/core/storage/ossStorage.d.ts +2 -2
- package/dist/core/storage/ossStorage.js +14 -5
- package/dist/core/storage/ossStorage.js.map +1 -1
- package/dist/core/storage/storageFlusher.d.ts +3 -8
- package/dist/core/storage/storageFlusher.js +10 -13
- package/dist/core/storage/storageFlusher.js.map +1 -1
- package/dist/core/storage/storageLogger.d.ts +3 -6
- package/dist/core/storage/storageLogger.js +14 -19
- package/dist/core/storage/storageLogger.js.map +1 -1
- package/dist/core/storage/storagePath.d.ts +1 -0
- package/dist/core/storage/storagePath.js +3 -0
- package/dist/core/storage/storagePath.js.map +1 -1
- package/dist/core/utils/flusher.d.ts +1 -4
- package/dist/core/utils/flusher.js.map +1 -1
- package/dist/core/utils/http.d.ts +3 -0
- package/dist/core/utils/http.js +36 -0
- package/dist/core/utils/http.js.map +1 -0
- package/dist/core/utils/index.d.ts +7 -1
- package/dist/core/utils/index.js +16 -2
- package/dist/core/utils/index.js.map +1 -1
- package/dist/core/utils/suanpan.d.ts +20 -0
- package/dist/core/utils/suanpan.js +93 -0
- package/dist/core/utils/suanpan.js.map +1 -0
- package/dist/types/conmonTypes.d.ts +7 -0
- package/dist/types/conmonTypes.js.map +1 -1
- package/dist/types/storageTypes.d.ts +14 -7
- package/dist/types/storageTypes.js.map +1 -1
- package/package.json +2 -2
- package/dist/core/utils/suanpanApi.d.ts +0 -7
- package/dist/core/utils/suanpanApi.js +0 -50
- package/dist/core/utils/suanpanApi.js.map +0 -1
- package/dist/core/utils/support.d.ts +0 -4
- package/dist/core/utils/support.js +0 -33
- package/dist/core/utils/support.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
declare
|
|
3
|
-
|
|
1
|
+
import winston from 'winston';
|
|
2
|
+
export declare function createLogger(): winston.Logger;
|
|
3
|
+
declare const defaultLogger: winston.Logger;
|
|
4
|
+
export default defaultLogger;
|
package/dist/core/common/log.js
CHANGED
|
@@ -3,14 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
|
|
7
|
-
const
|
|
6
|
+
exports.createLogger = void 0;
|
|
7
|
+
const winston_1 = __importDefault(require("winston"));
|
|
8
8
|
const environment_1 = require("../parameter/environment");
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
const level = environment_1.Environment.spConfig.debug ? 'debug' : 'info';
|
|
10
|
+
const levels = {
|
|
11
|
+
error: 0,
|
|
12
|
+
warn: 1,
|
|
13
|
+
info: 2,
|
|
14
|
+
http: 3,
|
|
15
|
+
debug: 4
|
|
16
|
+
};
|
|
17
|
+
const colors = {
|
|
18
|
+
error: 'red',
|
|
19
|
+
warn: 'yellow',
|
|
20
|
+
info: 'green',
|
|
21
|
+
http: 'magenta',
|
|
22
|
+
debug: 'blue'
|
|
23
|
+
};
|
|
24
|
+
const format = winston_1.default.format.combine(winston_1.default.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.default.format.colorize({ level: true, colors }), winston_1.default.format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`));
|
|
25
|
+
const transports = [
|
|
26
|
+
new winston_1.default.transports.Console()
|
|
27
|
+
];
|
|
28
|
+
function createLogger() {
|
|
29
|
+
return winston_1.default.createLogger({
|
|
30
|
+
level,
|
|
31
|
+
levels,
|
|
32
|
+
format,
|
|
33
|
+
transports
|
|
34
|
+
});
|
|
14
35
|
}
|
|
15
|
-
exports.
|
|
36
|
+
exports.createLogger = createLogger;
|
|
37
|
+
const defaultLogger = createLogger();
|
|
38
|
+
exports.default = defaultLogger;
|
|
16
39
|
//# sourceMappingURL=log.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/core/common/log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/core/common/log.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,0DAAuD;AAEvD,MAAM,KAAK,GAAG,yBAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAE5D,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACT,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,KAAK;IACZ,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,OAAO,CACnC,iBAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,EAC3D,iBAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAChD,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,MAAM,UAAU,GAAG;IACjB,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;CACjC,CAAC;AAEF,SAAgB,YAAY;IAC1B,OAAO,iBAAO,CAAC,YAAY,CAAC;QAC1B,KAAK;QACL,MAAM;QACN,MAAM;QACN,UAAU;KACX,CAAC,CAAC;AACL,CAAC;AAPD,oCAOC;AACD,MAAM,aAAa,GAAG,YAAY,EAAE,CAAC;AAErC,kBAAe,aAAa,CAAC"}
|
|
@@ -17,7 +17,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
17
17
|
const socket_io_client_1 = __importDefault(require("socket.io-client"));
|
|
18
18
|
const log_1 = __importDefault(require("../common/log"));
|
|
19
19
|
const environment_1 = require("../parameter/environment");
|
|
20
|
-
const
|
|
20
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
21
21
|
class EventLogger {
|
|
22
22
|
constructor() {
|
|
23
23
|
this._levels = {
|
|
@@ -56,8 +56,8 @@ class EventLogger {
|
|
|
56
56
|
_generateConnectOpts() {
|
|
57
57
|
return {
|
|
58
58
|
transports: ['websocket'],
|
|
59
|
-
query:
|
|
60
|
-
path:
|
|
59
|
+
query: suanpan_1.suanpanHeaders,
|
|
60
|
+
path: environment_1.Environment.logkit.path
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
emitToLogkit(event, ...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/logkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,wEAAkC;AAClC,wDAAmC;AACnC,0DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/logkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,wEAAkC;AAClC,wDAAmC;AACnC,0DAAuD;AACvD,8CAAkD;AAElD,MAAa,WAAW;IAkDtB;QA9BQ,YAAO,GAAG;YAChB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,CAAC;YACT,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;SACX,CAAC;QAwBA,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,yBAAW,CAAC,MAAM,CAAC,GAAa,EAAE,yBAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChG,IAAI,CAAC,OAAO,GAAG,0BAAE,CAAC,GAAG,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,aAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,aAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,aAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,GAAG,aAAM,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,yBAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;IAhDM,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC;SACpC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAcO,WAAW,CAAC,QAAgB;QAClC,IAAI,QAAQ,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE;YAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;SAC7C;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,cAAc,CAAE,QAAgB,EAAE,SAAiB;QACzD,MAAM,MAAM,GAAG,CAAC,gBAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;QACtE,MAAM,MAAM,GAAG,CAAC,gBAAC,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/E,OAAO,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEO,oBAAoB;QAC1B,OAAO;YACL,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,KAAK,EAAE,wBAAc;YACrB,IAAI,EAAE,yBAAW,CAAC,MAAM,CAAC,IAAI;SAC9B,CAAC;IACJ,CAAC;IAaK,YAAY,CAAE,KAAa,EAAE,GAAG,IAAW;;YAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE;oBACzC,IAAI,MAAM,CAAC,OAAO,EAAE;wBAClB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBACtB;yBAAM;wBACL,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;qBACtB;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAED,aAAa,CAAE,UAAU,EAAE,UAAU;QACnC,OAAO,CAAC;gBACN,KAAK,EAAE,UAAU;gBACjB,KAAK,EAAE,UAAU;gBACjB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBAC9B,IAAI,EAAE;oBACJ,IAAI,EAAE,yBAAW,CAAC,MAAM,CAAC,MAAM;iBAChC;aACF,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,KAAK;QAEzB,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAAE,OAAO,KAAK,CAAC;SAAE;QAExC,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,2CAA2C;YAC3C,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,KAAK,CAAC,OAAO,CAAC;SACtB;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAE,KAAa,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7D,KAAK,CAAE,KAAa,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAE,KAAa,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAE,KAAa,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3D,KAAK,CAAE,KAAa,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE7D,GAAG,CAAE,KAAa,EAAE,KAAa;QAE/B,IAAI,CAAC,KAAK,EAAE;YAAE,OAAO;SAAE;QAEvB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;SAAE;QAEzD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,CAAC,YAAY,CAAC,yBAAW,CAAC,MAAM,CAAC,SAAS,EAAE,yBAAW,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aAC7G,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC;IAEK,KAAK;;YACT,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,yBAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7E,CAAC;KAAA;;AArHH,kCAsHC;AApHgB,iBAAK,GAAG,OAAO,CAAC;AAChB,iBAAK,GAAG,OAAO,CAAC;AAChB,gBAAI,GAAG,MAAM,CAAC;AACd,gBAAI,GAAG,MAAM,CAAC;AACd,iBAAK,GAAG,OAAO,CAAC"}
|
|
@@ -96,6 +96,7 @@ Environment.spConfig = {
|
|
|
96
96
|
};
|
|
97
97
|
Environment.logkit = {
|
|
98
98
|
uri: process.env.SP_LOGKIT_URI,
|
|
99
|
+
path: process.env.SP_LOGKIT_PATH || `/socket/${Environment.stream.userId}/${Environment.stream.appId}`,
|
|
99
100
|
logLevel: process.env.SP_LOGKIT_LOGS_LEVEL || 'debug',
|
|
100
101
|
namespace: process.env.SP_LOGKIT_NAMESPACE || 'logkit',
|
|
101
102
|
eventName: process.env.SP_LOGKIT_EVENTS_APPEND || 'append'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/core/parameter/environment.ts"],"names":[],"mappings":";;;AAAA,+CAAsC;AACtC,uCAAuC;AAEvC,SAAgB,WAAW;IACzB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,gBAAQ,CAAC,KAAK,CAAC;KACvB;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACjC,OAAO,gBAAQ,CAAC,SAAS,CAAC;KAC3B;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,gBAAQ,CAAC,OAAO,CAAC;KACzB;IACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;AACtD,CAAC;AAXD,kCAWC;AAED,MAAa,WAAW;;AAAxB,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/core/parameter/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
export declare class PortService {
|
|
2
|
-
private static readonly suanpanUrl;
|
|
3
2
|
private static readonly loopupRange;
|
|
4
|
-
private static httpRequest;
|
|
5
3
|
static getHostFreePort(): Promise<number>;
|
|
6
|
-
static registerPort(logicalPort: number, realPort: number): Promise<void>;
|
|
7
4
|
static registerPortUntilSuccess(logicPort: number): Promise<number>;
|
|
8
5
|
}
|
|
@@ -15,29 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.PortService = void 0;
|
|
16
16
|
const log_1 = __importDefault(require("../common/log"));
|
|
17
17
|
const get_port_1 = __importDefault(require("get-port"));
|
|
18
|
-
const environment_1 = require("../parameter/environment");
|
|
19
18
|
const utils_1 = require("../utils");
|
|
20
|
-
const
|
|
21
|
-
const support_1 = require("../utils/support");
|
|
19
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
22
20
|
const lookupFrom = parseInt(process.env.SP_PORT_START || '50000');
|
|
23
21
|
const lookupTo = parseInt(process.env.SP_PORT_END || '60000');
|
|
24
22
|
class PortService {
|
|
25
|
-
static httpRequest(options) {
|
|
26
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
let res;
|
|
28
|
-
yield utils_1.promiseRetry((retry, times) => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
try {
|
|
30
|
-
res = yield axios_1.default.request(options);
|
|
31
|
-
}
|
|
32
|
-
catch (ex) {
|
|
33
|
-
log_1.default.error('http request error is : \n%O', ex);
|
|
34
|
-
log_1.default.info(`retry ${times} times`);
|
|
35
|
-
retry(ex);
|
|
36
|
-
}
|
|
37
|
-
}));
|
|
38
|
-
return res.data;
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
23
|
static getHostFreePort() {
|
|
42
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
25
|
try {
|
|
@@ -48,30 +30,15 @@ class PortService {
|
|
|
48
30
|
}
|
|
49
31
|
});
|
|
50
32
|
}
|
|
51
|
-
static registerPort(logicalPort, realPort) {
|
|
52
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
const { userId, appId, nodeId } = environment_1.Environment.stream;
|
|
54
|
-
const requestConfig = {
|
|
55
|
-
url: `${this.suanpanUrl}/app/service/register`,
|
|
56
|
-
method: 'POST',
|
|
57
|
-
data: {
|
|
58
|
-
userId, appId, nodeId,
|
|
59
|
-
nodePort: logicalPort, port: realPort
|
|
60
|
-
},
|
|
61
|
-
headers: support_1.buildUserIdHeaderField()
|
|
62
|
-
};
|
|
63
|
-
const registerPortResponse = yield this.httpRequest(requestConfig);
|
|
64
|
-
if (!registerPortResponse.success) {
|
|
65
|
-
throw new Error(registerPortResponse.msg);
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
33
|
static registerPortUntilSuccess(logicPort) {
|
|
70
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
35
|
for (;;) {
|
|
72
36
|
try {
|
|
73
37
|
const availableHostPort = yield PortService.getHostFreePort();
|
|
74
|
-
yield
|
|
38
|
+
const response = yield suanpan_1.SuanpanWebApi.registerPort(logicPort, availableHostPort);
|
|
39
|
+
if (!response.success) {
|
|
40
|
+
throw new Error(response.msg);
|
|
41
|
+
}
|
|
75
42
|
return availableHostPort;
|
|
76
43
|
}
|
|
77
44
|
catch (e) {
|
|
@@ -83,35 +50,5 @@ class PortService {
|
|
|
83
50
|
}
|
|
84
51
|
}
|
|
85
52
|
exports.PortService = PortService;
|
|
86
|
-
PortService.suanpanUrl = support_1.buildSpAffinityUrl();
|
|
87
53
|
PortService.loopupRange = get_port_1.default.makeRange(lookupFrom, lookupTo);
|
|
88
|
-
// import * as crypto from 'crypto';
|
|
89
|
-
// (async () => {
|
|
90
|
-
// const systime = new Date().getTime().toString();
|
|
91
|
-
// const token = `${systime} | xuelang xuelang`;
|
|
92
|
-
// function md5(text: string | Buffer): string {
|
|
93
|
-
// return crypto.createHash('md5').update(text).digest('hex');
|
|
94
|
-
// }
|
|
95
|
-
// console.log(token);
|
|
96
|
-
// const mm = md5(token);
|
|
97
|
-
// console.log(mm);
|
|
98
|
-
// const requestConfig: AxiosRequestConfig = {
|
|
99
|
-
// url: 'http://fx.hzrobam.com/DWGateway/restful/IDM/IDataForOut/getEcShipState',
|
|
100
|
-
// method: 'POST',
|
|
101
|
-
// data: {
|
|
102
|
-
// fromSys: 'xuelang',
|
|
103
|
-
// so_no: '4941760865090579711',
|
|
104
|
-
// timestamp: systime,
|
|
105
|
-
// token: mm
|
|
106
|
-
// }
|
|
107
|
-
// };
|
|
108
|
-
// console.log(JSON.stringify({
|
|
109
|
-
// fromSys: 'xuelang',
|
|
110
|
-
// so_no: '4941760865090579711',
|
|
111
|
-
// timestamp: systime,
|
|
112
|
-
// token: mm
|
|
113
|
-
// }, null, 4));
|
|
114
|
-
// const registerPortResponse = await PortService.httpRequest<RegisterPortResponse>(requestConfig);
|
|
115
|
-
// console.log(JSON.stringify(registerPortResponse, null, 4));
|
|
116
|
-
// })();
|
|
117
54
|
//# sourceMappingURL=port.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,wDAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,wDAAqC;AAErC,oCAAiC;AACjC,8CAAiD;AAEjD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,CAAC;AAClE,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC;AAC9D,MAAa,WAAW;IAItB,MAAM,CAAO,eAAe;;YAC1B,IAAI;gBACF,OAAO,MAAM,kBAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACxD;YAAC,OAAO,EAAO,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;aACjE;QACH,CAAC;KAAA;IAED,MAAM,CAAO,wBAAwB,CAAC,SAAiB;;YACrD,SAAS;gBACP,IAAI;oBACF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;oBAC9D,MAAM,QAAQ,GAAG,MAAM,uBAAa,CAAC,YAAY,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBAChF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;qBAC/B;oBACD,OAAO,iBAAiB,CAAC;iBAC1B;gBAAC,OAAO,CAAM,EAAE;oBACf,aAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,MAAM,aAAK,CAAC,GAAG,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;;AA1BH,kCA2BC;AAzByB,uBAAW,GAAG,kBAAa,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
|
-
import
|
|
4
|
-
import type { ObjectData, ObjectItem, MinioConfig, ObjectMetadata } from '../../types';
|
|
3
|
+
import { Readable as ReadableStream } from 'stream';
|
|
4
|
+
import type { ObjectData, ObjectItem, MinioConfig, ObjectMetadata, JSONObject } from '../../types';
|
|
5
5
|
export declare class MinioStorage implements IObjectStorage {
|
|
6
6
|
private config?;
|
|
7
7
|
private bucketName;
|
|
@@ -9,13 +9,12 @@ export declare class MinioStorage implements IObjectStorage {
|
|
|
9
9
|
constructor(config?: MinioConfig | undefined);
|
|
10
10
|
private buildMinioClient;
|
|
11
11
|
private getClient;
|
|
12
|
-
append(objectName: string, content: string): Promise<
|
|
12
|
+
append(objectName: string, content: string, metaData?: ObjectMetadata): Promise<void>;
|
|
13
13
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
14
14
|
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
15
15
|
getObjectToString(objectName: string): Promise<string>;
|
|
16
|
-
getObjectToJSON(objectName: string): Promise<
|
|
16
|
+
getObjectToJSON(objectName: string): Promise<JSONObject>;
|
|
17
17
|
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
18
|
-
putObjectWithMetaData(objectName: string, data: ReadableStream | Buffer | string, metaData: object): Promise<void>;
|
|
19
18
|
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
20
19
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
21
20
|
presignedGetObject(objectName: string): Promise<string>;
|
|
@@ -33,11 +33,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
33
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
34
|
exports.MinioStorage = void 0;
|
|
35
35
|
const lodash_1 = __importDefault(require("lodash"));
|
|
36
|
-
const log_1 = __importDefault(require("../common/log"));
|
|
37
36
|
const Minio = __importStar(require("minio"));
|
|
38
|
-
const
|
|
39
|
-
const suanpanApi_1 = require("../utils/suanpanApi");
|
|
37
|
+
const stream_1 = require("stream");
|
|
40
38
|
const utils_1 = require("../utils");
|
|
39
|
+
const environment_1 = require("../parameter/environment");
|
|
40
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
41
|
+
const utils_2 = require("../utils");
|
|
41
42
|
class MinioStorage {
|
|
42
43
|
constructor(config) {
|
|
43
44
|
this.config = config;
|
|
@@ -55,7 +56,7 @@ class MinioStorage {
|
|
|
55
56
|
}
|
|
56
57
|
else {
|
|
57
58
|
const { hostname, port, protocol } = new URL(environment_1.Environment.minio.endpoint);
|
|
58
|
-
const { bucket, Credentials } = yield
|
|
59
|
+
const { bucket, Credentials } = yield suanpan_1.SuanpanWebApi.getSTSToken();
|
|
59
60
|
this.bucketName = bucket;
|
|
60
61
|
options.endPoint = hostname;
|
|
61
62
|
options.port = Number(port);
|
|
@@ -74,57 +75,59 @@ class MinioStorage {
|
|
|
74
75
|
return this.minioClient;
|
|
75
76
|
});
|
|
76
77
|
}
|
|
77
|
-
append(objectName, content) {
|
|
78
|
+
append(objectName, content, metaData) {
|
|
78
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
originalContent = yield this.getObjectToString(objectName);
|
|
82
|
-
}
|
|
83
|
-
catch (e) {
|
|
84
|
-
log_1.default.warn(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
|
|
85
|
-
}
|
|
86
|
-
const data = `${originalContent}${content}`;
|
|
87
|
-
yield this.putObjectWithMetaData(objectName, data, { 'Content-Disposition': 'inline', 'Content-Type': 'text/plain' });
|
|
80
|
+
const sourceStream = yield this.getObjectToStream(objectName);
|
|
81
|
+
yield this.putObject(objectName, sourceStream.pipe(new utils_2.AppendTransform(content)), metaData);
|
|
88
82
|
});
|
|
89
83
|
}
|
|
90
84
|
getObjectToBuffer(objectName) {
|
|
91
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
86
|
const stream = yield this.getObjectToStream(objectName);
|
|
93
|
-
return
|
|
87
|
+
return utils_2.convertStreamToBuffer(stream);
|
|
94
88
|
});
|
|
95
89
|
}
|
|
96
90
|
getObjectToStream(objectName) {
|
|
97
91
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
92
|
const minioClient = yield this.getClient();
|
|
99
|
-
|
|
93
|
+
try {
|
|
94
|
+
return yield minioClient.getObject(this.bucketName, objectName);
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
if ((e === null || e === void 0 ? void 0 : e.code) === 'NoSuchKey') {
|
|
98
|
+
return stream_1.Readable.from('');
|
|
99
|
+
}
|
|
100
|
+
throw e;
|
|
101
|
+
}
|
|
100
102
|
});
|
|
101
103
|
}
|
|
102
104
|
getObjectToString(objectName) {
|
|
103
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
104
106
|
const stream = yield this.getObjectToStream(objectName);
|
|
105
|
-
return yield
|
|
107
|
+
return yield utils_2.convertStreamToString(stream);
|
|
106
108
|
});
|
|
107
109
|
}
|
|
108
110
|
getObjectToJSON(objectName) {
|
|
109
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
112
|
const str = yield this.getObjectToString(objectName);
|
|
111
|
-
return
|
|
113
|
+
return utils_2.tryJSONParse(str, str);
|
|
112
114
|
});
|
|
113
115
|
}
|
|
114
116
|
putObject(objectName, data, metaData) {
|
|
115
117
|
return __awaiter(this, void 0, void 0, function* () {
|
|
116
118
|
const minioClient = yield this.getClient();
|
|
119
|
+
if (lodash_1.default.isString(data)) {
|
|
120
|
+
data = Buffer.from(data);
|
|
121
|
+
}
|
|
117
122
|
yield minioClient.putObject(this.bucketName, objectName, data, metaData);
|
|
118
123
|
});
|
|
119
124
|
}
|
|
120
|
-
putObjectWithMetaData(objectName, data, metaData) {
|
|
121
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
yield this.minioClient.putObject(this.bucketName, objectName, data, metaData);
|
|
123
|
-
});
|
|
124
|
-
}
|
|
125
125
|
fPutObject(objectName, filePath, metaData) {
|
|
126
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
127
127
|
const minioClient = yield this.getClient();
|
|
128
|
+
if (!utils_1.fileExists(filePath)) {
|
|
129
|
+
throw new Error(`Local file path(${filePath}) is not exist.`);
|
|
130
|
+
}
|
|
128
131
|
yield minioClient.fPutObject(this.bucketName, objectName, filePath, metaData || {});
|
|
129
132
|
});
|
|
130
133
|
}
|
|
@@ -136,12 +139,14 @@ class MinioStorage {
|
|
|
136
139
|
}
|
|
137
140
|
presignedGetObject(objectName) {
|
|
138
141
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
|
-
|
|
142
|
+
const presignedResponse = yield suanpan_1.SuanpanWebApi.presignedGetObject(objectName);
|
|
143
|
+
return presignedResponse.data;
|
|
140
144
|
});
|
|
141
145
|
}
|
|
142
146
|
presignedPutObject(objectName) {
|
|
143
147
|
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
-
|
|
148
|
+
const presignedResponse = yield suanpan_1.SuanpanWebApi.presignedPutObject(objectName);
|
|
149
|
+
return presignedResponse.data;
|
|
145
150
|
});
|
|
146
151
|
}
|
|
147
152
|
listObjects(prefix, recursive = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minioStorage.js","sourceRoot":"","sources":["../../../src/core/storage/minioStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;
|
|
1
|
+
{"version":3,"file":"minioStorage.js","sourceRoot":"","sources":["../../../src/core/storage/minioStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import type {
|
|
3
|
-
import type { ObjectData, ObjectMetadata, ObjectItem } from '../../types';
|
|
2
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
3
|
+
import type { ObjectData, ObjectMetadata, ObjectItem, JSONObject } from '../../types';
|
|
4
4
|
export interface IObjectStorage {
|
|
5
|
-
append(objectName: string, content:
|
|
5
|
+
append(objectName: string, content: string, metaData?: ObjectMetadata): Promise<void>;
|
|
6
6
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
7
|
-
getObjectToStream(objectName: string): Promise<
|
|
7
|
+
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
8
8
|
getObjectToString(objectName: string): Promise<string>;
|
|
9
|
-
getObjectToJSON(objectName: string): Promise<
|
|
9
|
+
getObjectToJSON(objectName: string): Promise<JSONObject>;
|
|
10
10
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
11
11
|
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
12
12
|
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
|
-
import type { ObjectData, ObjectItem, AliOSSConfig, ObjectMetadata } from '../../types';
|
|
3
|
+
import type { ObjectData, ObjectItem, AliOSSConfig, ObjectMetadata, JSONObject } from '../../types';
|
|
4
4
|
export declare class OSSStorage implements IObjectStorage {
|
|
5
5
|
private config?;
|
|
6
6
|
private ossClient;
|
|
@@ -13,7 +13,7 @@ export declare class OSSStorage implements IObjectStorage {
|
|
|
13
13
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
14
14
|
getObjectToStream(objectName: string): Promise<any>;
|
|
15
15
|
getObjectToString(objectName: string): Promise<string>;
|
|
16
|
-
getObjectToJSON(objectName: string): Promise<
|
|
16
|
+
getObjectToJSON(objectName: string): Promise<JSONObject>;
|
|
17
17
|
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
18
18
|
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
19
19
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
@@ -37,7 +37,8 @@ const util = __importStar(require("../utils"));
|
|
|
37
37
|
const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
38
38
|
const moment_1 = __importDefault(require("moment"));
|
|
39
39
|
const utils_1 = require("../utils");
|
|
40
|
-
const
|
|
40
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
41
|
+
const stream_1 = require("stream");
|
|
41
42
|
class OSSStorage {
|
|
42
43
|
constructor(config) {
|
|
43
44
|
this.config = config;
|
|
@@ -53,7 +54,7 @@ class OSSStorage {
|
|
|
53
54
|
options.stsToken = this.config.securityToken;
|
|
54
55
|
}
|
|
55
56
|
else {
|
|
56
|
-
const { bucket, region, Credentials } = yield
|
|
57
|
+
const { bucket, region, Credentials } = yield suanpan_1.SuanpanWebApi.getSTSToken();
|
|
57
58
|
this.tokenExpiration = Credentials.Expiration || '';
|
|
58
59
|
options.region = region;
|
|
59
60
|
options.bucket = bucket;
|
|
@@ -91,8 +92,16 @@ class OSSStorage {
|
|
|
91
92
|
getObjectToStream(objectName) {
|
|
92
93
|
return __awaiter(this, void 0, void 0, function* () {
|
|
93
94
|
const ossClient = yield this.getClient();
|
|
94
|
-
|
|
95
|
-
|
|
95
|
+
try {
|
|
96
|
+
const result = yield ossClient.getStream(objectName);
|
|
97
|
+
return result.stream;
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
if ((e === null || e === void 0 ? void 0 : e.code) === 'NoSuchKey') {
|
|
101
|
+
return stream_1.Readable.from('');
|
|
102
|
+
}
|
|
103
|
+
throw e;
|
|
104
|
+
}
|
|
96
105
|
});
|
|
97
106
|
}
|
|
98
107
|
getObjectToString(objectName) {
|
|
@@ -117,7 +126,7 @@ class OSSStorage {
|
|
|
117
126
|
}
|
|
118
127
|
fPutObject(objectName, filePath, metaData) {
|
|
119
128
|
return __awaiter(this, void 0, void 0, function* () {
|
|
120
|
-
if (util.fileExists(filePath)) {
|
|
129
|
+
if (!util.fileExists(filePath)) {
|
|
121
130
|
throw new Error(`Local file path(${filePath}) is not exist.`);
|
|
122
131
|
}
|
|
123
132
|
const ossClient = yield this.getClient();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ossStorage.js","sourceRoot":"","sources":["../../../src/core/storage/ossStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,+CAAiC;AACjC,sDAA0B;AAC1B,oDAA4B;AAE5B,oCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"ossStorage.js","sourceRoot":"","sources":["../../../src/core/storage/ossStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
export declare type StorageFlushOptions = {
|
|
4
|
-
storageFilePath: string;
|
|
5
|
-
} & FlushOptions;
|
|
6
|
-
export declare class StorageLogFlusher {
|
|
1
|
+
import type { StorageFlushOptions } from '../../types';
|
|
2
|
+
export declare class StorageFlusher {
|
|
7
3
|
private options;
|
|
8
|
-
private storage?;
|
|
9
4
|
private bFlusher;
|
|
10
|
-
constructor(options: StorageFlushOptions
|
|
5
|
+
constructor(options: StorageFlushOptions);
|
|
11
6
|
onFlush: (logItems: string[]) => Promise<void>;
|
|
12
7
|
add(content: string): void;
|
|
13
8
|
flush(): void;
|
|
@@ -12,36 +12,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.StorageFlusher = void 0;
|
|
16
16
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
17
|
const log_1 = __importDefault(require("../common/log"));
|
|
18
18
|
const wrapperStorage_1 = require("./wrapperStorage");
|
|
19
19
|
const flusher_1 = require("../utils/flusher");
|
|
20
|
-
class
|
|
21
|
-
constructor(options
|
|
20
|
+
class StorageFlusher {
|
|
21
|
+
constructor(options) {
|
|
22
22
|
this.options = options;
|
|
23
|
-
this.storage = storage;
|
|
24
23
|
this.onFlush = (logItems) => __awaiter(this, void 0, void 0, function* () {
|
|
25
24
|
if (lodash_1.default.isEmpty(logItems)) {
|
|
26
25
|
return;
|
|
27
26
|
}
|
|
28
|
-
|
|
27
|
+
const { storage = wrapperStorage_1.Storage.Instance, storageFilePath } = this.options;
|
|
28
|
+
// TODO: delete
|
|
29
|
+
log_1.default.debug(`⬇ append ${logItems} to ${storageFilePath}`);
|
|
29
30
|
try {
|
|
30
|
-
const
|
|
31
|
+
const contents = logItems.reduce((acc, cur) => {
|
|
31
32
|
acc += `${cur}\r\n`;
|
|
32
33
|
return acc;
|
|
33
34
|
}, '');
|
|
34
|
-
|
|
35
|
-
yield storageInstance.append(this.options.storageFilePath, joinWithLineBreak);
|
|
35
|
+
yield storage.append(this.options.storageFilePath, contents, { 'Content-Disposition': 'inline', 'Content-Type': 'text/plain' });
|
|
36
36
|
}
|
|
37
37
|
catch (e) {
|
|
38
38
|
log_1.default.warn(`write log to storage failed ${e}`);
|
|
39
39
|
}
|
|
40
40
|
});
|
|
41
|
-
this.bFlusher = new flusher_1.BufferFlusher(
|
|
42
|
-
maxItems: options.maxItems,
|
|
43
|
-
flushInterval: options.flushInterval
|
|
44
|
-
});
|
|
41
|
+
this.bFlusher = new flusher_1.BufferFlusher(options);
|
|
45
42
|
this.bFlusher.on('flush', this.onFlush);
|
|
46
43
|
}
|
|
47
44
|
add(content) {
|
|
@@ -51,5 +48,5 @@ class StorageLogFlusher {
|
|
|
51
48
|
this.bFlusher.flush();
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
|
-
exports.
|
|
51
|
+
exports.StorageFlusher = StorageFlusher;
|
|
55
52
|
//# sourceMappingURL=storageFlusher.js.map
|