refactor!: improve and clean up codebase, refactor typings

index.ts

@@ -7,22 +7,16 @@
  * in the root directory of this source tree.
  */
 
-export * from './types/index.js';
+export * from './src/async/index.js';
+export * from './src/common/index.js';
+export * from './src/env/index.js';
 export * from './src/errors/index.js';
-export * from './src/logger/errors/index.js';
-export * from './src/timer/errors/index.js';
-export * from './src/locker/errors/index.js';
-export * from './src/redis-client/errors/index.js';
-export * from './src/worker/errors/index.js';
-export { Locker } from './src/locker/locker.js';
-export { PowerSwitch } from './src/power-switch/power-switch.js';
-export { RedisClient } from './src/redis-client/redis-client.js';
-export { Timer } from './src/timer/timer.js';
-export { Runnable } from './src/runnable/runnable.js';
-export { WorkerCallable } from './src/worker/worker-callable.js';
-export { WorkerRunnable } from './src/worker/worker-runnable.js';
-export { WorkerResourceGroup } from './src/worker/worker-resource-group.js';
-export { logger } from './src/logger/logger.js';
-export { async } from './src/async/async.js';
-export { redis } from './src/redis-client/index.js';
 export * from './src/event/index.js';
+export * from './src/event-bus/index.js';
+export * from './src/locker/index.js';
+export * from './src/logger/index.js';
+export * from './src/power-switch/index.js';
+export * from './src/redis-client/index.js';
+export * from './src/runnable/index.js';
+export * from './src/timer/index.js';
+export * from './src/worker/index.js';

scripts/build.sh

@@ -17,8 +17,8 @@ rm -rf dist
 
 # esm
 tsc -p ./tsconfig.json
-cp -r src/redis-client/lua dist/esm/src/redis-client/
-cp -r src/locker/redis-client dist/esm/src/locker/
+cp -r src/redis-client/lua-scripts/scripts dist/esm/src/redis-client/lua-scripts/
+cp -r src/locker/redis-client/lua-scripts/scripts dist/esm/src/locker/redis-client/lua-scripts/
 
 # cjs
 tsc -p ./tsconfig.cjs.json
@@ -27,8 +27,8 @@ cat >dist/cjs/package.json <<!EOF
     "type": "commonjs"
 }
 !EOF
-cp -r src/redis-client/lua dist/cjs/src/redis-client/
-cp -r src/locker/redis-client dist/cjs/src/locker/
+cp -r src/redis-client/lua-scripts/scripts dist/cjs/src/redis-client/lua-scripts/
+cp -r src/locker/redis-client/lua-scripts/scripts dist/cjs/src/locker/redis-client/lua-scripts/
 
 # types
 tsc -p ./tsconfig.types.json

src/async/async.ts

@@ -7,7 +7,7 @@
  * in the root directory of this source tree.
  */
 
-import { ICallback, TFunction } from '../../types/index.js';
+import { ICallback, TFunction } from '../common/index.js';
 
 const eachOf = <T>(
   collection: T[],

src/async/index.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c)
+ * Weyoss <weyoss@protonmail.com>
+ * https://github.com/weyoss
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+
+export * from './async.js';

src/common/index.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c)
+ * Weyoss <weyoss@protonmail.com>
+ * https://github.com/weyoss
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+
+export * from './types/index.js';

src/env/index.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c)
+ * Weyoss <weyoss@protonmail.com>
+ * https://github.com/weyoss
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+
+export * from './environment.js';

src/errors/abort.error.ts

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c)
+ * Weyoss <weyoss@protonmail.com>
+ * https://github.com/weyoss
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+
+import { RedisSMQError } from './redis-smq.error.js';
+
+export class AbortError extends RedisSMQError {}

src/errors/index.ts

@@ -11,3 +11,4 @@ export { CallbackEmptyReplyError } from './callback-empty-reply.error.js';
 export { CallbackInvalidReplyError } from './callback-invalid-reply.error.js';
 export { PanicError } from './panic.error.js';
 export { RedisSMQError } from './redis-smq.error.js';
+export { AbortError } from './abort.error.js';

src/event/errors/event-bus-connection.error.ts → src/event-bus/errors/event-bus-not-connected.error.ts

@@ -9,4 +9,4 @@
 
 import { EventBusError } from './event-bus.error.js';
 
-export class EventBusConnectionError extends EventBusError {}
+export class EventBusNotConnectedError extends EventBusError {}

src/event/errors/index.ts → src/event-bus/errors/index.ts

@@ -8,4 +8,4 @@
  */
 
 export { EventBusError } from './event-bus.error.js';
-export { EventBusConnectionError } from './event-bus-connection.error.js';
+export { EventBusNotConnectedError } from './event-bus-not-connected.error.js';

src/event-bus/event-bus-redis.ts

@@ -0,0 +1,175 @@
+/*
+ * Copyright (c)
+ * Weyoss <weyoss@protonmail.com>
+ * https://github.com/weyoss
+ *
+ * This source code is licensed under the MIT license found in the LICENSE file
+ * in the root directory of this source tree.
+ */
+
+import { async } from '../async/index.js';
+import { ICallback } from '../common/index.js';
+import {
+  createRedisClient,
+  IRedisConfig,
+  IRedisClient,
+} from '../redis-client/index.js';
+import { EventEmitter, IEventBus, TEventBusEvent } from '../event/index.js';
+import { EventBusNotConnectedError } from './errors/index.js';
+
+export class EventBusRedis<Events extends TEventBusEvent>
+  extends EventEmitter<Events>
+  implements IEventBus<Events>
+{
+  protected connected = false;
+  protected pubClient;
+  protected subClient;
+
+  protected constructor(pubClient: IRedisClient, subClient: IRedisClient) {
+    super();
+
+    //
+    this.pubClient = pubClient;
+    this.pubClient.on('error', (err: Error) => {
+      this.eventEmitter.emit('error', err);
+    });
+
+    //
+    this.subClient = subClient;
+    this.subClient.on('message', (channel: keyof Events, message: string) => {
+      this.eventEmitter.emit(String(channel), ...JSON.parse(message));
+    });
+    this.subClient.on('error', (err: Error) => {
+      this.eventEmitter.emit('error', err);
+    });
+
+    this.connected = true;
+  }
+
+  override emit<E extends keyof Events>(
+    event: E,
+    ...args: Parameters<Events[E]>
+  ): boolean {
+    if (!this.connected) {
+      this.eventEmitter.emit('error', new EventBusNotConnectedError());
+      return false;
+    }
+    this.pubClient.publish(String(event), JSON.stringify(args), () => void 0);
+    return true;
+  }
+
+  override on<E extends keyof Events>(event: E, listener: Events[E]): this {
+    if (event === 'error') {
+      super.on('error', listener);
+      return this;
+    }
+    if (!this.connected) {
+      this.eventEmitter.emit('error', new EventBusNotConnectedError());
+      return this;
+    }
+    this.subClient.subscribe(String(event));
+    super.on(event, listener);
+    return this;
+  }
+
+  override once<E extends keyof Events>(event: E, listener: Events[E]): this {
+    if (event === 'error') {
+      super.once('error', listener);
+      return this;
+    }
+    if (!this.connected) {
+      this.eventEmitter.emit('error', new EventBusNotConnectedError());
+      return this;
+    }
+    this.subClient.subscribe(String(event));
+    super.once(event, listener);
+    return this;
+  }
+
+  override removeAllListeners<E extends keyof Events>(
+    event?: Extract<E, string>,
+  ): this {
+    if (event === 'error') {
+      super.removeAllListeners('error');
+      return this;
+    }
+    if (!this.connected) {
+      this.eventEmitter.emit('error', new EventBusNotConnectedError());
+      return this;
+    }
+    if (event) this.subClient.unsubscribe(String(event));
+    else this.subClient.unsubscribe();
+    super.removeAllListeners(event);
+    return this;
+  }
+
+  override removeListener<E extends keyof Events>(
+    event: E,
+    listener: Events[E],
+  ): this {
+    if (event === 'error') {
+      super.removeListener('error', listener);
+      return this;
+    }
+    if (!this.connected) {
+      this.eventEmitter.emit('error', new EventBusNotConnectedError());
+      return this;
+    }
+    super.removeListener(event, listener);
+    return this;
+  }
+
+  shutDown(cb: ICallback<void>) {
+    if (this.connected) {
+      async.waterfall(
+        [
+          (cb: ICallback<void>) => this.subClient.halt(() => cb()),
+          (cb: ICallback<void>) => this.pubClient.halt(() => cb()),
+        ],
+        () => {
+          this.connected = false;
+          cb();
+        },
+      );
+    } else cb();
+  }
+
+  static createInstance<T extends TEventBusEvent>(
+    config: IRedisConfig,
+    cb: ICallback<IEventBus<T>>,
+  ): void {
+    let pubClient: IRedisClient | null | undefined = null;
+    let subClient: IRedisClient | null | undefined = null;
+    async.waterfall(
+      [
+        (cb: ICallback<void>) =>
+          createRedisClient(config, (err, client) => {
+            if (err) cb(err);
+            else {
+              pubClient = client;
+              cb();
+            }
+          }),
+        (cb: ICallback<void>) =>
+          createRedisClient(config, (err, client) => {
+            if (err) cb(err);
+            else {
+              subClient = client;
+              cb();
+            }
+          }),
+      ],
+      (err) => {
+        if (err) {
+          if (pubClient) pubClient.halt(() => void 0);
+          if (subClient) subClient.halt(() => void 0);
+          cb(err);
+        } else if (!pubClient || !subClient) cb(new Error());
+        else {
+          const instance = new EventBusRedis<T>(pubClient, subClient);
+          cb(null, instance);
+        }
+      },
+    );
+  }
+}