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

package/CHANGELOG.md

@@ -3,6 +3,84 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.0-next.10](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.9...v9.0.0-next.10) (2025-10-26)
+
+### 🐛 Bug Fixes
+
+- **redis-smq-web-server:** add rate limiting middleware to prevent DoS attacks ([5c144fd](https://github.com/weyoss/redis-smq/commit/5c144fdc67007aa686bdceddc36e3d93635bcff9))
+- **redis-smq-web-server:** improve base path handling and routing logic ([5e7ff4c](https://github.com/weyoss/redis-smq/commit/5e7ff4c46b07b29bd1328bbf9732efbd07cb60b1))
+
+### 📝 Documentation
+
+- **redis-smq-web-server:** add npm version/code coverage badges ([c4c76c2](https://github.com/weyoss/redis-smq/commit/c4c76c2a781ad414ae1117f9b47cdb0c4eb04fac))
+
+### ✅ Tests
+
+- **redis-smq-web-server:** add comprehensive E2E test suite ([d67e5c6](https://github.com/weyoss/redis-smq/commit/d67e5c6d4cfb62d6736698d5fdb158a2bebf41df))
+
+## [9.0.0-next.9](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.8...v9.0.0-next.9) (2025-10-21)
+
+**Note:** Version bump only for package redis-smq-web-server
+
+## [9.0.0-next.8](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.7...v9.0.0-next.8) (2025-10-18)
+
+**Note:** Version bump only for package redis-smq-web-server
+
+## [9.0.0-next.7](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.6...v9.0.0-next.7) (2025-10-13)
+
+**Note:** Version bump only for package redis-smq-web-server
+
+## [9.0.0-next.6](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.5...v9.0.0-next.6) (2025-10-13)
+
+**Note:** Version bump only for package redis-smq-web-server
+
+## [9.0.0-next.5](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.4...v9.0.0-next.5) (2025-10-12)
+
+### 🚀 Chore
+
+- **redis-smq-web-server:** update dependencies to latest versions ([34676ff](https://github.com/weyoss/redis-smq/commit/34676ff071c0d1f99b8b3d8efa8b1980b3e2eee6))
+
+### 📝 Documentation
+
+- add GitHub note callouts in README files ([86e855a](https://github.com/weyoss/redis-smq/commit/86e855ae7aea91e3295301671b8da3249164ea40))
+- standardize "next" branch reference ([15f3e4f](https://github.com/weyoss/redis-smq/commit/15f3e4f4347fd4f76f9dc167dd72f174f178ab8e))
+- update README files for next branch with pre-release badges and doc links ([463250b](https://github.com/weyoss/redis-smq/commit/463250bbd754d44ae6741abcf4e2d62995aef620))
+
+## [9.0.0-next.4](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.3...v9.0.0-next.4) (2025-10-09)
+
+### ♻️ Code Refactoring
+
+- **redis-smq-web-server:** replace console logging with app logger ([d8b3210](https://github.com/weyoss/redis-smq/commit/d8b32109929c54316630029ac8f7d9ed7fa094eb))
+- **redis-smq-web-server:** use createLogger function ([436e2ea](https://github.com/weyoss/redis-smq/commit/436e2ea044d9e02e0916b96c1213e92e25787e8a))
+
+## [9.0.0-next.3](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.2...v9.0.0-next.3) (2025-09-09)
+
+### 🐛 Bug Fixes
+
+- **redis-smq-web-server:** set default Redis database to 0 ([3b4e200](https://github.com/weyoss/redis-smq/commit/3b4e200681a5e1eec2446fa6ffa27878cb790b29))
+- **redis-smq-web-server:** update peer dependencies ([2be664e](https://github.com/weyoss/redis-smq/commit/2be664ea4bacffd5b0a780e05355e356028b6321))
+
+### 📝 Documentation
+
+- **redis-smq-rest-api:** add Redis client installation instructions ([40d9d54](https://github.com/weyoss/redis-smq/commit/40d9d541274701b6b701505e70d9f5ee8add0912))
+- **redis-smq-web-server:** update configuration API and CLI options ([873bedf](https://github.com/weyoss/redis-smq/commit/873bedf848bf7098010cf67b3a886e50864021c4))
+
+### ♻️ Code Refactoring
+
+- **redis-smq-web-server:** improve CLI configuration and config parsing ([8ec1d84](https://github.com/weyoss/redis-smq/commit/8ec1d840678eb360a7854453cd6e20976d872c5c))
+
+## [9.0.0-next.2](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.1...v9.0.0-next.2) (2025-09-07)
+
+### 🐛 Bug Fixes
+
+- **redis-smq-web-server:** add shebang to CLI script for proper execution ([0c213c5](https://github.com/weyoss/redis-smq/commit/0c213c5a39a86c1d752cfbf6e5e9595b678e7208))
+
+### 📝 Documentation
+
+- **redis-smq-web-server:** fix installation/quick start commands ([9832d33](https://github.com/weyoss/redis-smq/commit/9832d33d8beafc31f989e6477a2d83be86392966))
+- **redis-smq-web-server:** fix npm install command ([db7f4e3](https://github.com/weyoss/redis-smq/commit/db7f4e3bd4f0778c2dad2eb9d779afd9515628ea))
+- update installation instructions to include required deps ([107c2a5](https://github.com/weyoss/redis-smq/commit/107c2a5b2eda5b540f5f033808be94923e8688fa))
+
 ## [9.0.0-next.1](https://github.com/weyoss/redis-smq/compare/v9.0.0-next.0...v9.0.0-next.1) (2025-09-06)
 
 **Note:** Version bump only for package redis-smq-web-server

package/README.md

@@ -1,5 +1,16 @@
 # RedisSMQ Web Server
 
+> [!NOTE]
+> You are viewing the documentation for the "next" branch. These docs describe unreleased changes published under the npm "next" dist-tag.  
+> For the latest stable documentation, see:
+>
+> - Master (stable) README: https://github.com/weyoss/redis-smq/tree/master/packages/redis-smq-web-server
+> - Latest release notes/tags: https://github.com/weyoss/redis-smq/releases/latest
+> - Install stable packages with @latest; pre-release with @next.
+
+[![Pre-release (next)](https://img.shields.io/npm/v/redis-smq-web-server/next?style=flat-square&label=redis-smq-web-server%40next)](https://www.npmjs.com/package/redis-smq-web-server?activeTab=versions)
+[![Code Coverage (next)](https://img.shields.io/codecov/c/github/weyoss/redis-smq?flag=redis-smq-web-server&branch=next&style=flat-square)](https://app.codecov.io/github/weyoss/redis-smq/tree/next/packages/redis-smq-web-server)
+
 A lightweight, configurable HTTP server that hosts the RedisSMQ Web UI and exposes the RedisSMQ HTTP API in the same process — or proxies it to an external API service.
 
 - Serves the SPA (Single Page Application) for monitoring and managing RedisSMQ.
@@ -18,7 +29,16 @@ A lightweight, configurable HTTP server that hosts the RedisSMQ Web UI and expos
 ## Installation
 
 ```bash
-npm install redis-smq-web-server
+# Using npm
+npm install redis-smq@next redis-smq-common@next redis-smq-rest-api@next redis-smq-web-ui@next redis-smq-web-server@next --save
+```
+
+Don't forget to install a Redis client. Choose either node-redis or ioredis:
+
+```shell
+npm install @redis/client --save
+# or
+npm install ioredis --save
 ```
 
 ## Quick Start
@@ -60,58 +80,55 @@ npx redis-smq-web-server \
   --api-proxy-target http://127.0.0.1:7210
 ```
 
-When `--api-proxy-target` is provided, requests to `<basePath>/api`, `<basePath>/docs`, and `<basePath>/assets` are forwarded 
+When `--api-proxy-target` is provided, requests to `<basePath>/api`, `<basePath>/docs`, and `<basePath>/assets` are forwarded
 to the upstream. In this mode, Redis connection options on the web server are not used; the upstream API service manages Redis.
 
 ### Programmatically (optional)
 
 If you prefer embedding the server in your app, you can pass the same configuration programmatically.
 
-#### ESM / TypeScript
-
 ```typescript
 import { RedisSMQWebServer } from 'redis-smq-web-server';
-
-const redisSMQWebServer = new RedisSMQWebServer();
-
-await redisSMQWebServer.run({
-  port: 8080,
-  basePath: '/',
-  redisHost: '127.0.0.1',
-  redisPort: 6379,
-  redisDB: '1',
-});
-
-// Or proxy API/docs/assets to an external service
-await redisSMQWebServer.run({
-  port: 8080,
-  apiProxyTarget: 'http://127.0.0.1:7210',
+import { EConsoleLoggerLevel, ERedisConfigClient } from 'redis-smq-common';
+
+// Run with the embedded REST API (in-process)
+const server = new RedisSMQWebServer({
+  webServer: {
+    port: 8080,
+    basePath: '/', // UI at '/', API at '/api', docs at '/docs'
+  },
+  // The following options are used only when apiProxyTarget is NOT set
+  redis: {
+    client: ERedisConfigClient.IOREDIS,
+    options: {
+      host: '127.0.0.1',
+      port: 6379,
+      db: 1,
+      showFriendlyErrorStack: true,
+    },
+  },
+  logger: {
+    enabled: true,
+    options: {
+      level: EConsoleLoggerLevel.INFO,
+    },
+  },
 });
 
-// Optional: stop later
-// await redisSMQWebServer.shutdown();
-```
-
-#### CommonJS
+await server.run();
+// await server.shutdown();
 
-```javascript
-const { startWebServer } = require('redis-smq-web-server');
-
-const redisSMQWebServer = new RedisSMQWebServer();
-
-redisSMQWebServer.run({
-  port: 8080,
-  basePath: '/',
-  redisHost: '127.0.0.1',
-  redisPort: 6379,
-  redisDB: '1',
+// Or proxy API/docs/assets to an external service
+const srv = new RedisSMQWebServer({
+  webServer: {
+    port: 8080,
+    basePath: '/', // or '/redis-smq'
+    apiProxyTarget: 'http://127.0.0.1:7210',
+  },
+  // No redis/logger config required in proxy mode
 });
 
-// Or proxy to external API
-redisSMQWebServer.run({
-  port: 8080,
-  apiProxyTarget: 'http://127.0.0.1:7210',
-});
+await srv.run();
 ```
 
 ## Routes
@@ -119,7 +136,6 @@ redisSMQWebServer.run({
 - UI: served from the configured base path
   - Example: basePath = / → UI at /
   - Example: basePath = /redis-smq → UI at /redis-smq
-  
 - HTTP API: mounted under <basePath>/api
   - Example: basePath = / → API at /api
   - Example: basePath = /redis-smq → API at /redis-smq/api
@@ -141,39 +157,54 @@ Proxying behavior:
 Configuration can be provided programmatically or via CLI arguments. The core interface is:
 
 ```typescript
-interface IRedisSMQWebServerConfig {
-  port: number;
-  basePath: string;
-  redisPort: number;
-  redisHost: string;
-  redisDB: string;
-  /**
-   * Optional: forward <basePath>/api, <basePath>/docs and <basePath>/assets
-   * to an external redis-smq-rest-api service. Example: "http://127.0.0.1:7210"
-   */
-  apiProxyTarget?: string;
+import type { IRedisSMQRestApiConfig } from 'redis-smq-rest-api';
+
+interface IRedisSMQWebServerConfig extends IRedisSMQRestApiConfig {
+  webServer?: {
+    /**
+     * HTTP port to run the web server on.
+     * Default: 8080
+     */
+    port?: number;
+
+    /**
+     * Base public path for the RedisSMQ Web UI and the local API/docs when embedded.
+     * Default: '/'
+     */
+    basePath?: string;
+
+    /**
+     * Optional target for proxying (/api, /docs, /assets).
+     * If provided, the embedded REST API is not mounted and requests are forwarded to the target.
+     * Example: 'http://127.0.0.1:7210'
+     */
+    apiProxyTarget?: string;
+  };
 }
 ```
 
-### Options
-- port: HTTP port the web server listens on.
-- basePath: Public base path where the UI and API are mounted (e.g., / or /redis-smq).
-- redisPort: Redis server port (default 6379).
-- redisHost: Redis server host (default 127.0.0.1).
-- redisDB: Redis database index used by RedisSMQ (e.g., "1").
-- apiProxyTarget: If provided, the web server proxies API/docs/assets to this upstream instead of hosting the API in-process.
+Notes:
+
+- When `webServer.apiProxyTarget` is set, the server proxies `<basePath>/api`, `<basePath>/docs`, and
+  `<basePath>/assets` to the target. In this mode, redis and logger options are not used by the web server (they are
+  handled by the upstream API service).
+
+- When `webServer.apiProxyTarget` is not set, the web server mounts the embedded `redis-smq-rest-api` using the provided
+  `IRedisSMQRestApiConfig` (redis, logger, etc.).
 
 ### ClI flags
 
 ```shell
-  -p, --port <port>             Port to run the server on (default: "8080")
-  -B, --base-path <basePath>    base public path for the RedisSMQ Web UI SPA (default: "/")
-  -H, --redis-host <redisHost>  Redis server host (default: "127.0.0.1")
-  -P, --redis-port <redisPort>  Redis server port (default: "6379")
-  -D, --redis-db <redisDB>      Redis database number (default: "1")
-  -x, --api-proxy-target <url>  Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:7210
-  -h, --help                    display help for command
-
+-p, --port <number>                 Port to run the server on (default: "8080")
+-b, --base-path <string>            Base public path for the RedisSMQ Web UI SPA (default: "/")
+-t, --api-proxy-target <string>     Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:6000
+-c, --redis-client <ioredis|redis>  Redis client. Valid options are: ioredis, redis. (default: "ioredis")
+-r, --redis-host <string>           Redis server host (default: "127.0.0.1")
+-o, --redis-port <number>           Redis server port (default: "6379")
+-d, --redis-db <number>             Redis database number (default: "0")
+-e, --enable-log <0|1>              Enable console logging. Valid options are: 0, 1 (default: "0")
+-v, --log-level <0|1|2|3>           Log level. Numbers: 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default: "1")
+-h, --help                          display help for command
 ```
 
 ## Deploying behind a reverse proxy
@@ -188,5 +219,4 @@ interface IRedisSMQWebServerConfig {
 
 ## License
 
-RedisSMQ Web Server is licensed under is released under the [MIT License](https://github.com/weyoss/redis-smq/blob/master/LICENSE).
-
+RedisSMQ Web Server is licensed under is released under the [MIT License](/LICENSE).

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

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

package/dist/cjs/bin/cli.js

@@ -1,21 +1,56 @@
+#!/usr/bin/env node
 "use strict";
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const index_js_1 = require("../src/index.js");
 const parse_config_js_1 = require("../src/config/parse-config.js");
+const redis_smq_common_1 = require("redis-smq-common");
+const redis_smq_1 = require("redis-smq");
+const defaultLogLevel = typeof redis_smq_1.defaultConfig.logger.options.logLevel === 'number'
+    ? redis_smq_1.defaultConfig.logger.options.logLevel
+    : redis_smq_common_1.EConsoleLoggerLevel[redis_smq_1.defaultConfig.logger.options.logLevel];
 const program = new commander_1.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(parse_config_js_1.defaultConfig.port))
-    .option('-B, --base-path <basePath>', 'base public path for the RedisSMQ Web UI SPA', String(parse_config_js_1.defaultConfig.basePath))
-    .option('-H, --redis-host <redisHost>', 'Redis server host', parse_config_js_1.defaultConfig.redisHost)
-    .option('-P, --redis-port <redisPort>', 'Redis server port', String(parse_config_js_1.defaultConfig.redisPort))
-    .option('-D, --redis-db <redisDB>', 'Redis database number', String(parse_config_js_1.defaultConfig.redisDB))
-    .option('-x, --api-proxy-target <url>', 'Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:7210', parse_config_js_1.defaultConfig.apiProxyTarget);
+    .option('-p, --port <number>', 'Port to run the server on', String((_a = parse_config_js_1.defaultConfig.webServer) === null || _a === void 0 ? void 0 : _a.port))
+    .option('-b, --base-path <string>', 'Base public path for the RedisSMQ Web UI SPA', (_b = parse_config_js_1.defaultConfig.webServer) === null || _b === void 0 ? void 0 : _b.basePath)
+    .option('-t, --api-proxy-target <string>', 'Proxy target for API (/api, /docs, /assets). Example: http://127.0.0.1:6000', (_c = parse_config_js_1.defaultConfig.webServer) === null || _c === void 0 ? void 0 : _c.apiProxyTarget)
+    .option('-c, --redis-client <ioredis|redis>', 'Redis client. Valid options are: ioredis, redis.', redis_smq_1.defaultConfig.redis.client)
+    .option('-r, --redis-host <string>', 'Redis server host', redis_smq_1.defaultConfig.redis.options.host)
+    .option('-o, --redis-port <number>', 'Redis server port', String(redis_smq_1.defaultConfig.redis.options.port))
+    .option('-d, --redis-db <number>', 'Redis database number', String(redis_smq_1.defaultConfig.redis.options.db))
+    .option('-e, --enable-log <0|1>', 'Enable console logging. Valid options are: 0, 1', String(Number(redis_smq_1.defaultConfig.logger.enabled)))
+    .option('-v, --log-level <0|1|2|3>', `Log level. Numbers: ${redis_smq_common_1.EConsoleLoggerLevel.DEBUG}=DEBUG, ${redis_smq_common_1.EConsoleLoggerLevel.INFO}=INFO, ${redis_smq_common_1.EConsoleLoggerLevel.WARN}=WARN, ${redis_smq_common_1.EConsoleLoggerLevel.ERROR}=ERROR`, String(defaultLogLevel));
 program.parse();
 const options = program.opts();
-const server = new index_js_1.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 index_js_1.RedisSMQWebServer(config);
 server.run();
 //# sourceMappingURL=cli.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../bin/cli.ts"],"names":[],"mappings":";;AASA,yCAAoC;AACpC,8CAAoD;AACpD,mEAA8D;AAE9D,MAAM,OAAO,GAAG,IAAI,mBAAO,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,+BAAa,CAAC,IAAI,CAAC,CAC3B;KACA,MAAM,CACL,4BAA4B,EAC5B,8CAA8C,EAC9C,MAAM,CAAC,+BAAa,CAAC,QAAQ,CAAC,CAC/B;KACA,MAAM,CACL,8BAA8B,EAC9B,mBAAmB,EACnB,+BAAa,CAAC,SAAS,CACxB;KACA,MAAM,CACL,8BAA8B,EAC9B,mBAAmB,EACnB,MAAM,CAAC,+BAAa,CAAC,SAAS,CAAC,CAChC;KACA,MAAM,CACL,0BAA0B,EAC1B,uBAAuB,EACvB,MAAM,CAAC,+BAAa,CAAC,OAAO,CAAC,CAC9B;KACA,MAAM,CACL,8BAA8B,EAC9B,6EAA6E,EAC7E,+BAAa,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,4BAAiB,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/cjs/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/cjs/src/config/parse-config.js

@@ -2,37 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultConfig = void 0;
 exports.parseConfig = parseConfig;
-const redis_smq_common_1 = require("redis-smq-common");
+const redis_smq_rest_api_1 = require("redis-smq-rest-api");
 exports.defaultConfig = {
-    port: 8080,
-    basePath: '/',
-    redisPort: 6379,
-    redisHost: '127.0.0.1',
-    redisDB: 1,
-    apiProxyTarget: undefined,
+    webServer: {
+        port: 8080,
+        basePath: '/',
+        apiProxyTarget: undefined,
+    },
 };
 function parseConfig(config = {}) {
-    const cfg = Object.assign(Object.assign({}, exports.defaultConfig), config);
-    const webServerCfg = {
-        port: cfg.port,
-        basePath: cfg.basePath,
-        apiProxyTarget: cfg.apiProxyTarget,
-    };
-    return {
-        redis: {
-            client: redis_smq_common_1.ERedisConfigClient.IOREDIS,
-            options: {
-                port: cfg.redisPort,
-                host: cfg.redisHost,
-                db: cfg.redisDB,
-                showFriendlyErrorStack: true,
-            },
-        },
-        webServer: webServerCfg,
-        apiServer: {
-            port: cfg.port,
-            basePath: cfg.basePath,
-        },
-    };
+    const restApiParsedConfig = (0, redis_smq_rest_api_1.parseConfig)(config);
+    const webServer = Object.assign(Object.assign({}, exports.defaultConfig.webServer), config.webServer);
+    const basePath = String(webServer.basePath).replace(/\/+$/, '') || '/';
+    return Object.assign(Object.assign({}, restApiParsedConfig), { webServer: {
+            port: Number(webServer.port),
+            basePath,
+            apiProxyTarget: webServer.apiProxyTarget
+                ? String(webServer.apiProxyTarget)
+                : undefined,
+        } });
 }
 //# sourceMappingURL=parse-config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"parse-config.js","sourceRoot":"","sources":["../../../../src/config/parse-config.ts"],"names":[],"mappings":";;;AAwBA,kCA6BC;AAxCD,uDAAsD;AAEzC,QAAA,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,SAAgB,WAAW,CACzB,SAA4C,EAAE;IAE9C,MAAM,GAAG,mCACJ,qBAAa,GACb,MAAM,CACV,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,qCAAkB,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":";;;AA2BA,kCAoBC;AAlCD,2DAAuE;AAE1D,QAAA,aAAa,GAA6B;IACrD,SAAS,EAAE;QACT,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,GAAG;QACb,cAAc,EAAE,SAAS;KAC1B;CACF,CAAC;AAMF,SAAgB,WAAW,CACzB,SAA4C,EAAE;IAE9C,MAAM,mBAAmB,GAAG,IAAA,gCAAkB,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,SAAS,mCACV,qBAAa,CAAC,SAAS,GACvB,MAAM,CAAC,SAAS,CACpB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;IACvE,uCACK,mBAAmB,KACtB,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,IACD;AACJ,CAAC"}

package/dist/cjs/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/cjs/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/cjs/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/cjs/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"}