redis-smq-web-server 9.0.0-next.9 → 9.0.1
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 +97 -0
- package/README.md +20 -190
- package/dist/cjs/bin/cli.js +1 -5
- 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 +14 -2
- package/dist/cjs/src/config/parse-config.js.map +1 -1
- package/dist/cjs/src/config/types/index.d.ts +1 -1
- package/dist/cjs/src/config/types/index.d.ts.map +1 -1
- package/dist/cjs/src/index.d.ts +1 -0
- package/dist/cjs/src/index.d.ts.map +1 -1
- package/dist/cjs/src/index.js +54 -21
- 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 +39 -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 +114 -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 +70 -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 +119 -0
- package/dist/cjs/tests/tests/test00003.test.js.map +1 -0
- package/dist/esm/bin/cli.js +1 -5
- 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 +16 -1
- package/dist/esm/src/config/parse-config.js.map +1 -1
- package/dist/esm/src/config/types/index.d.ts +1 -1
- package/dist/esm/src/config/types/index.d.ts.map +1 -1
- package/dist/esm/src/index.d.ts +1 -0
- package/dist/esm/src/index.d.ts.map +1 -1
- package/dist/esm/src/index.js +54 -21
- 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 +22 -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 +99 -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 +59 -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 +104 -0
- package/dist/esm/tests/tests/test00003.test.js.map +1 -0
- package/package.json +7 -6
|
@@ -0,0 +1,70 @@
|
|
|
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
|
+
const vitest_1 = require("vitest");
|
|
16
|
+
const supertest_1 = __importDefault(require("supertest"));
|
|
17
|
+
const start_api_server_js_1 = require("../common/start-api-server.js");
|
|
18
|
+
const index_js_1 = require("../../index.js");
|
|
19
|
+
const config_js_1 = require("../common/config.js");
|
|
20
|
+
const redis_smq_common_1 = require("redis-smq-common");
|
|
21
|
+
const path_1 = __importDefault(require("path"));
|
|
22
|
+
(0, vitest_1.describe)('RedisSMQWebServer with apiProxyTarget', () => {
|
|
23
|
+
let webServerUrl;
|
|
24
|
+
let webServer;
|
|
25
|
+
(0, vitest_1.beforeEach)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
|
+
const apiPort = yield (0, start_api_server_js_1.startApiServer)();
|
|
27
|
+
const apiProxyTarget = `http://127.0.0.1:${apiPort}`;
|
|
28
|
+
const webServerPort = yield redis_smq_common_1.net.getRandomPort();
|
|
29
|
+
webServer = new index_js_1.RedisSMQWebServer(Object.assign(Object.assign({}, config_js_1.config), { webServer: {
|
|
30
|
+
port: webServerPort,
|
|
31
|
+
apiProxyTarget,
|
|
32
|
+
} }));
|
|
33
|
+
yield webServer.run();
|
|
34
|
+
webServerUrl = `http://127.0.0.1:${webServerPort}`;
|
|
35
|
+
}));
|
|
36
|
+
(0, vitest_1.afterEach)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
yield webServer.shutdown();
|
|
38
|
+
yield (0, start_api_server_js_1.stopApiServer)();
|
|
39
|
+
}));
|
|
40
|
+
(0, vitest_1.it)('proxies /api/v1 endpoints', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
|
+
yield (0, supertest_1.default)(webServerUrl)
|
|
42
|
+
.get('/api/v1/queues')
|
|
43
|
+
.expect(200)
|
|
44
|
+
.expect('Content-Type', /application\/json/);
|
|
45
|
+
}));
|
|
46
|
+
(0, vitest_1.it)('proxies /swagger', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
const res = yield (0, supertest_1.default)(webServerUrl).get('/swagger').expect(200);
|
|
48
|
+
(0, vitest_1.expect)(res.text).toContain('Swagger UI');
|
|
49
|
+
}));
|
|
50
|
+
(0, vitest_1.it)('serves SPA index.html for non-API routes', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
51
|
+
const res = yield (0, supertest_1.default)(webServerUrl)
|
|
52
|
+
.get('/queues/my-queue')
|
|
53
|
+
.expect(200)
|
|
54
|
+
.expect('Content-Type', /text\/html/);
|
|
55
|
+
(0, vitest_1.expect)(res.text).toContain('<!doctype html>');
|
|
56
|
+
}));
|
|
57
|
+
(0, vitest_1.it)('serves assets as static files', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
|
+
const res = yield (0, supertest_1.default)(webServerUrl).get('/').expect(200);
|
|
59
|
+
const match = res.text.match(/<script[^>]+src=["']([^"']+)["']/i);
|
|
60
|
+
(0, vitest_1.expect)(match).toBeTruthy();
|
|
61
|
+
const scriptSrc = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
62
|
+
const assetPath = scriptSrc.startsWith('http')
|
|
63
|
+
? scriptSrc.replace(webServerUrl, '')
|
|
64
|
+
: scriptSrc;
|
|
65
|
+
const absolutePath = path_1.default.resolve('/', assetPath);
|
|
66
|
+
const assetRes = yield (0, supertest_1.default)(webServerUrl).get(absolutePath).expect(200);
|
|
67
|
+
(0, vitest_1.expect)(assetRes.headers['cache-control']).toBeDefined();
|
|
68
|
+
}));
|
|
69
|
+
});
|
|
70
|
+
//# sourceMappingURL=test00002.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test00002.test.js","sourceRoot":"","sources":["../../../../tests/tests/test00002.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test00003.test.d.ts","sourceRoot":"","sources":["../../../../tests/tests/test00003.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,119 @@
|
|
|
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
|
+
const vitest_1 = require("vitest");
|
|
16
|
+
const supertest_1 = __importDefault(require("supertest"));
|
|
17
|
+
const start_api_server_js_1 = require("../common/start-api-server.js");
|
|
18
|
+
const start_cli_js_1 = require("../common/start-cli.js");
|
|
19
|
+
const path_1 = __importDefault(require("path"));
|
|
20
|
+
(0, vitest_1.describe)('RedisSMQ Web Server CLI e2e tests', () => {
|
|
21
|
+
(0, vitest_1.describe)('serves SPA with default basePath "/"', () => {
|
|
22
|
+
let started;
|
|
23
|
+
(0, vitest_1.beforeAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
started = yield (0, start_cli_js_1.startCliWithArgs)([
|
|
25
|
+
'--base-path',
|
|
26
|
+
'/',
|
|
27
|
+
'--enable-log',
|
|
28
|
+
'0',
|
|
29
|
+
]);
|
|
30
|
+
}));
|
|
31
|
+
(0, vitest_1.afterAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
|
+
yield started.stop();
|
|
33
|
+
}));
|
|
34
|
+
(0, vitest_1.it)('returns index.html for / and caches assets', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
|
+
var _a;
|
|
36
|
+
const res = yield (0, supertest_1.default)(started.url).get('/index.html').expect(200);
|
|
37
|
+
(0, vitest_1.expect)(res.headers['content-type']).toMatch(/text\/html/);
|
|
38
|
+
(0, vitest_1.expect)(res.headers['cache-control']).toMatch(/no-cache/);
|
|
39
|
+
const match = res.text.match(/<script[^>]+src=["']([^"']+)["']/i);
|
|
40
|
+
(0, vitest_1.expect)(match).toBeTruthy();
|
|
41
|
+
const scriptSrc = (_a = match === null || match === void 0 ? void 0 : match[1]) !== null && _a !== void 0 ? _a : '';
|
|
42
|
+
const assetPath = scriptSrc.startsWith('http')
|
|
43
|
+
? scriptSrc.replace(started.url, '')
|
|
44
|
+
: scriptSrc;
|
|
45
|
+
const absolutePath = path_1.default.resolve('/', assetPath);
|
|
46
|
+
const assetRes = yield (0, supertest_1.default)(started.url).get(absolutePath).expect(200);
|
|
47
|
+
(0, vitest_1.expect)(assetRes.headers['cache-control']).toBeDefined();
|
|
48
|
+
(0, vitest_1.expect)(assetRes.headers['cache-control']).toMatch(/max-age=\d+/);
|
|
49
|
+
}));
|
|
50
|
+
(0, vitest_1.it)('SPA fallback works on non-API route', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
51
|
+
const res = yield (0, supertest_1.default)(started.url).get('/queues/demo').expect(200);
|
|
52
|
+
(0, vitest_1.expect)(res.headers['content-type']).toMatch(/text\/html/);
|
|
53
|
+
}));
|
|
54
|
+
});
|
|
55
|
+
(0, vitest_1.describe)('respects custom basePath "/ui"', () => {
|
|
56
|
+
let started;
|
|
57
|
+
(0, vitest_1.beforeAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
58
|
+
started = yield (0, start_cli_js_1.startCliWithArgs)([
|
|
59
|
+
'--base-path',
|
|
60
|
+
'/ui',
|
|
61
|
+
'--enable-log',
|
|
62
|
+
'0',
|
|
63
|
+
]);
|
|
64
|
+
}));
|
|
65
|
+
(0, vitest_1.afterAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
66
|
+
yield started.stop();
|
|
67
|
+
}));
|
|
68
|
+
(0, vitest_1.it)('redirects "/" to "/ui"', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
const res = yield (0, supertest_1.default)(started.url).get('/').expect(302);
|
|
70
|
+
(0, vitest_1.expect)(res.headers.location).toBe('/ui');
|
|
71
|
+
}));
|
|
72
|
+
(0, vitest_1.it)('serves index.html at "/ui" and SPA fallback under it', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
|
+
const res = yield (0, supertest_1.default)(started.url).get('/ui/').expect(200);
|
|
74
|
+
(0, vitest_1.expect)(res.headers['content-type']).toMatch(/text\/html/);
|
|
75
|
+
const sub = yield (0, supertest_1.default)(started.url).get('/ui/queues').expect(200);
|
|
76
|
+
(0, vitest_1.expect)(sub.headers['content-type']).toMatch(/text\/html/);
|
|
77
|
+
}));
|
|
78
|
+
(0, vitest_1.it)('serves api requests under custom basePath', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
79
|
+
yield (0, supertest_1.default)(started.url)
|
|
80
|
+
.get('/ui/api/v1/queues')
|
|
81
|
+
.expect((r) => {
|
|
82
|
+
(0, vitest_1.expect)(r.headers['content-type']).not.toMatch(/text\/html/);
|
|
83
|
+
});
|
|
84
|
+
}));
|
|
85
|
+
});
|
|
86
|
+
(0, vitest_1.describe)('proxies API when apiProxyTarget is set', () => {
|
|
87
|
+
let started;
|
|
88
|
+
(0, vitest_1.beforeAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
89
|
+
const port = yield (0, start_api_server_js_1.startApiServer)();
|
|
90
|
+
started = yield (0, start_cli_js_1.startCliWithArgs)([
|
|
91
|
+
'--base-path',
|
|
92
|
+
'/',
|
|
93
|
+
'--api-proxy-target',
|
|
94
|
+
`http://127.0.0.1:${port}`,
|
|
95
|
+
'--enable-log',
|
|
96
|
+
'0',
|
|
97
|
+
]);
|
|
98
|
+
}));
|
|
99
|
+
(0, vitest_1.afterAll)(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
100
|
+
yield started.stop();
|
|
101
|
+
yield (0, start_api_server_js_1.stopApiServer)();
|
|
102
|
+
}));
|
|
103
|
+
(0, vitest_1.it)('proxies /api/v1 endpoints', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
104
|
+
yield (0, supertest_1.default)(started.url)
|
|
105
|
+
.get('/api/v1/queues')
|
|
106
|
+
.expect(200)
|
|
107
|
+
.expect('Content-Type', /application\/json/);
|
|
108
|
+
}));
|
|
109
|
+
(0, vitest_1.it)('proxies /swagger', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
110
|
+
const res = yield (0, supertest_1.default)(started.url).get('/swagger').expect(200);
|
|
111
|
+
(0, vitest_1.expect)(res.text).toMatch(/<html|<!doctype/i);
|
|
112
|
+
}));
|
|
113
|
+
(0, vitest_1.it)('keeps SPA behavior for non-API routes', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
114
|
+
const res = yield (0, supertest_1.default)(started.url).get('/about').expect(200);
|
|
115
|
+
(0, vitest_1.expect)(res.headers['content-type']).toMatch(/text\/html/);
|
|
116
|
+
}));
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
//# sourceMappingURL=test00003.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test00003.test.js","sourceRoot":"","sources":["../../../../tests/tests/test00003.test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/bin/cli.js
CHANGED
|
@@ -14,7 +14,7 @@ program
|
|
|
14
14
|
program
|
|
15
15
|
.option('-p, --port <number>', 'Port to run the server on', String(defaultConfig.webServer?.port))
|
|
16
16
|
.option('-b, --base-path <string>', 'Base public path for the RedisSMQ Web UI SPA', defaultConfig.webServer?.basePath)
|
|
17
|
-
.option('-t, --api-proxy-target <string>', 'Proxy target for API (/api, /
|
|
17
|
+
.option('-t, --api-proxy-target <string>', 'Proxy target for API (/api, /swagger). Example: http://127.0.0.1:6000', defaultConfig.webServer?.apiProxyTarget)
|
|
18
18
|
.option('-c, --redis-client <ioredis|redis>', 'Redis client. Valid options are: ioredis, redis.', defaultRedisSMQConfig.redis.client)
|
|
19
19
|
.option('-r, --redis-host <string>', 'Redis server host', defaultRedisSMQConfig.redis.options.host)
|
|
20
20
|
.option('-o, --redis-port <number>', 'Redis server port', String(defaultRedisSMQConfig.redis.options.port))
|
|
@@ -29,10 +29,6 @@ const config = {
|
|
|
29
29
|
basePath: options.basePath,
|
|
30
30
|
apiProxyTarget: options.apiProxyTarget,
|
|
31
31
|
},
|
|
32
|
-
apiServer: {
|
|
33
|
-
port: Number(options.port),
|
|
34
|
-
basePath: options.basePath,
|
|
35
|
-
},
|
|
36
32
|
redis: {
|
|
37
33
|
client: options.redisClient,
|
|
38
34
|
options: {
|
package/dist/esm/bin/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../bin/cli.ts"],"names":[],"mappings":";AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAKpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEnE,MAAM,eAAe,GACnB,OAAO,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ;IAC/D,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ;IAC/C,CAAC,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEzE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,sBAAsB,CAAC;KAC5B,WAAW,CAAC,gCAAgC,CAAC,CAAC;AAEjD,OAAO;KACJ,MAAM,CACL,qBAAqB,EACrB,2BAA2B,EAC3B,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CACtC;KACA,MAAM,CACL,0BAA0B,EAC1B,8CAA8C,EAC9C,aAAa,CAAC,SAAS,EAAE,QAAQ,CAClC;KACA,MAAM,CACL,iCAAiC,EACjC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../bin/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-config.d.ts","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":"AASA,OAAO,EACL,wBAAwB,EACxB,8BAA8B,EAC/B,MAAM,kBAAkB,CAAC;AAG1B,eAAO,MAAM,aAAa,EAAE,wBAM3B,CAAC;AAMF,wBAAgB,WAAW,CACzB,MAAM,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAC7C,8BAA8B,
|
|
1
|
+
{"version":3,"file":"parse-config.d.ts","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":"AASA,OAAO,EACL,wBAAwB,EACxB,8BAA8B,EAC/B,MAAM,kBAAkB,CAAC;AAG1B,eAAO,MAAM,aAAa,EAAE,wBAM3B,CAAC;AAMF,wBAAgB,WAAW,CACzB,MAAM,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAC7C,8BAA8B,CA0ChC"}
|
|
@@ -8,15 +8,30 @@ export const defaultConfig = {
|
|
|
8
8
|
};
|
|
9
9
|
export function parseConfig(config = {}) {
|
|
10
10
|
const restApiParsedConfig = parseRestApiConfig(config);
|
|
11
|
+
const normalizePath = (path) => {
|
|
12
|
+
const s = path
|
|
13
|
+
.split('/')
|
|
14
|
+
.map((i) => i.trim())
|
|
15
|
+
.filter((i) => !!i)
|
|
16
|
+
.join('/');
|
|
17
|
+
return `/${s}`;
|
|
18
|
+
};
|
|
19
|
+
const basePath = config.webServer?.basePath !== undefined
|
|
20
|
+
? normalizePath(config.webServer.basePath)
|
|
21
|
+
: restApiParsedConfig.apiServer.basePath;
|
|
11
22
|
const webServer = {
|
|
12
23
|
...defaultConfig.webServer,
|
|
13
24
|
...config.webServer,
|
|
14
25
|
};
|
|
15
26
|
return {
|
|
16
27
|
...restApiParsedConfig,
|
|
28
|
+
apiServer: {
|
|
29
|
+
...restApiParsedConfig.apiServer,
|
|
30
|
+
basePath: basePath,
|
|
31
|
+
},
|
|
17
32
|
webServer: {
|
|
18
33
|
port: Number(webServer.port),
|
|
19
|
-
basePath:
|
|
34
|
+
basePath: basePath,
|
|
20
35
|
apiProxyTarget: webServer.apiProxyTarget
|
|
21
36
|
? String(webServer.apiProxyTarget)
|
|
22
37
|
: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-config.js","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,SAAS,EAAE;QACT,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,GAAG;QACb,cAAc,EAAE,SAAS;KAC1B;CACF,CAAC;AAMF,MAAM,UAAU,WAAW,CACzB,SAA4C,EAAE;IAE9C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"parse-config.js","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,SAAS,EAAE;QACT,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,GAAG;QACb,cAAc,EAAE,SAAS;KAC1B;CACF,CAAC;AAMF,MAAM,UAAU,WAAW,CACzB,SAA4C,EAAE;IAE9C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAIvD,MAAM,aAAa,GAAG,CAAC,IAAY,EAAU,EAAE;QAC7C,MAAM,CAAC,GAAG,IAAI;aACX,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAClB,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC;IAKF,MAAM,QAAQ,GACZ,MAAM,CAAC,SAAS,EAAE,QAAQ,KAAK,SAAS;QACtC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC1C,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC;IAG7C,MAAM,SAAS,GAAG;QAChB,GAAG,aAAa,CAAC,SAAS;QAC1B,GAAG,MAAM,CAAC,SAAS;KACpB,CAAC;IAEF,OAAO;QACL,GAAG,mBAAmB;QACtB,SAAS,EAAE;YACT,GAAG,mBAAmB,CAAC,SAAS;YAChC,QAAQ,EAAE,QAAQ;SACnB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC5B,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,SAAS,CAAC,cAAc;gBACtC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;gBAClC,CAAC,CAAC,SAAS;SACd;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -11,7 +11,7 @@ export interface IRedisSMQWebServerCliOptions {
|
|
|
11
11
|
logLevel: EConsoleLoggerLevel;
|
|
12
12
|
apiProxyTarget?: string;
|
|
13
13
|
}
|
|
14
|
-
export interface IRedisSMQWebServerConfig extends IRedisSMQRestApiConfig {
|
|
14
|
+
export interface IRedisSMQWebServerConfig extends Omit<IRedisSMQRestApiConfig, 'apiServer'> {
|
|
15
15
|
webServer?: {
|
|
16
16
|
port?: number;
|
|
17
17
|
basePath?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/config/types/index.ts"],"names":[],"mappings":"AASA,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/config/types/index.ts"],"names":[],"mappings":"AASA,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAK3E,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,kBAAkB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,mBAAmB,CAAC;IAK9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAWD,MAAM,WAAW,wBACf,SAAQ,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC;IACjD,SAAS,CAAC,EAAE;QAKV,IAAI,CAAC,EAAE,MAAM,CAAC;QAQd,QAAQ,CAAC,EAAE,MAAM,CAAC;QASlB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAMD,MAAM,WAAW,8BACf,SAAQ,4BAA4B;IACpC,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QAKjB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH"}
|
package/dist/esm/src/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAgB,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAgB,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMzD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IACnD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;IACtD,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAA4B;IAC9C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;gBAEd,MAAM,GAAE,wBAA6B;YAYnC,eAAe;YA0Bf,QAAQ;IAsCtB,OAAO,CAAC,aAAa;YAeP,WAAW;YA6BX,SAAS;IAQV,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAepB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBvC"}
|
package/dist/esm/src/index.js
CHANGED
|
@@ -20,19 +20,22 @@ export class RedisSMQWebServer {
|
|
|
20
20
|
this.config = parseConfig(config);
|
|
21
21
|
this.webUIConfig = {
|
|
22
22
|
BASE_PATH: this.config.webServer.basePath,
|
|
23
|
-
API_URL:
|
|
23
|
+
API_URL: this.config.webServer.basePath,
|
|
24
24
|
};
|
|
25
25
|
this.apiProxyTarget = this.config.webServer.apiProxyTarget ?? null;
|
|
26
26
|
this.webUIPath = getDistPath();
|
|
27
27
|
this.logger = createLogger(this.config.logger, 'RedisSMQWebServer');
|
|
28
28
|
}
|
|
29
29
|
async setupMiddleware() {
|
|
30
|
-
this.
|
|
30
|
+
const { basePath } = this.config.webServer;
|
|
31
|
+
this.app.set('trust proxy', true);
|
|
32
|
+
this.logger.info('Trusting reverse proxy headers.');
|
|
33
|
+
this.app.use(basePath, express.static(this.webUIPath, {
|
|
31
34
|
etag: true,
|
|
32
35
|
lastModified: true,
|
|
33
36
|
index: false,
|
|
34
37
|
setHeaders: (res, filePath) => {
|
|
35
|
-
if (filePath.match(/\.(
|
|
38
|
+
if (filePath.match(/\.(png|jpg|jpeg|gif|ico|svg|css|js)$/)) {
|
|
36
39
|
res.setHeader('Cache-Control', 'public, max-age=86400');
|
|
37
40
|
}
|
|
38
41
|
else {
|
|
@@ -42,36 +45,65 @@ export class RedisSMQWebServer {
|
|
|
42
45
|
}));
|
|
43
46
|
}
|
|
44
47
|
async setupApi() {
|
|
48
|
+
const basePath = this.config.webServer.basePath;
|
|
49
|
+
const apiPath = path.posix.join(basePath, 'api');
|
|
50
|
+
const swaggerPath = path.posix.join(basePath, 'swagger');
|
|
51
|
+
const apiBasePaths = [apiPath, swaggerPath];
|
|
52
|
+
const isApiRequest = (path) => apiBasePaths.some((base) => path === base || path.startsWith(`${base}/`));
|
|
45
53
|
const target = this.config.webServer.apiProxyTarget;
|
|
46
54
|
if (target) {
|
|
47
|
-
const
|
|
55
|
+
const proxy = createProxyMiddleware({
|
|
48
56
|
target,
|
|
49
57
|
changeOrigin: true,
|
|
50
58
|
ws: true,
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
59
|
+
});
|
|
60
|
+
this.app.use((req, res, next) => {
|
|
61
|
+
if (isApiRequest(req.path)) {
|
|
62
|
+
return proxy(req, res, next);
|
|
63
|
+
}
|
|
64
|
+
next();
|
|
65
|
+
});
|
|
56
66
|
return;
|
|
57
67
|
}
|
|
58
68
|
this.restApi = new RedisSMQRestApi(this.config, false);
|
|
59
69
|
const restApiCallback = await this.restApi.getApplication();
|
|
60
|
-
this.app.use(
|
|
70
|
+
this.app.use((req, res, next) => {
|
|
71
|
+
if (isApiRequest(req.path)) {
|
|
72
|
+
return restApiCallback(req, res);
|
|
73
|
+
}
|
|
74
|
+
next();
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
sendIndexHtml(res) {
|
|
78
|
+
const indexPath = path.join(this.webUIPath, 'index.html');
|
|
79
|
+
fs.readFile(indexPath, 'utf8', (err, data) => {
|
|
80
|
+
if (err) {
|
|
81
|
+
this.logger.error('Error reading index.html:', err);
|
|
82
|
+
return res.status(500).send('Error loading application');
|
|
83
|
+
}
|
|
84
|
+
const configScript = `<script>window.configs = ${JSON.stringify(this.webUIConfig)};</script>`;
|
|
85
|
+
const modifiedHtml = data.replace('</head>', `${configScript}</head>`);
|
|
86
|
+
res.send(modifiedHtml);
|
|
87
|
+
});
|
|
61
88
|
}
|
|
62
89
|
async setupRoutes() {
|
|
63
90
|
await this.setupApi();
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
91
|
+
const { basePath } = this.config.webServer;
|
|
92
|
+
if (basePath !== '/') {
|
|
93
|
+
this.app.get('/', (_req, res) => res.redirect(basePath));
|
|
94
|
+
}
|
|
95
|
+
this.app.get('*', (req, res, next) => {
|
|
96
|
+
if (req.path.startsWith(path.posix.join(basePath, 'api')) ||
|
|
97
|
+
req.path.startsWith(path.posix.join(basePath, 'swagger'))) {
|
|
98
|
+
return next();
|
|
99
|
+
}
|
|
100
|
+
if (path.extname(req.path)) {
|
|
101
|
+
return next();
|
|
102
|
+
}
|
|
103
|
+
if (req.headers.accept && !req.headers.accept.includes('text/html')) {
|
|
104
|
+
return next();
|
|
105
|
+
}
|
|
106
|
+
this.sendIndexHtml(res);
|
|
75
107
|
});
|
|
76
108
|
}
|
|
77
109
|
async bootstrap() {
|
|
@@ -93,6 +125,7 @@ export class RedisSMQWebServer {
|
|
|
93
125
|
this.logger.info(`Embedded Redis SMQ REST API is mounted`);
|
|
94
126
|
}
|
|
95
127
|
this.logger.info(`Serving static assets from: ${this.webUIPath}`);
|
|
128
|
+
this.logger.info(`Base path: ${this.config.webServer.basePath || '/'}`);
|
|
96
129
|
});
|
|
97
130
|
}
|
|
98
131
|
async 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;AAC9D,OAAO,EAAE,YAAY,EAAW,MAAM,kBAAkB,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"}
|