@hastehaul/common 2.0.50 → 2.0.52

package/build/connections-wrappers/redis-wrapper.d.ts

@@ -5,13 +5,10 @@ export declare class RedisClient {
     get masterClient(): IORedis;
     get relicaClients(): IORedis[];
     connect(masterHost: string, replicaHosts: string[]): Promise<void>;
-    private executeMasterOperation;
-    private executeReplicaOperation;
-    private executeOperation;
-    set(key: string, value: string): Promise<any>;
-    get(key: string): Promise<any>;
-    del(key: string): Promise<any>;
-    setex(key: string, value: string, seconds: number): Promise<any>;
+    set(key: string, value: any): Promise<'OK'>;
+    get(key: string): Promise<string | null>;
+    del(key: string): Promise<number>;
+    setex(key: string, seconds: number, value: string): Promise<'OK'>;
     quit(): void;
 }
 export declare const rWrapper: RedisClient;

package/build/connections-wrappers/redis-wrapper.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,9 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rWrapper = exports.RedisClient = void 0;
-const ioredis_1 = __importStar(require("ioredis"));
+const ioredis_1 = __importDefault(require("ioredis"));
 class RedisClient {
     get masterClient() {
         if (!this.master)
@@ -76,35 +56,18 @@ class RedisClient {
             return console.log('All connections established');
         });
     }
-    executeMasterOperation(command, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.executeOperation(this.master, command, ...args);
-        });
-    }
-    executeReplicaOperation(command, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const replica = this.replicas[Math.floor(Math.random() * this.replicas.length)];
-            return this.executeOperation(replica, command, ...args);
-        });
-    }
-    executeOperation(client, command, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return client.sendCommand(new ioredis_1.Command(command, args));
-        });
-    }
     set(key, value) {
-        return this.executeMasterOperation('SET', key, value);
+        return this.master.set(key, value);
     }
     get(key) {
-        return this.executeReplicaOperation('GET', key);
+        const replica = this.replicas[Math.floor(Math.random() * this.replicas.length)];
+        return replica.get(key);
     }
     del(key) {
-        return this.executeMasterOperation('DEL', key);
+        return this.master.del(key);
     }
-    setex(key, value, seconds) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.executeMasterOperation('SETEX', key, seconds, value);
-        });
+    setex(key, seconds, value) {
+        return this.master.setex(key, seconds, value);
     }
     quit() {
         this.master.quit();

package/build/connections-wrappers/socket-connection-wrapper.d.ts

@@ -20,7 +20,7 @@ export declare class SocketWrapper {
      *
      * @param {http.Server} httpServer - The HTTP server instance to attach Socket.IO to.
      */
-    connect(httpServer: http.Server, path?: string): Promise<void>;
+    connect(httpServer: http.Server, path?: string, adapter?: any): Promise<void>;
 }
 /**
  * Singleton instance of the SocketWrapper class to provide a centralized Socket.IO server connection.

package/build/connections-wrappers/socket-connection-wrapper.js

@@ -33,10 +33,11 @@ class SocketWrapper {
      *
      * @param {http.Server} httpServer - The HTTP server instance to attach Socket.IO to.
      */
-    connect(httpServer, path) {
+    connect(httpServer, path, adapter) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 this._io = new socket_io_1.Server(httpServer, {
+                    adapter: adapter,
                     path: `/${path ? path + '/' : ''}socket/`,
                     pingTimeout: 30000,
                     pingInterval: 25000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "2.0.50",
+  "version": "2.0.52",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",