redis-smq-web-server 9.0.0-next.0 → 9.0.0-next.10

package/dist/esm/bin/cli.d.ts

@@ -1,2 +1,3 @@
+#!/usr/bin/env node
 export {};
 //# sourceMappingURL=cli.d.ts.map

package/dist/esm/bin/cli.js

@@ -1,19 +1,53 @@
+#!/usr/bin/env node
 import { Command } from 'commander';
 import { RedisSMQWebServer } from '../src/index.js';
 import { defaultConfig } from '../src/config/parse-config.js';
+import { EConsoleLoggerLevel } from 'redis-smq-common';
+import { defaultConfig as defaultRedisSMQConfig } from 'redis-smq';
+const defaultLogLevel = typeof defaultRedisSMQConfig.logger.options.logLevel === 'number'
+    ? defaultRedisSMQConfig.logger.options.logLevel
+    : EConsoleLoggerLevel[defaultRedisSMQConfig.logger.options.logLevel];
 const program = new Command();
 program
     .name('redis-smq-web-server')
     .description('Web server for RedisSMQ Web UI');
 program
-    .option('-p, --port <port>', 'Port to run the server on', String(defaultConfig.port))
-    .option('-B, --base-path <basePath>', 'base public path for the RedisSMQ Web UI SPA', String(defaultConfig.basePath))
-    .option('-H, --redis-host <redisHost>', 'Redis server host', defaultConfig.redisHost)
-    .option('-P, --redis-port <redisPort>', 'Redis server port', String(defaultConfig.redisPort))
-    .option('-D, --redis-db <redisDB>', 'Redis database number', String(defaultConfig.redisDB))
-    .option('-x, --api-proxy-target <url>', 'Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:7210', defaultConfig.apiProxyTarget);
+    .option('-p, --port <number>', 'Port to run the server on', String(defaultConfig.webServer?.port))
+    .option('-b, --base-path <string>', 'Base public path for the RedisSMQ Web UI SPA', defaultConfig.webServer?.basePath)
+    .option('-t, --api-proxy-target <string>', 'Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:6000', defaultConfig.webServer?.apiProxyTarget)
+    .option('-c, --redis-client <ioredis|redis>', 'Redis client. Valid options are: ioredis, redis.', defaultRedisSMQConfig.redis.client)
+    .option('-r, --redis-host <string>', 'Redis server host', defaultRedisSMQConfig.redis.options.host)
+    .option('-o, --redis-port <number>', 'Redis server port', String(defaultRedisSMQConfig.redis.options.port))
+    .option('-d, --redis-db <number>', 'Redis database number', String(defaultRedisSMQConfig.redis.options.db))
+    .option('-e, --enable-log <0|1>', 'Enable console logging. Valid options are: 0, 1', String(Number(defaultRedisSMQConfig.logger.enabled)))
+    .option('-v, --log-level <0|1|2|3>', `Log level. Numbers: ${EConsoleLoggerLevel.DEBUG}=DEBUG, ${EConsoleLoggerLevel.INFO}=INFO, ${EConsoleLoggerLevel.WARN}=WARN, ${EConsoleLoggerLevel.ERROR}=ERROR`, String(defaultLogLevel));
 program.parse();
 const options = program.opts();
-const server = new RedisSMQWebServer(options);
+const config = {
+    webServer: {
+        port: Number(options.port),
+        basePath: options.basePath,
+        apiProxyTarget: options.apiProxyTarget,
+    },
+    apiServer: {
+        port: Number(options.port),
+        basePath: options.basePath,
+    },
+    redis: {
+        client: options.redisClient,
+        options: {
+            host: options.redisHost,
+            port: Number(options.redisPort),
+            db: Number(options.redisDb),
+        },
+    },
+    logger: {
+        enabled: Boolean(Number(options.enableLog)),
+        options: {
+            logLevel: Number(options.logLevel),
+        },
+    },
+};
+const server = new RedisSMQWebServer(config);
 server.run();
 //# sourceMappingURL=cli.js.map

package/dist/esm/bin/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../bin/cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,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,mBAAmB,EACnB,2BAA2B,EAC3B,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAC3B;KACA,MAAM,CACL,4BAA4B,EAC5B,8CAA8C,EAC9C,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAC/B;KACA,MAAM,CACL,8BAA8B,EAC9B,mBAAmB,EACnB,aAAa,CAAC,SAAS,CACxB;KACA,MAAM,CACL,8BAA8B,EAC9B,mBAAmB,EACnB,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAChC;KACA,MAAM,CACL,0BAA0B,EAC1B,uBAAuB,EACvB,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAC9B;KACA,MAAM,CACL,8BAA8B,EAC9B,6EAA6E,EAC7E,aAAa,CAAC,cAAc,CAC7B,CAAC;AAEJ,OAAO,CAAC,KAAK,EAAE,CAAC;AAEhB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAC/B,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAC9C,MAAM,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../bin/cli.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/config/parse-config.d.ts.map

@@ -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,wBAO3B,CAAC;AAEF,wBAAgB,WAAW,CACzB,MAAM,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAC7C,8BAA8B,CA2BhC"}
+{"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,CAkBhC"}

package/dist/esm/src/config/parse-config.js

@@ -1,36 +1,26 @@
-import { ERedisConfigClient } from 'redis-smq-common';
+import { parseConfig as parseRestApiConfig } from 'redis-smq-rest-api';
 export const defaultConfig = {
-    port: 8080,
-    basePath: '/',
-    redisPort: 6379,
-    redisHost: '127.0.0.1',
-    redisDB: 1,
-    apiProxyTarget: undefined,
+    webServer: {
+        port: 8080,
+        basePath: '/',
+        apiProxyTarget: undefined,
+    },
 };
 export function parseConfig(config = {}) {
-    const cfg = {
-        ...defaultConfig,
-        ...config,
-    };
-    const webServerCfg = {
-        port: cfg.port,
-        basePath: cfg.basePath,
-        apiProxyTarget: cfg.apiProxyTarget,
+    const restApiParsedConfig = parseRestApiConfig(config);
+    const webServer = {
+        ...defaultConfig.webServer,
+        ...config.webServer,
     };
+    const basePath = String(webServer.basePath).replace(/\/+$/, '') || '/';
     return {
-        redis: {
-            client: ERedisConfigClient.IOREDIS,
-            options: {
-                port: cfg.redisPort,
-                host: cfg.redisHost,
-                db: cfg.redisDB,
-                showFriendlyErrorStack: true,
-            },
-        },
-        webServer: webServerCfg,
-        apiServer: {
-            port: cfg.port,
-            basePath: cfg.basePath,
+        ...restApiParsedConfig,
+        webServer: {
+            port: Number(webServer.port),
+            basePath,
+            apiProxyTarget: webServer.apiProxyTarget
+                ? String(webServer.apiProxyTarget)
+                : undefined,
         },
     };
 }

package/dist/esm/src/config/parse-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-config.js","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,GAAG;IACb,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,CAAC;IACV,cAAc,EAAE,SAAS;CAC1B,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,SAA4C,EAAE;IAE9C,MAAM,GAAG,GAA6B;QACpC,GAAG,aAAa;QAChB,GAAG,MAAM;KACV,CAAC;IACF,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAC;IACF,OAAO;QACL,KAAK,EAAE;YACL,MAAM,EAAE,kBAAkB,CAAC,OAAO;YAClC,OAAO,EAAE;gBACP,IAAI,EAAE,GAAG,CAAC,SAAS;gBACnB,IAAI,EAAE,GAAG,CAAC,SAAS;gBACnB,EAAE,EAAE,GAAG,CAAC,OAAO;gBACf,sBAAsB,EAAE,IAAI;aAC7B;SACF;QACD,SAAS,EAAE,YAAY;QAEvB,SAAS,EAAE;YACT,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB;KACF,CAAC;AACJ,CAAC"}
+{"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;IACvD,MAAM,SAAS,GAAG;QAChB,GAAG,aAAa,CAAC,SAAS;QAC1B,GAAG,MAAM,CAAC,SAAS;KACpB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;IACvE,OAAO;QACL,GAAG,mBAAmB;QACtB,SAAS,EAAE;YACT,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC5B,QAAQ;YACR,cAAc,EAAE,SAAS,CAAC,cAAc;gBACtC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC;gBAClC,CAAC,CAAC,SAAS;SACd;KACF,CAAC;AACJ,CAAC"}

package/dist/esm/src/config/types/index.d.ts

@@ -1,12 +1,23 @@
-import { IRedisSMQRestApiParsedConfig } from 'redis-smq-rest-api';
-export interface IRedisSMQWebServerConfig {
-    port: number;
+import { IRedisSMQRestApiConfig, IRedisSMQRestApiParsedConfig } from 'redis-smq-rest-api';
+import { EConsoleLoggerLevel, ERedisConfigClient } from 'redis-smq-common';
+export interface IRedisSMQWebServerCliOptions {
+    port: string;
     basePath: string;
-    redisPort: number;
+    redisClient: ERedisConfigClient;
+    redisPort: string;
     redisHost: string;
-    redisDB: number;
+    redisDb: string;
+    enableLog: string;
+    logLevel: EConsoleLoggerLevel;
     apiProxyTarget?: string;
 }
+export interface IRedisSMQWebServerConfig extends IRedisSMQRestApiConfig {
+    webServer?: {
+        port?: number;
+        basePath?: string;
+        apiProxyTarget?: string;
+    };
+}
 export interface IRedisSMQWebServerParsedConfig extends IRedisSMQRestApiParsedConfig {
     webServer: {
         port: number;

package/dist/esm/src/config/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/config/types/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAKhB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,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"}
+{"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;AAE3E,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;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,wBAAyB,SAAQ,sBAAsB;IACtE,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAKlB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAED,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

@@ -1,4 +1,5 @@
 import { IRedisSMQWebServerConfig } from './config/types/index.js';
+import { ILogger } from 'redis-smq-common';
 export declare class RedisSMQWebServer {
     private readonly app;
     private readonly config;
@@ -8,9 +9,11 @@ export declare class RedisSMQWebServer {
     private restApi;
     private bootstrapped;
     private httpServer;
-    constructor(config?: Partial<IRedisSMQWebServerConfig>);
+    protected logger: ILogger;
+    constructor(config?: IRedisSMQWebServerConfig);
     private setupMiddleware;
     private setupApi;
+    private sendIndexHtml;
     private setupRoutes;
     private bootstrap;
     run(): Promise<void>;

package/dist/esm/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AAMjC,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;gBAElC,MAAM,GAAE,OAAO,CAAC,wBAAwB,CAAM;YAW5C,eAAe;YAsBf,QAAQ;YAuBR,WAAW;YAoCX,SAAS;IAQV,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAmBvC"}
+{"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;AAOzD,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;YA4Bf,QAAQ;IAyCtB,OAAO,CAAC,aAAa;YAeP,WAAW;YA8BX,SAAS;IAWV,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAepB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAmBvC"}

package/dist/esm/src/index.js

@@ -5,6 +5,8 @@ import { getDistPath } from 'redis-smq-web-ui';
 import { RedisSMQRestApi } from 'redis-smq-rest-api';
 import { parseConfig } from './config/parse-config.js';
 import { createProxyMiddleware } from 'http-proxy-middleware';
+import { createLogger } from 'redis-smq-common';
+import rateLimit from 'express-rate-limit';
 export class RedisSMQWebServer {
     app = express();
     config;
@@ -14,16 +16,22 @@ export class RedisSMQWebServer {
     restApi = null;
     bootstrapped = false;
     httpServer = null;
+    logger;
     constructor(config = {}) {
         this.config = parseConfig(config);
         this.webUIConfig = {
             BASE_PATH: this.config.webServer.basePath,
-            API_URL: '/',
+            API_URL: this.config.webServer.basePath,
         };
         this.apiProxyTarget = this.config.webServer.apiProxyTarget ?? null;
         this.webUIPath = getDistPath();
+        this.logger = createLogger(this.config.logger, 'RedisSMQWebServer');
     }
     async setupMiddleware() {
+        this.app.use(rateLimit({
+            windowMs: 60 * 1000,
+            limit: 1000,
+        }));
         this.app.use(express.static(this.webUIPath, {
             etag: true,
             lastModified: true,
@@ -39,37 +47,58 @@ export class RedisSMQWebServer {
         }));
     }
     async setupApi() {
+        const basePath = this.config.webServer.basePath;
+        const apiPath = path.posix.join(basePath, 'api');
+        const docsPath = path.posix.join(basePath, 'docs');
+        const apiBasePaths = [apiPath, docsPath];
+        const isApiRequest = (path) => apiBasePaths.some((base) => path === base || path.startsWith(`${base}/`));
         const target = this.config.webServer.apiProxyTarget;
         if (target) {
-            const proxyOptions = {
+            const proxy = createProxyMiddleware({
                 target,
                 changeOrigin: true,
                 ws: true,
-                logLevel: 'warn',
-            };
-            this.app.use('/api', createProxyMiddleware(proxyOptions));
-            this.app.use('/docs', createProxyMiddleware(proxyOptions));
-            this.app.use('/assets', createProxyMiddleware(proxyOptions));
+            });
+            this.app.use((req, res, next) => {
+                if (isApiRequest(req.path)) {
+                    return proxy(req, res, next);
+                }
+                next();
+            });
             return;
         }
         this.restApi = new RedisSMQRestApi(this.config, false);
         const restApiCallback = await this.restApi.getApplication();
-        this.app.use(restApiCallback);
+        this.app.use((req, res, next) => {
+            if (isApiRequest(req.path)) {
+                return restApiCallback(req, res);
+            }
+            next();
+        });
+    }
+    sendIndexHtml(res) {
+        const indexPath = path.join(this.webUIPath, 'index.html');
+        fs.readFile(indexPath, 'utf8', (err, data) => {
+            if (err) {
+                this.logger.error('Error reading index.html:', err);
+                return res.status(500).send('Error loading application');
+            }
+            const configScript = `<script>window.configs = ${JSON.stringify(this.webUIConfig)};</script>`;
+            const modifiedHtml = data.replace('</head>', `${configScript}</head>`);
+            res.send(modifiedHtml);
+        });
     }
     async setupRoutes() {
         await this.setupApi();
-        this.app.get(/^\/(?!api|docs|assets).*/, (_, res) => {
-            const indexPath = path.join(this.webUIPath, 'index.html');
-            fs.readFile(indexPath, 'utf8', (err, data) => {
-                if (err) {
-                    console.error('Error reading index.html:', err);
-                    return res.status(500).send('Error loading application');
-                }
-                const configScript = `<script>window.configs = ${JSON.stringify(this.webUIConfig)};</script>`;
-                const modifiedHtml = data.replace('</head>', `${configScript}</head>`);
-                res.send(modifiedHtml);
-            });
-        });
+        const basePath = this.config.webServer.basePath || '/';
+        if (basePath !== '/') {
+            this.app.get('/', (_req, res) => res.redirect(basePath));
+        }
+        const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        const normalizedBase = basePath.replace(/\/+$/, '') || '/';
+        const anchor = normalizedBase === '/' ? '^/' : `^${escapeRegex(normalizedBase)}/?`;
+        const nonApiOrAsset = new RegExp(`${anchor}(?!api/|docs/|assets/).*`);
+        this.app.get(nonApiOrAsset, (_req, res) => this.sendIndexHtml(res));
     }
     async bootstrap() {
         if (!this.bootstrapped) {
@@ -82,14 +111,15 @@ export class RedisSMQWebServer {
         await this.bootstrap();
         const port = this.config.webServer.port;
         this.httpServer = this.app.listen(port, () => {
-            console.log(`Redis SMQ Web Server running on port ${port}`);
+            this.logger.info(`Redis SMQ Web Server running on port ${port}`);
             if (this.apiProxyTarget) {
-                console.log(`Proxying API requests to ${this.apiProxyTarget}`);
+                this.logger.info(`Proxying API requests to ${this.apiProxyTarget}`);
             }
             else {
-                console.log(`Embedded Redis SMQ REST API is mounted`);
+                this.logger.info(`Embedded Redis SMQ REST API is mounted`);
             }
-            console.log(`Serving static assets from: ${this.webUIPath}`);
+            this.logger.info(`Serving static assets from: ${this.webUIPath}`);
+            this.logger.info(`Base path: ${this.config.webServer.basePath || '/'}`);
         });
     }
     async shutdown() {
@@ -102,7 +132,7 @@ export class RedisSMQWebServer {
                 });
             });
             this.httpServer = null;
-            console.log('Redis SMQ Web Server has been shutdown.');
+            this.logger.info('Redis SMQ Web Server has been shutdown.');
         }
         if (this.restApi) {
             await this.restApi.shutdown();

package/dist/esm/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/tests/common/config.d.ts

@@ -0,0 +1,3 @@
+import { IRedisSMQWebServerConfig } from '../../src/config/types/index.js';
+export declare const config: IRedisSMQWebServerConfig;
+//# sourceMappingURL=config.d.ts.map

package/dist/esm/tests/common/config.d.ts.map

@@ -0,0 +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"}

package/dist/esm/tests/common/config.js

@@ -0,0 +1,21 @@
+import { ERedisConfigClient } from 'redis-smq-common';
+export const config = {
+    redis: {
+        client: ERedisConfigClient.IOREDIS,
+        options: {
+            host: '127.0.0.1',
+            port: 0,
+            showFriendlyErrorStack: true,
+        },
+    },
+    logger: {
+        enabled: false,
+        options: {
+            logLevel: 'DEBUG',
+        },
+    },
+    webServer: {
+        port: 8080,
+    },
+};
+//# sourceMappingURL=config.js.map

package/dist/esm/tests/common/config.js.map

@@ -0,0 +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"}

package/dist/esm/tests/common/redis-client.d.ts

@@ -0,0 +1,94 @@
+export declare function getRedisClientInstance(): Promise<{
+    validateRedisServerSupportAsync: (() => Promise<undefined>) | (() => Promise<void>);
+    setAsync: ((key: string, value: string, options: {
+        expire?: {
+            mode: "EX" | "PX";
+            value: number;
+        };
+        exists?: "NX" | "XX";
+    }) => Promise<null>) | ((key: string, value: string, options: {
+        expire?: {
+            mode: "EX" | "PX";
+            value: number;
+        };
+        exists?: "NX" | "XX";
+    }) => Promise<string>);
+    zaddAsync: ((key: string, score: number, member: string) => Promise<string>) | ((key: string, score: number, member: string) => Promise<number>);
+    watchAsync: (args: string[]) => Promise<string>;
+    unwatchAsync: () => Promise<string>;
+    sismemberAsync: (key: string, member: string) => Promise<number>;
+    zcardAsync: (key: string) => Promise<number>;
+    zrangeAsync: (key: string, min: number, max: number) => Promise<string[]>;
+    zrevrangeAsync: (key: string, min: number, max: number) => Promise<string[]>;
+    zrangebyscoreAsync: (key: string, min: string | number, max: string | number, offset: number, count: number) => Promise<string[]>;
+    smembersAsync: (key: string) => Promise<string[]>;
+    sscanAsync: (key: string, cursor: string, options: {
+        MATCH?: string;
+        COUNT?: number;
+    }) => Promise<{
+        cursor: string;
+        items: string[];
+    }>;
+    sscanAllAsync: (key: string, options: {
+        MATCH?: string;
+        COUNT?: number;
+    }) => Promise<string[]>;
+    saddAsync: (key: string, member: string) => Promise<number>;
+    sremAsync: (key: string, member: string) => Promise<number>;
+    scardAsync: (key: string) => Promise<number>;
+    hgetallAsync: (key: string) => Promise<Record<string, string>>;
+    hscanAsync: (key: string, cursor: string, options: {
+        MATCH?: string;
+        COUNT?: number;
+    }) => Promise<{
+        cursor: string;
+        result: Record<string, string>;
+    }>;
+    hscanAllAsync: (key: string, options: {
+        MATCH?: string;
+        COUNT?: number;
+    }) => Promise<Record<string, string>>;
+    hgetAsync: ((key: string, field: string) => Promise<null>) | ((key: string, field: string) => Promise<string>);
+    hsetAsync: (key: string, field: string, value: string | number) => Promise<number>;
+    hdelAsync: (key: string, fields: string | string[]) => Promise<number>;
+    lrangeAsync: (key: string, start: number, stop: number) => Promise<string[]>;
+    hkeysAsync: (key: string) => Promise<string[]>;
+    hlenAsync: (key: string) => Promise<number>;
+    brpoplpushAsync: ((source: string, destination: string, timeout: number) => Promise<null>) | ((source: string, destination: string, timeout: number) => Promise<string>);
+    rpoplpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
+    zpoprpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
+    zscanAsync: (key: string, cursor: string, options: {
+        MATCH?: string;
+        COUNT?: number;
+    }) => Promise<{
+        cursor: string;
+        items: string[];
+    }>;
+    lpoprpushAsync: ((source: string, destination: string) => Promise<null>) | ((source: string, destination: string) => Promise<string>);
+    zrangebyscorewithscoresAsync: (source: string, min: number, max: number) => Promise<Record<string, string>>;
+    zremAsync: (source: string, id: string) => Promise<number>;
+    rpopAsync: ((key: string) => Promise<null>) | ((key: string) => Promise<string>);
+    lremAsync: (key: string, count: number, element: string) => Promise<number>;
+    publishAsync: (channel: string, message: string) => Promise<number>;
+    flushallAsync: () => Promise<string>;
+    evalshaAsync: (hash: string, args: string | number | (string | number)[]) => Promise<unknown>;
+    getAsync: ((key: string) => Promise<null>) | ((key: string) => Promise<string>);
+    delAsync: (key: string | string[]) => Promise<number>;
+    llenAsync: (key: string) => Promise<number>;
+    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>);
+    zremrangebyscoreAsync: (source: string, min: string | number, max: string | number) => Promise<number>;
+    hmgetAsync: (source: string, keys: string[]) => Promise<(string | null)[]>;
+    haltAsync: (() => Promise<undefined>) | (() => Promise<void>);
+    shutdownAsync: (() => Promise<undefined>) | (() => Promise<void>);
+    getInfoAsync: () => Promise<string>;
+    updateServerVersionAsync: (() => Promise<undefined>) | (() => Promise<void>);
+    loadBuiltInScriptFilesAsync: (() => Promise<undefined>) | (() => Promise<void>);
+    loadScriptFilesAsync: (scriptMap: Record<string, string | string[]>) => Promise<Record<string, string>>;
+    loadScriptAsync: (script: string) => Promise<string>;
+    runScriptAsync: (scriptName: string, keys: (string | number)[], args: (string | number)[]) => Promise<unknown>;
+    onAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
+    onceAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
+    removeListenerAsync: ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<undefined>) | ((event: keyof import("redis-smq-common").TRedisClientEvent) => Promise<string>);
+} & import("redis-smq-common").IRedisClient>;
+export declare function shutdownRedisClient(): Promise<void>;
+//# sourceMappingURL=redis-client.d.ts.map

package/dist/esm/tests/common/redis-client.d.ts.map

@@ -0,0 +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"}

package/dist/esm/tests/common/redis-client.js

@@ -0,0 +1,20 @@
+import bluebird from 'bluebird';
+import { RedisClientFactory } from 'redis-smq-common';
+import { config } from './config.js';
+const { promisifyAll } = bluebird;
+let redisClient = null;
+export async function getRedisClientInstance() {
+    if (!redisClient) {
+        if (!config.redis)
+            throw new Error(`Redis configuration is required`);
+        redisClient = promisifyAll(new RedisClientFactory(config.redis));
+        await redisClient.initAsync();
+    }
+    return promisifyAll(redisClient.getInstance());
+}
+export async function shutdownRedisClient() {
+    if (redisClient) {
+        await redisClient.shutdownAsync();
+    }
+}
+//# sourceMappingURL=redis-client.js.map

package/dist/esm/tests/common/redis-client.js.map

@@ -0,0 +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"}

package/dist/esm/tests/common/start-redis-server.d.ts

@@ -0,0 +1,3 @@
+export declare function initializeRedis(): Promise<void>;
+export declare function shutDownRedisServer(): Promise<void>;
+//# sourceMappingURL=start-redis-server.d.ts.map

package/dist/esm/tests/common/start-redis-server.d.ts.map

@@ -0,0 +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"}

package/dist/esm/tests/common/start-redis-server.js

@@ -0,0 +1,22 @@
+import { ERedisConfigClient } from 'redis-smq-common';
+import { RedisServer } from 'redis-smq-common';
+import { config } from './config.js';
+let redisServer = null;
+export async function initializeRedis() {
+    if (!redisServer) {
+        redisServer = new RedisServer();
+        const port = await redisServer.start();
+        config.redis = config.redis ?? {
+            client: ERedisConfigClient.IOREDIS,
+        };
+        config.redis.options = {
+            ...config.redis.options,
+            port,
+        };
+    }
+}
+export async function shutDownRedisServer() {
+    if (redisServer)
+        await redisServer.shutdown();
+}
+//# sourceMappingURL=start-redis-server.js.map

package/dist/esm/tests/common/start-redis-server.js.map

@@ -0,0 +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"}

package/dist/esm/tests/common/start-web-server.d.ts

@@ -0,0 +1,3 @@
+export declare function startWebServer(): Promise<void>;
+export declare function shutdownWebServer(): Promise<void>;
+//# sourceMappingURL=start-web-server.d.ts.map

package/dist/esm/tests/common/start-web-server.d.ts.map

@@ -0,0 +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"}

package/dist/esm/tests/common/start-web-server.js

@@ -0,0 +1,16 @@
+import { RedisSMQWebServer } from '../../src/index.js';
+import { config } from './config.js';
+let webServer = null;
+export async function startWebServer() {
+    if (!webServer) {
+        webServer = new RedisSMQWebServer(config);
+        await webServer.run();
+    }
+}
+export async function shutdownWebServer() {
+    if (webServer) {
+        await webServer.shutdown();
+        webServer = null;
+    }
+}
+//# sourceMappingURL=start-web-server.js.map

package/dist/esm/tests/common/start-web-server.js.map

@@ -0,0 +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"}

package/dist/esm/tests/setup.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=setup.d.ts.map

package/dist/esm/tests/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../tests/setup.ts"],"names":[],"mappings":""}