Update for latest code.

Author: junhaoliao

components/log-viewer-webui/server/package-lock.json

@@ -20,11 +20,11 @@
     "@aws-sdk/s3-request-presigner": "^3.731.1",
     "@fastify/mongodb": "^9.0.2",
     "@fastify/mysql": "^5.0.2",
-    "@fastify/static": "^8.0.4",
+    "@fastify/static": "^8.1.1",
     "@fastify/type-provider-typebox": "^5.1.0",
-    "@msgpack/msgpack": "^3.0.0-beta2",
-    "@sinclair/typebox": "^0.34.14",
-    "@types/node": "^22.10.7",
+    "@msgpack/msgpack": "^3.0.1",
+    "@sinclair/typebox": "^0.34.25",
+    "@types/node": "^22.13.4",
     "dotenv": "^16.4.7",
     "fastify": "^5.2.1",
     "fastify-plugin": "^5.0.1",
@@ -36,6 +36,6 @@
     "concurrently": "^9.1.2",
     "eslint-config-yscope": "latest",
     "nodemon": "^3.1.9",
-    "tap": "^21.0.1"
+    "tap": "^21.0.2"
   }
 }

components/log-viewer-webui/server/package.json

@@ -15,6 +15,7 @@ import {
     ResultSetHeader,
 } from "mysql2/promise";
 
+import {Nullable} from "./typings/common.js";
 import {
     QUERY_JOB_STATUS,
     QUERY_JOB_STATUS_WAITING_STATES,
@@ -209,7 +210,7 @@ class DbManager {
      * @return A promise that resolves to the extracted stream's metadata.
      */
     async getExtractedStreamFileMetadata (streamId: string, logEventIdx: number)
-        : Promise<StreamFileMongoDocument | null> {
+        : Promise<Nullable<StreamFileMongoDocument>> {
         return await this.#streamFilesCollection.findOne({
             stream_id: streamId,
             begin_msg_ix: {$lte: logEventIdx},

components/log-viewer-webui/server/src/DbManager.js

@@ -1,10 +1,11 @@
-import fastifyPlugin from "fastify-plugin";
-
 import {
     GetObjectCommand,
     S3Client,
 } from "@aws-sdk/client-s3";
 import {getSignedUrl} from "@aws-sdk/s3-request-presigner";
+import fastifyPlugin from "fastify-plugin";
+
+import {Nullable} from "./typings/common.js";
 
 
 /**
@@ -16,12 +17,12 @@ const PRE_SIGNED_URL_EXPIRY_TIME_SECONDS = 3600;
  * Class to manage Simple Storage Service (S3) objects.
  */
 class S3Manager {
-    #s3Client;
+    readonly #s3Client;
 
     /**
-     * @param {string} region
+     * @param region
      */
-    constructor (region) {
+    constructor (region: string) {
         this.#s3Client = new S3Client({
             region: region,
         });
@@ -30,11 +31,11 @@ class S3Manager {
     /**
      * Generates a pre-signed URL for accessing an S3 object.
      *
-     * @param {string} s3UriString The S3 object URI string.
-     * @return {Promise<string>} The pre-signed URL string.
+     * @param s3UriString The S3 object URI string.
+     * @return The pre-signed URL string.
      * @throws {Error} If a pre-signed URL couldn't be generated.
      */
-    async getPreSignedUrl (s3UriString) {
+    async getPreSignedUrl (s3UriString: string) {
         const s3Uri = new URL(s3UriString);
         const command = new GetObjectCommand({
             Bucket: s3Uri.hostname,
@@ -49,7 +50,10 @@ class S3Manager {
                     expiresIn: PRE_SIGNED_URL_EXPIRY_TIME_SECONDS,
                 }
             );
-        } catch (error) {
+        } catch (error: unknown) {
+            if (false === error instanceof Error) {
+                throw error;
+            }
             throw new Error(`Failed to generate pre-signed URL: ${error.message}`);
         }
     }
@@ -59,12 +63,18 @@ class S3Manager {
  * Initializes a Fastify plugin, which decorates the application with an S3 manager at the
  * "s3Manager" property when all plugin options are valid.
  */
-export default fastifyPlugin(async (app, options) => {
+export default fastifyPlugin(async (app, options: {region: Nullable<string>}) => {
     const {region} = options;
     if (null === region) {
         return;
     }
 
     console.log(`Initializing S3Manager with region="${region}"...`);
-    await app.decorate("s3Manager", new S3Manager(region));
+    app.decorate("s3Manager", new S3Manager(region));
 });
+
+declare module "fastify" {
+    interface FastifyInstance {
+        s3Manager?: S3Manager;
+    }
+}