suanpan_node_sdk 2.0.0-beta.11 → 2.0.0-beta.15
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 +69 -45
- package/dist/common/util.d.ts +1 -0
- package/dist/common/util.js +15 -0
- package/dist/common/util.js.map +1 -1
- package/dist/eventLogger.d.ts +1 -0
- package/dist/eventLogger.js +19 -0
- package/dist/eventLogger.js.map +1 -1
- package/dist/latestStorage/minio.d.ts +4 -1
- package/dist/latestStorage/minio.js +34 -0
- package/dist/latestStorage/minio.js.map +1 -1
- package/dist/latestStorage/oss.d.ts +3 -0
- package/dist/latestStorage/oss.js +31 -0
- package/dist/latestStorage/oss.js.map +1 -1
- package/dist/latestStorage/storage.d.ts +25 -10
- package/dist/latestStorage/storage.js.map +1 -1
- package/dist/latestStorage/wrapperStorage.d.ts +2 -3
- package/dist/latestStorage/wrapperStorage.js +2 -2
- package/dist/latestStorage/wrapperStorage.js.map +1 -1
- package/dist/main.d.ts +1 -0
- package/dist/main.js +1 -0
- package/dist/main.js.map +1 -1
- package/dist/mq.d.ts +1 -3
- package/dist/mq.js +1 -3
- package/dist/mq.js.map +1 -1
- package/dist/port.d.ts +1 -0
- package/dist/port.js +18 -2
- package/dist/port.js.map +1 -1
- package/dist/web/server.js +3 -3
- package/dist/web/server.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,96 +1,120 @@
|
|
|
1
|
+
<a name="tZMOF"></a>
|
|
1
2
|
## 简介
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
- 支持消息收发
|
|
5
|
-
- 读取组件的右面板参数
|
|
6
|
-
- Event Log Sender
|
|
7
|
-
- 支持 oss 类型的 storage 功能 [beta]
|
|
8
|
-
|
|
9
|
-
[SDK 目录约定](https://xuelangyun.yuque.com/suanpan_doc/public/bokg7z)
|
|
10
|
-
|
|
3
|
+
算盘组件之间通过 Redis 消息队列进行消息通信，SDK 对 Redis 提供的 Stream API 进行了封装，提供了发送消息/监听队列/oss/minio存储等方法。<br /><br />[SDK 目录约定](https://xuelangyun.yuque.com/suanpan_doc/public/bokg7z)
|
|
4
|
+
<a name="Installation"></a>
|
|
11
5
|
## Installation
|
|
12
6
|
```powershell
|
|
13
7
|
npm install suanpan_node_sdk -S
|
|
14
8
|
// or beta
|
|
15
9
|
npm install suanpan_node_sdk@beta -S
|
|
16
10
|
```
|
|
17
|
-
## Docker
|
|
18
|
-
可以使用基础镜像 node_sdk_base:latest
|
|
19
|
-
latest可替换为指定的SDK版本号
|
|
20
|
-
例如：
|
|
21
|
-
```
|
|
22
|
-
ARG ARCH="amd64"
|
|
23
|
-
FROM registry.cn-shanghai.aliyuncs.com/shuzhi-$ARCH/node_sdk_base:latest
|
|
24
|
-
```
|
|
25
11
|
|
|
26
|
-
基础镜像中 suanpan_node_sdk 通过全局安装
|
|
27
|
-
本地开发可以通过`npm install -D suanpan_node_sdk`来提供代码提示
|
|
28
12
|
|
|
13
|
+
<a name="d089eb8a"></a>
|
|
29
14
|
## 功能列表
|
|
30
|
-
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
<a name="2eb2aa84"></a>
|
|
18
|
+
### 1. 获得右面板配置参数
|
|
19
|
+
|
|
20
|
+
|
|
31
21
|
```javascript
|
|
32
|
-
const sp = require('suanpan_node_sdk')
|
|
33
|
-
const
|
|
34
|
-
console.log(
|
|
22
|
+
const { sp } = require('suanpan_node_sdk');
|
|
23
|
+
const parameter = sp.parameter
|
|
24
|
+
console.log(parameter)
|
|
35
25
|
```
|
|
36
26
|
|
|
27
|
+
|
|
28
|
+
<a name="c4665ba5"></a>
|
|
37
29
|
### 2. 发送消息与接受消息
|
|
30
|
+
<a name="KRO7Z"></a>
|
|
38
31
|
#### 构建发送包
|
|
32
|
+
|
|
33
|
+
|
|
39
34
|
```javascript
|
|
40
35
|
let msgPackOut = {
|
|
41
36
|
out1: "a", //将发送 "a" 到第一个消息出口
|
|
42
37
|
out2: "b", //将发送 "b" 到第二个消息出口
|
|
43
38
|
}
|
|
44
39
|
```
|
|
45
|
-
`msgPackOut` 对象的 `key` 由 `out` 与数字拼接而成的 key，表示第 N 个消息出口
|
|
46
|
-
`msgPackOut` 对象的 `value` 表示发送到对应出口的数据（value 必须是字符串）
|
|
47
40
|
|
|
48
|
-
|
|
49
|
-
|
|
41
|
+
<br />`msgPackOut` 对象的 `key` 由 `out` 与数字拼接而成的 key，表示第 N 个消息出口<br />`msgPackOut` 对象的 `value` 表示发送到对应出口的数据（value 必须是字符串）<br />
|
|
42
|
+
|
|
43
|
+
<a name="goFXb"></a>
|
|
44
|
+
#### 发送信息
|
|
45
|
+
```javascript
|
|
46
|
+
sp.sendMessage(msgPackOut)
|
|
47
|
+
```
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
<a name="Cm6Ll"></a>
|
|
51
|
+
#### 监听 onMessage
|
|
52
|
+
每当有新消息到达组件，则会触发 Message 事件<br />
|
|
53
|
+
|
|
50
54
|
```javascript
|
|
51
|
-
sp.
|
|
52
|
-
let msgPackIn =
|
|
55
|
+
sp.onMessage(message => {
|
|
56
|
+
let msgPackIn = message.body
|
|
53
57
|
console.log(msgPackIn)
|
|
54
58
|
// msgPackIn结构如下
|
|
55
|
-
//{in1:"a"}
|
|
56
|
-
// key(inN) 表示第N个消息入口, value是字符串
|
|
59
|
+
// {in1:"a"} key(inN) 表示第N个消息入口, value是字符串
|
|
57
60
|
|
|
58
61
|
// doSomething here
|
|
59
|
-
|
|
62
|
+
sp.sendMessage(msgPackOut) // 调用 res.sendMessage 发送数据包到下游节点
|
|
60
63
|
})
|
|
61
64
|
```
|
|
65
|
+
<a name="ZkoKt"></a>
|
|
66
|
+
####
|
|
67
|
+
<a name="lv17Y"></a>
|
|
68
|
+
### 3. Storage Api
|
|
69
|
+
```javascript
|
|
70
|
+
const { Storage } = require('suanpan_node_sdk');
|
|
62
71
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
72
|
+
(async () => {
|
|
73
|
+
|
|
74
|
+
await Storage.instance.getObjectToBuffer(objectName)
|
|
75
|
+
await Storage.instance.getObjectToStream(objectName)
|
|
76
|
+
await Storage.instance.getObjectToString(objectName)
|
|
77
|
+
|
|
78
|
+
await Storage.instance.fGetObject(objectName, filePath)
|
|
79
|
+
await Storage.instance.fPutObject(objectName, filePath)
|
|
80
|
+
|
|
81
|
+
await Storage.instance.putObject(objectName, data)
|
|
82
|
+
await Storage.instance.listObjects(prefix)
|
|
83
|
+
|
|
84
|
+
await Storage.instance.deleteObject(objectName)
|
|
85
|
+
await Storage.instance.deleteMultiObjects(objectNames)
|
|
86
|
+
})();
|
|
66
87
|
```
|
|
67
88
|
|
|
68
|
-
### 3. EventLogger Sender
|
|
69
|
-
提供 log 格式化的存储形式持久化在数据库中，app 释放后仍然保留，用于不同用户查看修改错误，用户重新部署后清除。logkit 能够直接运行在算盘 Server 中，也可以单独运行。架构图：
|
|
70
|
-
|
|
71
|
-
Node Sdk 提供 event log（内部使用 socketio 作为接口的基础协议）接口单向传输到 logkit。
|
|
72
89
|
|
|
73
|
-
|
|
90
|
+
<a name="72a374df"></a>
|
|
91
|
+
### 4. EventLogger Sender
|
|
92
|
+
|
|
93
|
+
<br />提供 log 格式化的存储形式持久化在数据库中，app 释放后仍然保留，用于不同用户查看修改错误，用户重新部署后清除。logkit 能够直接运行在算盘 Server 中，也可以单独运行。架构图：<br /><br />Node Sdk 提供 event log（内部使用 socketio 作为接口的基础协议）接口单向传输到 logkit。<br />
|
|
94
|
+
<br />代码示例：<br />
|
|
95
|
+
|
|
74
96
|
```javascript
|
|
75
97
|
let { sp, EventLogger } = require('suanpan_node_sdk');
|
|
76
98
|
|
|
77
99
|
const eventLogger = EventLogger.Instance;
|
|
78
100
|
|
|
79
|
-
sp.
|
|
101
|
+
sp.onMessage(message => {
|
|
80
102
|
|
|
81
|
-
if (!
|
|
103
|
+
if (!message.body) {
|
|
82
104
|
// 发送 event log
|
|
83
105
|
eventLogger.warn('received message is empty.');
|
|
84
106
|
}
|
|
85
107
|
|
|
86
|
-
|
|
108
|
+
sp.sendMessage({
|
|
87
109
|
out1: 'hello world this send in call'
|
|
88
110
|
});
|
|
89
111
|
});
|
|
90
112
|
```
|
|
91
113
|
|
|
92
|
-
|
|
114
|
+
<br />默认情况下，用户代码（onCall）中运行时 Error，将会自动触发 event log 的 error 事件，将结构化错误信息发送到 logkit。等于在 `after onCall` 中插入如下代码：<br />
|
|
115
|
+
|
|
93
116
|
```javascript
|
|
94
117
|
eventLogger.error(e.message)
|
|
95
118
|
```
|
|
96
|
-
|
|
119
|
+
|
|
120
|
+
<br />**注**：确保 sdk 版本在 `1.4.2` 以上
|
package/dist/common/util.d.ts
CHANGED
package/dist/common/util.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
process.env.SUPPRESS_NO_CONFIG_WARNING = true;
|
|
3
3
|
const _ = require('lodash');
|
|
4
|
+
const fs = require('fs-extra');
|
|
4
5
|
const path = require('path');
|
|
5
6
|
const config = require('config');
|
|
6
7
|
const logger = require('./log');
|
|
@@ -154,7 +155,21 @@ function signatureV1(secret = '', data = '') {
|
|
|
154
155
|
function isDesktop() {
|
|
155
156
|
return getConfig('app.isDesktop');
|
|
156
157
|
}
|
|
158
|
+
function fileExists(path) {
|
|
159
|
+
try {
|
|
160
|
+
return fs.statSync(path).isFile();
|
|
161
|
+
}
|
|
162
|
+
catch (e) {
|
|
163
|
+
if (e.code == 'ENOENT') { // no such file or directory. File really does not exist
|
|
164
|
+
logger.info(`File(${path}) does not exist.`);
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
logger.info('Exception fs.statSync (' + path + '): ' + e);
|
|
168
|
+
throw e; // something else went wrong, we don't have rights, ...
|
|
169
|
+
}
|
|
170
|
+
}
|
|
157
171
|
module.exports = {
|
|
172
|
+
fileExists,
|
|
158
173
|
generateUUID,
|
|
159
174
|
isDesktop,
|
|
160
175
|
signatureV1,
|
package/dist/common/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,IAAI,CAAC;AAC9C,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/common/util.js"],"names":[],"mappings":"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"}
|
package/dist/eventLogger.d.ts
CHANGED
package/dist/eventLogger.js
CHANGED
|
@@ -24,6 +24,7 @@ const USER_SIGN_VERSION_HEADER = process.env.SP_USER_SIGN_VERSION_HEADER_FIELD |
|
|
|
24
24
|
const SP_WEB_ENDPOINT = process.env.SP_LOGKIT_URI;
|
|
25
25
|
const SP_LOGKIT_NAMESPACE = process.env.SP_LOGKIT_NAMESPACE || 'logkit';
|
|
26
26
|
const SP_LOGKIT_EVENTS_APPEND = process.env.SP_LOGKIT_EVENTS_APPEND || 'append';
|
|
27
|
+
const SP_LOGKIT_LOGS_LEVEL = process.env.SP_LOGKIT_LOGS_LEVEL || 'debug';
|
|
27
28
|
function getRequestUrl(endpoint, routePath) {
|
|
28
29
|
const prefix = !_.endsWith(endpoint, '/') ? endpoint + '/' : endpoint;
|
|
29
30
|
const suffix = !_.startsWith(routePath, '/') ? routePath : routePath.substr(1);
|
|
@@ -43,6 +44,20 @@ function generateConnectOpts() {
|
|
|
43
44
|
path: process.env.SP_LOGKIT_PATH
|
|
44
45
|
};
|
|
45
46
|
}
|
|
47
|
+
const levels = {
|
|
48
|
+
'trace': 1,
|
|
49
|
+
'debug': 2,
|
|
50
|
+
'info': 3,
|
|
51
|
+
'warning': 4,
|
|
52
|
+
'warn': 4,
|
|
53
|
+
'error': 5
|
|
54
|
+
};
|
|
55
|
+
function levelToInt(minLevel) {
|
|
56
|
+
if (minLevel.toLowerCase() in levels) {
|
|
57
|
+
return this.levels[minLevel.toLowerCase()];
|
|
58
|
+
}
|
|
59
|
+
return 99;
|
|
60
|
+
}
|
|
46
61
|
class EventLogger {
|
|
47
62
|
constructor() {
|
|
48
63
|
if (EventLogger._instance) {
|
|
@@ -53,6 +68,7 @@ class EventLogger {
|
|
|
53
68
|
this.socket.on('error', (...args) => { logger.error('error', args); });
|
|
54
69
|
this.socket.on('disconnect', (...args) => { logger.warn('disconnect', args); });
|
|
55
70
|
this.socket.on('connect_error', (...args) => { logger.error('connect_error', args); });
|
|
71
|
+
this.minLevel = levelToInt(SP_LOGKIT_LOGS_LEVEL);
|
|
56
72
|
}
|
|
57
73
|
static get Instance() {
|
|
58
74
|
if (!this._instance) {
|
|
@@ -104,6 +120,9 @@ class EventLogger {
|
|
|
104
120
|
if (!title) {
|
|
105
121
|
return;
|
|
106
122
|
}
|
|
123
|
+
if (levelToInt(level) < this.minLevel) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
107
126
|
const eventTitle = this.parseTitleIfNecessary(title);
|
|
108
127
|
this.emitToLogkit(SP_LOGKIT_EVENTS_APPEND, APP_ID, this.buildEventLog(eventTitle, level))
|
|
109
128
|
.catch(error => logger.error(error));
|
package/dist/eventLogger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventLogger.js","sourceRoot":"","sources":["../src/eventLogger.js"],"names":[],"mappings":";;;;;;;;;;;;AAAA,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACvC,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAEvC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEjD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS,CAAC;AACpD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AACrC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AACvC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;AACnD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,cAAc,CAAC;AAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,gBAAgB,CAAC;AACtF,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,mBAAmB,CAAC;AAEtG,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;AAClD,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,QAAQ,CAAC;AACxE,MAAM,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"eventLogger.js","sourceRoot":"","sources":["../src/eventLogger.js"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
import * as Minio from 'minio';
|
|
3
3
|
import { AbstractStorage } from './storage';
|
|
4
4
|
import type { ObjectItem } from '../types/storage-types';
|
|
5
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
5
6
|
export declare class MinioStorage extends AbstractStorage {
|
|
6
7
|
private bucketName;
|
|
7
8
|
protected buildClient(): Promise<Minio.Client>;
|
|
8
9
|
updateBucketName(bucketName: string): void;
|
|
10
|
+
append(objectName: string, content: string): Promise<any>;
|
|
9
11
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
10
|
-
getObjectToStream(objectName: string): Promise<
|
|
12
|
+
getObjectToStream(objectName: string): Promise<ReadableStream>;
|
|
11
13
|
getObjectToString(objectName: string): Promise<string>;
|
|
12
14
|
putObject(objectName: string, data: ReadableStream | Buffer | string): Promise<void>;
|
|
13
15
|
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
@@ -15,4 +17,5 @@ export declare class MinioStorage extends AbstractStorage {
|
|
|
15
17
|
listObjects(prefix: string, recursive?: boolean): Promise<ObjectItem[]>;
|
|
16
18
|
deleteObject(objectName: string): Promise<void>;
|
|
17
19
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
20
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
18
21
|
}
|
|
@@ -27,12 +27,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
+
};
|
|
30
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
34
|
exports.MinioStorage = void 0;
|
|
32
35
|
const Minio = __importStar(require("minio"));
|
|
36
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
33
37
|
const storage_1 = require("./storage");
|
|
34
38
|
const streamUtility_1 = require("../common/streamUtility");
|
|
35
39
|
const spArguments = require("../arguments");
|
|
40
|
+
const logger = require("../common/log");
|
|
36
41
|
const { bucketName: defaultBucketName, endpoint } = spArguments.minio;
|
|
37
42
|
const { hostname: HOST_NAME, port: PORT, protocol: PROTOCOL } = new URL(endpoint);
|
|
38
43
|
class MinioStorage extends storage_1.AbstractStorage {
|
|
@@ -57,6 +62,19 @@ class MinioStorage extends storage_1.AbstractStorage {
|
|
|
57
62
|
updateBucketName(bucketName) {
|
|
58
63
|
this.bucketName = bucketName;
|
|
59
64
|
}
|
|
65
|
+
append(objectName, content) {
|
|
66
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
let originalContent = '';
|
|
68
|
+
try {
|
|
69
|
+
originalContent = yield this.getObjectToString(objectName);
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
logger.debug(`❗️Storage AppendWarning ==> ${e.code}: ${e.message} objectName: ${objectName}`);
|
|
73
|
+
}
|
|
74
|
+
const data = `${originalContent}${content}`;
|
|
75
|
+
yield this.putObject(objectName, data);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
60
78
|
getObjectToBuffer(objectName) {
|
|
61
79
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
80
|
const stream = yield this.getObjectToStream(objectName);
|
|
@@ -130,6 +148,22 @@ class MinioStorage extends storage_1.AbstractStorage {
|
|
|
130
148
|
yield minioClient.removeObjects(this.bucketName, objectNames);
|
|
131
149
|
});
|
|
132
150
|
}
|
|
151
|
+
checkObjectNameExist(objectName) {
|
|
152
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
153
|
+
const minioClient = yield this.getClient();
|
|
154
|
+
let bucketExist = false;
|
|
155
|
+
try {
|
|
156
|
+
yield minioClient.getObject(this.bucketName, objectName);
|
|
157
|
+
bucketExist = true;
|
|
158
|
+
}
|
|
159
|
+
catch (ex) {
|
|
160
|
+
if (ex.code && !lodash_1.default.includes(['NoSuchKey', 'NotFound'], ex.code)) {
|
|
161
|
+
throw ex;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return bucketExist;
|
|
165
|
+
});
|
|
166
|
+
}
|
|
133
167
|
}
|
|
134
168
|
exports.MinioStorage = MinioStorage;
|
|
135
169
|
//# sourceMappingURL=minio.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minio.js","sourceRoot":"","sources":["../../src/latestStorage/minio.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minio.js","sourceRoot":"","sources":["../../src/latestStorage/minio.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
import OSS from 'ali-oss';
|
|
3
3
|
import { AbstractStorage } from './storage';
|
|
4
4
|
import type { ObjectItem } from '../types/storage-types';
|
|
5
|
+
import type { Readable as ReadableStream } from 'stream';
|
|
5
6
|
export declare class OSSStorage extends AbstractStorage {
|
|
6
7
|
protected buildClient(): Promise<OSS>;
|
|
8
|
+
append(objectName: string, content: string): Promise<any>;
|
|
7
9
|
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
8
10
|
getObjectToStream(objectName: string): Promise<any>;
|
|
9
11
|
getObjectToString(objectName: string): Promise<string>;
|
|
@@ -13,4 +15,5 @@ export declare class OSSStorage extends AbstractStorage {
|
|
|
13
15
|
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
14
16
|
deleteObject(objectName: string): Promise<void>;
|
|
15
17
|
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
18
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
16
19
|
}
|
|
@@ -13,6 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.OSSStorage = void 0;
|
|
16
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
17
|
+
const util = require("../common/util");
|
|
16
18
|
const ali_oss_1 = __importDefault(require("ali-oss"));
|
|
17
19
|
const storage_1 = require("./storage");
|
|
18
20
|
const streamUtility_1 = require("../common/streamUtility");
|
|
@@ -30,6 +32,12 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
30
32
|
});
|
|
31
33
|
});
|
|
32
34
|
}
|
|
35
|
+
append(objectName, content) {
|
|
36
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
const ossClient = yield this.getClient();
|
|
38
|
+
yield ossClient.append(objectName, Buffer.from(content));
|
|
39
|
+
});
|
|
40
|
+
}
|
|
33
41
|
getObjectToBuffer(objectName) {
|
|
34
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
43
|
const ossClient = yield this.getClient();
|
|
@@ -52,12 +60,20 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
52
60
|
}
|
|
53
61
|
putObject(objectName, data) {
|
|
54
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
if (lodash_1.default.isString(data)) {
|
|
64
|
+
if (!util.fileExists(data)) {
|
|
65
|
+
throw new Error(`File(${data}) is not exist.`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
55
68
|
const ossClient = yield this.getClient();
|
|
56
69
|
yield ossClient.put(objectName, data);
|
|
57
70
|
});
|
|
58
71
|
}
|
|
59
72
|
fPutObject(objectName, filePath) {
|
|
60
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
|
+
if (util.fileExists(filePath)) {
|
|
75
|
+
throw new Error(`File (${filePath}) is not exist.`);
|
|
76
|
+
}
|
|
61
77
|
const ossClient = yield this.getClient();
|
|
62
78
|
yield ossClient.put(objectName, filePath);
|
|
63
79
|
});
|
|
@@ -100,6 +116,21 @@ class OSSStorage extends storage_1.AbstractStorage {
|
|
|
100
116
|
})));
|
|
101
117
|
});
|
|
102
118
|
}
|
|
119
|
+
checkObjectNameExist(objectName) {
|
|
120
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
121
|
+
const ossClient = yield this.getClient();
|
|
122
|
+
try {
|
|
123
|
+
yield ossClient.head(objectName);
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
catch (e) {
|
|
127
|
+
if ((e === null || e === void 0 ? void 0 : e.name) === 'NoSuchKeyError') {
|
|
128
|
+
return false;
|
|
129
|
+
}
|
|
130
|
+
throw e;
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}
|
|
103
134
|
}
|
|
104
135
|
exports.OSSStorage = OSSStorage;
|
|
105
136
|
//# sourceMappingURL=oss.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oss.js","sourceRoot":"","sources":["../../src/latestStorage/oss.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAA0B;AAC1B,uCAA4C;AAC5C,2DAA+D;
|
|
1
|
+
{"version":3,"file":"oss.js","sourceRoot":"","sources":["../../src/latestStorage/oss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { Stream } from 'stream';
|
|
3
3
|
import type { StsToken, ObjectItem } from '../types/storage-types';
|
|
4
|
-
export
|
|
4
|
+
export interface ObjectStorage {
|
|
5
|
+
append(objectName: string, content: String): Promise<any>;
|
|
6
|
+
getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
7
|
+
getObjectToStream(objectName: string): Promise<Stream | null>;
|
|
8
|
+
getObjectToString(objectName: string): Promise<string>;
|
|
9
|
+
fGetObject(objectName: string, filePath: string): Promise<any>;
|
|
10
|
+
fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
11
|
+
putObject(objectName: string, data: any): Promise<void>;
|
|
12
|
+
listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
13
|
+
deleteObject(objectName: string): Promise<void>;
|
|
14
|
+
deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
15
|
+
checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
16
|
+
}
|
|
17
|
+
export declare abstract class AbstractStorage implements ObjectStorage {
|
|
5
18
|
private client;
|
|
6
19
|
private lastToken;
|
|
7
20
|
readonly userPath: string;
|
|
@@ -15,13 +28,15 @@ export declare abstract class AbstractStorage {
|
|
|
15
28
|
protected getClient(): Promise<unknown>;
|
|
16
29
|
protected getStsToken(): Promise<StsToken>;
|
|
17
30
|
protected abstract buildClient(): Promise<any>;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
31
|
+
abstract append(objectName: string, content: String): Promise<any>;
|
|
32
|
+
abstract getObjectToBuffer(objectName: string): Promise<Buffer>;
|
|
33
|
+
abstract getObjectToStream(objectName: string): Promise<Stream | null>;
|
|
34
|
+
abstract getObjectToString(objectName: string): Promise<string>;
|
|
35
|
+
abstract fGetObject(objectName: string, filePath: string): Promise<void>;
|
|
36
|
+
abstract fPutObject(objectName: string, filePath: string): Promise<void>;
|
|
37
|
+
abstract putObject(objectName: string, data: any): Promise<void>;
|
|
38
|
+
abstract listObjects(prefix: string, recursive?: boolean, maxKeys?: number): Promise<ObjectItem[]>;
|
|
39
|
+
abstract deleteObject(objectName: string): Promise<void>;
|
|
40
|
+
abstract deleteMultiObjects(objectNames: string[]): Promise<void>;
|
|
41
|
+
abstract checkObjectNameExist(objectName: string): Promise<boolean>;
|
|
27
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/latestStorage/storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,oDAA4B;AAC5B,iCAAqC;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/latestStorage/storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,oDAA4B;AAC5B,iCAAqC;AAKrC,+BAAgC;AAChC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC;AAC7B,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;AAqB/B,MAAsB,eAAe;IAArC;QAKkB,aAAQ,GAAG,kBAAW,CAAC,QAAQ,CAAC;QAChC,YAAO,GAAG,kBAAW,CAAC,OAAO,CAAC;QAC9B,aAAQ,GAAG,kBAAW,CAAC,QAAQ,CAAC;QAChC,YAAO,GAAG,kBAAW,CAAC,OAAO,CAAC;QAC9B,eAAU,GAAG,kBAAW,CAAC,UAAU,CAAC;QACpC,gBAAW,GAAG,kBAAW,CAAC,WAAW,CAAC;QACtC,eAAU,GAAG,kBAAW,CAAC,UAAU,CAAC;IA6CtD,CAAC;IA3CW,iBAAiB,CAAE,eAAuB;QAClD,OAAO,gBAAM,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/D,CAAC;IAEe,SAAS;;;YAEvB,MAAM,eAAe,GAAG,MAAA,MAAC,IAAI,CAAC,SAAsB,0CAAE,WAAW,0CAAE,UAAU,CAAC;YAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE;gBAC/E,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;aACxC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC;;KACpB;IAEe,WAAW;;YACzB,MAAM,UAAU,GAAG;gBACjB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,aAAa;aACvB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,aAAG,CAAC,WAAW,EAAE,UAAiB,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,OAAO,QAAoB,CAAC;QAC9B,CAAC;KAAA;CAoBF;AAxDD,0CAwDC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { MinioStorage } from './minio';
|
|
1
|
+
import type { ObjectStorage } from './storage';
|
|
3
2
|
export declare class Storage {
|
|
4
3
|
private static _instance;
|
|
5
|
-
static get Instance():
|
|
4
|
+
static get Instance(): ObjectStorage;
|
|
6
5
|
private constructor();
|
|
7
6
|
}
|
|
@@ -4,6 +4,7 @@ exports.Storage = void 0;
|
|
|
4
4
|
const oss_1 = require("./oss");
|
|
5
5
|
const minio_1 = require("./minio");
|
|
6
6
|
const storage_types_1 = require("../types/storage-types");
|
|
7
|
+
const g = require("../arguments");
|
|
7
8
|
class StorageFactory {
|
|
8
9
|
getStorage(storageType) {
|
|
9
10
|
if (!storageType) {
|
|
@@ -22,8 +23,7 @@ class Storage {
|
|
|
22
23
|
constructor() { }
|
|
23
24
|
static get Instance() {
|
|
24
25
|
if (!this._instance) {
|
|
25
|
-
|
|
26
|
-
this._instance = new StorageFactory().getStorage(spConfig.storageType);
|
|
26
|
+
this._instance = new StorageFactory().getStorage(g.spConfig.storageType);
|
|
27
27
|
}
|
|
28
28
|
return this._instance;
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../src/latestStorage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,mCAAuC;AACvC,0DAAqD;AAErD,MAAM,cAAc;IAClB,UAAU,CAAC,WAAwB;QACjC,IAAI,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAAE;QAC7D,IAAI,WAAW,KAAK,2BAAW,CAAC,GAAG,IAAI,WAAW,KAAK,2BAAW,CAAC,OAAO,EAAE;YAC1E,OAAO,IAAI,gBAAU,EAAE,CAAC;SACzB;aAAM,IAAI,WAAW,KAAK,2BAAW,CAAC,KAAK,EAAE;YAC5C,OAAO,IAAI,oBAAY,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AACD,MAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"wrapperStorage.js","sourceRoot":"","sources":["../../src/latestStorage/wrapperStorage.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,mCAAuC;AACvC,0DAAqD;AAErD,kCAAmC;AAEnC,MAAM,cAAc;IAClB,UAAU,CAAC,WAAwB;QACjC,IAAI,CAAC,WAAW,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAAE;QAC7D,IAAI,WAAW,KAAK,2BAAW,CAAC,GAAG,IAAI,WAAW,KAAK,2BAAW,CAAC,OAAO,EAAE;YAC1E,OAAO,IAAI,gBAAU,EAAE,CAAC;SACzB;aAAM,IAAI,WAAW,KAAK,2BAAW,CAAC,KAAK,EAAE;YAC5C,OAAO,IAAI,oBAAY,EAAE,CAAC;SAC3B;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;IAC1D,CAAC;CACF;AACD,MAAa,OAAO;IASlB,gBAAwB,CAAC;IANlB,MAAM,KAAK,QAAQ;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAkB,CAAC,CAAC;SACjF;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CAEF;AAVD,0BAUC"}
|
package/dist/main.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export * from './eventLogger';
|
|
|
3
3
|
export * from './latestStorage/wrapperStorage';
|
|
4
4
|
export declare const sp: {
|
|
5
5
|
parameter: any;
|
|
6
|
+
/** @deprecated this method has deprecated and use onMessage(message => {}) instead */
|
|
6
7
|
onCall: (callBack: import("./types/mq-types").SyncCallBack | import("./types/mq-types").AsyncCallBack) => void;
|
|
7
8
|
onMessage: (callBack: import("./types/mq-types").AsyncMessageFn | import("./types/mq-types").SyncMessageFn) => void;
|
|
8
9
|
sendMessage: (sendData: import("./types/mq-types").SendData) => Promise<void>;
|
package/dist/main.js
CHANGED
|
@@ -35,6 +35,7 @@ const mq_1 = require("./mq");
|
|
|
35
35
|
const mqSender = new mq_1.MQSender();
|
|
36
36
|
exports.sp = {
|
|
37
37
|
parameter,
|
|
38
|
+
/** @deprecated this method has deprecated and use onMessage(message => {}) instead */
|
|
38
39
|
onCall: mqSender.onCall,
|
|
39
40
|
onMessage: mqSender.onMessage,
|
|
40
41
|
sendMessage: mqSender.sendSuccessMessage,
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwC;AACxC,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;AACnD,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;AAE7C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzD,yCAAuB;AACvB,gDAA8B;AAC9B,iEAA+C;AAE/C,6BAAgC;AAChC,MAAM,QAAQ,GAAG,IAAI,aAAQ,EAAE,CAAC;AAEnB,QAAA,EAAE,GAAG;IAChB,SAAS;IACT,MAAM,EAAE,QAAQ,CAAC,MAAM;IACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;IAC7B,WAAW,EAAE,QAAQ,CAAC,kBAAkB;IACxC,OAAO,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC9E,WAAW,EAAE,OAAO;CACrB,CAAC;AAEF,4DAAwD;AAC3C,QAAA,gBAAgB,GAAG,EAAE,aAAa,EAAb,8BAAa,EAAE,CAAC;AAElD,sCAAuC;AACvC,0DAAkC;AAElC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;IACpB,CAAC,GAAS,EAAE;QACV,MAAM,gBAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAA,CAAC,EAAE,CAAC;CACN"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwC;AACxC,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;AACnD,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;AAE7C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzD,yCAAuB;AACvB,gDAA8B;AAC9B,iEAA+C;AAE/C,6BAAgC;AAChC,MAAM,QAAQ,GAAG,IAAI,aAAQ,EAAE,CAAC;AAEnB,QAAA,EAAE,GAAG;IAChB,SAAS;IACT,sFAAsF;IACtF,MAAM,EAAE,QAAQ,CAAC,MAAM;IACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;IAC7B,WAAW,EAAE,QAAQ,CAAC,kBAAkB;IACxC,OAAO,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC9E,WAAW,EAAE,OAAO;CACrB,CAAC;AAEF,4DAAwD;AAC3C,QAAA,gBAAgB,GAAG,EAAE,aAAa,EAAb,8BAAa,EAAE,CAAC;AAElD,sCAAuC;AACvC,0DAAkC;AAElC,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;IACpB,CAAC,GAAS,EAAE;QACV,MAAM,gBAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC,CAAA,CAAC,EAAE,CAAC;CACN"}
|
package/dist/mq.d.ts
CHANGED
|
@@ -15,9 +15,7 @@ export declare class MQSender extends events.EventEmitter {
|
|
|
15
15
|
private buildSender;
|
|
16
16
|
private onStreamHandler;
|
|
17
17
|
sendSuccessMessage: (sendData: SendData) => Promise<void>;
|
|
18
|
-
/**
|
|
19
|
-
* @deprecated this method has deprecated and use onMessage(message => {}) instead
|
|
20
|
-
*/
|
|
18
|
+
/** @deprecated this method has deprecated and use onMessage(message => {}) instead */
|
|
21
19
|
onCall: (callBack: SyncCallBack | AsyncCallBack) => void;
|
|
22
20
|
onMessage: (callBack: AsyncMessageFn | SyncMessageFn) => void;
|
|
23
21
|
}
|
package/dist/mq.js
CHANGED
|
@@ -65,9 +65,7 @@ class MQSender extends events.EventEmitter {
|
|
|
65
65
|
const options = this.buildSendOptions(sendData);
|
|
66
66
|
yield this._send(options);
|
|
67
67
|
});
|
|
68
|
-
/**
|
|
69
|
-
* @deprecated this method has deprecated and use onMessage(message => {}) instead
|
|
70
|
-
*/
|
|
68
|
+
/** @deprecated this method has deprecated and use onMessage(message => {}) instead */
|
|
71
69
|
this.onCall = (callBack) => {
|
|
72
70
|
this.initMQClinet();
|
|
73
71
|
this.onStreamHandler(callBack);
|
package/dist/mq.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mq.js","sourceRoot":"","sources":["../src/mq.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAC5B,+CAAiC;AAEjC,uDAAmC;AACnC,2CAA4C;AAE5C,+CAA4C;AAC5C,wCAAqD;AACrD,2CAAyH;AACzH,+CAAqM;AACrM,MAAa,QAAS,SAAQ,MAAM,CAAC,YAAY;IAK/C;QACE,KAAK,EAAE,CAAC;QAmGF,oBAAe,GAAG,CAAO,QAAsC,EAAE,EAAE;YACzE,IAAI,CAAC,EAAE,CAAC,8BAAmB,CAAC,IAAI,EAAE,CAAO,KAA0B,EAAE,EAAE;gBACrE,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,GAAG,GAAG;oBACV,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;iBACzB,CAAC;gBACF,IAAI;oBACF,MAAM,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC1B;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,WAAW,GAAG,yBAAW,CAAC,QAAQ,CAAC;oBACzC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACrB,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;iBACzG;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC,CAAA,CAAA;QAED,uBAAkB,GAAG,CAAO,QAAkB,EAAE,EAAE;YAChD,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAA;QAED
|
|
1
|
+
{"version":3,"file":"mq.js","sourceRoot":"","sources":["../src/mq.ts"],"names":[],"mappings":"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"}
|
package/dist/port.d.ts
CHANGED
package/dist/port.js
CHANGED
|
@@ -15,10 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.PortService = void 0;
|
|
16
16
|
const g = require("./global");
|
|
17
17
|
const log_1 = __importDefault(require("./common/log"));
|
|
18
|
-
const get_port_1 = __importDefault(require("get-port"));
|
|
19
|
-
const axios_1 = __importDefault(require("axios"));
|
|
20
18
|
const args = require("./arguments");
|
|
19
|
+
const get_port_1 = __importDefault(require("get-port"));
|
|
21
20
|
const retry_1 = require("./common/retry");
|
|
21
|
+
const axios_1 = __importDefault(require("axios"));
|
|
22
|
+
function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms)); }
|
|
22
23
|
const lookupFrom = parseInt(process.env.SP_PORT_START || '50000');
|
|
23
24
|
const lookupTo = parseInt(process.env.SP_PORT_END || '60000');
|
|
24
25
|
class PortService {
|
|
@@ -66,6 +67,21 @@ class PortService {
|
|
|
66
67
|
}
|
|
67
68
|
});
|
|
68
69
|
}
|
|
70
|
+
static registerPortUntilSuccess(logicPort) {
|
|
71
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
for (;;) {
|
|
73
|
+
try {
|
|
74
|
+
const availableHostPort = yield PortService.getHostFreePort();
|
|
75
|
+
yield PortService.registerPort(logicPort, availableHostPort);
|
|
76
|
+
return availableHostPort;
|
|
77
|
+
}
|
|
78
|
+
catch (e) {
|
|
79
|
+
log_1.default.error(e.message);
|
|
80
|
+
}
|
|
81
|
+
yield sleep(200);
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
69
85
|
}
|
|
70
86
|
exports.PortService = PortService;
|
|
71
87
|
PortService.suanpanUrl = g.affinity;
|
package/dist/port.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port.js","sourceRoot":"","sources":["../src/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8BAA+B;AAC/B,uDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"port.js","sourceRoot":"","sources":["../src/port.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8BAA+B;AAC/B,uDAAkC;AAClC,oCAAqC;AACrC,wDAAqC;AAErC,0CAA8C;AAC9C,kDAAiE;AAEjE,SAAS,KAAK,CAAC,EAAU,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAOtF,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;AAE9D,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,EAAE,EAAE;gBACX,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,EAAG,GAAG,IAAI,CAAC,MAAM,CAAC;YAE/C,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,CAAC,CAAC,MAAM;aAClB,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,SAAQ;gBACN,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,CAAC,EAAE;oBACV,aAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACzB;gBACD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;;AA1DH,kCAsFC;AApFyB,sBAAU,GAAW,CAAC,CAAC,QAAQ,CAAC;AAChC,uBAAW,GAAG,kBAAa,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC"}
|
package/dist/web/server.js
CHANGED
|
@@ -42,9 +42,9 @@ class Server {
|
|
|
42
42
|
static setup() {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
44
|
const logicPort = config_1.default.has(portFromConfig) ? config_1.default.get(portFromConfig) : 8002;
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
logger.info(`registering nodePort: ${logicPort}...`);
|
|
46
|
+
const realFreePort = yield port_1.PortService.registerPortUntilSuccess(logicPort);
|
|
47
|
+
logger.info(`assigned host port ${realFreePort}`);
|
|
48
48
|
const server = http.createServer(app_1.default);
|
|
49
49
|
server.listen(realFreePort, () => {
|
|
50
50
|
logger.info(`Web server listening on port ${realFreePort}`);
|
package/dist/web/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/web/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;AAEhD,2CAA6B;AAC7B,gDAAwB;AACxB,oDAA4B;AAC5B,wCAAyC;AACzC,kCAAsC;AAEtC,MAAM,cAAc,GAAG,4BAA4B,CAAC;AAEpD,MAAqB,MAAM;IAEzB,MAAM,CAAO,KAAK;;YAEhB,MAAM,SAAS,GAAW,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/web/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,GAAG,MAAM,CAAC;AAEhD,2CAA6B;AAC7B,gDAAwB;AACxB,oDAA4B;AAC5B,wCAAyC;AACzC,kCAAsC;AAEtC,MAAM,cAAc,GAAG,4BAA4B,CAAC;AAEpD,MAAqB,MAAM;IAEzB,MAAM,CAAO,KAAK;;YAEhB,MAAM,SAAS,GAAW,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAEzF,MAAM,CAAC,IAAI,CAAC,yBAAyB,SAAS,KAAK,CAAC,CAAC;YACrD,MAAM,YAAY,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,sBAAsB,YAAY,EAAE,CAAC,CAAC;YAElD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,aAAG,CAAC,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;gBAC5D,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AAtBD,yBAsBC"}
|