suanpan_node_sdk 2.1.5 → 2.2.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/README.md +14 -14
- package/dist/core/common/constant.d.ts +1 -1
- package/dist/core/common/constant.js +1 -1
- package/dist/core/common/constant.js.map +1 -1
- 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.d.ts +3 -1
- package/dist/core/message/mq/redis.js +6 -0
- package/dist/core/message/mq/redis.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.js +29 -0
- package/dist/core/service/port.js.map +1 -1
- package/dist/core/storage/minioStorage.d.ts +7 -3
- package/dist/core/storage/minioStorage.js +29 -8
- package/dist/core/storage/minioStorage.js.map +1 -1
- package/dist/core/storage/objectStorage.d.ts +6 -4
- package/dist/core/storage/ossStorage.d.ts +5 -4
- package/dist/core/storage/ossStorage.js +20 -6
- 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/suanpanApi.d.ts +7 -0
- package/dist/core/utils/suanpanApi.js +50 -0
- package/dist/core/utils/suanpanApi.js.map +1 -0
- package/dist/core/utils/support.d.ts +0 -2
- package/dist/core/utils/support.js +1 -22
- package/dist/core/utils/support.js.map +1 -1
- package/dist/types/storageTypes.d.ts +6 -0
- package/dist/types/storageTypes.js.map +1 -1
- package/package.json +4 -4
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 操作，将日志上传到对象存储。 |
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const SP_USER_SIGN_VERSION = "v1";
|
|
2
2
|
export declare const APP_NODE_TYPE_CONFIG = "app.nodeType";
|
|
3
3
|
export declare const APP_NODE_SDK_PORT_CONFIG = "app.predict.appNodeSDKPort";
|
|
4
|
-
export declare const DEFAULT_NODE_SDK_PORT =
|
|
4
|
+
export declare const DEFAULT_NODE_SDK_PORT = 8002;
|
|
5
5
|
export declare const USER_MASTER = "user-master";
|
|
6
6
|
export declare const COMMAND_FILTER_KEYS: string[];
|
|
@@ -4,7 +4,7 @@ exports.COMMAND_FILTER_KEYS = exports.USER_MASTER = exports.DEFAULT_NODE_SDK_POR
|
|
|
4
4
|
exports.SP_USER_SIGN_VERSION = 'v1';
|
|
5
5
|
exports.APP_NODE_TYPE_CONFIG = 'app.nodeType';
|
|
6
6
|
exports.APP_NODE_SDK_PORT_CONFIG = 'app.predict.appNodeSDKPort';
|
|
7
|
-
exports.DEFAULT_NODE_SDK_PORT =
|
|
7
|
+
exports.DEFAULT_NODE_SDK_PORT = 8002;
|
|
8
8
|
exports.USER_MASTER = 'user-master';
|
|
9
9
|
exports.COMMAND_FILTER_KEYS = [
|
|
10
10
|
'stream-user-id',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/core/common/constant.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,wBAAwB,GAAG,4BAA4B,CAAC;AACxD,QAAA,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/core/common/constant.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,wBAAwB,GAAG,4BAA4B,CAAC;AACxD,QAAA,qBAAqB,GAAG,IAAI,CAAC;AAC7B,QAAA,WAAW,GAAG,aAAa,CAAC;AAC5B,QAAA,mBAAmB,GAAG;IACjC,gBAAgB;IAChB,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,mBAAmB;IACnB,mBAAmB;IACnB,8BAA8B;IAC9B,oCAAoC;IACpC,SAAS;IACT,eAAe;IACf,eAAe;IACf,+BAA+B;IAC/B,qBAAqB;IACrB,cAAc;IACd,wBAAwB;IACxB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,0BAA0B;IAC1B,SAAS;IACT,cAAc;IACd,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,kBAAkB;IAClB,kBAAkB;IAClB,sBAAsB;IACtB,yBAAyB;IACzB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;IAC1B,0BAA0B;IAC1B,GAAG;IACH,IAAI;IACJ,OAAO;IACP,OAAO;IACP,SAAS;IACT,QAAQ;IACR,WAAW;CACZ,CAAC"}
|
|
@@ -17,7 +17,7 @@ const messageChain_1 = require("../messageChain");
|
|
|
17
17
|
const event_1 = require("../../event");
|
|
18
18
|
class RedisStreamChannel {
|
|
19
19
|
constructor() {
|
|
20
|
-
this._client =
|
|
20
|
+
this._client = redis_1.RedisClient.Instance;
|
|
21
21
|
}
|
|
22
22
|
receiveMessage() {
|
|
23
23
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/message/mq/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kBAAuB;AAEvB,mCAAsC;AACtC,yCAA2C;AAC3C,kDAA+C;AAC/C,uCAAkD;AAIlD,MAAa,kBAAkB;IAG7B;QACE,IAAI,CAAC,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/message/mq/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kBAAuB;AAEvB,mCAAsC;AACtC,yCAA2C;AAC3C,kDAA+C;AAC/C,uCAAkD;AAIlD,MAAa,kBAAkB;IAG7B;QACE,IAAI,CAAC,OAAO,GAAG,mBAAW,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,2BAAmB,CAAC,IAAI,EAAE,CAAC,KAA0B,EAAE,EAAE;gBACzE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,OAAuB;QAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,2BAAmB,CAAC,IAAI,EAAE,CAAO,KAA0B,EAAE,EAAE;YAC7E,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,2BAAY,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YACrD,IAAI;gBACF,MAAM,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;aACtC;YAAC,OAAO,CAAM,EAAE;gBACf,oBAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,aAAa,GAAG,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACtE,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;aAC/C;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;IAEK,WAAW,CAAC,OAAgB;;YAChC,MAAM,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAClD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;KAAA;CACF;AAjCD,gDAiCC"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
import * as events from 'events';
|
|
3
3
|
import type { ResponseStream } from '../../../types';
|
|
4
4
|
export declare class RedisClient extends events.EventEmitter {
|
|
5
|
+
private static _instance;
|
|
6
|
+
static get Instance(): RedisClient;
|
|
5
7
|
private _client;
|
|
6
|
-
constructor();
|
|
8
|
+
private constructor();
|
|
7
9
|
private initMQClient;
|
|
8
10
|
private _buildSendMessageOptions;
|
|
9
11
|
sendMessage(responseStream: ResponseStream): Promise<void>;
|
|
@@ -44,6 +44,12 @@ class RedisClient extends events.EventEmitter {
|
|
|
44
44
|
super();
|
|
45
45
|
this.initMQClient();
|
|
46
46
|
}
|
|
47
|
+
static get Instance() {
|
|
48
|
+
if (!this._instance) {
|
|
49
|
+
this._instance = new RedisClient();
|
|
50
|
+
}
|
|
51
|
+
return this._instance;
|
|
52
|
+
}
|
|
47
53
|
initMQClient() {
|
|
48
54
|
if (!this._client) {
|
|
49
55
|
this._client = new suanpan_mq_1.SPMQClient({ host: environment_1.Environment.mq.host, readWriteSeparation: true, port: environment_1.Environment.mq.port });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/core/message/mq/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,2DAAsC;AAItC,uCAAqC;AACrC,wCAAqC;AACrC,6DAA0D;AAC1D,uCAAkD;AAClD,2CAAyH;AACzH,MAAa,WAAY,SAAQ,MAAM,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../../src/core/message/mq/redis.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,2DAAsC;AAItC,uCAAqC;AACrC,wCAAqC;AACrC,6DAA0D;AAC1D,uCAAkD;AAClD,2CAAyH;AACzH,MAAa,WAAY,SAAQ,MAAM,CAAC,YAAY;IAalD;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAZM,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,WAAW,EAAE,CAAC;SACpC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IASO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAEjB,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,CAAC,EAAE,IAAI,EAAE,yBAAW,CAAC,EAAE,CAAC,IAAc,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,EAAE,yBAAW,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;YAE7H,MAAM,KAAK,GAAG,yBAAW,CAAC,EAAE,CAAC,YAAsB,CAAC;YAEpD,MAAM,QAAQ,GAA2B,CAAO,QAAsB,EAAE,EAAE;gBACxE,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACjB,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAqB,CAAC;oBACrD,MAAM,OAAO,GAAG,iBAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;oBACzD,IAAI,CAAC,IAAI,CAAC,2BAAmB,CAAC,IAAI,EAAE,IAAI,2BAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;iBACvE;qBAAM;oBACL,aAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBAClE,aAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;iBAC9E;YACH,CAAC,CAAA,CAAC;YACF,uHAAuH;YACvH,MAAM,WAAW,GAA0B,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAEzE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SAC1C;IACH,CAAC;IAEO,wBAAwB,CAAC,cAA8B;QAC7D,MAAM,MAAM,GAAG,yBAAW,CAAC,EAAE,CAAC,kBAA4B,CAAC;QAC3D,MAAM,eAAe,GAAG,yBAAW,CAAC,EAAE,CAAC,wBAAwB,CAAC;QAChE,OAAO;YACL,KAAK,EAAE,yBAAW,CAAC,EAAE,CAAC,SAAmB;YACzC,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;YACxC,eAAe,EAAE,cAAM,CAAC,eAAe,CAAC;SACzC,CAAC;IACJ,CAAC;IAEK,WAAW,CAAC,cAA8B;;YAC9C,IAAI;gBACF,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;gBAClE,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,aAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,CAAC;aACT;QACH,CAAC;KAAA;CACF;AA/DD,kCA+DC"}
|
|
@@ -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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"}
|
|
@@ -85,4 +85,33 @@ class PortService {
|
|
|
85
85
|
exports.PortService = PortService;
|
|
86
86
|
PortService.suanpanUrl = support_1.buildSpAffinityUrl();
|
|
87
87
|
PortService.loopupRange = get_port_1.default.makeRange(lookupFrom, lookupTo);
|
|
88
|
+
// import * as crypto from 'crypto';
|
|
89
|
+
// (async () => {
|
|
90
|
+
// const systime = new Date().getTime().toString();
|
|
91
|
+
// const token = `${systime} | xuelang xuelang`;
|
|
92
|
+
// function md5(text: string | Buffer): string {
|
|
93
|
+
// return crypto.createHash('md5').update(text).digest('hex');
|
|
94
|
+
// }
|
|
95
|
+
// console.log(token);
|
|
96
|
+
// const mm = md5(token);
|
|
97
|
+
// console.log(mm);
|
|
98
|
+
// const requestConfig: AxiosRequestConfig = {
|
|
99
|
+
// url: 'http://fx.hzrobam.com/DWGateway/restful/IDM/IDataForOut/getEcShipState',
|
|
100
|
+
// method: 'POST',
|
|
101
|
+
// data: {
|
|
102
|
+
// fromSys: 'xuelang',
|
|
103
|
+
// so_no: '4941760865090579711',
|
|
104
|
+
// timestamp: systime,
|
|
105
|
+
// token: mm
|
|
106
|
+
// }
|
|
107
|
+
// };
|
|
108
|
+
// console.log(JSON.stringify({
|
|
109
|
+
// fromSys: 'xuelang',
|
|
110
|
+
// so_no: '4941760865090579711',
|
|
111
|
+
// timestamp: systime,
|
|
112
|
+
// token: mm
|
|
113
|
+
// }, null, 4));
|
|
114
|
+
// const registerPortResponse = await PortService.httpRequest<RegisterPortResponse>(requestConfig);
|
|
115
|
+
// console.log(JSON.stringify(registerPortResponse, null, 4));
|
|
116
|
+
// })();
|
|
88
117
|
//# 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,0DAAuD;AACvD,oCAA+C;AAC/C,kDAAiE;AACjE,8CAA8E;AAO9E,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;IAKd,MAAM,CAAO,WAAW,CAAI,OAA2B;;YAC7D,IAAI,GAAsB,CAAC;YAC3B,MAAM,oBAAY,CAAC,CAAO,KAAK,EAAE,KAAa,EAAE,EAAE;gBAChD,IAAI;oBACF,GAAG,GAAG,MAAM,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;iBACpC;gBAAC,OAAO,EAAE,EAAE;oBACX,aAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;oBACjD,aAAM,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;oBACpC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACX;YACH,CAAC,CAAA,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC;QAClB,CAAC;KAAA;IAED,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,YAAY,CAAC,WAAmB,EAAE,QAAgB;;YAC7D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,yBAAW,CAAC,MAAM,CAAC;YAErD,MAAM,aAAa,GAAuB;gBACxC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,uBAAuB;gBAC9C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE;oBACJ,MAAM,EAAE,KAAK,EAAE,MAAM;oBACrB,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ;iBACtC;gBACD,OAAO,EAAE,gCAAsB,EAAE;aAClC,CAAC;YAEF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAuB,aAAa,CAAC,CAAC;YAEzF,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;aAC3C;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,WAAW,CAAC,YAAY,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBAC7D,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;;AA1DH,kCAoFC;AAlFyB,sBAAU,GAAW,4BAAkB,EAAE,CAAC;AAC1C,uBAAW,GAAG,kBAAa,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../src/core/service/port.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
3
|
import type { Readable as ReadableStream } from 'stream';
|
|
4
|
-
import type { ObjectItem, MinioConfig } from '../../types';
|
|
4
|
+
import type { ObjectData, ObjectItem, MinioConfig, ObjectMetadata } from '../../types';
|
|
5
5
|
export declare class MinioStorage implements IObjectStorage {
|
|
6
6
|
private config?;
|
|
7
7
|
private bucketName;
|
|
@@ -14,11 +14,15 @@ export declare class MinioStorage implements IObjectStorage {
|
|
|
14
14
|
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
15
15
|
getObjectToString(objectName: string): Promise<string>;
|
|
16
16
|
getObjectToJSON(objectName: string): Promise<any>;
|
|
17
|
-
putObject(objectName: string, data:
|
|
18
|
-
|
|
17
|
+
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
18
|
+
putObjectWithMetaData(objectName: string, data: ReadableStream | Buffer | string, metaData: object): Promise<void>;
|
|
19
|
+
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
19
20
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
21
|
+
presignedGetObject(objectName: string): Promise<string>;
|
|
22
|
+
presignedPutObject(objectName: string): Promise<string>;
|
|
20
23
|
listObjects(prefix: string, recursive?: boolean): Promise<ObjectItem[]>;
|
|
21
24
|
deleteObject(objectName: string): Promise<void>;
|
|
22
25
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
23
26
|
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
27
|
+
getLastModified(objectName: string): Promise<Date>;
|
|
24
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 helper = __importStar(require("../utils/support"));
|
|
39
38
|
const environment_1 = require("../parameter/environment");
|
|
39
|
+
const suanpanApi_1 = require("../utils/suanpanApi");
|
|
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 suanpanApi_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) {
|
|
@@ -111,16 +111,21 @@ class MinioStorage {
|
|
|
111
111
|
return utils_1.tryJSONParse(str, str);
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
|
-
putObject(objectName, data) {
|
|
114
|
+
putObject(objectName, data, metaData) {
|
|
115
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
116
116
|
const minioClient = yield this.getClient();
|
|
117
|
-
yield minioClient.putObject(this.bucketName, objectName, data);
|
|
117
|
+
yield minioClient.putObject(this.bucketName, objectName, data, metaData);
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
|
-
|
|
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
|
+
fPutObject(objectName, filePath, metaData) {
|
|
121
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
122
127
|
const minioClient = yield this.getClient();
|
|
123
|
-
yield minioClient.fPutObject(this.bucketName, objectName, filePath, {});
|
|
128
|
+
yield minioClient.fPutObject(this.bucketName, objectName, filePath, metaData || {});
|
|
124
129
|
});
|
|
125
130
|
}
|
|
126
131
|
fGetObject(objectName, filePath) {
|
|
@@ -129,6 +134,16 @@ class MinioStorage {
|
|
|
129
134
|
yield minioClient.fGetObject(this.bucketName, objectName, filePath);
|
|
130
135
|
});
|
|
131
136
|
}
|
|
137
|
+
presignedGetObject(objectName) {
|
|
138
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
139
|
+
return yield suanpanApi_1.SuanpanWebApi.presignedGetObject(objectName);
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
presignedPutObject(objectName) {
|
|
143
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
+
return yield suanpanApi_1.SuanpanWebApi.presignedPutObject(objectName);
|
|
145
|
+
});
|
|
146
|
+
}
|
|
132
147
|
listObjects(prefix, recursive = true) {
|
|
133
148
|
return __awaiter(this, void 0, void 0, function* () {
|
|
134
149
|
const mnClient = yield this.getClient();
|
|
@@ -182,6 +197,12 @@ class MinioStorage {
|
|
|
182
197
|
return bucketExist;
|
|
183
198
|
});
|
|
184
199
|
}
|
|
200
|
+
getLastModified(objectName) {
|
|
201
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
202
|
+
const stat = yield this.minioClient.statObject(this.bucketName, objectName);
|
|
203
|
+
return stat.lastModified;
|
|
204
|
+
});
|
|
205
|
+
}
|
|
185
206
|
}
|
|
186
207
|
exports.MinioStorage = MinioStorage;
|
|
187
208
|
//# 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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"}
|
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Stream } from 'stream';
|
|
3
|
-
import type { ObjectItem } from '../../types';
|
|
3
|
+
import type { ObjectData, ObjectMetadata, ObjectItem } from '../../types';
|
|
4
4
|
export interface IObjectStorage {
|
|
5
5
|
append(objectName: string, content: String): Promise<any>;
|
|
6
6
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
7
7
|
getObjectToStream(objectName: string): Promise<Stream | null>;
|
|
8
8
|
getObjectToString(objectName: string): Promise<string>;
|
|
9
9
|
getObjectToJSON(objectName: string): Promise<unknown>;
|
|
10
|
-
fGetObject(objectName: string, filePath: string): Promise<
|
|
11
|
-
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
12
|
-
putObject(objectName: string, data:
|
|
10
|
+
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
11
|
+
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
12
|
+
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
13
13
|
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
14
14
|
deleteObject(objectName: string): Promise<void>;
|
|
15
15
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
16
16
|
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
17
|
+
presignedGetObject(objectName: string): Promise<string>;
|
|
18
|
+
presignedPutObject(objectName: string): Promise<string>;
|
|
17
19
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { IObjectStorage } from './objectStorage';
|
|
3
|
-
import type {
|
|
4
|
-
import type { ObjectItem, AliOSSConfig } from '../../types';
|
|
3
|
+
import type { ObjectData, ObjectItem, AliOSSConfig, ObjectMetadata } from '../../types';
|
|
5
4
|
export declare class OSSStorage implements IObjectStorage {
|
|
6
5
|
private config?;
|
|
7
6
|
private ossClient;
|
|
@@ -15,9 +14,11 @@ export declare class OSSStorage implements IObjectStorage {
|
|
|
15
14
|
getObjectToStream(objectName: string): Promise<any>;
|
|
16
15
|
getObjectToString(objectName: string): Promise<string>;
|
|
17
16
|
getObjectToJSON(objectName: string): Promise<any>;
|
|
18
|
-
putObject(objectName: string, data:
|
|
19
|
-
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
17
|
+
putObject(objectName: string, data: ObjectData, metaData?: ObjectMetadata): Promise<void>;
|
|
18
|
+
fPutObject(objectName: string, filePath: string, metaData?: ObjectMetadata): Promise<void>;
|
|
20
19
|
fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
20
|
+
presignedGetObject(objectName: string): Promise<string>;
|
|
21
|
+
presignedPutObject(objectName: string): Promise<string>;
|
|
21
22
|
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
22
23
|
deleteObject(objectName: string): Promise<void>;
|
|
23
24
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
@@ -34,10 +34,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
34
34
|
exports.OSSStorage = void 0;
|
|
35
35
|
const lodash_1 = __importDefault(require("lodash"));
|
|
36
36
|
const util = __importStar(require("../utils"));
|
|
37
|
-
const helper = __importStar(require("../utils/support"));
|
|
38
37
|
const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
39
38
|
const moment_1 = __importDefault(require("moment"));
|
|
40
39
|
const utils_1 = require("../utils");
|
|
40
|
+
const suanpanApi_1 = require("../utils/suanpanApi");
|
|
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 suanpanApi_1.SuanpanWebApi.getSTSToken();
|
|
57
57
|
this.tokenExpiration = Credentials.Expiration || '';
|
|
58
58
|
options.region = region;
|
|
59
59
|
options.bucket = bucket;
|
|
@@ -107,19 +107,21 @@ class OSSStorage {
|
|
|
107
107
|
return utils_1.tryJSONParse(str, str);
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
|
-
putObject(objectName, data) {
|
|
110
|
+
putObject(objectName, data, metaData) {
|
|
111
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
112
|
const ossClient = yield this.getClient();
|
|
113
|
-
|
|
113
|
+
// string to buffer for compatibility and interface consistency
|
|
114
|
+
const file = lodash_1.default.isString(data) ? Buffer.from(data) : data;
|
|
115
|
+
yield ossClient.put(objectName, file, { meta: metaData });
|
|
114
116
|
});
|
|
115
117
|
}
|
|
116
|
-
fPutObject(objectName, filePath) {
|
|
118
|
+
fPutObject(objectName, filePath, metaData) {
|
|
117
119
|
return __awaiter(this, void 0, void 0, function* () {
|
|
118
120
|
if (util.fileExists(filePath)) {
|
|
119
121
|
throw new Error(`Local file path(${filePath}) is not exist.`);
|
|
120
122
|
}
|
|
121
123
|
const ossClient = yield this.getClient();
|
|
122
|
-
yield ossClient.put(objectName, filePath);
|
|
124
|
+
yield ossClient.put(objectName, filePath, { meta: metaData });
|
|
123
125
|
});
|
|
124
126
|
}
|
|
125
127
|
fGetObject(objectName, filePath) {
|
|
@@ -128,6 +130,18 @@ class OSSStorage {
|
|
|
128
130
|
yield ossClient.get(objectName, filePath);
|
|
129
131
|
});
|
|
130
132
|
}
|
|
133
|
+
presignedGetObject(objectName) {
|
|
134
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
+
const ossClient = yield this.getClient();
|
|
136
|
+
return ossClient.signatureUrl(objectName, { method: 'GET' });
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
presignedPutObject(objectName) {
|
|
140
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
141
|
+
const ossClient = yield this.getClient();
|
|
142
|
+
return ossClient.signatureUrl(objectName, { method: 'PUT' });
|
|
143
|
+
});
|
|
144
|
+
}
|
|
131
145
|
listObjects(prefix, recursive = true, maxKeys = 1000) {
|
|
132
146
|
var _a;
|
|
133
147
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ossStorage.js","sourceRoot":"","sources":["../../../src/core/storage/ossStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,+CAAiC;AACjC,
|
|
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,7 @@
|
|
|
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
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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,20 +1,10 @@
|
|
|
1
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
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
14
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
6
|
+
exports.buildSpAffinityUrl = exports.buildUserIdHeaderField = void 0;
|
|
16
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
|
-
const got_1 = __importDefault(require("got"));
|
|
18
8
|
const _1 = require(".");
|
|
19
9
|
const environment_1 = require("../parameter/environment");
|
|
20
10
|
function buildUserIdHeaderField() {
|
|
@@ -40,15 +30,4 @@ function buildSpAffinityUrl() {
|
|
|
40
30
|
return `${protocol}://${host}`;
|
|
41
31
|
}
|
|
42
32
|
exports.buildSpAffinityUrl = buildSpAffinityUrl;
|
|
43
|
-
function getSTSToken() {
|
|
44
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
const gotOptions = {
|
|
46
|
-
prefixUrl: buildSpAffinityUrl(),
|
|
47
|
-
headers: buildUserIdHeaderField()
|
|
48
|
-
};
|
|
49
|
-
const response = yield got_1.default('oss/token', gotOptions);
|
|
50
|
-
return JSON.parse(response.body);
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
exports.getSTSToken = getSTSToken;
|
|
54
33
|
//# sourceMappingURL=support.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"support.js","sourceRoot":"","sources":["../../../src/core/utils/support.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import type { LogLevel } from './conmonTypes';
|
|
3
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
4
|
+
export interface ObjectMetadata {
|
|
5
|
+
[key: string]: any;
|
|
6
|
+
}
|
|
2
7
|
export declare type ObjectItem = {
|
|
3
8
|
name: string;
|
|
4
9
|
lastModified: string;
|
|
5
10
|
};
|
|
11
|
+
export declare type ObjectData = string | Buffer | ReadableStream;
|
|
6
12
|
export declare enum StorageType {
|
|
7
13
|
OSS = "oss",
|
|
8
14
|
SUANPAN = "suanpan",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageTypes.js","sourceRoot":"","sources":["../../src/types/storageTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"storageTypes.js","sourceRoot":"","sources":["../../src/types/storageTypes.ts"],"names":[],"mappings":";;;AAaA,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,0BAAW,CAAA;IACX,kCAAmB,CAAA;IACnB,8BAAe,CAAA;AACjB,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "suanpan_node_sdk",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.2",
|
|
4
4
|
"description": "suanpan sdk for node.js",
|
|
5
5
|
"main": "dist/main.js",
|
|
6
6
|
"types": "dist/main.d.ts",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@babel/core": "^7.12.3",
|
|
47
|
-
"ali-oss": "^6.
|
|
47
|
+
"ali-oss": "^6.17.1",
|
|
48
48
|
"axios": "^0.21.0",
|
|
49
49
|
"config": "^3.3.1",
|
|
50
50
|
"csvtojson": "^2.0.10",
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
"yargs": "^13.3.2"
|
|
71
71
|
},
|
|
72
72
|
"devDependencies": {
|
|
73
|
-
"@types/ali-oss": "^6.
|
|
73
|
+
"@types/ali-oss": "^6.16.3",
|
|
74
74
|
"@types/config": "0.0.39",
|
|
75
75
|
"@types/express": "^4.17.13",
|
|
76
76
|
"@types/fs-extra": "^9.0.8",
|
|
77
77
|
"@types/get-port": "^4.2.0",
|
|
78
|
-
"@types/lodash": "^4.14.
|
|
78
|
+
"@types/lodash": "^4.14.182",
|
|
79
79
|
"@types/minio": "^7.0.7",
|
|
80
80
|
"@types/node": "^14.14.35",
|
|
81
81
|
"@types/promise-retry": "^1.1.3",
|