suanpan_node_sdk 2.2.3 → 2.3.0-beta.1
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/storage/minioStorage.d.ts +4 -5
- package/dist/core/storage/minioStorage.js +24 -21
- 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 +12 -3
- 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/index.d.ts +7 -1
- package/dist/core/utils/index.js +16 -2
- package/dist/core/utils/index.js.map +1 -1
- 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 +3 -2
|
@@ -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"}
|
|
@@ -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, JSONValue } 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<JSONValue>;
|
|
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"));
|
|
37
|
+
const stream_1 = require("stream");
|
|
38
|
+
const utils_1 = require("../utils");
|
|
38
39
|
const environment_1 = require("../parameter/environment");
|
|
39
40
|
const suanpan_1 = require("../utils/suanpan");
|
|
40
|
-
const
|
|
41
|
+
const utils_2 = require("../utils");
|
|
41
42
|
class MinioStorage {
|
|
42
43
|
constructor(config) {
|
|
43
44
|
this.config = config;
|
|
@@ -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
|
}
|
|
@@ -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, JSONValue } 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<JSONValue>;
|
|
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, JSONValue } 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<JSONValue>;
|
|
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>;
|
|
@@ -38,6 +38,7 @@ const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
|
38
38
|
const moment_1 = __importDefault(require("moment"));
|
|
39
39
|
const utils_1 = require("../utils");
|
|
40
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;
|
|
@@ -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,8CAAiD;
|
|
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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;
|
|
1
|
+
{"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;AAEnC,qDAA2C;AAC3C,8CAAiD;AAEjD,MAAa,cAAc;IAIzB,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAKhD,YAAO,GAAG,CAAO,QAAkB,EAAE,EAAE;YACrC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;aAAE;YAEpC,MAAM,EAAE,OAAO,GAAG,wBAAO,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YAErE,eAAe;YACf,aAAM,CAAC,KAAK,CAAC,YAAY,QAAQ,OAAO,eAAe,EAAE,CAAC,CAAC;YAC3D,IAAI;gBACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC5C,GAAG,IAAI,GAAG,GAAG,MAAM,CAAC;oBACpB,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEP,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,EAAE,EAAE,qBAAqB,EAAE,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC;aACjI;YAAC,OAAO,CAAC,EAAE;gBACV,aAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;aACjD;QACH,CAAC,CAAA,CAAC;QArBA,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAqBD,GAAG,CAAC,OAAe;QACjB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF;AAnCD,wCAmCC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
export declare class ObjectStorageLogger {
|
|
1
|
+
import { ILogger, StorageLoggerOptions } from '../../types';
|
|
2
|
+
export declare class ObjectStorageLogger implements ILogger {
|
|
4
3
|
private options;
|
|
5
|
-
private storage?;
|
|
6
|
-
private _logger;
|
|
7
4
|
private _minLevel;
|
|
8
5
|
private _flusher;
|
|
9
|
-
constructor(options: StorageLoggerOptions
|
|
6
|
+
constructor(options: StorageLoggerOptions);
|
|
10
7
|
private _validate;
|
|
11
8
|
private log;
|
|
12
9
|
info: (message: string, flush?: boolean) => void;
|
|
@@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ObjectStorageLogger = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
-
const log4js_1 = __importDefault(require("log4js"));
|
|
9
8
|
const moment_1 = __importDefault(require("moment"));
|
|
9
|
+
const log_1 = require("../common/log");
|
|
10
10
|
const storageFlusher_1 = require("./storageFlusher");
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
12
|
const types_1 = require("../../types");
|
|
13
|
+
const logger = log_1.createLogger();
|
|
13
14
|
class ObjectStorageLogger {
|
|
14
|
-
constructor(options
|
|
15
|
+
constructor(options) {
|
|
15
16
|
this.options = options;
|
|
16
|
-
this.storage = storage;
|
|
17
17
|
this.log = (level, message, flush = false) => {
|
|
18
18
|
if (level < this._minLevel) {
|
|
19
19
|
return;
|
|
@@ -21,16 +21,16 @@ class ObjectStorageLogger {
|
|
|
21
21
|
if (this.options.console) {
|
|
22
22
|
switch (level) {
|
|
23
23
|
case types_1.LogLevel.DEBUG:
|
|
24
|
-
|
|
24
|
+
logger.debug(message);
|
|
25
25
|
break;
|
|
26
26
|
case types_1.LogLevel.INFO:
|
|
27
|
-
|
|
27
|
+
logger.info(message);
|
|
28
28
|
break;
|
|
29
29
|
case types_1.LogLevel.WARN:
|
|
30
|
-
|
|
30
|
+
logger.warn(message);
|
|
31
31
|
break;
|
|
32
32
|
case types_1.LogLevel.ERROR:
|
|
33
|
-
|
|
33
|
+
logger.error(message);
|
|
34
34
|
break;
|
|
35
35
|
default: {
|
|
36
36
|
throw new Error(`unsupported log level: ${level}`);
|
|
@@ -55,37 +55,32 @@ class ObjectStorageLogger {
|
|
|
55
55
|
this.log(types_1.LogLevel.ERROR, message, flush);
|
|
56
56
|
};
|
|
57
57
|
this._validate(options);
|
|
58
|
-
this._logger = log4js_1.default.getLogger();
|
|
59
58
|
this._minLevel = this.options.level || types_1.LogLevel.DEBUG;
|
|
60
59
|
switch (this._minLevel) {
|
|
61
60
|
case types_1.LogLevel.DEBUG:
|
|
62
|
-
|
|
61
|
+
logger.level = 'debug';
|
|
63
62
|
break;
|
|
64
63
|
case types_1.LogLevel.INFO:
|
|
65
|
-
|
|
64
|
+
logger.level = 'info';
|
|
66
65
|
break;
|
|
67
66
|
case types_1.LogLevel.WARN:
|
|
68
|
-
|
|
67
|
+
logger.level = 'warn';
|
|
69
68
|
break;
|
|
70
69
|
case types_1.LogLevel.ERROR:
|
|
71
|
-
|
|
70
|
+
logger.level = 'error';
|
|
72
71
|
break;
|
|
73
72
|
default: {
|
|
74
73
|
throw new Error(`unsupported log level: ${this._minLevel}`);
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
this._flusher = new storageFlusher_1.
|
|
78
|
-
storageFilePath: options.storagePath,
|
|
79
|
-
maxItems: options.maxItems,
|
|
80
|
-
flushInterval: options.flushInterval
|
|
81
|
-
}, this.storage);
|
|
76
|
+
this._flusher = new storageFlusher_1.StorageFlusher(options);
|
|
82
77
|
}
|
|
83
78
|
_validate(options) {
|
|
84
79
|
if (lodash_1.default.isEmpty(options)) {
|
|
85
80
|
throw new Error('storage options is empty.');
|
|
86
81
|
}
|
|
87
|
-
if (!options.
|
|
88
|
-
throw new Error('
|
|
82
|
+
if (!options.storageFilePath) {
|
|
83
|
+
throw new Error('objectName must be provided.');
|
|
89
84
|
}
|
|
90
85
|
const flushInterval = options.flushInterval;
|
|
91
86
|
if (flushInterval !== undefined && !utils_1.isSafePositiveInteger(flushInterval)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageLogger.js","sourceRoot":"","sources":["../../../src/core/storage/storageLogger.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,oDAA4B;
|
|
1
|
+
{"version":3,"file":"storageLogger.js","sourceRoot":"","sources":["../../../src/core/storage/storageLogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,6 @@ export declare class StoragePath {
|
|
|
12
12
|
getNodePath(userId?: string, appId?: string, nodeId?: string): string;
|
|
13
13
|
getAppLogPath(userId?: string, appId?: string): string;
|
|
14
14
|
getNodeLogPath(userId?: string, appId?: string, nodeId?: string): string;
|
|
15
|
+
getNodeConfigsPath(userId: string, appId: string | number, nodeId: string): string;
|
|
15
16
|
getAppTempDir(userId?: string, appId?: string): string;
|
|
16
17
|
}
|
|
@@ -42,6 +42,9 @@ class StoragePath {
|
|
|
42
42
|
getNodeLogPath(userId, appId, nodeId) {
|
|
43
43
|
return `${this.getAppLogPath(userId, appId)}/${this._getNodeId(nodeId)}`;
|
|
44
44
|
}
|
|
45
|
+
getNodeConfigsPath(userId, appId, nodeId) {
|
|
46
|
+
return `${this.getUserPath(userId)}/configs/${appId}/${nodeId}`;
|
|
47
|
+
}
|
|
45
48
|
getAppTempDir(userId, appId) {
|
|
46
49
|
return `${this.getUserPath(userId)}/tmp/${this._getAppId(appId)}`;
|
|
47
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storagePath.js","sourceRoot":"","sources":["../../../src/core/storage/storagePath.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AACvD,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC/B,GAAG,yBAAW,CAAC,MAAM,CAAC;AAGvB,MAAa,WAAW;IAEtB,YAAoB,GAAwB;QAAxB,QAAG,GAAH,GAAG,CAAqB;IAAI,CAAC;IAEzC,UAAU,CAAC,MAAe;;QAChC,OAAO,MAAM,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,CAAA,IAAI,YAAsB,CAAC;IAC9D,CAAC;IAEO,SAAS,CAAC,KAAc;;QAC9B,OAAO,KAAK,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,WAAqB,CAAC;IAC3D,CAAC;IAEO,UAAU,CAAC,MAAe;;QAChC,OAAO,MAAM,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,CAAA,IAAI,YAAsB,CAAC;IAC9D,CAAC;IAEO,eAAe,CAAC,WAAoB;;QAC1C,OAAO,WAAW,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,WAAW,CAAA,IAAI,iBAAiB,CAAC;IACnE,CAAC;IAED,WAAW,CAAC,MAAe;QACzB,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,UAAU,CAAC,MAAe,EAAE,KAAc;QACxC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,MAAe,EAAE,WAAoB;QACpD,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;IACtF,CAAC;IAED,WAAW,CAAC,MAAe,EAAE,KAAc,EAAE,MAAe;QAC1D,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IACxE,CAAC;IAED,aAAa,CAAC,MAAe,EAAE,KAAc;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,GAAG,QAAQ,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACrD,CAAC;IAED,cAAc,CAAC,MAAe,EAAE,KAAc,EAAE,MAAe;QAC7D,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3E,CAAC;IAED,aAAa,CAAC,MAAe,EAAE,KAAc;QAC3C,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACpE,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"storagePath.js","sourceRoot":"","sources":["../../../src/core/storage/storagePath.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AACvD,MAAM,EACJ,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC/B,GAAG,yBAAW,CAAC,MAAM,CAAC;AAGvB,MAAa,WAAW;IAEtB,YAAoB,GAAwB;QAAxB,QAAG,GAAH,GAAG,CAAqB;IAAI,CAAC;IAEzC,UAAU,CAAC,MAAe;;QAChC,OAAO,MAAM,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,CAAA,IAAI,YAAsB,CAAC;IAC9D,CAAC;IAEO,SAAS,CAAC,KAAc;;QAC9B,OAAO,KAAK,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,KAAK,CAAA,IAAI,WAAqB,CAAC;IAC3D,CAAC;IAEO,UAAU,CAAC,MAAe;;QAChC,OAAO,MAAM,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,CAAA,IAAI,YAAsB,CAAC;IAC9D,CAAC;IAEO,eAAe,CAAC,WAAoB;;QAC1C,OAAO,WAAW,KAAI,MAAA,IAAI,CAAC,GAAG,0CAAE,WAAW,CAAA,IAAI,iBAAiB,CAAC;IACnE,CAAC;IAED,WAAW,CAAC,MAAe;QACzB,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,UAAU,CAAC,MAAe,EAAE,KAAc;QACxC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,MAAe,EAAE,WAAoB;QACpD,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;IACtF,CAAC;IAED,WAAW,CAAC,MAAe,EAAE,KAAc,EAAE,MAAe;QAC1D,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IACxE,CAAC;IAED,aAAa,CAAC,MAAe,EAAE,KAAc;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,GAAG,QAAQ,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACrD,CAAC;IAED,cAAc,CAAC,MAAe,EAAE,KAAc,EAAE,MAAe;QAC7D,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3E,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,KAAsB,EAAE,MAAc;QACvE,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,KAAK,IAAI,MAAM,EAAE,CAAC;IAClE,CAAC;IAED,aAAa,CAAC,MAAe,EAAE,KAAc;QAC3C,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACpE,CAAC;CACF;AApDD,kCAoDC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as events from 'events';
|
|
3
|
-
|
|
4
|
-
maxItems?: number;
|
|
5
|
-
flushInterval?: number;
|
|
6
|
-
};
|
|
3
|
+
import type { FlushOptions } from '../../types/storageTypes';
|
|
7
4
|
export declare class BufferFlusher extends events.EventEmitter {
|
|
8
5
|
private _buffer;
|
|
9
6
|
private _maxItems;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flusher.js","sourceRoot":"","sources":["../../../src/core/utils/flusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;
|
|
1
|
+
{"version":3,"file":"flusher.js","sourceRoot":"","sources":["../../../src/core/utils/flusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAGjC,MAAa,aAAc,SAAQ,MAAM,CAAC,YAAY;IAOpD,YAAY,UAAwB,EAAE;QACpC,KAAK,EAAE,CAAC;QANF,YAAO,GAAa,EAAE,CAAC;QAO7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QACtF,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,GAAG,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9B,KAAK,KAAK,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9B,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAE9C,GAAG,CAAC,IAAY;QACd,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE;gBACzC,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,uEAAuE;QACvE,iFAAiF;QACjF,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,CAAC;QAEnF,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAAE,OAAO;SAAE;QAErC,IAAI;YACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAClC;QAAC,OAAO,GAAG,EAAE;YACZ,qCAAqC;YACrC,kDAAkD;YAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;CACF;AA7CD,sCA6CC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export * from './flusher';
|
|
3
3
|
export * from './number';
|
|
4
4
|
export * from './retry';
|
|
5
|
-
import { Readable as ReadableStream, Stream } from 'stream';
|
|
5
|
+
import { Readable as ReadableStream, Stream, Transform, TransformCallback } from 'stream';
|
|
6
6
|
export declare function generateUUID(): string;
|
|
7
7
|
export declare function getConfig(setting: any): any;
|
|
8
8
|
export declare function tryJSONParse(text: string, fallback?: any): any;
|
|
@@ -54,3 +54,9 @@ export declare function convertStreamToBuffer(stream: Stream): Promise<Buffer>;
|
|
|
54
54
|
declare type BufferEncoding = 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'latin1' | 'binary' | 'hex';
|
|
55
55
|
export declare function convertStreamToString(stream: Stream, encoding?: BufferEncoding): Promise<string>;
|
|
56
56
|
export declare function convertBufferToStream(buffer: Buffer): Stream;
|
|
57
|
+
export declare class AppendTransform extends Transform {
|
|
58
|
+
private str;
|
|
59
|
+
constructor(str: string);
|
|
60
|
+
_transform(chunk: any, encoding: BufferEncoding, done: TransformCallback): void;
|
|
61
|
+
_flush(done: TransformCallback): void;
|
|
62
|
+
}
|
package/dist/core/utils/index.js
CHANGED
|
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.convertBufferToStream = exports.convertStreamToString = exports.convertStreamToBuffer = exports.sleep = exports.writeBufToFile = exports.fileExists = exports.signatureV1 = exports.lastIndexOfNthCharacters = exports.indexOfNthCharacters = exports.insertbyIndex = exports.leftMerge = exports.readableToString = exports.pathEndWith = exports.stringifyIfNecessary = exports.isDesktopMaster = exports.isUseMaster = exports.isDesktop = exports.isTrue = exports.tryJSONParse = exports.getConfig = exports.generateUUID = void 0;
|
|
25
|
+
exports.AppendTransform = exports.convertBufferToStream = exports.convertStreamToString = exports.convertStreamToBuffer = exports.sleep = exports.writeBufToFile = exports.fileExists = exports.signatureV1 = exports.lastIndexOfNthCharacters = exports.indexOfNthCharacters = exports.insertbyIndex = exports.leftMerge = exports.readableToString = exports.pathEndWith = exports.stringifyIfNecessary = exports.isDesktopMaster = exports.isUseMaster = exports.isDesktop = exports.isTrue = exports.tryJSONParse = exports.getConfig = exports.generateUUID = void 0;
|
|
26
26
|
process.env.SUPPRESS_NO_CONFIG_WARNING = 'true';
|
|
27
27
|
__exportStar(require("./flusher"), exports);
|
|
28
28
|
__exportStar(require("./number"), exports);
|
|
@@ -34,8 +34,8 @@ const uuid_1 = __importDefault(require("uuid"));
|
|
|
34
34
|
const config_1 = __importDefault(require("config"));
|
|
35
35
|
const log_1 = __importDefault(require("../common/log"));
|
|
36
36
|
const crypto_1 = __importDefault(require("crypto"));
|
|
37
|
-
const stream_1 = require("stream");
|
|
38
37
|
const constant_1 = require("../common/constant");
|
|
38
|
+
const stream_1 = require("stream");
|
|
39
39
|
function generateUUID() {
|
|
40
40
|
return uuid_1.default.v4();
|
|
41
41
|
}
|
|
@@ -241,4 +241,18 @@ function convertBufferToStream(buffer) {
|
|
|
241
241
|
});
|
|
242
242
|
}
|
|
243
243
|
exports.convertBufferToStream = convertBufferToStream;
|
|
244
|
+
class AppendTransform extends stream_1.Transform {
|
|
245
|
+
constructor(str) {
|
|
246
|
+
super();
|
|
247
|
+
this.str = str;
|
|
248
|
+
}
|
|
249
|
+
_transform(chunk, encoding, done) {
|
|
250
|
+
done(null, chunk);
|
|
251
|
+
}
|
|
252
|
+
_flush(done) {
|
|
253
|
+
this.push(this.str);
|
|
254
|
+
done();
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
exports.AppendTransform = AppendTransform;
|
|
244
258
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;AAEhD,4CAA0B;AAC1B,2CAAyB;AACzB,0CAAwB;AAExB,oDAAuB;AACvB,wDAA0B;AAC1B,gDAAwB;AACxB,gDAAwB;AACxB,oDAA4B;AAC5B,wDAAmC;AACnC,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/utils/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,13 @@ export declare enum LogLevel {
|
|
|
14
14
|
WARN = 3,
|
|
15
15
|
ERROR = 4
|
|
16
16
|
}
|
|
17
|
+
export interface ILogger {
|
|
18
|
+
debug(message?: any, ...optionalParams: any[]): void;
|
|
19
|
+
info(message?: any, ...optionalParams: any[]): void;
|
|
20
|
+
warn(message?: any, ...optionalParams: any[]): void;
|
|
21
|
+
error(message?: any, ...optionalParams: any[]): void;
|
|
22
|
+
[x: string]: any;
|
|
23
|
+
}
|
|
17
24
|
export declare enum Platform {
|
|
18
25
|
WINDOWS = 0,
|
|
19
26
|
MACINTOSH = 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conmonTypes.js","sourceRoot":"","sources":["../../src/types/conmonTypes.ts"],"names":[],"mappings":";;;AAOA,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;AACX,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;
|
|
1
|
+
{"version":3,"file":"conmonTypes.js","sourceRoot":"","sources":["../../src/types/conmonTypes.ts"],"names":[],"mappings":";;;AAOA,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;AACX,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;AASD,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,6CAAO,CAAA;IACP,iDAAS,CAAA;IACT,yCAAK,CAAA;AACP,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { LogLevel } from './conmonTypes';
|
|
3
|
+
import type { IObjectStorage } from '../core/storage/objectStorage';
|
|
3
4
|
import type { Readable as ReadableStream } from 'stream';
|
|
4
5
|
export interface ObjectMetadata {
|
|
5
6
|
[key: string]: any;
|
|
@@ -20,13 +21,6 @@ export interface StoragePathOptions {
|
|
|
20
21
|
nodeId?: string;
|
|
21
22
|
componentId?: string;
|
|
22
23
|
}
|
|
23
|
-
export declare type StorageLoggerOptions = {
|
|
24
|
-
storagePath: string;
|
|
25
|
-
console?: boolean;
|
|
26
|
-
level?: LogLevel;
|
|
27
|
-
maxItems?: number;
|
|
28
|
-
flushInterval?: number;
|
|
29
|
-
};
|
|
30
24
|
export declare type StsToken = {
|
|
31
25
|
Credentials: {
|
|
32
26
|
AccessKeyId: string;
|
|
@@ -56,3 +50,16 @@ export interface IStorageConfig {
|
|
|
56
50
|
type: 'oss' | 'minio';
|
|
57
51
|
config: StorageConfig;
|
|
58
52
|
}
|
|
53
|
+
export interface FlushOptions {
|
|
54
|
+
maxItems?: number;
|
|
55
|
+
flushInterval?: number;
|
|
56
|
+
}
|
|
57
|
+
export interface StorageFlushOptions extends FlushOptions {
|
|
58
|
+
storageFilePath: string;
|
|
59
|
+
storage?: IObjectStorage;
|
|
60
|
+
maxClearLength?: number;
|
|
61
|
+
}
|
|
62
|
+
export interface StorageLoggerOptions extends StorageFlushOptions {
|
|
63
|
+
console?: boolean;
|
|
64
|
+
level?: LogLevel;
|
|
65
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageTypes.js","sourceRoot":"","sources":["../../src/types/storageTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"storageTypes.js","sourceRoot":"","sources":["../../src/types/storageTypes.ts"],"names":[],"mappings":";;;AAcA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,0BAAW,CAAA;IACX,kCAAmB,CAAA;IACnB,8BAAe,CAAA;AACjB,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "suanpan_node_sdk",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0-beta.1",
|
|
4
4
|
"description": "suanpan sdk for node.js",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"types": "dist/main.d.ts",
|
|
@@ -52,9 +52,9 @@
|
|
|
52
52
|
"express-async-handler": "^1.1.4",
|
|
53
53
|
"fs-extra": "^9.0.1",
|
|
54
54
|
"get-port": "^5.1.1",
|
|
55
|
+
"got": "^10.7.0",
|
|
55
56
|
"is-type-of": "^1.2.1",
|
|
56
57
|
"lodash": "^4.17.15",
|
|
57
|
-
"log4js": "^6.3.0",
|
|
58
58
|
"minio": "^7.0.15",
|
|
59
59
|
"moment": "^2.24.0",
|
|
60
60
|
"promise-retry": "^2.0.1",
|
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"split-string": "^6.1.0",
|
|
67
67
|
"suanpan-mq": "^1.4.1",
|
|
68
68
|
"uuid": "^3.4.0",
|
|
69
|
+
"winston": "^3.8.1",
|
|
69
70
|
"yargs": "^13.3.2"
|
|
70
71
|
},
|
|
71
72
|
"devDependencies": {
|