@technicity/data-service-generator 0.11.0 → 0.11.2

package/dist/runtime/Cache.d.ts

@@ -1,12 +1,19 @@
-import { RedisClientType } from 'redis';
-import { TResolveParams } from './IRuntime';
-import Stats from './Stats';
+import { RedisClientType, RedisClusterType } from "redis";
+import { TResolveParams } from "./IRuntime";
+import Stats from "./Stats";
+export declare type RedisConfig = {
+    url: string;
+    tls?: boolean;
+    db?: number;
+    socketTimeout?: number;
+    clusterMode?: boolean;
+};
 declare class Cache {
-    client: RedisClientType;
+    client: RedisClientType | RedisClusterType;
     waiting?: Set<() => void> | undefined;
     logs?: boolean;
     stats?: Stats;
-    constructor(url: string, debug?: string[]);
+    constructor(redisConfig: RedisConfig, debug?: string[]);
     log(message: string): void;
     pending(): Promise<void>;
     from(input: TResolveParams): Promise<{

package/dist/runtime/Cache.js

@@ -5,16 +5,48 @@ const redis_1 = require("redis");
 const utility_1 = require("./lib/utility");
 const Stats_1 = require("./Stats");
 class Cache {
-    constructor(url, debug) {
+    constructor(redisConfig, debug) {
         this.waiting = new Set();
         if (debug?.includes("Cache"))
             this.logs = true;
-        const client = this.client =
-            (0, redis_1.createClient)({ url: `redis://${url}` });
+        const { url } = redisConfig;
+        const tls = redisConfig.tls ? true : false;
+        const clusterMode = redisConfig.clusterMode ? true : false;
+        const scheme = tls ? "rediss://" : "redis://";
+        const db = redisConfig.db == null ? 0 : redisConfig.db;
+        const socketTimeout = redisConfig.socketTimeout == null ? 50000 : redisConfig.socketTimeout;
+        let client = undefined;
+        if (clusterMode) {
+            client = (0, redis_1.createCluster)({
+                rootNodes: [
+                    {
+                        url: `${scheme}${url}`
+                    }
+                ],
+                defaults: {
+                    socket: {
+                        tls,
+                        rejectUnauthorized: false,
+                        connectTimeout: socketTimeout
+                    }
+                }
+            });
+        }
+        else {
+            client = (0, redis_1.createClient)({
+                url: `${scheme}${url}/${db}`,
+                socket: {
+                    tls,
+                    rejectUnauthorized: false,
+                    connectTimeout: socketTimeout
+                }
+            });
+        }
+        this.client = client;
         client.connect();
         client.on("connect", () => {
             if (this.waiting)
-                this.waiting.forEach(x => x());
+                this.waiting.forEach((x) => x());
             this.waiting = undefined;
         });
         if (debug?.includes("Stats"))
@@ -26,16 +58,17 @@ class Cache {
     }
     async pending() {
         if (this.waiting)
-            return new Promise(res => this.waiting.add(res));
+            return new Promise((res) => this.waiting.add(res));
     }
     async from(input) {
         let { action, args, fields, resource } = input;
         const request = JSON.stringify({
-            action, resource, args, fields
+            action,
+            resource,
+            args,
+            fields
         });
-        const key = (0, crypto_1.createHash)('sha256')
-            .update(request)
-            .digest('hex');
+        const key = (0, crypto_1.createHash)("sha256").update(request).digest("hex");
         const cached = await this.read(key);
         return {
             request: key,
@@ -47,7 +80,7 @@ class Cache {
         const json = JSON.stringify(payload);
         const regex = /"uuid":"(.+?)"/g;
         const pending = [];
-        for (let result; result = regex.exec(json);) {
+        for (let result; (result = regex.exec(json));) {
             const uuid = result[1];
             if (!uuid)
                 continue;
@@ -56,10 +89,7 @@ class Cache {
         if (!pending.length)
             return;
         this.log(`insert: ${key.substring(0, 6)}`);
-        await Promise.all([
-            redis.set(`cache:${key}`, json),
-            ...pending
-        ]);
+        await Promise.all([redis.set(`cache:${key}`, json), ...pending]);
     }
     async read(key) {
         await this.pending();
@@ -76,13 +106,13 @@ class Cache {
     }
     async purge(...uuids) {
         const redis = this.client;
-        await (0, utility_1.mapAsync)(uuids, uuid => {
+        await (0, utility_1.mapAsync)(uuids, (uuid) => {
             const getDependancies = redis.sMembers(`deps:${uuid}`);
             return [
-                (0, utility_1.mapAsync)(getDependancies, key => {
+                (0, utility_1.mapAsync)(getDependancies, (key) => {
                     const getDependants = redis.sMembers(`cached:${key}`);
                     return [
-                        (0, utility_1.mapAsync)(getDependants, uuid => (redis.sRem(`deps:${uuid}`, [key]))),
+                        (0, utility_1.mapAsync)(getDependants, (uuid) => redis.sRem(`deps:${uuid}`, [key])),
                         redis.del(`cache:${key}`),
                         redis.del(`cached:${key}`)
                     ];

package/dist/runtime/RuntimeMySQL.d.ts

@@ -1,3 +1,4 @@
+import { RedisConfig } from "./Cache";
 import type { IRuntime, TMiddleware, TResolveParams, IArtifacts, ISupplementClientOpts } from "./IRuntime";
 export declare class RuntimeMySQL implements IRuntime {
     #private;
@@ -5,7 +6,7 @@ export declare class RuntimeMySQL implements IRuntime {
         [k: string]: any;
     }, otherOpts: {
         supplementClientOpts?: ISupplementClientOpts;
-        redisHost?: string;
+        redis?: RedisConfig;
     }, artifacts: IArtifacts);
     resolve(input: TResolveParams): Promise<any>;
     $queryRaw(sql: string, values?: any[]): Promise<any>;

package/dist/runtime/RuntimeMySQL.js

@@ -24,8 +24,8 @@ class RuntimeMySQL {
         _RuntimeMySQL_clientCache.set(this, void 0);
         _RuntimeMySQL_middlewareHandler.set(this, void 0);
         __classPrivateFieldSet(this, _RuntimeMySQL_middlewareHandler, new shared_1.MiddlewareHandler(), "f");
-        if (otherOpts.redisHost)
-            __classPrivateFieldSet(this, _RuntimeMySQL_clientCache, new Cache_1.default(otherOpts.redisHost, clientOpts?.debug), "f");
+        if (otherOpts.redis)
+            __classPrivateFieldSet(this, _RuntimeMySQL_clientCache, new Cache_1.default(otherOpts.redis, clientOpts?.debug), "f");
         if (otherOpts.supplementClientOpts) {
             clientOpts = {
                 supportBigNumbers: true,
@@ -48,7 +48,7 @@ class RuntimeMySQL {
                     }
                     return next();
                 },
-                ...clientOpts,
+                ...clientOpts
             };
         }
         else {
@@ -62,7 +62,7 @@ class RuntimeMySQL {
                     }
                     return next();
                 },
-                ...clientOpts,
+                ...clientOpts
             };
         }
         __classPrivateFieldSet(this, _RuntimeMySQL_mysqlClient, new MySQL_1.MySQL(clientOpts), "f");

package/dist/runtime/Stats.d.ts

@@ -1,7 +1,7 @@
-import { RedisClientType } from '@redis/client';
+import { RedisClientType, RedisClusterType } from "@redis/client";
 declare class Stats {
-    client: RedisClientType<any>;
-    constructor(client: RedisClientType<any>);
+    client: RedisClientType<any> | RedisClusterType<any>;
+    constructor(client: RedisClientType<any> | RedisClusterType<any>);
     updateStats: (ms: number, category: string) => Promise<void>;
 }
 declare namespace timer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "main": "./dist/index.js",
   "files": [
     "dist"