backup

y-scope · Jan 23, 2025 · 4f40126 · 4f40126
1 parent ba63a76
commit 4f40126
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 23 deletions.
diff --git a/components/log-viewer-webui/server/src/S3Manager.js b/components/log-viewer-webui/server/src/S3Manager.js
@@ -1,3 +1,5 @@
+import fastifyPlugin from "fastify-plugin";
+
 import {
     GetObjectCommand,
     S3Client,
@@ -16,15 +18,27 @@ const PRE_SIGNED_URL_EXPIRY_TIME_SECONDS = 3600;
 class S3Manager {
     #s3Client;
 
+    #enabled;
+
     /**
-     * @param {string} region
+     * @param {string|null} region
      */
-    constructor (
-        region,
-    ) {
-        this.#s3Client = new S3Client({
-            region: region,
-        });
+    constructor (region) {
+        console.log(`Region's length is ${region.length}`)
+        console.log(`Region is ${region}`)
+        console.log(region)
+        this.#enabled = null !== region;
+        console.log(`Enabled is ${this.#enabled}`)
+        if (true === this.#enabled) {
+            console.log(`Initializing S3 client`)
+            this.#s3Client = new S3Client({
+                region: region,
+            });
+        }
+    }
+
+    isEnabled () {
+        return this.#enabled;
     }
 
     /**
@@ -55,4 +69,8 @@ class S3Manager {
     }
 }
 
-export default S3Manager;
+export default fastifyPlugin(async (app, region) => {
+    console.log(`Region in Plugin init is ${region}`)
+    console.log(region)
+    await app.decorate("s3Manager", new S3Manager(region));
+});
diff --git a/components/log-viewer-webui/server/src/app.js b/components/log-viewer-webui/server/src/app.js
@@ -6,6 +6,7 @@ import DbManager from "./DbManager.js";
 import exampleRoutes from "./routes/example.js";
 import queryRoutes from "./routes/query.js";
 import staticRoutes from "./routes/static.js";
+import S3Manager from "./S3Manager.js";
 
 
 /**
@@ -41,6 +42,8 @@ const app = async ({
                 port: settings.MongoDbPort,
             },
         });
+        console.log(settings.StreamFilesS3Region)
+        await server.register(S3Manager, settings.StreamFilesS3Region);
     }
 
     await server.register(staticRoutes);

diff --git a/components/log-viewer-webui/server/src/routes/query.js b/components/log-viewer-webui/server/src/routes/query.js
@@ -2,22 +2,15 @@ import {StatusCodes} from "http-status-codes";
 
 import settings from "../../settings.json" with {type: "json"};
 import {EXTRACT_JOB_TYPES} from "../DbManager.js";
-import S3Manager from "../S3Manager.js";
-
-
-const S3_MANAGER = (
-    null === settings.StreamFilesS3PathPrefix ||
-    null === settings.StreamFilesS3Region
-) ?
-    null :
-    new S3Manager(settings.StreamFilesS3Region);
 
 
 /**
  * Submits a stream extraction job and returns the metadata of the extracted stream.
  *
  * @param {object} props
- * @param {import("fastify").FastifyInstance | {dbManager: DbManager}} props.fastify
+ * @param {import("fastify").FastifyInstance |
+ * {dbManager: DbManager} |
+ * {s3Manager: S3Manager}} props.fastify
  * @param {EXTRACT_JOB_TYPES} props.jobType
  * @param {number} props.logEventIdx
  * @param {string} props.streamId
@@ -63,7 +56,9 @@ const extractStreamAndGetMetadata = async ({
 /**
  * Creates query routes.
  *
- * @param {import("fastify").FastifyInstance | {dbManager: DbManager}} fastify
+ * @param {import("fastify").FastifyInstance |
+ * {dbManager: DbManager} |
+ * {s3Manager: S3Manager}} fastify
  * @param {import("fastify").FastifyPluginOptions} options
  * @return {Promise<void>}
  */
@@ -96,12 +91,12 @@ const routes = async (fastify, options) => {
             });
         }
 
-        if (null === S3_MANAGER) {
-            streamMetadata.path = `/streams/${streamMetadata.path}`;
-        } else {
-            streamMetadata.path = await S3_MANAGER.getPreSignedUrl(
+        if (fastify.s3Manager.isEnabled()) {
+            streamMetadata.path = await fastify.s3Manager.getPreSignedUrl(
                 `s3://${settings.StreamFilesS3PathPrefix}${streamMetadata.path}`
             );
+        } else {
+            streamMetadata.path = `/streams/${streamMetadata.path}`;
         }
 
         return streamMetadata;