suanpan_node_sdk 2.2.1 → 2.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -14
- package/dist/core/logkit/index.js +3 -3
- package/dist/core/logkit/index.js.map +1 -1
- package/dist/core/parameter/environment.d.ts +1 -0
- package/dist/core/parameter/environment.js +1 -0
- package/dist/core/parameter/environment.js.map +1 -1
- package/dist/core/script/script-manager.js +4 -4
- package/dist/core/script/script-manager.js.map +1 -1
- package/dist/core/service/port.d.ts +0 -3
- package/dist/core/service/port.js +5 -39
- package/dist/core/service/port.js.map +1 -1
- package/dist/core/storage/minioStorage.d.ts +4 -1
- package/dist/core/storage/minioStorage.js +19 -6
- package/dist/core/storage/minioStorage.js.map +1 -1
- package/dist/core/storage/ossStorage.js +2 -2
- package/dist/core/storage/ossStorage.js.map +1 -1
- package/dist/core/storage/storageFlusher.d.ts +3 -1
- package/dist/core/storage/storageFlusher.js +5 -3
- package/dist/core/storage/storageFlusher.js.map +1 -1
- package/dist/core/storage/storageLogger.d.ts +3 -1
- package/dist/core/storage/storageLogger.js +3 -2
- package/dist/core/storage/storageLogger.js.map +1 -1
- package/dist/core/storage/wrapperStorage.js +1 -1
- package/dist/core/storage/wrapperStorage.js.map +1 -1
- package/dist/core/utils/http.d.ts +3 -0
- package/dist/core/utils/http.js +36 -0
- package/dist/core/utils/http.js.map +1 -0
- package/dist/core/utils/suanpan.d.ts +20 -0
- package/dist/core/utils/suanpan.js +93 -0
- package/dist/core/utils/suanpan.js.map +1 -0
- package/package.json +1 -1
- package/dist/core/utils/suanpanApi.d.ts +0 -7
- package/dist/core/utils/suanpanApi.js +0 -50
- package/dist/core/utils/suanpanApi.js.map +0 -1
- package/dist/core/utils/support.d.ts +0 -4
- package/dist/core/utils/support.js +0 -33
- package/dist/core/utils/support.js.map +0 -1
package/README.md
CHANGED
|
@@ -355,7 +355,7 @@ Append an object to the bucket, it's almost same as [putObject](#.putObject(obje
|
|
|
355
355
|
import { Storage } from 'suanpan_node_sdk';
|
|
356
356
|
|
|
357
357
|
(async () => {
|
|
358
|
-
await Storage.Instance.append('
|
|
358
|
+
await Storage.Instance.append('studio/userId/appId/nodeId/log.txt', 'redis subscribed.');
|
|
359
359
|
})();
|
|
360
360
|
```
|
|
361
361
|
### .putObject(objectName, data)
|
|
@@ -370,14 +370,14 @@ Uploads an object from a stream/Buffer/string.
|
|
|
370
370
|
import { Storage } from 'suanpan_node_sdk';
|
|
371
371
|
|
|
372
372
|
(async () => {
|
|
373
|
-
await Storage.Instance.putObject('
|
|
373
|
+
await Storage.Instance.putObject('studio/userId/appId/nodeId/data.js', 'const f = () => { console.log("a")}');
|
|
374
374
|
})();
|
|
375
375
|
```
|
|
376
376
|
### .listObjects(prefix[, recursive][, maxKeys])
|
|
377
377
|
List objects in the bucket.
|
|
378
378
|
**parameters**:
|
|
379
379
|
|
|
380
|
-
- `prefix {string}` - Name prefix store on OSS，such as
|
|
380
|
+
- `prefix {string}` - Name prefix store on OSS，such as `studio/userId/appId/nodeId`
|
|
381
381
|
- `recursive {boolean}` - Default：true。Recursively find all objects under “prefix”
|
|
382
382
|
- `maxKeys {Number}` - Max objects, default is 100, limit to 1000
|
|
383
383
|
|
|
@@ -386,7 +386,7 @@ List objects in the bucket.
|
|
|
386
386
|
import { Storage, ObjectItem } from 'suanpan_node_sdk';
|
|
387
387
|
|
|
388
388
|
(async () => {
|
|
389
|
-
const objects: ObjectItem[] = await Storage.Instance.listObjects('
|
|
389
|
+
const objects: ObjectItem[] = await Storage.Instance.listObjects('studio/userId/appId/nodeId/', true, 200);
|
|
390
390
|
})();
|
|
391
391
|
```
|
|
392
392
|
### .fGetObject(objectName, filePath)
|
|
@@ -401,7 +401,7 @@ Downloads and saves the object as a file in the local filesystem.
|
|
|
401
401
|
import { Storage } from 'suanpan_node_sdk';
|
|
402
402
|
|
|
403
403
|
(async () => {
|
|
404
|
-
await Storage.Instance.fGetObject('
|
|
404
|
+
await Storage.Instance.fGetObject('studio/userId/appId/nodeId/coco.ts', '/tmp/coco.ts');
|
|
405
405
|
})();
|
|
406
406
|
```
|
|
407
407
|
### .fPutObject(objectName, filePath)
|
|
@@ -416,7 +416,7 @@ Uploads contents from a file to objectName.
|
|
|
416
416
|
import { Storage } from 'suanpan_node_sdk';
|
|
417
417
|
|
|
418
418
|
(async () => {
|
|
419
|
-
await Storage.Instance.fPutObject('
|
|
419
|
+
await Storage.Instance.fPutObject('studio/userId/appId/nodeId/coco.ts', '/tmp/coco.ts');
|
|
420
420
|
})();
|
|
421
421
|
```
|
|
422
422
|
### .deleteObject(objectName)
|
|
@@ -430,7 +430,7 @@ Removes an object. If delete object not exists, will also delete success.
|
|
|
430
430
|
import { Storage } from 'suanpan_node_sdk';
|
|
431
431
|
|
|
432
432
|
(async () => {
|
|
433
|
-
await Storage.Instance.deleteObject('
|
|
433
|
+
await Storage.Instance.deleteObject('studio/userId/appId/nodeId/coco.ts');
|
|
434
434
|
})();
|
|
435
435
|
```
|
|
436
436
|
### .deleteMultiObjects(objectNames)
|
|
@@ -444,7 +444,7 @@ Removes multiple objects.
|
|
|
444
444
|
import { Storage } from 'suanpan_node_sdk';
|
|
445
445
|
|
|
446
446
|
(async () => {
|
|
447
|
-
const objectList = ['
|
|
447
|
+
const objectList = ['studio/userId/appId/nodeId/coco1.ts', 'studio/userId/appId/nodeId/coco2.ts'];
|
|
448
448
|
await Storage.Instance.deleteMultiObjects(objectList);
|
|
449
449
|
})();
|
|
450
450
|
```
|
|
@@ -459,7 +459,7 @@ Check whether the object exists，Returns true if it exists, otherwise false
|
|
|
459
459
|
import { Storage } from 'suanpan_node_sdk';
|
|
460
460
|
|
|
461
461
|
(async () => {
|
|
462
|
-
const exist = await Storage.Instance.checkObjectNameExist('
|
|
462
|
+
const exist = await Storage.Instance.checkObjectNameExist('studio/not.json');
|
|
463
463
|
if (exist) {
|
|
464
464
|
// do something
|
|
465
465
|
}
|
|
@@ -476,7 +476,7 @@ Get an object to JSON object
|
|
|
476
476
|
import { Storage } from 'suanpan_node_sdk';
|
|
477
477
|
|
|
478
478
|
(async () => {
|
|
479
|
-
const json = await Storage.Instance.getObjectToJSON('
|
|
479
|
+
const json = await Storage.Instance.getObjectToJSON('studio/not.json');
|
|
480
480
|
})();
|
|
481
481
|
```
|
|
482
482
|
### .getObjectToString(objectName)
|
|
@@ -490,7 +490,7 @@ Get an object to string.
|
|
|
490
490
|
import { Storage } from 'suanpan_node_sdk';
|
|
491
491
|
|
|
492
492
|
(async () => {
|
|
493
|
-
const str = await Storage.Instance.getObjectToString('
|
|
493
|
+
const str = await Storage.Instance.getObjectToString('studio/log.txt');
|
|
494
494
|
})();
|
|
495
495
|
```
|
|
496
496
|
### .getObjectToBuffer(objectName)
|
|
@@ -504,7 +504,7 @@ Get an object to Buffer.
|
|
|
504
504
|
import { Storage } from 'suanpan_node_sdk';
|
|
505
505
|
|
|
506
506
|
(async () => {
|
|
507
|
-
const buf = await Storage.Instance.getObjectToBuffer('
|
|
507
|
+
const buf = await Storage.Instance.getObjectToBuffer('studio/log.txt');
|
|
508
508
|
})();
|
|
509
509
|
```
|
|
510
510
|
### .getObjectToStream(objectName)
|
|
@@ -519,7 +519,7 @@ Get an object to read stream.
|
|
|
519
519
|
import { Storage } from 'suanpan_node_sdk';
|
|
520
520
|
|
|
521
521
|
(async () => {
|
|
522
|
-
const stream = await Storage.Instance.getObjectToStream('
|
|
522
|
+
const stream = await Storage.Instance.getObjectToStream('studio/demo.txt');
|
|
523
523
|
stream.pipe(fs.createWriteStream('some file.txt'));
|
|
524
524
|
})();
|
|
525
525
|
```
|
|
@@ -579,7 +579,7 @@ import { Storage } from 'suanpan_node_sdk';
|
|
|
579
579
|
### constructor([options](#storageLoggerOptions))
|
|
580
580
|
| **属性名** | **类型** | **是否必填** | **说明** |
|
|
581
581
|
| --- | --- | --- | --- |
|
|
582
|
-
| storagePath | string | **是** | 完整对象存储路径 objectName
|
|
582
|
+
| storagePath | string | **是** | 完整对象存储路径 objectName，例如：`studio/userId/appId/nodeId/log-2021-1014.txt` |
|
|
583
583
|
| console | boolean | 否 | 默认 false。开启后日志将会 print 到标准输入输出 |
|
|
584
584
|
| level | [Loglevel](#logLevel) | 否 | 默认 1 (debug)。日志等级 |
|
|
585
585
|
| maxItems | number | 否 | 默认 1。表示缓存长度。当日志积累条数 >= maxItems 时，将会触发 flush 操作，将日志上传到对象存储。 |
|
|
@@ -17,7 +17,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
17
17
|
const socket_io_client_1 = __importDefault(require("socket.io-client"));
|
|
18
18
|
const log_1 = __importDefault(require("../common/log"));
|
|
19
19
|
const environment_1 = require("../parameter/environment");
|
|
20
|
-
const
|
|
20
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
21
21
|
class EventLogger {
|
|
22
22
|
constructor() {
|
|
23
23
|
this._levels = {
|
|
@@ -56,8 +56,8 @@ class EventLogger {
|
|
|
56
56
|
_generateConnectOpts() {
|
|
57
57
|
return {
|
|
58
58
|
transports: ['websocket'],
|
|
59
|
-
query:
|
|
60
|
-
path:
|
|
59
|
+
query: suanpan_1.suanpanHeaders,
|
|
60
|
+
path: environment_1.Environment.logkit.path
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
emitToLogkit(event, ...args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/logkit/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,wEAAkC;AAClC,wDAAmC;AACnC,0DAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/logkit/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,6 +96,7 @@ Environment.spConfig = {
|
|
|
96
96
|
};
|
|
97
97
|
Environment.logkit = {
|
|
98
98
|
uri: process.env.SP_LOGKIT_URI,
|
|
99
|
+
path: process.env.SP_LOGKIT_PATH || `/socket/${Environment.stream.userId}/${Environment.stream.appId}`,
|
|
99
100
|
logLevel: process.env.SP_LOGKIT_LOGS_LEVEL || 'debug',
|
|
100
101
|
namespace: process.env.SP_LOGKIT_NAMESPACE || 'logkit',
|
|
101
102
|
eventName: process.env.SP_LOGKIT_EVENTS_APPEND || 'append'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/core/parameter/environment.ts"],"names":[],"mappings":";;;AAAA,+CAAsC;AACtC,uCAAuC;AAEvC,SAAgB,WAAW;IACzB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,gBAAQ,CAAC,KAAK,CAAC;KACvB;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACjC,OAAO,gBAAQ,CAAC,SAAS,CAAC;KAC3B;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC,OAAO,gBAAQ,CAAC,OAAO,CAAC;KACzB;IACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;AACtD,CAAC;AAXD,kCAWC;AAED,MAAa,WAAW;;AAAxB,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/core/parameter/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ class ScriptManager extends EventEmitter {
|
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
99
|
try {
|
|
100
|
-
log_1.default.
|
|
100
|
+
log_1.default.debug('start parse script...');
|
|
101
101
|
const compiledCode = this.handleInputWithBabel(scriptInput);
|
|
102
102
|
log_1.default.debug('code converted by babel is: %s', compiledCode);
|
|
103
103
|
const scriptTemplate = this.generateSrciptTemplate(compiledCode);
|
|
@@ -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
|
-
log_1.default.
|
|
114
|
+
log_1.default.debug('parsed successfully.');
|
|
115
115
|
}
|
|
116
116
|
catch (err) {
|
|
117
117
|
this.emitToSuanpanWeb('scriptParseError', { err: this.serializeError(err) });
|
|
@@ -142,7 +142,7 @@ class ScriptManager extends EventEmitter {
|
|
|
142
142
|
}
|
|
143
143
|
process(nodeId, when, data, extra = {}) {
|
|
144
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
145
|
-
log_1.default.
|
|
145
|
+
log_1.default.debug('start execute hanlder...');
|
|
146
146
|
let port;
|
|
147
147
|
try {
|
|
148
148
|
log_1.default.debug('(nodeId: \'%s\', when: \'%s\', data: %j, extra: %j)', nodeId, when, data, extra);
|
|
@@ -162,7 +162,7 @@ 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
|
-
log_1.default.
|
|
165
|
+
log_1.default.debug('execute successfully.');
|
|
166
166
|
}
|
|
167
167
|
catch (err) {
|
|
168
168
|
log_1.default.error(`(${this.userId},${this.appId},${nodeId},${port},${when}) process failed:`, err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"script-manager.js","sourceRoot":"","sources":["../../../src/core/script/script-manager.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"script-manager.js","sourceRoot":"","sources":["../../../src/core/script/script-manager.js"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
export declare class PortService {
|
|
2
|
-
private static readonly suanpanUrl;
|
|
3
2
|
private static readonly loopupRange;
|
|
4
|
-
private static httpRequest;
|
|
5
3
|
static getHostFreePort(): Promise<number>;
|
|
6
|
-
static registerPort(logicalPort: number, realPort: number): Promise<void>;
|
|
7
4
|
static registerPortUntilSuccess(logicPort: number): Promise<number>;
|
|
8
5
|
}
|
|
@@ -15,29 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.PortService = void 0;
|
|
16
16
|
const log_1 = __importDefault(require("../common/log"));
|
|
17
17
|
const get_port_1 = __importDefault(require("get-port"));
|
|
18
|
-
const environment_1 = require("../parameter/environment");
|
|
19
18
|
const utils_1 = require("../utils");
|
|
20
|
-
const
|
|
21
|
-
const support_1 = require("../utils/support");
|
|
19
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
22
20
|
const lookupFrom = parseInt(process.env.SP_PORT_START || '50000');
|
|
23
21
|
const lookupTo = parseInt(process.env.SP_PORT_END || '60000');
|
|
24
22
|
class PortService {
|
|
25
|
-
static httpRequest(options) {
|
|
26
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
let res;
|
|
28
|
-
yield utils_1.promiseRetry((retry, times) => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
try {
|
|
30
|
-
res = yield axios_1.default.request(options);
|
|
31
|
-
}
|
|
32
|
-
catch (ex) {
|
|
33
|
-
log_1.default.error('http request error is : \n%O', ex);
|
|
34
|
-
log_1.default.info(`retry ${times} times`);
|
|
35
|
-
retry(ex);
|
|
36
|
-
}
|
|
37
|
-
}));
|
|
38
|
-
return res.data;
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
23
|
static getHostFreePort() {
|
|
42
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
25
|
try {
|
|
@@ -48,30 +30,15 @@ class PortService {
|
|
|
48
30
|
}
|
|
49
31
|
});
|
|
50
32
|
}
|
|
51
|
-
static registerPort(logicalPort, realPort) {
|
|
52
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
const { userId, appId, nodeId } = environment_1.Environment.stream;
|
|
54
|
-
const requestConfig = {
|
|
55
|
-
url: `${this.suanpanUrl}/app/service/register`,
|
|
56
|
-
method: 'POST',
|
|
57
|
-
data: {
|
|
58
|
-
userId, appId, nodeId,
|
|
59
|
-
nodePort: logicalPort, port: realPort
|
|
60
|
-
},
|
|
61
|
-
headers: support_1.buildUserIdHeaderField()
|
|
62
|
-
};
|
|
63
|
-
const registerPortResponse = yield this.httpRequest(requestConfig);
|
|
64
|
-
if (!registerPortResponse.success) {
|
|
65
|
-
throw new Error(registerPortResponse.msg);
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
33
|
static registerPortUntilSuccess(logicPort) {
|
|
70
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
35
|
for (;;) {
|
|
72
36
|
try {
|
|
73
37
|
const availableHostPort = yield PortService.getHostFreePort();
|
|
74
|
-
yield
|
|
38
|
+
const response = yield suanpan_1.SuanpanWebApi.registerPort(logicPort, availableHostPort);
|
|
39
|
+
if (!response.success) {
|
|
40
|
+
throw new Error(response.msg);
|
|
41
|
+
}
|
|
75
42
|
return availableHostPort;
|
|
76
43
|
}
|
|
77
44
|
catch (e) {
|
|
@@ -83,6 +50,5 @@ class PortService {
|
|
|
83
50
|
}
|
|
84
51
|
}
|
|
85
52
|
exports.PortService = PortService;
|
|
86
|
-
PortService.suanpanUrl = support_1.buildSpAffinityUrl();
|
|
87
53
|
PortService.loopupRange = get_port_1.default.makeRange(lookupFrom, lookupTo);
|
|
88
54
|
//# sourceMappingURL=port.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,wDAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,wDAAqC;AAErC,oCAAiC;AACjC,8CAAiD;AAEjD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,CAAC;AAClE,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC;AAC9D,MAAa,WAAW;IAItB,MAAM,CAAO,eAAe;;YAC1B,IAAI;gBACF,OAAO,MAAM,kBAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACxD;YAAC,OAAO,EAAO,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;aACjE;QACH,CAAC;KAAA;IAED,MAAM,CAAO,wBAAwB,CAAC,SAAiB;;YACrD,SAAS;gBACP,IAAI;oBACF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;oBAC9D,MAAM,QAAQ,GAAG,MAAM,uBAAa,CAAC,YAAY,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBAChF,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;wBACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;qBAC/B;oBACD,OAAO,iBAAiB,CAAC;iBAC1B;gBAAC,OAAO,CAAM,EAAE;oBACf,aAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,MAAM,aAAK,CAAC,GAAG,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;;AA1BH,kCA2BC;AAzByB,uBAAW,GAAG,kBAAa,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
3
4
|
import type { ObjectData, ObjectItem, MinioConfig, ObjectMetadata } from '../../types';
|
|
4
5
|
export declare class MinioStorage implements IObjectStorage {
|
|
5
6
|
private config?;
|
|
@@ -10,10 +11,11 @@ export declare class MinioStorage implements IObjectStorage {
|
|
|
10
11
|
private getClient;
|
|
11
12
|
append(objectName: string, content: string): Promise<any>;
|
|
12
13
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
13
|
-
getObjectToStream(objectName: string): Promise<
|
|
14
|
+
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
14
15
|
getObjectToString(objectName: string): Promise<string>;
|
|
15
16
|
getObjectToJSON(objectName: string): Promise<any>;
|
|
16
17
|
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
18
|
+
putObjectWithMetaData(objectName: string, data: ReadableStream | Buffer | string, metaData: object): Promise<void>;
|
|
17
19
|
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
18
20
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
19
21
|
presignedGetObject(objectName: string): Promise<string>;
|
|
@@ -22,4 +24,5 @@ export declare class MinioStorage implements IObjectStorage {
|
|
|
22
24
|
deleteObject(objectName: string): Promise<void>;
|
|
23
25
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
24
26
|
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
27
|
+
getLastModified(objectName: string): Promise<Date>;
|
|
25
28
|
}
|
|
@@ -35,8 +35,8 @@ exports.MinioStorage = void 0;
|
|
|
35
35
|
const lodash_1 = __importDefault(require("lodash"));
|
|
36
36
|
const log_1 = __importDefault(require("../common/log"));
|
|
37
37
|
const Minio = __importStar(require("minio"));
|
|
38
|
-
const suanpanApi_1 = require("../utils/suanpanApi");
|
|
39
38
|
const environment_1 = require("../parameter/environment");
|
|
39
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
40
40
|
const utils_1 = require("../utils");
|
|
41
41
|
class MinioStorage {
|
|
42
42
|
constructor(config) {
|
|
@@ -49,13 +49,13 @@ class MinioStorage {
|
|
|
49
49
|
this.bucketName = this.config.bucket;
|
|
50
50
|
options.endPoint = this.config.host;
|
|
51
51
|
options.port = this.config.port;
|
|
52
|
-
options.useSSL = this.config.useSSL;
|
|
52
|
+
options.useSSL = this.config.useSSL; // If set to true, https is used instead of http. Default is true.
|
|
53
53
|
options.accessKey = this.config.accessKey;
|
|
54
54
|
options.secretKey = this.config.accessSecret;
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
57
|
const { hostname, port, protocol } = new URL(environment_1.Environment.minio.endpoint);
|
|
58
|
-
const { bucket, Credentials } = yield
|
|
58
|
+
const { bucket, Credentials } = yield suanpan_1.SuanpanWebApi.getSTSToken();
|
|
59
59
|
this.bucketName = bucket;
|
|
60
60
|
options.endPoint = hostname;
|
|
61
61
|
options.port = Number(port);
|
|
@@ -84,7 +84,7 @@ class MinioStorage {
|
|
|
84
84
|
log_1.default.warn(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
|
|
85
85
|
}
|
|
86
86
|
const data = `${originalContent}${content}`;
|
|
87
|
-
yield this.
|
|
87
|
+
yield this.putObjectWithMetaData(objectName, data, { 'Content-Disposition': 'inline', 'Content-Type': 'text/plain' });
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
getObjectToBuffer(objectName) {
|
|
@@ -117,6 +117,11 @@ class MinioStorage {
|
|
|
117
117
|
yield minioClient.putObject(this.bucketName, objectName, data, metaData);
|
|
118
118
|
});
|
|
119
119
|
}
|
|
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
|
+
}
|
|
120
125
|
fPutObject(objectName, filePath, metaData) {
|
|
121
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
122
127
|
const minioClient = yield this.getClient();
|
|
@@ -131,12 +136,14 @@ class MinioStorage {
|
|
|
131
136
|
}
|
|
132
137
|
presignedGetObject(objectName) {
|
|
133
138
|
return __awaiter(this, void 0, void 0, function* () {
|
|
134
|
-
|
|
139
|
+
const presignedResponse = yield suanpan_1.SuanpanWebApi.presignedGetObject(objectName);
|
|
140
|
+
return presignedResponse.data;
|
|
135
141
|
});
|
|
136
142
|
}
|
|
137
143
|
presignedPutObject(objectName) {
|
|
138
144
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
|
-
|
|
145
|
+
const presignedResponse = yield suanpan_1.SuanpanWebApi.presignedPutObject(objectName);
|
|
146
|
+
return presignedResponse.data;
|
|
140
147
|
});
|
|
141
148
|
}
|
|
142
149
|
listObjects(prefix, recursive = true) {
|
|
@@ -192,6 +199,12 @@ class MinioStorage {
|
|
|
192
199
|
return bucketExist;
|
|
193
200
|
});
|
|
194
201
|
}
|
|
202
|
+
getLastModified(objectName) {
|
|
203
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
204
|
+
const stat = yield this.minioClient.statObject(this.bucketName, objectName);
|
|
205
|
+
return stat.lastModified;
|
|
206
|
+
});
|
|
207
|
+
}
|
|
195
208
|
}
|
|
196
209
|
exports.MinioStorage = MinioStorage;
|
|
197
210
|
//# sourceMappingURL=minioStorage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minioStorage.js","sourceRoot":"","sources":["../../../src/core/storage/minioStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,wDAAmC;AAEnC,6CAA+B;
|
|
1
|
+
{"version":3,"file":"minioStorage.js","sourceRoot":"","sources":["../../../src/core/storage/minioStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ const util = __importStar(require("../utils"));
|
|
|
37
37
|
const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
38
38
|
const moment_1 = __importDefault(require("moment"));
|
|
39
39
|
const utils_1 = require("../utils");
|
|
40
|
-
const
|
|
40
|
+
const suanpan_1 = require("../utils/suanpan");
|
|
41
41
|
class OSSStorage {
|
|
42
42
|
constructor(config) {
|
|
43
43
|
this.config = config;
|
|
@@ -53,7 +53,7 @@ class OSSStorage {
|
|
|
53
53
|
options.stsToken = this.config.securityToken;
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
const { bucket, region, Credentials } = yield
|
|
56
|
+
const { bucket, region, Credentials } = yield suanpan_1.SuanpanWebApi.getSTSToken();
|
|
57
57
|
this.tokenExpiration = Credentials.Expiration || '';
|
|
58
58
|
options.region = region;
|
|
59
59
|
options.bucket = bucket;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ossStorage.js","sourceRoot":"","sources":["../../../src/core/storage/ossStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,+CAAiC;AACjC,sDAA0B;AAC1B,oDAA4B;AAE5B,oCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"ossStorage.js","sourceRoot":"","sources":["../../../src/core/storage/ossStorage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { FlushOptions } from '../utils/flusher';
|
|
2
|
+
import type { IObjectStorage } from './objectStorage';
|
|
2
3
|
export declare type StorageFlushOptions = {
|
|
3
4
|
storageFilePath: string;
|
|
4
5
|
} & FlushOptions;
|
|
5
6
|
export declare class StorageLogFlusher {
|
|
6
7
|
private options;
|
|
8
|
+
private storage?;
|
|
7
9
|
private bFlusher;
|
|
8
|
-
constructor(options: StorageFlushOptions);
|
|
10
|
+
constructor(options: StorageFlushOptions, storage?: IObjectStorage | undefined);
|
|
9
11
|
onFlush: (logItems: string[]) => Promise<void>;
|
|
10
12
|
add(content: string): void;
|
|
11
13
|
flush(): void;
|
|
@@ -18,19 +18,21 @@ const log_1 = __importDefault(require("../common/log"));
|
|
|
18
18
|
const wrapperStorage_1 = require("./wrapperStorage");
|
|
19
19
|
const flusher_1 = require("../utils/flusher");
|
|
20
20
|
class StorageLogFlusher {
|
|
21
|
-
constructor(options) {
|
|
21
|
+
constructor(options, storage) {
|
|
22
22
|
this.options = options;
|
|
23
|
+
this.storage = storage;
|
|
23
24
|
this.onFlush = (logItems) => __awaiter(this, void 0, void 0, function* () {
|
|
24
25
|
if (lodash_1.default.isEmpty(logItems)) {
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
|
-
log_1.default.
|
|
28
|
+
log_1.default.debug(`⬇ StorageLogFlusher ==> append ${logItems} to ${this.options.storageFilePath}`);
|
|
28
29
|
try {
|
|
29
30
|
const joinWithLineBreak = logItems.reduce((acc, cur) => {
|
|
30
31
|
acc += `${cur}\r\n`;
|
|
31
32
|
return acc;
|
|
32
33
|
}, '');
|
|
33
|
-
|
|
34
|
+
const storageInstance = this.storage ? this.storage : wrapperStorage_1.Storage.Instance;
|
|
35
|
+
yield storageInstance.append(this.options.storageFilePath, joinWithLineBreak);
|
|
34
36
|
}
|
|
35
37
|
catch (e) {
|
|
36
38
|
log_1.default.warn(`write log to storage failed ${e}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;AACnC,qDAA2C;AAC3C,8CAA+D;
|
|
1
|
+
{"version":3,"file":"storageFlusher.js","sourceRoot":"","sources":["../../../src/core/storage/storageFlusher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,wDAAmC;AACnC,qDAA2C;AAC3C,8CAA+D;AAM/D,MAAa,iBAAiB;IAI5B,YAAoB,OAA4B,EAAU,OAAwB;QAA9D,YAAO,GAAP,OAAO,CAAqB;QAAU,YAAO,GAAP,OAAO,CAAiB;QAQlF,YAAO,GAAG,CAAO,QAAkB,EAAE,EAAE;YACrC,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO;aAAE;YAEpC,aAAM,CAAC,KAAK,CAAC,kCAAkC,QAAQ,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;YAE9F,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,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAO,CAAC,QAAQ,CAAC;gBACvE,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;aAC/E;YAAC,OAAO,CAAC,EAAE;gBACV,aAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;aACjD;QACH,CAAC,CAAA,CAAC;QAvBA,IAAI,CAAC,QAAQ,GAAG,IAAI,uBAAa,CAAC;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAoBD,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;AArCD,8CAqCC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import type { IObjectStorage } from './objectStorage';
|
|
1
2
|
import { StorageLoggerOptions } from '../../types';
|
|
2
3
|
export declare class ObjectStorageLogger {
|
|
3
4
|
private options;
|
|
5
|
+
private storage?;
|
|
4
6
|
private _logger;
|
|
5
7
|
private _minLevel;
|
|
6
8
|
private _flusher;
|
|
7
|
-
constructor(options: StorageLoggerOptions);
|
|
9
|
+
constructor(options: StorageLoggerOptions, storage?: IObjectStorage | undefined);
|
|
8
10
|
private _validate;
|
|
9
11
|
private log;
|
|
10
12
|
info: (message: string, flush?: boolean) => void;
|
|
@@ -11,8 +11,9 @@ const storageFlusher_1 = require("./storageFlusher");
|
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
12
|
const types_1 = require("../../types");
|
|
13
13
|
class ObjectStorageLogger {
|
|
14
|
-
constructor(options) {
|
|
14
|
+
constructor(options, storage) {
|
|
15
15
|
this.options = options;
|
|
16
|
+
this.storage = storage;
|
|
16
17
|
this.log = (level, message, flush = false) => {
|
|
17
18
|
if (level < this._minLevel) {
|
|
18
19
|
return;
|
|
@@ -77,7 +78,7 @@ class ObjectStorageLogger {
|
|
|
77
78
|
storageFilePath: options.storagePath,
|
|
78
79
|
maxItems: options.maxItems,
|
|
79
80
|
flushInterval: options.flushInterval
|
|
80
|
-
});
|
|
81
|
+
}, this.storage);
|
|
81
82
|
}
|
|
82
83
|
_validate(options) {
|
|
83
84
|
if (lodash_1.default.isEmpty(options)) {
|
|
@@ -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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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Storage = exports.StorageFactory = void 0;
|
|
4
4
|
const ossStorage_1 = require("./ossStorage");
|
|
5
|
-
const types_1 = require("../../types");
|
|
6
5
|
const environment_1 = require("../parameter/environment");
|
|
7
6
|
const minioStorage_1 = require("./minioStorage");
|
|
7
|
+
const types_1 = require("../../types");
|
|
8
8
|
class StorageFactory {
|
|
9
9
|
/**
|
|
10
10
|
* 组件内部使用 OSS API
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../../src/core/storage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../../src/core/storage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,0DAAuD;AACvD,iDAA8C;AAC9C,uCAAqF;AAErF,MAAa,cAAc;IAEzB;;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;AA1BD,wCA0BC;AACD,MAAa,OAAO;IASlB,gBAAwB,CAAC;IANlB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC,yBAAW,CAAC,QAAQ,CAAC,WAA0B,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CAEF;AAVD,0BAUC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.httpRequest = void 0;
|
|
16
|
+
const log_1 = __importDefault(require("../common/log"));
|
|
17
|
+
const axios_1 = __importDefault(require("axios"));
|
|
18
|
+
const utils_1 = require("../utils");
|
|
19
|
+
function httpRequest(options) {
|
|
20
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
let res;
|
|
22
|
+
yield utils_1.promiseRetry((retry, times) => __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
try {
|
|
24
|
+
res = yield axios_1.default.request(options);
|
|
25
|
+
}
|
|
26
|
+
catch (ex) {
|
|
27
|
+
log_1.default.error('http request error is : \n%O', ex);
|
|
28
|
+
log_1.default.info(`retry ${times} times`);
|
|
29
|
+
retry(ex);
|
|
30
|
+
}
|
|
31
|
+
}));
|
|
32
|
+
return res.data;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
exports.httpRequest = httpRequest;
|
|
36
|
+
//# sourceMappingURL=http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/core/utils/http.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAAmC;AACnC,kDAAiE;AACjE,oCAAwC;AAIxC,SAAsB,WAAW,CAAI,OAAsB;;QACzD,IAAI,GAAsB,CAAC;QAC3B,MAAM,oBAAY,CAAC,CAAO,KAAK,EAAE,KAAa,EAAE,EAAE;YAChD,IAAI;gBACF,GAAG,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACpC;YAAC,OAAO,EAAE,EAAE;gBACX,aAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;gBACjD,aAAM,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;gBACpC,KAAK,CAAC,EAAE,CAAC,CAAC;aACX;QACH,CAAC,CAAA,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;CAAA;AAZD,kCAYC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { StsToken } from '../../types';
|
|
2
|
+
declare type PresignedResponse = {
|
|
3
|
+
success: boolean;
|
|
4
|
+
data: string;
|
|
5
|
+
};
|
|
6
|
+
declare type RegisterPortResponse = {
|
|
7
|
+
success: boolean;
|
|
8
|
+
msg: string;
|
|
9
|
+
};
|
|
10
|
+
export declare const suanpanAddress: string;
|
|
11
|
+
export declare const suanpanHeaders: {
|
|
12
|
+
[key: string]: string;
|
|
13
|
+
};
|
|
14
|
+
export declare class SuanpanWebApi {
|
|
15
|
+
static getSTSToken(): Promise<StsToken>;
|
|
16
|
+
static presignedGetObject(objectName: string): Promise<PresignedResponse>;
|
|
17
|
+
static presignedPutObject(objectName: string): Promise<PresignedResponse>;
|
|
18
|
+
static registerPort(logicalPort: number, realPort: number): Promise<RegisterPortResponse>;
|
|
19
|
+
}
|
|
20
|
+
export {};
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.SuanpanWebApi = exports.suanpanHeaders = exports.suanpanAddress = void 0;
|
|
16
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
17
|
+
const _1 = require(".");
|
|
18
|
+
const environment_1 = require("../parameter/environment");
|
|
19
|
+
const http_1 = require("./http");
|
|
20
|
+
function buildUserIdHeaderField() {
|
|
21
|
+
return Object.assign({}, {
|
|
22
|
+
[environment_1.Environment.suanpan.field.userIdHeader]: environment_1.Environment.stream.userId,
|
|
23
|
+
[environment_1.Environment.suanpan.field.userSignature]: _1.signatureV1(environment_1.Environment.suanpan.accessSecret, lodash_1.default.toString(environment_1.Environment.stream.userId)),
|
|
24
|
+
[environment_1.Environment.suanpan.field.userSignVersionHeader]: 'v1'
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
function buildSpAffinityUrl() {
|
|
28
|
+
const { host, port: spPort, affinity, protocol: httpsProtocol } = environment_1.Environment.suanpan;
|
|
29
|
+
if (affinity) {
|
|
30
|
+
return affinity;
|
|
31
|
+
}
|
|
32
|
+
const protocol = httpsProtocol ? 'https' : 'http';
|
|
33
|
+
const port = spPort ? `:${spPort}` : '';
|
|
34
|
+
if (environment_1.Environment.isWindows) {
|
|
35
|
+
// http://localhost:7000
|
|
36
|
+
return `${protocol}://${host}${port}`;
|
|
37
|
+
}
|
|
38
|
+
// http://suanpan-service.default:7000
|
|
39
|
+
return `${protocol}://${host}`;
|
|
40
|
+
}
|
|
41
|
+
exports.suanpanAddress = buildSpAffinityUrl();
|
|
42
|
+
exports.suanpanHeaders = buildUserIdHeaderField();
|
|
43
|
+
class SuanpanWebApi {
|
|
44
|
+
static getSTSToken() {
|
|
45
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
const requestConfig = {
|
|
47
|
+
url: `${exports.suanpanAddress}/oss/token`,
|
|
48
|
+
headers: exports.suanpanHeaders,
|
|
49
|
+
method: 'GET'
|
|
50
|
+
};
|
|
51
|
+
return yield http_1.httpRequest(requestConfig);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
static presignedGetObject(objectName) {
|
|
55
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
const requestConfig = {
|
|
57
|
+
url: `${exports.suanpanAddress}/oss/object/get`,
|
|
58
|
+
headers: exports.suanpanHeaders,
|
|
59
|
+
method: 'POST',
|
|
60
|
+
data: { Key: objectName }
|
|
61
|
+
};
|
|
62
|
+
return yield http_1.httpRequest(requestConfig);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
static presignedPutObject(objectName) {
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
const requestConfig = {
|
|
68
|
+
url: `${exports.suanpanAddress}/oss/object/put`,
|
|
69
|
+
headers: exports.suanpanHeaders,
|
|
70
|
+
method: 'POST',
|
|
71
|
+
data: { Key: objectName }
|
|
72
|
+
};
|
|
73
|
+
return yield http_1.httpRequest(requestConfig);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
static registerPort(logicalPort, realPort) {
|
|
77
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
78
|
+
const { userId, appId, nodeId } = environment_1.Environment.stream;
|
|
79
|
+
const requestConfig = {
|
|
80
|
+
url: `${exports.suanpanAddress}/app/service/register`,
|
|
81
|
+
method: 'POST',
|
|
82
|
+
data: {
|
|
83
|
+
userId, appId, nodeId,
|
|
84
|
+
nodePort: logicalPort, port: realPort
|
|
85
|
+
},
|
|
86
|
+
headers: exports.suanpanHeaders
|
|
87
|
+
};
|
|
88
|
+
return yield http_1.httpRequest(requestConfig);
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
exports.SuanpanWebApi = SuanpanWebApi;
|
|
93
|
+
//# sourceMappingURL=suanpan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"suanpan.js","sourceRoot":"","sources":["../../../src/core/utils/suanpan.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import type { StsToken } from '../../types';
|
|
2
|
-
export declare class SuanpanWebApi {
|
|
3
|
-
private static defaultRequestOptions;
|
|
4
|
-
static getSTSToken(): Promise<StsToken>;
|
|
5
|
-
static presignedGetObject(objectName: string): Promise<string>;
|
|
6
|
-
static presignedPutObject(objectName: string): Promise<string>;
|
|
7
|
-
}
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.SuanpanWebApi = void 0;
|
|
16
|
-
const got_1 = __importDefault(require("got"));
|
|
17
|
-
const support_1 = require("./support");
|
|
18
|
-
class SuanpanWebApi {
|
|
19
|
-
static getSTSToken() {
|
|
20
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
-
this.defaultRequestOptions.method = 'GET';
|
|
22
|
-
const { body } = yield got_1.default('oss/token', this.defaultRequestOptions);
|
|
23
|
-
return JSON.parse(body);
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
static presignedGetObject(objectName) {
|
|
27
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
this.defaultRequestOptions.method = 'POST';
|
|
29
|
-
this.defaultRequestOptions.json = { Key: objectName };
|
|
30
|
-
const { body } = yield got_1.default('oss/object/get', this.defaultRequestOptions);
|
|
31
|
-
const jsonResponse = JSON.parse(body);
|
|
32
|
-
return jsonResponse.data;
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
static presignedPutObject(objectName) {
|
|
36
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
this.defaultRequestOptions.method = 'POST';
|
|
38
|
-
this.defaultRequestOptions.json = { Key: objectName };
|
|
39
|
-
const { body } = yield got_1.default('oss/object/put', this.defaultRequestOptions);
|
|
40
|
-
const jsonResponse = JSON.parse(body);
|
|
41
|
-
return jsonResponse.data;
|
|
42
|
-
});
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
exports.SuanpanWebApi = SuanpanWebApi;
|
|
46
|
-
SuanpanWebApi.defaultRequestOptions = {
|
|
47
|
-
prefixUrl: support_1.buildSpAffinityUrl(),
|
|
48
|
-
headers: support_1.buildUserIdHeaderField()
|
|
49
|
-
};
|
|
50
|
-
//# sourceMappingURL=suanpanApi.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"suanpanApi.js","sourceRoot":"","sources":["../../../src/core/utils/suanpanApi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+C;AAE/C,uCAAuE;AAMvE,MAAa,aAAa;IAOxB,MAAM,CAAO,WAAW;;YACtB,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,KAAK,CAAC;YAC1C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAG,CAAC,WAAW,EAAE,IAAI,CAAC,qBAA4B,CAAC,CAAC;YAC3E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC;QACtC,CAAC;KAAA;IAED,MAAM,CAAO,kBAAkB,CAAC,UAAkB;;YAChD,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,MAAM,CAAC;YAC3C,IAAI,CAAC,qBAAqB,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;YACtD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,qBAA4B,CAAC,CAAC;YAChF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAiB,CAAC;YACtD,OAAO,YAAY,CAAC,IAAc,CAAC;QACrC,CAAC;KAAA;IAED,MAAM,CAAO,kBAAkB,CAAC,UAAkB;;YAChD,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,MAAM,CAAC;YAC3C,IAAI,CAAC,qBAAqB,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;YACtD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,qBAA4B,CAAC,CAAC;YAChF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAiB,CAAC;YACtD,OAAO,YAAY,CAAC,IAAc,CAAC;QACrC,CAAC;KAAA;;AA3BH,sCA4BC;AA1BgB,mCAAqB,GAAe;IACjD,SAAS,EAAE,4BAAkB,EAAE;IAC/B,OAAO,EAAE,gCAAsB,EAAa;CAC7C,CAAC"}
|
|
@@ -1,33 +0,0 @@
|
|
|
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.buildSpAffinityUrl = exports.buildUserIdHeaderField = void 0;
|
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
-
const _1 = require(".");
|
|
9
|
-
const environment_1 = require("../parameter/environment");
|
|
10
|
-
function buildUserIdHeaderField() {
|
|
11
|
-
return Object.assign({}, {
|
|
12
|
-
[environment_1.Environment.suanpan.field.userIdHeader]: environment_1.Environment.stream.userId,
|
|
13
|
-
[environment_1.Environment.suanpan.field.userSignature]: _1.signatureV1(environment_1.Environment.suanpan.accessSecret, lodash_1.default.toString(environment_1.Environment.stream.userId)),
|
|
14
|
-
[environment_1.Environment.suanpan.field.userSignVersionHeader]: 'v1'
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
exports.buildUserIdHeaderField = buildUserIdHeaderField;
|
|
18
|
-
function buildSpAffinityUrl() {
|
|
19
|
-
const { host, port: spPort, affinity, protocol: httpsProtocol } = environment_1.Environment.suanpan;
|
|
20
|
-
if (affinity) {
|
|
21
|
-
return affinity;
|
|
22
|
-
}
|
|
23
|
-
const protocol = httpsProtocol ? 'https' : 'http';
|
|
24
|
-
const port = spPort ? `:${spPort}` : '';
|
|
25
|
-
if (environment_1.Environment.isWindows) {
|
|
26
|
-
// http://localhost:7000
|
|
27
|
-
return `${protocol}://${host}${port}`;
|
|
28
|
-
}
|
|
29
|
-
// http://suanpan-service.default:7000
|
|
30
|
-
return `${protocol}://${host}`;
|
|
31
|
-
}
|
|
32
|
-
exports.buildSpAffinityUrl = buildSpAffinityUrl;
|
|
33
|
-
//# sourceMappingURL=support.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"support.js","sourceRoot":"","sources":["../../../src/core/utils/support.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,wBAAgC;AAChC,0DAAuD;AAEvD,SAAgB,sBAAsB;IACpC,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE;QACvB,CAAC,yBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,yBAAW,CAAC,MAAM,CAAC,MAAgB;QAC7E,CAAC,yBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,cAAW,CAAC,yBAAW,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAC,CAAC,QAAQ,CAAC,yBAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/H,CAAC,yBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,IAAI;KACxD,CAAC,CAAC;AACL,CAAC;AAND,wDAMC;AAED,SAAgB,kBAAkB;IAChC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,yBAAW,CAAC,OAAO,CAAC;IAEtF,IAAI,QAAQ,EAAE;QAAE,OAAO,QAAQ,CAAC;KAAE;IAElC,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAClD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAExC,IAAI,yBAAW,CAAC,SAAS,EAAE;QACzB,wBAAwB;QACxB,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,IAAI,EAAE,CAAC;KACvC;IAED,sCAAsC;IACtC,OAAO,GAAG,QAAQ,MAAM,IAAI,EAAE,CAAC;AACjC,CAAC;AAfD,gDAeC"}
|