suanpan_node_sdk 2.0.0-beta.12 → 2.0.0-beta.16
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/common/bufferFlusher.d.ts +18 -0
- package/dist/common/bufferFlusher.js +73 -0
- package/dist/common/bufferFlusher.js.map +1 -0
- package/dist/common/util.d.ts +1 -0
- package/dist/common/util.js +15 -0
- package/dist/common/util.js.map +1 -1
- package/dist/eventLogger.d.ts +1 -0
- package/dist/eventLogger.js +19 -0
- package/dist/eventLogger.js.map +1 -1
- package/dist/latestStorage/minio.d.ts +4 -1
- package/dist/latestStorage/minio.js +34 -0
- package/dist/latestStorage/minio.js.map +1 -1
- package/dist/latestStorage/oss.d.ts +3 -0
- package/dist/latestStorage/oss.js +31 -0
- package/dist/latestStorage/oss.js.map +1 -1
- package/dist/latestStorage/storage.d.ts +25 -10
- package/dist/latestStorage/storage.js.map +1 -1
- package/dist/latestStorage/storageFlusher.d.ts +9 -0
- package/dist/latestStorage/storageFlusher.js +66 -0
- package/dist/latestStorage/storageFlusher.js.map +1 -0
- package/dist/latestStorage/storageLogger.d.ts +21 -0
- package/dist/latestStorage/storageLogger.js +68 -0
- package/dist/latestStorage/storageLogger.js.map +1 -0
- package/dist/latestStorage/wrapperStorage.d.ts +2 -3
- package/dist/latestStorage/wrapperStorage.js +2 -2
- package/dist/latestStorage/wrapperStorage.js.map +1 -1
- package/package.json +2 -4
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import * as events from 'events';
|
|
3
|
+
export declare type FlushOptions = {
|
|
4
|
+
flushInterval?: number;
|
|
5
|
+
maxItems?: number;
|
|
6
|
+
};
|
|
7
|
+
export declare class BufferFlusher extends events.EventEmitter {
|
|
8
|
+
private buffer;
|
|
9
|
+
private flushInterval;
|
|
10
|
+
private maxItems;
|
|
11
|
+
private flushTimeoutId;
|
|
12
|
+
constructor(options?: FlushOptions);
|
|
13
|
+
get(): string[];
|
|
14
|
+
clear(): void;
|
|
15
|
+
stop(): void;
|
|
16
|
+
add(data: string): void;
|
|
17
|
+
flush(): void;
|
|
18
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
exports.BufferFlusher = void 0;
|
|
23
|
+
const events = __importStar(require("events"));
|
|
24
|
+
class BufferFlusher extends events.EventEmitter {
|
|
25
|
+
constructor(options = {}) {
|
|
26
|
+
super();
|
|
27
|
+
this.buffer = [];
|
|
28
|
+
this.flushInterval = options.flushInterval || 10000;
|
|
29
|
+
this.maxItems = options.maxItems || 5;
|
|
30
|
+
this.flush();
|
|
31
|
+
}
|
|
32
|
+
get() { return this.buffer; }
|
|
33
|
+
clear() { this.buffer = []; }
|
|
34
|
+
stop() { clearTimeout(this.flushTimeoutId); }
|
|
35
|
+
add(data) {
|
|
36
|
+
if (data) {
|
|
37
|
+
this.buffer.push(data);
|
|
38
|
+
if (this.buffer.length >= this.maxItems) {
|
|
39
|
+
this.flush();
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
flush() {
|
|
44
|
+
this.stop();
|
|
45
|
+
// The timer is the only action that would hold the node-process open.
|
|
46
|
+
// By unref-ing it, the process will exit prior to the timeout callback execution
|
|
47
|
+
this.flushTimeoutId = setTimeout(() => this.flush(), this.flushInterval).unref();
|
|
48
|
+
if (!this.buffer.length) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
try {
|
|
52
|
+
this.emit('flush', this.buffer);
|
|
53
|
+
}
|
|
54
|
+
catch (err) {
|
|
55
|
+
// 当事件被触发时，如果没有与该事件绑定的函数的话，该事件会被静默忽略掉
|
|
56
|
+
// 但是如果事件的名称是 error 的话，没有与此相关的事件处理的话，程序就会 crash 退出
|
|
57
|
+
this.emit('error', err);
|
|
58
|
+
}
|
|
59
|
+
this.buffer = [];
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
exports.BufferFlusher = BufferFlusher;
|
|
63
|
+
// const buffer = new FlushBuffer({ flushInterval: 2000, maxItems: 1 });
|
|
64
|
+
// buffer.on('flush', (data) => {
|
|
65
|
+
// console.log(data); // bla
|
|
66
|
+
// console.log(data[0]); // bla
|
|
67
|
+
// // throw new Error('222');
|
|
68
|
+
// });
|
|
69
|
+
// buffer.add('woaini');
|
|
70
|
+
// setTimeout(() => {
|
|
71
|
+
// console.log('程序结束了...');
|
|
72
|
+
// }, 20000);
|
|
73
|
+
//# sourceMappingURL=bufferFlusher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bufferFlusher.js","sourceRoot":"","sources":["../../src/common/bufferFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAMjC,MAAa,aAAc,SAAQ,MAAM,CAAC,YAAY;IAOpD,YAAY,UAAwB,EAAE;QACpC,KAAK,EAAE,CAAC;QANF,WAAM,GAAa,EAAE,CAAC;QAO5B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC;QACpD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,GAAG,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7B,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE7C,GAAG,CAAC,IAAY;QACd,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACvC,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,uEAAuE;QACvE,iFAAiF;QACjF,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,OAAO;SAAE;QAEpC,IAAI;YACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SACjC;QAAC,OAAO,GAAG,EAAE;YACZ,qCAAqC;YACrC,kDAAkD;YAClD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;CACF;AA7CD,sCA6CC;AAED,wEAAwE;AAExE,iCAAiC;AACjC,8BAA8B;AAC9B,iCAAiC;AACjC,+BAA+B;AAC/B,MAAM;AAEN,wBAAwB;AAExB,qBAAqB;AACrB,6BAA6B;AAC7B,aAAa"}
|
package/dist/common/util.d.ts
CHANGED
package/dist/common/util.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
process.env.SUPPRESS_NO_CONFIG_WARNING = true;
|
|
3
3
|
const _ = require('lodash');
|
|
4
|
+
const fs = require('fs-extra');
|
|
4
5
|
const path = require('path');
|
|
5
6
|
const config = require('config');
|
|
6
7
|
const logger = require('./log');
|
|
@@ -154,7 +155,21 @@ function signatureV1(secret = '', data = '') {
|
|
|
154
155
|
function isDesktop() {
|
|
155
156
|
return getConfig('app.isDesktop');
|
|
156
157
|
}
|
|
158
|
+
function fileExists(path) {
|
|
159
|
+
try {
|
|
160
|
+
return fs.statSync(path).isFile();
|
|
161
|
+
}
|
|
162
|
+
catch (e) {
|
|
163
|
+
if (e.code == 'ENOENT') { // no such file or directory. File really does not exist
|
|
164
|
+
logger.info(`File(${path}) does not exist.`);
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
logger.info('Exception fs.statSync (' + path + '): ' + e);
|
|
168
|
+
throw e; // something else went wrong, we don't have rights, ...
|
|
169
|
+
}
|
|
170
|
+
}
|
|
157
171
|
module.exports = {
|
|
172
|
+
fileExists,
|
|
158
173
|
generateUUID,
|
|
159
174
|
isDesktop,
|
|
160
175
|
signatureV1,
|
package/dist/common/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,IAAI,CAAC;AAC9C,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.js"],"names":[],"mappings":"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"}
|
package/dist/eventLogger.d.ts
CHANGED
package/dist/eventLogger.js
CHANGED
|
@@ -24,6 +24,7 @@ const USER_SIGN_VERSION_HEADER = process.env.SP_USER_SIGN_VERSION_HEADER_FIELD |
|
|
|
24
24
|
const SP_WEB_ENDPOINT = process.env.SP_LOGKIT_URI;
|
|
25
25
|
const SP_LOGKIT_NAMESPACE = process.env.SP_LOGKIT_NAMESPACE || 'logkit';
|
|
26
26
|
const SP_LOGKIT_EVENTS_APPEND = process.env.SP_LOGKIT_EVENTS_APPEND || 'append';
|
|
27
|
+
const SP_LOGKIT_LOGS_LEVEL = process.env.SP_LOGKIT_LOGS_LEVEL || 'debug';
|
|
27
28
|
function getRequestUrl(endpoint, routePath) {
|
|
28
29
|
const prefix = !_.endsWith(endpoint, '/') ? endpoint + '/' : endpoint;
|
|
29
30
|
const suffix = !_.startsWith(routePath, '/') ? routePath : routePath.substr(1);
|
|
@@ -43,6 +44,20 @@ function generateConnectOpts() {
|
|
|
43
44
|
path: process.env.SP_LOGKIT_PATH
|
|
44
45
|
};
|
|
45
46
|
}
|
|
47
|
+
const levels = {
|
|
48
|
+
'trace': 1,
|
|
49
|
+
'debug': 2,
|
|
50
|
+
'info': 3,
|
|
51
|
+
'warning': 4,
|
|
52
|
+
'warn': 4,
|
|
53
|
+
'error': 5
|
|
54
|
+
};
|
|
55
|
+
function levelToInt(minLevel) {
|
|
56
|
+
if (minLevel.toLowerCase() in levels) {
|
|
57
|
+
return this.levels[minLevel.toLowerCase()];
|
|
58
|
+
}
|
|
59
|
+
return 99;
|
|
60
|
+
}
|
|
46
61
|
class EventLogger {
|
|
47
62
|
constructor() {
|
|
48
63
|
if (EventLogger._instance) {
|
|
@@ -53,6 +68,7 @@ class EventLogger {
|
|
|
53
68
|
this.socket.on('error', (...args) => { logger.error('error', args); });
|
|
54
69
|
this.socket.on('disconnect', (...args) => { logger.warn('disconnect', args); });
|
|
55
70
|
this.socket.on('connect_error', (...args) => { logger.error('connect_error', args); });
|
|
71
|
+
this.minLevel = levelToInt(SP_LOGKIT_LOGS_LEVEL);
|
|
56
72
|
}
|
|
57
73
|
static get Instance() {
|
|
58
74
|
if (!this._instance) {
|
|
@@ -104,6 +120,9 @@ class EventLogger {
|
|
|
104
120
|
if (!title) {
|
|
105
121
|
return;
|
|
106
122
|
}
|
|
123
|
+
if (levelToInt(level) < this.minLevel) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
107
126
|
const eventTitle = this.parseTitleIfNecessary(title);
|
|
108
127
|
this.emitToLogkit(SP_LOGKIT_EVENTS_APPEND, APP_ID, this.buildEventLog(eventTitle, level))
|
|
109
128
|
.catch(error => logger.error(error));
|
package/dist/eventLogger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventLogger.js","sourceRoot":"","sources":["../src/eventLogger.js"],"names":[],"mappings":";;;;;;;;;;;;AAAA,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACvC,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEvC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEjD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS,CAAC;AACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AACrC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AACvC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;AACnD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,cAAc,CAAC;AAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,gBAAgB,CAAC;AACtF,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,mBAAmB,CAAC;AAEtG,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;AAClD,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,QAAQ,CAAC;AACxE,MAAM,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"eventLogger.js","sourceRoot":"","sources":["../src/eventLogger.js"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
import * as Minio from 'minio';
|
|
3
3
|
import { AbstractStorage } from './storage';
|
|
4
4
|
import type { ObjectItem } from '../types/storage-types';
|
|
5
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
5
6
|
export declare class MinioStorage extends AbstractStorage {
|
|
6
7
|
private bucketName;
|
|
7
8
|
protected buildClient(): Promise<Minio.Client>;
|
|
8
9
|
updateBucketName(bucketName: string): void;
|
|
10
|
+
append(objectName: string, content: string): Promise<any>;
|
|
9
11
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
10
|
-
getObjectToStream(objectName: string): Promise<
|
|
12
|
+
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
11
13
|
getObjectToString(objectName: string): Promise<string>;
|
|
12
14
|
putObject(objectName: string, data: ReadableStream | Buffer | string): Promise<void>;
|
|
13
15
|
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
@@ -15,4 +17,5 @@ export declare class MinioStorage extends AbstractStorage {
|
|
|
15
17
|
listObjects(prefix: string, recursive?: boolean): Promise<ObjectItem[]>;
|
|
16
18
|
deleteObject(objectName: string): Promise<void>;
|
|
17
19
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
20
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
18
21
|
}
|
|
@@ -27,12 +27,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
+
};
|
|
30
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
34
|
exports.MinioStorage = void 0;
|
|
32
35
|
const Minio = __importStar(require("minio"));
|
|
36
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
33
37
|
const storage_1 = require("./storage");
|
|
34
38
|
const streamUtility_1 = require("../common/streamUtility");
|
|
35
39
|
const spArguments = require("../arguments");
|
|
40
|
+
const logger = require("../common/log");
|
|
36
41
|
const { bucketName: defaultBucketName, endpoint } = spArguments.minio;
|
|
37
42
|
const { hostname: HOST_NAME, port: PORT, protocol: PROTOCOL } = new URL(endpoint);
|
|
38
43
|
class MinioStorage extends storage_1.AbstractStorage {
|
|
@@ -57,6 +62,19 @@ class MinioStorage extends storage_1.AbstractStorage {
|
|
|
57
62
|
updateBucketName(bucketName) {
|
|
58
63
|
this.bucketName = bucketName;
|
|
59
64
|
}
|
|
65
|
+
append(objectName, content) {
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
let originalContent = '';
|
|
68
|
+
try {
|
|
69
|
+
originalContent = yield this.getObjectToString(objectName);
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
logger.debug(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
|
|
73
|
+
}
|
|
74
|
+
const data = `${originalContent}${content}`;
|
|
75
|
+
yield this.putObject(objectName, data);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
60
78
|
getObjectToBuffer(objectName) {
|
|
61
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
80
|
const stream = yield this.getObjectToStream(objectName);
|
|
@@ -130,6 +148,22 @@ class MinioStorage extends storage_1.AbstractStorage {
|
|
|
130
148
|
yield minioClient.removeObjects(this.bucketName, objectNames);
|
|
131
149
|
});
|
|
132
150
|
}
|
|
151
|
+
checkObjectNameExist(objectName) {
|
|
152
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
153
|
+
const minioClient = yield this.getClient();
|
|
154
|
+
let bucketExist = false;
|
|
155
|
+
try {
|
|
156
|
+
yield minioClient.getObject(this.bucketName, objectName);
|
|
157
|
+
bucketExist = true;
|
|
158
|
+
}
|
|
159
|
+
catch (ex) {
|
|
160
|
+
if (ex.code && !lodash_1.default.includes(['NoSuchKey', 'NotFound'], ex.code)) {
|
|
161
|
+
throw ex;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return bucketExist;
|
|
165
|
+
});
|
|
166
|
+
}
|
|
133
167
|
}
|
|
134
168
|
exports.MinioStorage = MinioStorage;
|
|
135
169
|
//# sourceMappingURL=minio.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minio.js","sourceRoot":"","sources":["../../src/latestStorage/minio.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minio.js","sourceRoot":"","sources":["../../src/latestStorage/minio.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
import OSS from 'ali-oss';
|
|
3
3
|
import { AbstractStorage } from './storage';
|
|
4
4
|
import type { ObjectItem } from '../types/storage-types';
|
|
5
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
5
6
|
export declare class OSSStorage extends AbstractStorage {
|
|
6
7
|
protected buildClient(): Promise<OSS>;
|
|
8
|
+
append(objectName: string, content: string): Promise<any>;
|
|
7
9
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
8
10
|
getObjectToStream(objectName: string): Promise<any>;
|
|
9
11
|
getObjectToString(objectName: string): Promise<string>;
|
|
@@ -13,4 +15,5 @@ export declare class OSSStorage extends AbstractStorage {
|
|
|
13
15
|
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
14
16
|
deleteObject(objectName: string): Promise<void>;
|
|
15
17
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
18
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
16
19
|
}
|
|
@@ -13,6 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.OSSStorage = void 0;
|
|
16
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
17
|
+
const util = require("../common/util");
|
|
16
18
|
const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
17
19
|
const storage_1 = require("./storage");
|
|
18
20
|
const streamUtility_1 = require("../common/streamUtility");
|
|
@@ -30,6 +32,12 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
30
32
|
});
|
|
31
33
|
});
|
|
32
34
|
}
|
|
35
|
+
append(objectName, content) {
|
|
36
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
const ossClient = yield this.getClient();
|
|
38
|
+
yield ossClient.append(objectName, Buffer.from(content));
|
|
39
|
+
});
|
|
40
|
+
}
|
|
33
41
|
getObjectToBuffer(objectName) {
|
|
34
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
43
|
const ossClient = yield this.getClient();
|
|
@@ -52,12 +60,20 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
52
60
|
}
|
|
53
61
|
putObject(objectName, data) {
|
|
54
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
if (lodash_1.default.isString(data)) {
|
|
64
|
+
if (!util.fileExists(data)) {
|
|
65
|
+
throw new Error(`File(${data}) is not exist.`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
55
68
|
const ossClient = yield this.getClient();
|
|
56
69
|
yield ossClient.put(objectName, data);
|
|
57
70
|
});
|
|
58
71
|
}
|
|
59
72
|
fPutObject(objectName, filePath) {
|
|
60
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
+
if (util.fileExists(filePath)) {
|
|
75
|
+
throw new Error(`File (${filePath}) is not exist.`);
|
|
76
|
+
}
|
|
61
77
|
const ossClient = yield this.getClient();
|
|
62
78
|
yield ossClient.put(objectName, filePath);
|
|
63
79
|
});
|
|
@@ -100,6 +116,21 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
100
116
|
})));
|
|
101
117
|
});
|
|
102
118
|
}
|
|
119
|
+
checkObjectNameExist(objectName) {
|
|
120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
+
const ossClient = yield this.getClient();
|
|
122
|
+
try {
|
|
123
|
+
yield ossClient.head(objectName);
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
catch (e) {
|
|
127
|
+
if ((e === null || e === void 0 ? void 0 : e.name) === 'NoSuchKeyError') {
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
130
|
+
throw e;
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}
|
|
103
134
|
}
|
|
104
135
|
exports.OSSStorage = OSSStorage;
|
|
105
136
|
//# sourceMappingURL=oss.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oss.js","sourceRoot":"","sources":["../../src/latestStorage/oss.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,uCAA4C;AAC5C,2DAA+D;
|
|
1
|
+
{"version":3,"file":"oss.js","sourceRoot":"","sources":["../../src/latestStorage/oss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Stream } from 'stream';
|
|
3
3
|
import type { StsToken, ObjectItem } from '../types/storage-types';
|
|
4
|
-
export
|
|
4
|
+
export interface ObjectStorage {
|
|
5
|
+
append(objectName: string, content: String): Promise<any>;
|
|
6
|
+
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
7
|
+
getObjectToStream(objectName: string): Promise<Stream | null>;
|
|
8
|
+
getObjectToString(objectName: string): Promise<string>;
|
|
9
|
+
fGetObject(objectName: string, filePath: string): Promise<any>;
|
|
10
|
+
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
11
|
+
putObject(objectName: string, data: any): Promise<void>;
|
|
12
|
+
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
13
|
+
deleteObject(objectName: string): Promise<void>;
|
|
14
|
+
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
15
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
16
|
+
}
|
|
17
|
+
export declare abstract class AbstractStorage implements ObjectStorage {
|
|
5
18
|
private client;
|
|
6
19
|
private lastToken;
|
|
7
20
|
readonly userPath: string;
|
|
@@ -15,13 +28,15 @@ export declare abstract class AbstractStorage {
|
|
|
15
28
|
protected getClient(): Promise<unknown>;
|
|
16
29
|
protected getStsToken(): Promise<StsToken>;
|
|
17
30
|
protected abstract buildClient(): Promise<any>;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
31
|
+
abstract append(objectName: string, content: String): Promise<any>;
|
|
32
|
+
abstract getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
33
|
+
abstract getObjectToStream(objectName: string): Promise<Stream | null>;
|
|
34
|
+
abstract getObjectToString(objectName: string): Promise<string>;
|
|
35
|
+
abstract fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
36
|
+
abstract fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
37
|
+
abstract putObject(objectName: string, data: any): Promise<void>;
|
|
38
|
+
abstract listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
39
|
+
abstract deleteObject(objectName: string): Promise<void>;
|
|
40
|
+
abstract deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
41
|
+
abstract checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
27
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/latestStorage/storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,oDAA4B;AAC5B,iCAAqC;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/latestStorage/storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,oDAA4B;AAC5B,iCAAqC;AAKrC,+BAAgC;AAChC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC;AAC7B,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;AAqB/B,MAAsB,eAAe;IAArC;QAKkB,aAAQ,GAAG,kBAAW,CAAC,QAAQ,CAAC;QAChC,YAAO,GAAG,kBAAW,CAAC,OAAO,CAAC;QAC9B,aAAQ,GAAG,kBAAW,CAAC,QAAQ,CAAC;QAChC,YAAO,GAAG,kBAAW,CAAC,OAAO,CAAC;QAC9B,eAAU,GAAG,kBAAW,CAAC,UAAU,CAAC;QACpC,gBAAW,GAAG,kBAAW,CAAC,WAAW,CAAC;QACtC,eAAU,GAAG,kBAAW,CAAC,UAAU,CAAC;IA6CtD,CAAC;IA3CW,iBAAiB,CAAE,eAAuB;QAClD,OAAO,gBAAM,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEe,SAAS;;;YAEvB,MAAM,eAAe,GAAG,MAAA,MAAC,IAAI,CAAC,SAAsB,0CAAE,WAAW,0CAAE,UAAU,CAAC;YAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE;gBAC/E,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;aACxC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC;;KACpB;IAEe,WAAW;;YACzB,MAAM,UAAU,GAAG;gBACjB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,aAAa;aACvB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,WAAW,EAAE,UAAiB,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,OAAO,QAAoB,CAAC;QAC9B,CAAC;KAAA;CAoBF;AAxDD,0CAwDC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { FlushOptions } from '../common/bufferFlusher';
|
|
2
|
+
export declare class StorageLogFlusher {
|
|
3
|
+
private storageFilePath;
|
|
4
|
+
private bFlusher;
|
|
5
|
+
constructor(storageFilePath: string, flushOptions?: FlushOptions);
|
|
6
|
+
onFlush: (logItems: string[]) => Promise<void>;
|
|
7
|
+
add(content: string): void;
|
|
8
|
+
flush(): void;
|
|
9
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
+
exports.StorageLogFlusher = void 0;
|
|
32
|
+
const _ = __importStar(require("lodash"));
|
|
33
|
+
const logger = require("../common/log");
|
|
34
|
+
const wrapperStorage_1 = require("./wrapperStorage");
|
|
35
|
+
const bufferFlusher_1 = require("../common/bufferFlusher");
|
|
36
|
+
class StorageLogFlusher {
|
|
37
|
+
constructor(storageFilePath, flushOptions) {
|
|
38
|
+
this.storageFilePath = storageFilePath;
|
|
39
|
+
this.onFlush = (logItems) => __awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
if (_.isEmpty(logItems)) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
logger.debug(`⬇ StorageLogFlusher ==> append log to ${this.storageFilePath}`);
|
|
44
|
+
try {
|
|
45
|
+
const joinWithLineBreak = logItems.reduce((acc, cur) => {
|
|
46
|
+
acc += `${cur}\r\n`;
|
|
47
|
+
return acc;
|
|
48
|
+
}, '');
|
|
49
|
+
yield wrapperStorage_1.Storage.Instance.append(this.storageFilePath, joinWithLineBreak);
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
logger.warn(`write log to storage failed ${e}`);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
this.bFlusher = new bufferFlusher_1.BufferFlusher(flushOptions);
|
|
56
|
+
this.bFlusher.on('flush', this.onFlush);
|
|
57
|
+
}
|
|
58
|
+
add(content) {
|
|
59
|
+
this.bFlusher.add(content);
|
|
60
|
+
}
|
|
61
|
+
flush() {
|
|
62
|
+
this.bFlusher.flush();
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.StorageLogFlusher = StorageLogFlusher;
|
|
66
|
+
//# sourceMappingURL=storageFlusher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../src/latestStorage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAE5B,wCAAyC;AAEzC,qDAA2C;AAC3C,2DAAsE;AAEtE,MAAa,iBAAiB;IAI5B,YAAoB,eAAuB,EAAE,YAA2B;QAApD,oBAAe,GAAf,eAAe,CAAQ;QAK3C,YAAO,GAAG,CAAO,QAAkB,EAAE,EAAE;YACrC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;aAAE;YAEpC,MAAM,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;YAE9E,IAAI;gBACF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBACrD,GAAG,IAAI,GAAG,GAAG,MAAM,CAAC;oBACpB,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEP,MAAM,wBAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;aACxE;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;aACjD;QACH,CAAC,CAAA,CAAC;QAnBA,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAa,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAmBD,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;AAjCD,8CAiCC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export declare type StorageOptions = {
|
|
2
|
+
storagePath: string;
|
|
3
|
+
debug: boolean;
|
|
4
|
+
};
|
|
5
|
+
export declare enum LogLevel {
|
|
6
|
+
Debug = 0,
|
|
7
|
+
Info = 1,
|
|
8
|
+
Warn = 2,
|
|
9
|
+
Error = 3
|
|
10
|
+
}
|
|
11
|
+
export declare class ObjectStorageLogger {
|
|
12
|
+
private debugMode;
|
|
13
|
+
private flusher;
|
|
14
|
+
constructor(options: StorageOptions);
|
|
15
|
+
private isDebugMode;
|
|
16
|
+
private log;
|
|
17
|
+
info: (message: string, flush?: boolean) => void;
|
|
18
|
+
debug: (message: string, flush?: boolean) => void;
|
|
19
|
+
warn: (message: string, flush?: boolean) => void;
|
|
20
|
+
error: (message: string, flush?: boolean) => void;
|
|
21
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ObjectStorageLogger = exports.LogLevel = void 0;
|
|
7
|
+
const log_1 = __importDefault(require("../common/log"));
|
|
8
|
+
const moment_1 = __importDefault(require("moment"));
|
|
9
|
+
const util_1 = require("../common/util");
|
|
10
|
+
const storageFlusher_1 = require("./storageFlusher");
|
|
11
|
+
var LogLevel;
|
|
12
|
+
(function (LogLevel) {
|
|
13
|
+
LogLevel[LogLevel["Debug"] = 0] = "Debug";
|
|
14
|
+
LogLevel[LogLevel["Info"] = 1] = "Info";
|
|
15
|
+
LogLevel[LogLevel["Warn"] = 2] = "Warn";
|
|
16
|
+
LogLevel[LogLevel["Error"] = 3] = "Error";
|
|
17
|
+
})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
|
|
18
|
+
class ObjectStorageLogger {
|
|
19
|
+
constructor(options) {
|
|
20
|
+
this.debugMode = true;
|
|
21
|
+
this.log = (level, message, flush = false) => {
|
|
22
|
+
switch (level) {
|
|
23
|
+
case LogLevel.Debug:
|
|
24
|
+
log_1.default.debug(message);
|
|
25
|
+
break;
|
|
26
|
+
case LogLevel.Info:
|
|
27
|
+
log_1.default.info(message);
|
|
28
|
+
break;
|
|
29
|
+
case LogLevel.Warn:
|
|
30
|
+
log_1.default.warn(message);
|
|
31
|
+
break;
|
|
32
|
+
case LogLevel.Error:
|
|
33
|
+
log_1.default.error(message);
|
|
34
|
+
break;
|
|
35
|
+
default: {
|
|
36
|
+
throw new Error(`unsupported log level: ${level}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (this.isDebugMode()) {
|
|
40
|
+
this.flusher.add(`${moment_1.default().format('YYYY-MM-DD HH:mm:ss')} ==> ${message}`);
|
|
41
|
+
if (flush) {
|
|
42
|
+
this.flusher.flush();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
this.info = (message, flush = false) => {
|
|
47
|
+
this.log(LogLevel.Info, message, flush);
|
|
48
|
+
};
|
|
49
|
+
this.debug = (message, flush = false) => {
|
|
50
|
+
this.log(LogLevel.Debug, message, flush);
|
|
51
|
+
};
|
|
52
|
+
this.warn = (message, flush = false) => {
|
|
53
|
+
this.log(LogLevel.Warn, message, flush);
|
|
54
|
+
};
|
|
55
|
+
this.error = (message, flush = false) => {
|
|
56
|
+
this.log(LogLevel.Error, message, flush);
|
|
57
|
+
};
|
|
58
|
+
if (options.debug !== undefined) {
|
|
59
|
+
this.debugMode = options.debug;
|
|
60
|
+
}
|
|
61
|
+
this.flusher = new storageFlusher_1.StorageLogFlusher(options.storagePath);
|
|
62
|
+
}
|
|
63
|
+
isDebugMode() {
|
|
64
|
+
return util_1.isTrue(this.debugMode);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
exports.ObjectStorageLogger = ObjectStorageLogger;
|
|
68
|
+
//# sourceMappingURL=storageLogger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storageLogger.js","sourceRoot":"","sources":["../../src/latestStorage/storageLogger.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAmC;AACnC,oDAA4B;AAE5B,yCAAwC;AACxC,qDAAqD;AAOrD,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,yCAAK,CAAA;IACL,uCAAI,CAAA;IACJ,uCAAI,CAAA;IACJ,yCAAK,CAAA;AACP,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;AAED,MAAa,mBAAmB;IAK9B,YAAY,OAAuB;QAH3B,cAAS,GAAG,IAAI,CAAC;QAcjB,QAAG,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YAEhE,QAAQ,KAAK,EAAE;gBACb,KAAK,QAAQ,CAAC,KAAK;oBACjB,aAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM;gBACR,KAAK,QAAQ,CAAC,IAAI;oBAChB,aAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACrB,MAAM;gBACR,KAAK,QAAQ,CAAC,IAAI;oBAChB,aAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACrB,MAAM;gBACR,KAAK,QAAQ,CAAC,KAAK;oBACjB,aAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM;gBACR,OAAO,CAAC,CAAC;oBACP,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;iBACpD;aACF;YAED,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;gBACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAM,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC;gBAC7E,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;iBACtB;aACF;QACH,CAAC,CAAA;QAED,SAAI,GAAG,CAAC,OAAe,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC,CAAA;QAED,UAAK,GAAG,CAAC,OAAe,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YACzC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAA;QAED,SAAI,GAAG,CAAC,OAAe,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC1C,CAAC,CAAA;QAED,UAAK,GAAG,CAAC,OAAe,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YACzC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAA;QApDC,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;SAChC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,kCAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAEO,WAAW;QACjB,OAAO,aAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;CA6CF;AA3DD,kDA2DC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { MinioStorage } from './minio';
|
|
1
|
+
import type { ObjectStorage } from './storage';
|
|
3
2
|
export declare class Storage {
|
|
4
3
|
private static _instance;
|
|
5
|
-
static get Instance():
|
|
4
|
+
static get Instance(): ObjectStorage;
|
|
6
5
|
private constructor();
|
|
7
6
|
}
|
|
@@ -4,6 +4,7 @@ exports.Storage = void 0;
|
|
|
4
4
|
const oss_1 = require("./oss");
|
|
5
5
|
const minio_1 = require("./minio");
|
|
6
6
|
const storage_types_1 = require("../types/storage-types");
|
|
7
|
+
const g = require("../arguments");
|
|
7
8
|
class StorageFactory {
|
|
8
9
|
getStorage(storageType) {
|
|
9
10
|
if (!storageType) {
|
|
@@ -22,8 +23,7 @@ class Storage {
|
|
|
22
23
|
constructor() { }
|
|
23
24
|
static get Instance() {
|
|
24
25
|
if (!this._instance) {
|
|
25
|
-
|
|
26
|
-
this._instance = new StorageFactory().getStorage(spConfig.storageType);
|
|
26
|
+
this._instance = new StorageFactory().getStorage(g.spConfig.storageType);
|
|
27
27
|
}
|
|
28
28
|
return this._instance;
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../src/latestStorage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,mCAAuC;AACvC,0DAAqD;AAErD,MAAM,cAAc;IAClB,UAAU,CAAC,WAAwB;QACjC,IAAI,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAAE;QAC7D,IAAI,WAAW,KAAK,2BAAW,CAAC,GAAG,IAAI,WAAW,KAAK,2BAAW,CAAC,OAAO,EAAE;YAC1E,OAAO,IAAI,gBAAU,EAAE,CAAC;SACzB;aAAM,IAAI,WAAW,KAAK,2BAAW,CAAC,KAAK,EAAE;YAC5C,OAAO,IAAI,oBAAY,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AACD,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../src/latestStorage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,mCAAuC;AACvC,0DAAqD;AAErD,kCAAmC;AAEnC,MAAM,cAAc;IAClB,UAAU,CAAC,WAAwB;QACjC,IAAI,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAAE;QAC7D,IAAI,WAAW,KAAK,2BAAW,CAAC,GAAG,IAAI,WAAW,KAAK,2BAAW,CAAC,OAAO,EAAE;YAC1E,OAAO,IAAI,gBAAU,EAAE,CAAC;SACzB;aAAM,IAAI,WAAW,KAAK,2BAAW,CAAC,KAAK,EAAE;YAC5C,OAAO,IAAI,oBAAY,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AACD,MAAa,OAAO;IASlB,gBAAwB,CAAC;IANlB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAkB,CAAC,CAAC;SACjF;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CAEF;AAVD,0BAUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "suanpan_node_sdk",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.16",
|
|
4
4
|
"description": "suanpan sdk for node.js",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"types": "dist/main.d.ts",
|
|
@@ -17,8 +17,7 @@
|
|
|
17
17
|
"lint": "./node_modules/.bin/eslint src --ext .ts,.js",
|
|
18
18
|
"lint-fix": "./node_modules/.bin/eslint --fix --ext .ts,.js .",
|
|
19
19
|
"prebuild": "make prebuild",
|
|
20
|
-
"build": "make build"
|
|
21
|
-
"postinstall": "./node_modules/node-prune/prune.sh"
|
|
20
|
+
"build": "make build"
|
|
22
21
|
},
|
|
23
22
|
"files": [
|
|
24
23
|
"dist",
|
|
@@ -87,7 +86,6 @@
|
|
|
87
86
|
"eslint": "^7.22.0",
|
|
88
87
|
"jest": "^26.4.2",
|
|
89
88
|
"jest-when": "^2.7.2",
|
|
90
|
-
"node-prune": "^1.0.2",
|
|
91
89
|
"typescript": "^4.2.3"
|
|
92
90
|
}
|
|
93
91
|
}
|