suanpan_node_sdk 2.2.4 → 2.3.0-beta.2
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/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/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/mq/index.js +1 -1
- package/dist/core/message/mq/index.js.map +1 -1
- package/dist/core/message/mq/redis.js +4 -4
- package/dist/core/message/mq/redis.js.map +1 -1
- 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 +1 -2
- package/dist/core/storage/index.js +1 -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 -3
- package/dist/core/storage/minioStorage.js +24 -21
- package/dist/core/storage/minioStorage.js.map +1 -1
- package/dist/core/storage/objectStorage.d.ts +4 -4
- package/dist/core/storage/ossStorage.js +12 -3
- package/dist/core/storage/ossStorage.js.map +1 -1
- package/dist/core/storage/storageLogger.d.ts +10 -6
- package/dist/core/storage/storageLogger.js +72 -56
- 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/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/utils/flusher.d.ts +1 -4
- package/dist/core/utils/flusher.js.map +1 -1
- 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 +8 -2
- package/dist/core/utils/index.js +21 -7
- 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 -6
- 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 +16 -8
- package/dist/types/storageTypes.js.map +1 -1
- package/package.json +2 -2
- package/dist/core/common/log.d.ts +0 -3
- package/dist/core/common/log.js +0 -16
- package/dist/core/common/log.js.map +0 -1
- package/dist/core/logkit/index.js.map +0 -1
- package/dist/core/service/port.js.map +0 -1
- package/dist/core/storage/storageFlusher.d.ts +0 -14
- package/dist/core/storage/storageFlusher.js +0 -55
- package/dist/core/storage/storageFlusher.js.map +0 -1
- package/dist/core/storage/wrapperStorage.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-front.js","sourceRoot":"","sources":["../../../src/core/script/script-front.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE5B,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,
|
|
1
|
+
{"version":3,"file":"script-front.js","sourceRoot":"","sources":["../../../src/core/script/script-front.js"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ScriptManager = void 0;
|
|
16
16
|
const _ = require('lodash');
|
|
17
|
-
const
|
|
17
|
+
const logger_1 = __importDefault(require("../common/logger"));
|
|
18
18
|
const babel = require('./script-babel/babel');
|
|
19
19
|
const scriptTpl = require('./script-template');
|
|
20
20
|
const EventEmitter = require('events');
|
|
@@ -92,16 +92,16 @@ class ScriptManager extends EventEmitter {
|
|
|
92
92
|
*/
|
|
93
93
|
parseScripts(scriptInput, globalHook = true) {
|
|
94
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
95
|
-
|
|
95
|
+
logger_1.default.debug('scriptInput is: %s', scriptInput);
|
|
96
96
|
if (_.isEmpty(scriptInput)) {
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
99
|
try {
|
|
100
|
-
|
|
100
|
+
logger_1.default.debug('start parse script...');
|
|
101
101
|
const compiledCode = this.handleInputWithBabel(scriptInput);
|
|
102
|
-
|
|
102
|
+
logger_1.default.debug('code converted by babel is: %s', compiledCode);
|
|
103
103
|
const scriptTemplate = this.generateSrciptTemplate(compiledCode);
|
|
104
|
-
|
|
104
|
+
logger_1.default.debug('generated script template is: %s', scriptTemplate);
|
|
105
105
|
const exportedScriptFn = this.exportScriptTemplate(scriptTemplate);
|
|
106
106
|
const resultOfExportedFn = this.executeFunction(exportedScriptFn, this.appScriptContext, ...this.getInjectedModules());
|
|
107
107
|
const handlers = resultOfExportedFn[HANDLERS];
|
|
@@ -111,7 +111,7 @@ class ScriptManager extends EventEmitter {
|
|
|
111
111
|
if (globalHook && initializeFn && _.isFunction(initializeFn) && this.enabled) {
|
|
112
112
|
yield this.executeAsyncFunction(initializeFn, this.appScriptContext);
|
|
113
113
|
}
|
|
114
|
-
|
|
114
|
+
logger_1.default.debug('parsed successfully.');
|
|
115
115
|
}
|
|
116
116
|
catch (err) {
|
|
117
117
|
this.emitToSuanpanWeb('scriptParseError', { err: this.serializeError(err) });
|
|
@@ -142,19 +142,19 @@ class ScriptManager extends EventEmitter {
|
|
|
142
142
|
}
|
|
143
143
|
process(nodeId, when, data, extra = {}) {
|
|
144
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
145
|
-
|
|
145
|
+
logger_1.default.debug('start execute hanlder...');
|
|
146
146
|
let port;
|
|
147
147
|
try {
|
|
148
|
-
|
|
148
|
+
logger_1.default.debug('(nodeId: \'%s\', when: \'%s\', data: %j, extra: %j)', nodeId, when, data, extra);
|
|
149
149
|
port = this.getTargetPort(when, data);
|
|
150
150
|
if (!this.enabled) {
|
|
151
|
-
|
|
151
|
+
logger_1.default.debug('(userId: \'%s\', appId: \'%s\', nodeId: \'%s\', port: \'%s\', when: \'%s\') ' +
|
|
152
152
|
'The script\'s switch is off, skipping processing...', this.userId, this.appId, nodeId, port, when);
|
|
153
153
|
return;
|
|
154
154
|
}
|
|
155
155
|
const handler = this.handlerRepo.findHandler(nodeId, port, when);
|
|
156
156
|
if (!handler || !handler.enabled) {
|
|
157
|
-
|
|
157
|
+
logger_1.default.debug('No handler was found, skip.');
|
|
158
158
|
return;
|
|
159
159
|
}
|
|
160
160
|
const raw = data[port];
|
|
@@ -162,10 +162,10 @@ class ScriptManager extends EventEmitter {
|
|
|
162
162
|
const nodeScriptContext = new NodeScriptContext(this.userId, this.appId, nodeId, port, when, data, extra, this.spmqClient, this.portTypes, this.utils, this, this.appScriptContext.g || {}, BUILT_IN_MODULES);
|
|
163
163
|
yield handler.handle(parsedData, nodeScriptContext);
|
|
164
164
|
this.emitToSuanpanWeb('scriptProcessed', { node: nodeId, port, when, before: raw, after: data[port] });
|
|
165
|
-
|
|
165
|
+
logger_1.default.debug('execute successfully.');
|
|
166
166
|
}
|
|
167
167
|
catch (err) {
|
|
168
|
-
|
|
168
|
+
logger_1.default.error(`(${this.userId},${this.appId},${nodeId},${port},${when}) process failed:`, err);
|
|
169
169
|
this.emitToSuanpanWeb('scriptRuntimeError', { node: nodeId, port, when, err: this.serializeError(err) });
|
|
170
170
|
}
|
|
171
171
|
});
|
|
@@ -196,8 +196,8 @@ class ScriptManager extends EventEmitter {
|
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
storeHandlers(handlers, systemMessageHandlers) {
|
|
199
|
-
|
|
200
|
-
|
|
199
|
+
logger_1.default.debug('The handles collected by HandlerRepository is %O:', handlers);
|
|
200
|
+
logger_1.default.debug('The handles collected by SystemMessageHandlers is %O:', systemMessageHandlers);
|
|
201
201
|
this.handlerRepo.addAll(handlers);
|
|
202
202
|
this.systemMessageHandlers = systemMessageHandlers;
|
|
203
203
|
}
|
|
@@ -208,9 +208,9 @@ class ScriptManager extends EventEmitter {
|
|
|
208
208
|
*/
|
|
209
209
|
processSystemMessage(nodeId, data) {
|
|
210
210
|
return __awaiter(this, void 0, void 0, function* () {
|
|
211
|
-
|
|
211
|
+
logger_1.default.debug('start execute system message hanlder...');
|
|
212
212
|
if (!this.systemMessageHandlers || !this.systemMessageHandlers[nodeId]) {
|
|
213
|
-
|
|
213
|
+
logger_1.default.debug(`no system message handler was found, nodeId: ${nodeId}`);
|
|
214
214
|
return;
|
|
215
215
|
}
|
|
216
216
|
const systemMessageCallBack = this.systemMessageHandlers[nodeId];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-manager.js","sourceRoot":"","sources":["../../../src/core/script/script-manager.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;AAEb,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE5B,
|
|
1
|
+
{"version":3,"file":"script-manager.js","sourceRoot":"","sources":["../../../src/core/script/script-manager.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.StorageFactory = void 0;
|
|
4
4
|
const ossStorage_1 = require("./ossStorage");
|
|
5
|
-
const environment_1 = require("../parameter/environment");
|
|
6
5
|
const minioStorage_1 = require("./minioStorage");
|
|
7
6
|
const types_1 = require("../../types");
|
|
8
7
|
class StorageFactory {
|
|
@@ -35,14 +34,4 @@ class StorageFactory {
|
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
36
|
exports.StorageFactory = StorageFactory;
|
|
38
|
-
|
|
39
|
-
constructor() { }
|
|
40
|
-
static get Instance() {
|
|
41
|
-
if (!this._instance) {
|
|
42
|
-
this._instance = StorageFactory.getStorage(environment_1.Environment.spConfig.storageType);
|
|
43
|
-
}
|
|
44
|
-
return this._instance;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
exports.Storage = Storage;
|
|
48
|
-
//# sourceMappingURL=wrapperStorage.js.map
|
|
37
|
+
//# sourceMappingURL=factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../src/core/storage/factory.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,iDAA8C;AAC9C,uCAAqF;AAErF,MAAa,cAAc;IACzB;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,WAAwB;QACxC,IAAI,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAAE;QAC7D,IAAI,WAAW,KAAK,mBAAW,CAAC,GAAG,IAAI,WAAW,KAAK,mBAAW,CAAC,OAAO,EAAE;YAC1E,OAAO,IAAI,uBAAU,EAAE,CAAC;SACzB;aAAM,IAAI,WAAW,KAAK,mBAAW,CAAC,KAAK,EAAE;YAC5C,OAAO,IAAI,2BAAY,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,OAAuB;QACvC,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE;YAC1B,OAAO,IAAI,uBAAU,CAAC,OAAO,CAAC,MAAsB,CAAC,CAAC;SACvD;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE;YACnC,OAAO,IAAI,2BAAY,CAAC,OAAO,CAAC,MAAqB,CAAC,CAAC;SACxD;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC3D,CAAC;CACF;AAzBD,wCAyBC"}
|
|
@@ -11,8 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./objectStorage"), exports);
|
|
14
|
-
__exportStar(require("./storageFlusher"), exports);
|
|
15
14
|
__exportStar(require("./storageLogger"), exports);
|
|
16
15
|
__exportStar(require("./storagePath"), exports);
|
|
17
|
-
__exportStar(require("./
|
|
16
|
+
__exportStar(require("./internal"), exports);
|
|
18
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/storage/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/storage/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,gDAA8B;AAC9B,6CAA2B"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Storage = void 0;
|
|
4
|
+
const environment_1 = require("../parameter/environment");
|
|
5
|
+
const factory_1 = require("./factory");
|
|
6
|
+
class Storage {
|
|
7
|
+
constructor() { }
|
|
8
|
+
static get Instance() {
|
|
9
|
+
if (!this._instance) {
|
|
10
|
+
this._instance = factory_1.StorageFactory.getStorage(environment_1.Environment.spConfig.storageType);
|
|
11
|
+
}
|
|
12
|
+
return this._instance;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.Storage = Storage;
|
|
16
|
+
//# sourceMappingURL=internal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/core/storage/internal.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AACvD,uCAA2C;AAK3C,MAAa,OAAO;IASlB,gBAAwB,CAAC;IANlB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,wBAAc,CAAC,UAAU,CAAC,yBAAW,CAAC,QAAQ,CAAC,WAA0B,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CAEF;AAVD,0BAUC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
|
-
import type { Readable as ReadableStream } from 'stream';
|
|
4
3
|
import type { ObjectData, ObjectItem, MinioConfig, ObjectMetadata } from '../../types';
|
|
4
|
+
import { Readable as ReadableStream } from 'stream';
|
|
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
16
|
getObjectToJSON(objectName: string): Promise<any>;
|
|
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 utils_1 = require("../utils");
|
|
38
38
|
const environment_1 = require("../parameter/environment");
|
|
39
39
|
const suanpan_1 = require("../utils/suanpan");
|
|
40
|
-
const
|
|
40
|
+
const stream_1 = require("stream");
|
|
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 {
|
|
2
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
3
3
|
import type { ObjectData, ObjectMetadata, ObjectItem } 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<any>;
|
|
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>;
|
|
@@ -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,17 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { WinstonLogger } from '../logger/winston';
|
|
2
2
|
import { StorageLoggerOptions } from '../../types';
|
|
3
|
-
export declare class ObjectStorageLogger {
|
|
3
|
+
export declare class ObjectStorageLogger extends WinstonLogger {
|
|
4
4
|
private options;
|
|
5
|
-
private
|
|
6
|
-
private _logger;
|
|
7
|
-
private _minLevel;
|
|
5
|
+
private _level;
|
|
8
6
|
private _flusher;
|
|
9
|
-
|
|
7
|
+
private _localLogPath;
|
|
8
|
+
private _storageLogPath;
|
|
9
|
+
constructor(options: StorageLoggerOptions);
|
|
10
10
|
private _validate;
|
|
11
|
+
private _initialize;
|
|
12
|
+
private _addHandlers;
|
|
13
|
+
private onFlush;
|
|
14
|
+
private isSuppressed;
|
|
11
15
|
private log;
|
|
12
16
|
info: (message: string, flush?: boolean) => void;
|
|
13
17
|
debug: (message: string, flush?: boolean) => void;
|