remove options and some redis caching

Author: adrianthedev

features/cache/index.ts

@@ -1,17 +1,13 @@
-import { REDIS_CACHE_DB } from "@/lib/constants"
+import { REDIS_CACHE_DB } from "@/lib/constants";
+import { ValueType } from "ioredis";
+import { getRedisClient } from "@/lib/redis";
 import { isUndefined } from "lodash";
-import Redis, { ValueType } from "ioredis";
 
 class CacheDriver {
   public redis;
 
-  constructor({ url }: { url: string }) {
-    const options = {
-      keyPrefix: `basetool_${process.env.NEXT_PUBLIC_APP_ENV}:`,
-      lazyConnect: true,
-      db: REDIS_CACHE_DB,
-    };
-    this.redis = new Redis(url, options);
+  constructor() {
+    this.redis = getRedisClient(REDIS_CACHE_DB);
   }
 
   public async get(key: string): Promise<string | null> {
@@ -65,16 +61,21 @@ class CacheDriver {
 
     // Store the result
     if (!isUndefined(options.expiresIn)) {
-      await this.set({ key, value: JSON.stringify(result), time: options.expiresIn, expiryMode: 'EX' });
-    } else{
-      await this.set({ key, value: JSON.stringify(result)});
+      await this.set({
+        key,
+        value: JSON.stringify(result),
+        time: options.expiresIn,
+        expiryMode: "EX",
+      });
+    } else {
+      await this.set({ key, value: JSON.stringify(result) });
     }
 
     // Return the result
     return result;
   }
 }
 
-const cache = new CacheDriver({ url: process.env.REDIS_URL as string });
+const cache = new CacheDriver();
 
 export default cache;

features/data-sources/components/DataSourceTileCreate.tsx

@@ -78,6 +78,7 @@ const DataSourceTileCreate = ({
                 className="w-5 h-5"
                 checked={!comingSoon && id === dataSourceId}
                 disabled={comingSoon}
+                onChange={() => ''}
               />
             </div>
             <div className="relative h-12 mb-4">

features/options/index.ts

@@ -1,45 +1,13 @@
-import { REDIS_OPTIONS_DB } from "@/lib/constants";
-import { isUndefined } from "lodash";
-import Redis, { ValueType } from "ioredis";
+type PossibleValues = string | boolean | number | null | undefined;
 
-class Options {
-  public redis;
+const OPTIONS: Record<string, PossibleValues> = {
+  runInProxy: false,
+};
 
-  constructor({ url }: { url: string }) {
-    const options = {
-      keyPrefix: `basetool_${process.env.NEXT_PUBLIC_APP_ENV}:`,
-      lazyConnect: true,
-      db: REDIS_OPTIONS_DB,
-    };
-    this.redis = new Redis(url, options);
-  }
+const optionsHandler = {
+  get: async (key: string): Promise<PossibleValues> => {
+    return OPTIONS[key];
+  },
+};
 
-  public async get(key: string): Promise<string | null> {
-    return await this.redis.get(key);
-  }
-
-  public async exists(key: string): Promise<boolean> {
-    return (await this.redis.exists(key)) !== 0;
-  }
-
-  public async set(
-    key: string,
-    value: ValueType,
-    options: {
-      expiryMode?: "EX";
-      time?: number;
-    } = {
-      expiryMode: "EX",
-    }
-  ) {
-    if (!isUndefined(options.time)) {
-      return this.redis.set(key, value, options.expiryMode, options.time);
-    }
-
-    return this.redis.set(key, value);
-  }
-}
-
-const options = new Options({ url: process.env.REDIS_URL as string });
-
-export default options;
+export default optionsHandler;

lib/redis.ts

@@ -0,0 +1,14 @@
+import Redis from "ioredis";
+
+const getRedisClient = (db: number) => {
+  const options = {
+    keyPrefix: `basetool_${process.env.NEXT_PUBLIC_APP_ENV}:`,
+    lazyConnect: true,
+    db,
+  };
+  const client = new Redis(process.env.REDIS_URL, options);
+
+  return client;
+};
+
+export { getRedisClient };

pages/data-sources/new.tsx

@@ -46,6 +46,7 @@ function New() {
               {availableDataSources.map(
                 ({ id, label, beta, comingSoon, readOnly }) => (
                   <DataSourceTileCreate
+                    key={id}
                     id={id}
                     label={label}
                     beta={beta}

plugins/data-sources/QueryServiceWrapper.ts

@@ -86,7 +86,7 @@ export default class QueryServiceWrapper implements IQueryServiceWrapper {
   }
 
   public async disconnect() {
-    return await this.queryService.disconnect()
+    return await this.queryService.disconnect();
   }
 }
 
@@ -163,20 +163,7 @@ export const runInSSHTunnel = async ({
  * Fetches and caches the key from S3
  */
 const getSSHKey = async (Key: string) => {
-  // Cache the key for 15 minutes so we avoid the S3 transport time.
-  const stringifiedKey = await cache.fetch<string>({
-    key: `ssh_key:${Key}`,
-    options: {
-      expiresIn: 900, // 15 minutes
-    },
-    callback: async () => {
-      const key = await fetchKeyFromS3(Key);
-
-      return encrypt(key?.toString() as string);
-    },
-  });
-
-  return decrypt(stringifiedKey);
+  return await fetchKeyFromS3(Key);
 };
 
 /**

plugins/data-sources/serverHelpers.ts

@@ -44,7 +44,7 @@ export const runQueries = async (
   // We want to better control if the queries should run in a proxy
   // We're checking to see if the redis DB has any options set 1 or 0.
   // If nothing is set in redis, we're going to fallback to an environment variable.
-  const runInProxyOverride = (await options.exists("runInProxy"))
+  const runInProxyOverride = (await options.get("runInProxy"))
     ? (await options.get("runInProxy")) === "1"
     : process.env.USE_PROXY === "1";