redis-smq-web-server 9.0.0-next.1 → 9.0.0-next.11
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/CHANGELOG.md +88 -0
- package/README.md +99 -69
- package/dist/cjs/bin/cli.d.ts +1 -0
- package/dist/cjs/bin/cli.js +42 -7
- package/dist/cjs/bin/cli.js.map +1 -1
- package/dist/cjs/src/config/parse-config.d.ts.map +1 -1
- package/dist/cjs/src/config/parse-config.js +16 -29
- package/dist/cjs/src/config/parse-config.js.map +1 -1
- package/dist/cjs/src/config/types/index.d.ts +16 -5
- package/dist/cjs/src/config/types/index.d.ts.map +1 -1
- package/dist/cjs/src/index.d.ts +4 -1
- package/dist/cjs/src/index.d.ts.map +1 -1
- package/dist/cjs/src/index.js +54 -25
- package/dist/cjs/src/index.js.map +1 -1
- package/dist/cjs/tests/common/config.d.ts +3 -0
- package/dist/cjs/tests/common/config.d.ts.map +1 -0
- package/dist/cjs/tests/common/config.js +24 -0
- package/dist/cjs/tests/common/config.js.map +1 -0
- package/dist/cjs/tests/common/redis-client.d.ts +94 -0
- package/dist/cjs/tests/common/redis-client.d.ts.map +1 -0
- package/dist/cjs/tests/common/redis-client.js +40 -0
- package/dist/cjs/tests/common/redis-client.js.map +1 -0
- package/dist/cjs/tests/common/start-api-server.d.ts +3 -0
- package/dist/cjs/tests/common/start-api-server.d.ts.map +1 -0
- package/dist/cjs/tests/common/start-api-server.js +38 -0
- package/dist/cjs/tests/common/start-api-server.js.map +1 -0
- package/dist/cjs/tests/common/start-cli.d.ts +10 -0
- package/dist/cjs/tests/common/start-cli.d.ts.map +1 -0
- package/dist/cjs/tests/common/start-cli.js +70 -0
- package/dist/cjs/tests/common/start-cli.js.map +1 -0
- package/dist/cjs/tests/common/start-redis-server.d.ts +3 -0
- package/dist/cjs/tests/common/start-redis-server.d.ts.map +1 -0
- package/dist/cjs/tests/common/start-redis-server.js +37 -0
- package/dist/cjs/tests/common/start-redis-server.js.map +1 -0
- package/dist/cjs/tests/common/start-web-server.d.ts +3 -0
- package/dist/cjs/tests/common/start-web-server.d.ts.map +1 -0
- package/dist/cjs/tests/common/start-web-server.js +33 -0
- package/dist/cjs/tests/common/start-web-server.js.map +1 -0
- package/dist/cjs/tests/setup.d.ts +2 -0
- package/dist/cjs/tests/setup.d.ts.map +1 -0
- package/dist/cjs/tests/setup.js +27 -0
- package/dist/cjs/tests/setup.js.map +1 -0
- package/dist/cjs/tests/tests/test00001.test.d.ts +2 -0
- package/dist/cjs/tests/tests/test00001.test.d.ts.map +1 -0
- package/dist/cjs/tests/tests/test00001.test.js +118 -0
- package/dist/cjs/tests/tests/test00001.test.js.map +1 -0
- package/dist/cjs/tests/tests/test00002.test.d.ts +2 -0
- package/dist/cjs/tests/tests/test00002.test.d.ts.map +1 -0
- package/dist/cjs/tests/tests/test00002.test.js +68 -0
- package/dist/cjs/tests/tests/test00002.test.js.map +1 -0
- package/dist/cjs/tests/tests/test00003.test.d.ts +2 -0
- package/dist/cjs/tests/tests/test00003.test.d.ts.map +1 -0
- package/dist/cjs/tests/tests/test00003.test.js +117 -0
- package/dist/cjs/tests/tests/test00003.test.js.map +1 -0
- package/dist/esm/bin/cli.d.ts +1 -0
- package/dist/esm/bin/cli.js +41 -7
- package/dist/esm/bin/cli.js.map +1 -1
- package/dist/esm/src/config/parse-config.d.ts.map +1 -1
- package/dist/esm/src/config/parse-config.js +18 -28
- package/dist/esm/src/config/parse-config.js.map +1 -1
- package/dist/esm/src/config/types/index.d.ts +16 -5
- package/dist/esm/src/config/types/index.d.ts.map +1 -1
- package/dist/esm/src/index.d.ts +4 -1
- package/dist/esm/src/index.d.ts.map +1 -1
- package/dist/esm/src/index.js +55 -25
- package/dist/esm/src/index.js.map +1 -1
- package/dist/esm/tests/common/config.d.ts +3 -0
- package/dist/esm/tests/common/config.d.ts.map +1 -0
- package/dist/esm/tests/common/config.js +21 -0
- package/dist/esm/tests/common/config.js.map +1 -0
- package/dist/esm/tests/common/redis-client.d.ts +94 -0
- package/dist/esm/tests/common/redis-client.d.ts.map +1 -0
- package/dist/esm/tests/common/redis-client.js +20 -0
- package/dist/esm/tests/common/redis-client.js.map +1 -0
- package/dist/esm/tests/common/start-api-server.d.ts +3 -0
- package/dist/esm/tests/common/start-api-server.d.ts.map +1 -0
- package/dist/esm/tests/common/start-api-server.js +21 -0
- package/dist/esm/tests/common/start-api-server.js.map +1 -0
- package/dist/esm/tests/common/start-cli.d.ts +10 -0
- package/dist/esm/tests/common/start-cli.d.ts.map +1 -0
- package/dist/esm/tests/common/start-cli.js +54 -0
- package/dist/esm/tests/common/start-cli.js.map +1 -0
- package/dist/esm/tests/common/start-redis-server.d.ts +3 -0
- package/dist/esm/tests/common/start-redis-server.d.ts.map +1 -0
- package/dist/esm/tests/common/start-redis-server.js +22 -0
- package/dist/esm/tests/common/start-redis-server.js.map +1 -0
- package/dist/esm/tests/common/start-web-server.d.ts +3 -0
- package/dist/esm/tests/common/start-web-server.d.ts.map +1 -0
- package/dist/esm/tests/common/start-web-server.js +16 -0
- package/dist/esm/tests/common/start-web-server.js.map +1 -0
- package/dist/esm/tests/setup.d.ts +2 -0
- package/dist/esm/tests/setup.d.ts.map +1 -0
- package/dist/esm/tests/setup.js +16 -0
- package/dist/esm/tests/setup.js.map +1 -0
- package/dist/esm/tests/tests/test00001.test.d.ts +2 -0
- package/dist/esm/tests/tests/test00001.test.d.ts.map +1 -0
- package/dist/esm/tests/tests/test00001.test.js +103 -0
- package/dist/esm/tests/tests/test00001.test.js.map +1 -0
- package/dist/esm/tests/tests/test00002.test.d.ts +2 -0
- package/dist/esm/tests/tests/test00002.test.d.ts.map +1 -0
- package/dist/esm/tests/tests/test00002.test.js +57 -0
- package/dist/esm/tests/tests/test00002.test.js.map +1 -0
- package/dist/esm/tests/tests/test00003.test.d.ts +2 -0
- package/dist/esm/tests/tests/test00003.test.d.ts.map +1 -0
- package/dist/esm/tests/tests/test00003.test.js +102 -0
- package/dist/esm/tests/tests/test00003.test.js.map +1 -0
- package/package.json +19 -8
package/dist/esm/src/index.js
CHANGED
|
@@ -5,6 +5,8 @@ import { getDistPath } from 'redis-smq-web-ui';
|
|
|
5
5
|
import { RedisSMQRestApi } from 'redis-smq-rest-api';
|
|
6
6
|
import { parseConfig } from './config/parse-config.js';
|
|
7
7
|
import { createProxyMiddleware } from 'http-proxy-middleware';
|
|
8
|
+
import { createLogger } from 'redis-smq-common';
|
|
9
|
+
import rateLimit from 'express-rate-limit';
|
|
8
10
|
export class RedisSMQWebServer {
|
|
9
11
|
app = express();
|
|
10
12
|
config;
|
|
@@ -14,16 +16,22 @@ export class RedisSMQWebServer {
|
|
|
14
16
|
restApi = null;
|
|
15
17
|
bootstrapped = false;
|
|
16
18
|
httpServer = null;
|
|
19
|
+
logger;
|
|
17
20
|
constructor(config = {}) {
|
|
18
21
|
this.config = parseConfig(config);
|
|
19
22
|
this.webUIConfig = {
|
|
20
23
|
BASE_PATH: this.config.webServer.basePath,
|
|
21
|
-
API_URL:
|
|
24
|
+
API_URL: this.config.webServer.basePath,
|
|
22
25
|
};
|
|
23
26
|
this.apiProxyTarget = this.config.webServer.apiProxyTarget ?? null;
|
|
24
27
|
this.webUIPath = getDistPath();
|
|
28
|
+
this.logger = createLogger(this.config.logger, 'RedisSMQWebServer');
|
|
25
29
|
}
|
|
26
30
|
async setupMiddleware() {
|
|
31
|
+
this.app.use(rateLimit({
|
|
32
|
+
windowMs: 60 * 1000,
|
|
33
|
+
limit: 1000,
|
|
34
|
+
}));
|
|
27
35
|
this.app.use(express.static(this.webUIPath, {
|
|
28
36
|
etag: true,
|
|
29
37
|
lastModified: true,
|
|
@@ -39,37 +47,58 @@ export class RedisSMQWebServer {
|
|
|
39
47
|
}));
|
|
40
48
|
}
|
|
41
49
|
async setupApi() {
|
|
50
|
+
const basePath = this.config.webServer.basePath;
|
|
51
|
+
const apiPath = path.posix.join(basePath, 'api');
|
|
52
|
+
const docsPath = path.posix.join(basePath, 'docs');
|
|
53
|
+
const apiBasePaths = [apiPath, docsPath];
|
|
54
|
+
const isApiRequest = (path) => apiBasePaths.some((base) => path === base || path.startsWith(`${base}/`));
|
|
42
55
|
const target = this.config.webServer.apiProxyTarget;
|
|
43
56
|
if (target) {
|
|
44
|
-
const
|
|
57
|
+
const proxy = createProxyMiddleware({
|
|
45
58
|
target,
|
|
46
59
|
changeOrigin: true,
|
|
47
60
|
ws: true,
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
61
|
+
});
|
|
62
|
+
this.app.use((req, res, next) => {
|
|
63
|
+
if (isApiRequest(req.path)) {
|
|
64
|
+
return proxy(req, res, next);
|
|
65
|
+
}
|
|
66
|
+
next();
|
|
67
|
+
});
|
|
53
68
|
return;
|
|
54
69
|
}
|
|
55
70
|
this.restApi = new RedisSMQRestApi(this.config, false);
|
|
56
71
|
const restApiCallback = await this.restApi.getApplication();
|
|
57
|
-
this.app.use(
|
|
72
|
+
this.app.use((req, res, next) => {
|
|
73
|
+
if (isApiRequest(req.path)) {
|
|
74
|
+
return restApiCallback(req, res);
|
|
75
|
+
}
|
|
76
|
+
next();
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
sendIndexHtml(res) {
|
|
80
|
+
const indexPath = path.join(this.webUIPath, 'index.html');
|
|
81
|
+
fs.readFile(indexPath, 'utf8', (err, data) => {
|
|
82
|
+
if (err) {
|
|
83
|
+
this.logger.error('Error reading index.html:', err);
|
|
84
|
+
return res.status(500).send('Error loading application');
|
|
85
|
+
}
|
|
86
|
+
const configScript = `<script>window.configs = ${JSON.stringify(this.webUIConfig)};</script>`;
|
|
87
|
+
const modifiedHtml = data.replace('</head>', `${configScript}</head>`);
|
|
88
|
+
res.send(modifiedHtml);
|
|
89
|
+
});
|
|
58
90
|
}
|
|
59
91
|
async setupRoutes() {
|
|
60
92
|
await this.setupApi();
|
|
61
|
-
this.
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
res.send(modifiedHtml);
|
|
71
|
-
});
|
|
72
|
-
});
|
|
93
|
+
const basePath = this.config.webServer.basePath || '/';
|
|
94
|
+
if (basePath !== '/') {
|
|
95
|
+
this.app.get('/', (_req, res) => res.redirect(basePath));
|
|
96
|
+
}
|
|
97
|
+
const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
98
|
+
const normalizedBase = basePath.replace(/\/+$/, '') || '/';
|
|
99
|
+
const anchor = normalizedBase === '/' ? '^/' : `^${escapeRegex(normalizedBase)}/?`;
|
|
100
|
+
const nonApiOrAsset = new RegExp(`${anchor}(?!api/|docs/|assets/).*`);
|
|
101
|
+
this.app.get(nonApiOrAsset, (_req, res) => this.sendIndexHtml(res));
|
|
73
102
|
}
|
|
74
103
|
async bootstrap() {
|
|
75
104
|
if (!this.bootstrapped) {
|
|
@@ -82,14 +111,15 @@ export class RedisSMQWebServer {
|
|
|
82
111
|
await this.bootstrap();
|
|
83
112
|
const port = this.config.webServer.port;
|
|
84
113
|
this.httpServer = this.app.listen(port, () => {
|
|
85
|
-
|
|
114
|
+
this.logger.info(`Redis SMQ Web Server running on port ${port}`);
|
|
86
115
|
if (this.apiProxyTarget) {
|
|
87
|
-
|
|
116
|
+
this.logger.info(`Proxying API requests to ${this.apiProxyTarget}`);
|
|
88
117
|
}
|
|
89
118
|
else {
|
|
90
|
-
|
|
119
|
+
this.logger.info(`Embedded Redis SMQ REST API is mounted`);
|
|
91
120
|
}
|
|
92
|
-
|
|
121
|
+
this.logger.info(`Serving static assets from: ${this.webUIPath}`);
|
|
122
|
+
this.logger.info(`Base path: ${this.config.webServer.basePath || '/'}`);
|
|
93
123
|
});
|
|
94
124
|
}
|
|
95
125
|
async shutdown() {
|
|
@@ -102,7 +132,7 @@ export class RedisSMQWebServer {
|
|
|
102
132
|
});
|
|
103
133
|
});
|
|
104
134
|
this.httpServer = null;
|
|
105
|
-
|
|
135
|
+
this.logger.info('Redis SMQ Web Server has been shutdown.');
|
|
106
136
|
}
|
|
107
137
|
if (this.restApi) {
|
|
108
138
|
await this.restApi.shutdown();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AASA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../tests/common/config.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,eAAO,MAAM,MAAM,EAAE,wBAkBpB,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { ERedisConfigClient } from 'redis-smq-common';
|
|
2
|
+
export const config = {
|
|
3
|
+
redis: {
|
|
4
|
+
client: ERedisConfigClient.IOREDIS,
|
|
5
|
+
options: {
|
|
6
|
+
host: '127.0.0.1',
|
|
7
|
+
port: 0,
|
|
8
|
+
showFriendlyErrorStack: true,
|
|
9
|
+
},
|
|
10
|
+
},
|
|
11
|
+
logger: {
|
|
12
|
+
enabled: false,
|
|
13
|
+
options: {
|
|
14
|
+
logLevel: 'DEBUG',
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
webServer: {
|
|
18
|
+
port: 8080,
|
|
19
|
+
},
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../tests/common/config.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,MAAM,CAAC,MAAM,MAAM,GAA6B;IAC9C,KAAK,EAAE;QACL,MAAM,EAAE,kBAAkB,CAAC,OAAO;QAClC,OAAO,EAAE;YACP,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,CAAC;YACP,sBAAsB,EAAE,IAAI;SAC7B;KACF;IACD,MAAM,EAAE;QACN,OAAO,EAAE,KAAK;QACd,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO;SAClB;KACF;IACD,SAAS,EAAE;QACT,IAAI,EAAE,IAAI;KACX;CACF,CAAC"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
export declare function getRedisClientInstance(): Promise<{
|
|
2
|
+
validateRedisServerSupportAsync: (() => Promise<undefined>) | (() => Promise<void>);
|
|
3
|
+
setAsync: ((key: string, value: string, options: {
|
|
4
|
+
expire?: {
|
|
5
|
+
mode: "EX" | "PX";
|
|
6
|
+
value: number;
|
|
7
|
+
};
|
|
8
|
+
exists?: "NX" | "XX";
|
|
9
|
+
}) => Promise<null>) | ((key: string, value: string, options: {
|
|
10
|
+
expire?: {
|
|
11
|
+
mode: "EX" | "PX";
|
|
12
|
+
value: number;
|
|
13
|
+
};
|
|
14
|
+
exists?: "NX" | "XX";
|
|
15
|
+
}) => Promise<string>);
|
|
16
|
+
zaddAsync: ((key: string, score: number, member: string) => Promise<string>) | ((key: string, score: number, member: string) => Promise<number>);
|
|
17
|
+
watchAsync: (args: string[]) => Promise<string>;
|
|
18
|
+
unwatchAsync: () => Promise<string>;
|
|
19
|
+
sismemberAsync: (key: string, member: string) => Promise<number>;
|
|
20
|
+
zcardAsync: (key: string) => Promise<number>;
|
|
21
|
+
zrangeAsync: (key: string, min: number, max: number) => Promise<string[]>;
|
|
22
|
+
zrevrangeAsync: (key: string, min: number, max: number) => Promise<string[]>;
|
|
23
|
+
zrangebyscoreAsync: (key: string, min: string | number, max: string | number, offset: number, count: number) => Promise<string[]>;
|
|
24
|
+
smembersAsync: (key: string) => Promise<string[]>;
|
|
25
|
+
sscanAsync: (key: string, cursor: string, options: {
|
|
26
|
+
MATCH?: string;
|
|
27
|
+
COUNT?: number;
|
|
28
|
+
}) => Promise<{
|
|
29
|
+
cursor: string;
|
|
30
|
+
items: string[];
|
|
31
|
+
}>;
|
|
32
|
+
sscanAllAsync: (key: string, options: {
|
|
33
|
+
MATCH?: string;
|
|
34
|
+
COUNT?: number;
|
|
35
|
+
}) => Promise<string[]>;
|
|
36
|
+
saddAsync: (key: string, member: string) => Promise<number>;
|
|
37
|
+
sremAsync: (key: string, member: string) => Promise<number>;
|
|
38
|
+
scardAsync: (key: string) => Promise<number>;
|
|
39
|
+
hgetallAsync: (key: string) => Promise<Record<string, string>>;
|
|
40
|
+
hscanAsync: (key: string, cursor: string, options: {
|
|
41
|
+
MATCH?: string;
|
|
42
|
+
COUNT?: number;
|
|
43
|
+
}) => Promise<{
|
|
44
|
+
cursor: string;
|
|
45
|
+
result: Record<string, string>;
|
|
46
|
+
}>;
|
|
47
|
+
hscanAllAsync: (key: string, options: {
|
|
48
|
+
MATCH?: string;
|
|
49
|
+
COUNT?: number;
|
|
50
|
+
}) => Promise<Record<string, string>>;
|
|
51
|
+
hgetAsync: ((key: string, field: string) => Promise<null>) | ((key: string, field: string) => Promise<string>);
|
|
52
|
+
hsetAsync: (key: string, field: string, value: string | number) => Promise<number>;
|
|
53
|
+
hdelAsync: (key: string, fields: string | string[]) => Promise<number>;
|
|
54
|
+
lrangeAsync: (key: string, start: number, stop: number) => Promise<string[]>;
|
|
55
|
+
hkeysAsync: (key: string) => Promise<string[]>;
|
|
56
|
+
hlenAsync: (key: string) => Promise<number>;
|
|
57
|
+
brpoplpushAsync: ((source: string, destination: string, timeout: number) => Promise<null>) | ((source: string, destination: string, timeout: number) => Promise<string>);
|
|
58
|
+
rpoplpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
|
|
59
|
+
zpoprpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
|
|
60
|
+
zscanAsync: (key: string, cursor: string, options: {
|
|
61
|
+
MATCH?: string;
|
|
62
|
+
COUNT?: number;
|
|
63
|
+
}) => Promise<{
|
|
64
|
+
cursor: string;
|
|
65
|
+
items: string[];
|
|
66
|
+
}>;
|
|
67
|
+
lpoprpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
|
|
68
|
+
zrangebyscorewithscoresAsync: (source: string, min: number, max: number) => Promise<Record<string, string>>;
|
|
69
|
+
zremAsync: (source: string, id: string) => Promise<number>;
|
|
70
|
+
rpopAsync: ((key: string) => Promise<null>) | ((key: string) => Promise<string>);
|
|
71
|
+
lremAsync: (key: string, count: number, element: string) => Promise<number>;
|
|
72
|
+
publishAsync: (channel: string, message: string) => Promise<number>;
|
|
73
|
+
flushallAsync: () => Promise<string>;
|
|
74
|
+
evalshaAsync: (hash: string, args: string | number | (string | number)[]) => Promise<unknown>;
|
|
75
|
+
getAsync: ((key: string) => Promise<null>) | ((key: string) => Promise<string>);
|
|
76
|
+
delAsync: (key: string | string[]) => Promise<number>;
|
|
77
|
+
llenAsync: (key: string) => Promise<number>;
|
|
78
|
+
lmoveAsync: ((source: string, destination: string, from: "LEFT" | "RIGHT", to: "LEFT" | "RIGHT") => Promise<null>) | ((source: string, destination: string, from: "LEFT" | "RIGHT", to: "LEFT" | "RIGHT") => Promise<string>);
|
|
79
|
+
zremrangebyscoreAsync: (source: string, min: string | number, max: string | number) => Promise<number>;
|
|
80
|
+
hmgetAsync: (source: string, keys: string[]) => Promise<(string | null)[]>;
|
|
81
|
+
haltAsync: (() => Promise<undefined>) | (() => Promise<void>);
|
|
82
|
+
shutdownAsync: (() => Promise<undefined>) | (() => Promise<void>);
|
|
83
|
+
getInfoAsync: () => Promise<string>;
|
|
84
|
+
updateServerVersionAsync: (() => Promise<undefined>) | (() => Promise<void>);
|
|
85
|
+
loadBuiltInScriptFilesAsync: (() => Promise<undefined>) | (() => Promise<void>);
|
|
86
|
+
loadScriptFilesAsync: (scriptMap: Record<string, string | string[]>) => Promise<Record<string, string>>;
|
|
87
|
+
loadScriptAsync: (script: string) => Promise<string>;
|
|
88
|
+
runScriptAsync: (scriptName: string, keys: (string | number)[], args: (string | number)[]) => Promise<unknown>;
|
|
89
|
+
onAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
|
|
90
|
+
onceAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
|
|
91
|
+
removeListenerAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
|
|
92
|
+
} & import("redis-smq-common").IRedisClient>;
|
|
93
|
+
export declare function shutdownRedisClient(): Promise<void>;
|
|
94
|
+
//# sourceMappingURL=redis-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redis-client.d.ts","sourceRoot":"","sources":["../../../../tests/common/redis-client.ts"],"names":[],"mappings":"AAmBA,wBAAsB,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CAO3C;AAED,wBAAsB,mBAAmB,kBAIxC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import bluebird from 'bluebird';
|
|
2
|
+
import { RedisClientFactory } from 'redis-smq-common';
|
|
3
|
+
import { config } from './config.js';
|
|
4
|
+
const { promisifyAll } = bluebird;
|
|
5
|
+
let redisClient = null;
|
|
6
|
+
export async function getRedisClientInstance() {
|
|
7
|
+
if (!redisClient) {
|
|
8
|
+
if (!config.redis)
|
|
9
|
+
throw new Error(`Redis configuration is required`);
|
|
10
|
+
redisClient = promisifyAll(new RedisClientFactory(config.redis));
|
|
11
|
+
await redisClient.initAsync();
|
|
12
|
+
}
|
|
13
|
+
return promisifyAll(redisClient.getInstance());
|
|
14
|
+
}
|
|
15
|
+
export async function shutdownRedisClient() {
|
|
16
|
+
if (redisClient) {
|
|
17
|
+
await redisClient.shutdownAsync();
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=redis-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../../tests/common/redis-client.ts"],"names":[],"mappings":"AASA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;AAElC,IAAI,WAAW,GAEJ,IAAI,CAAC;AAEhB,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACtE,WAAW,GAAG,YAAY,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,YAAY,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-api-server.d.ts","sourceRoot":"","sources":["../../../../tests/common/start-api-server.ts"],"names":[],"mappings":"AAeA,wBAAsB,cAAc,gCASnC;AAED,wBAAsB,aAAa,kBAKlC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { net } from 'redis-smq-common';
|
|
2
|
+
import { config } from './config.js';
|
|
3
|
+
import { RedisSMQRestApi } from 'redis-smq-rest-api';
|
|
4
|
+
let server = null;
|
|
5
|
+
export async function startApiServer() {
|
|
6
|
+
if (!server) {
|
|
7
|
+
const port = await net.getRandomPort();
|
|
8
|
+
config.apiServer = config.apiServer || {};
|
|
9
|
+
config.apiServer.port = port;
|
|
10
|
+
server = new RedisSMQRestApi(config);
|
|
11
|
+
await server.run();
|
|
12
|
+
return port;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
export async function stopApiServer() {
|
|
16
|
+
if (server) {
|
|
17
|
+
await server.shutdown();
|
|
18
|
+
server = null;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=start-api-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-api-server.js","sourceRoot":"","sources":["../../../../tests/common/start-api-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,IAAI,MAAM,GAA2B,IAAI,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;QAC1C,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;QAC7B,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
export type StartedProcess = {
|
|
3
|
+
proc: ReturnType<typeof spawn>;
|
|
4
|
+
url: string;
|
|
5
|
+
stop: () => Promise<void>;
|
|
6
|
+
stdout: string[];
|
|
7
|
+
stderr: string[];
|
|
8
|
+
};
|
|
9
|
+
export declare function startCliWithArgs(args: string[]): Promise<StartedProcess>;
|
|
10
|
+
//# sourceMappingURL=start-cli.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-cli.d.ts","sourceRoot":"","sources":["../../../../tests/common/start-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAMtC,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,cAAc,CAAC,CAyDzB"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
import { env, net } from 'redis-smq-common';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { config } from './config.js';
|
|
5
|
+
import request from 'supertest';
|
|
6
|
+
export async function startCliWithArgs(args) {
|
|
7
|
+
const node = process.execPath;
|
|
8
|
+
const currentDir = env.getCurrentDir();
|
|
9
|
+
const cliPath = path.resolve(currentDir, '../../bin/cli.js');
|
|
10
|
+
const port = await net.getRandomPort();
|
|
11
|
+
const finalArgs = [
|
|
12
|
+
cliPath,
|
|
13
|
+
'--port',
|
|
14
|
+
String(port),
|
|
15
|
+
'--redis-port',
|
|
16
|
+
String(config.redis?.options?.port),
|
|
17
|
+
...args,
|
|
18
|
+
];
|
|
19
|
+
const proc = spawn(node, finalArgs, {
|
|
20
|
+
env: {
|
|
21
|
+
...process.env,
|
|
22
|
+
},
|
|
23
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
24
|
+
});
|
|
25
|
+
const stdout = [];
|
|
26
|
+
const stderr = [];
|
|
27
|
+
proc.stdout.on('data', (d) => stdout.push(String(d)));
|
|
28
|
+
proc.stderr.on('data', (d) => stderr.push(String(d)));
|
|
29
|
+
const url = `http://127.0.0.1:${port}`;
|
|
30
|
+
const deadline = Date.now() + 10000;
|
|
31
|
+
let lastErr;
|
|
32
|
+
while (Date.now() < deadline) {
|
|
33
|
+
try {
|
|
34
|
+
await request(url).get('/').timeout({ deadline: 2000 });
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
lastErr = e;
|
|
39
|
+
await new Promise((r) => setTimeout(r, 150));
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (Date.now() >= deadline) {
|
|
43
|
+
proc.kill('SIGKILL');
|
|
44
|
+
throw new Error(`CLI server did not start in time. stderr:\n${stderr.join('')}\nLastErr: ${String(lastErr)}`);
|
|
45
|
+
}
|
|
46
|
+
const stop = async () => {
|
|
47
|
+
proc.kill('SIGINT');
|
|
48
|
+
await new Promise((r) => setTimeout(r, 200));
|
|
49
|
+
if (!proc.killed)
|
|
50
|
+
proc.kill('SIGKILL');
|
|
51
|
+
};
|
|
52
|
+
return { proc, url, stop, stdout, stderr };
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=start-cli.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-cli.js","sourceRoot":"","sources":["../../../../tests/common/start-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-redis-server.d.ts","sourceRoot":"","sources":["../../../../tests/common/start-redis-server.ts"],"names":[],"mappings":"AAeA,wBAAsB,eAAe,kBAYpC;AAED,wBAAsB,mBAAmB,kBAExC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { ERedisConfigClient } from 'redis-smq-common';
|
|
2
|
+
import { RedisServer } from 'redis-smq-common';
|
|
3
|
+
import { config } from './config.js';
|
|
4
|
+
let redisServer = null;
|
|
5
|
+
export async function initializeRedis() {
|
|
6
|
+
if (!redisServer) {
|
|
7
|
+
redisServer = new RedisServer();
|
|
8
|
+
const port = await redisServer.start();
|
|
9
|
+
config.redis = config.redis ?? {
|
|
10
|
+
client: ERedisConfigClient.IOREDIS,
|
|
11
|
+
};
|
|
12
|
+
config.redis.options = {
|
|
13
|
+
...config.redis.options,
|
|
14
|
+
port,
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
export async function shutDownRedisServer() {
|
|
19
|
+
if (redisServer)
|
|
20
|
+
await redisServer.shutdown();
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=start-redis-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-redis-server.js","sourceRoot":"","sources":["../../../../tests/common/start-redis-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,IAAI,WAAW,GAAuB,IAAI,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;QACvC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI;YAC7B,MAAM,EAAE,kBAAkB,CAAC,OAAO;SACnC,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG;YACrB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO;YACvB,IAAI;SACL,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,WAAW;QAAE,MAAM,WAAW,CAAC,QAAQ,EAAE,CAAC;AAChD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-web-server.d.ts","sourceRoot":"","sources":["../../../../tests/common/start-web-server.ts"],"names":[],"mappings":"AAcA,wBAAsB,cAAc,kBAKnC;AAED,wBAAsB,iBAAiB,kBAKtC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { RedisSMQWebServer } from '../../src/index.js';
|
|
2
|
+
import { config } from './config.js';
|
|
3
|
+
let webServer = null;
|
|
4
|
+
export async function startWebServer() {
|
|
5
|
+
if (!webServer) {
|
|
6
|
+
webServer = new RedisSMQWebServer(config);
|
|
7
|
+
await webServer.run();
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
export async function shutdownWebServer() {
|
|
11
|
+
if (webServer) {
|
|
12
|
+
await webServer.shutdown();
|
|
13
|
+
webServer = null;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=start-web-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"start-web-server.js","sourceRoot":"","sources":["../../../../tests/common/start-web-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,IAAI,SAAS,GAA6B,IAAI,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,SAAS,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC3B,SAAS,GAAG,IAAI,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../tests/setup.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { afterAll, afterEach, beforeAll, beforeEach } from 'vitest';
|
|
2
|
+
import { initializeRedis, shutDownRedisServer, } from './common/start-redis-server.js';
|
|
3
|
+
import { getRedisClientInstance, shutdownRedisClient, } from './common/redis-client.js';
|
|
4
|
+
beforeAll(async () => {
|
|
5
|
+
await initializeRedis();
|
|
6
|
+
});
|
|
7
|
+
afterAll(async () => {
|
|
8
|
+
await shutdownRedisClient();
|
|
9
|
+
await shutDownRedisServer();
|
|
10
|
+
});
|
|
11
|
+
beforeEach(async () => {
|
|
12
|
+
const redis = await getRedisClientInstance();
|
|
13
|
+
await redis.flushallAsync();
|
|
14
|
+
});
|
|
15
|
+
afterEach(async () => void 0);
|
|
16
|
+
//# sourceMappingURL=setup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../tests/setup.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpE,OAAO,EACL,eAAe,EACf,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAElC,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,eAAe,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,mBAAmB,EAAE,CAAC;IAC5B,MAAM,mBAAmB,EAAE,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,UAAU,CAAC,KAAK,IAAI,EAAE;IACpB,MAAM,KAAK,GAAG,MAAM,sBAAsB,EAAE,CAAC;IAC7C,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test00001.test.d.ts","sourceRoot":"","sources":["../../../../tests/tests/test00001.test.ts"],"names":[],"mappings":""}
|