package updates & more typings

Author: spasma

package.json

@@ -24,25 +24,25 @@
   "license": "BSL 1.1",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.x",
-    "archiver": "^5.x",
+    "archiver": "^7.x",
     "archiver-zip-encrypted": "^2.0.0",
     "axios": "^1.x",
-    "cron": "^2.x",
-    "dotenv": "^16.x",
-    "express": "^4.x",
-    "googleapis": "^118.x",
+    "cron": "^4.x",
+    "dotenv": "^17.x",
+    "express": "^5.x",
+    "googleapis": "^168.x",
     "mysql2": "^3.x",
-    "uuid": "^9.x",
+    "uuid": "^13.x",
     "winston": "^3.x"
   },
   "devDependencies": {
     "prettier": "3.5.3",
-    "@types/archiver": "^5.x",
-    "@types/cron": "^2.x",
+    "@types/archiver": "^7.x",
+    "@types/cron": "^4.x",
     "@types/express": "^4.x",
     "@types/jest": "^29.x",
     "@types/node": "^18.x",
-    "@types/uuid": "^9.x",
+    "@types/uuid": "^13.x",
     "@typescript-eslint/eslint-plugin": "^5.x",
     "@typescript-eslint/parser": "^5.x",
     "eslint": "^8.x",

src/core/scheduler.ts

@@ -45,7 +45,7 @@ export class Scheduler {
         },
         null, // onComplete
         true, // start
-        'UTC', // timeZone
+        process?.env?.TZ || 'UTC', // timezone
       );
 
       logger.info('Scheduler started');

src/db/connector.ts

@@ -1,3 +1,5 @@
+import { DatabaseConfig } from '../config';
+
 /**
  * Database connector interface
  * This interface defines the methods that all database connectors must implement
@@ -52,5 +54,5 @@ export interface DatabaseConnectorFactory {
    * @param config Database configuration
    * @returns Database connector instance
    */
-  createConnector(config: any): DatabaseConnector;
+  createConnector(config: DatabaseConfig): DatabaseConnector;
 }

src/db/implementations/mariadb.ts

@@ -76,10 +76,14 @@ export class MariaDBConnector implements DatabaseConnector {
         await this.connect();
       }
 
-      const [rows] = await this.connection!.query('SHOW DATABASES');
+      const [rows] = this.connection
+        ? await this.connection.query('SHOW DATABASES')
+        : [[], []];
+
+      type SHOW_DB_ROWS = { Database: string };
 
       // Filter out system databases
-      const databases = (rows as any[])
+      const databases = (rows as SHOW_DB_ROWS[])
         .map((row) => row.Database)
         .filter(
           (name) =>
@@ -113,9 +117,9 @@ export class MariaDBConnector implements DatabaseConnector {
         await this.connect();
       }
 
-      const [rows] = await this.connection!.query('SHOW DATABASES LIKE ?', [
-        database,
-      ]);
+      const [rows] = this.connection
+        ? await this.connection.query('SHOW DATABASES LIKE ?', [database])
+        : [[], []];
 
       return (rows as any[]).length > 0;
     } catch (error) {
@@ -180,9 +184,11 @@ export class MariaDBConnector implements DatabaseConnector {
 
       if (!exists) {
         logger.info(`Creating database: ${database}`);
-        await this.connection!.query(
-          `CREATE DATABASE IF NOT EXISTS \`${database}\``,
-        );
+        if (this.connection) {
+          await this.connection.query(
+            `CREATE DATABASE IF NOT EXISTS \`${database}\``,
+          );
+        }
       }
 
       // Use the mysql command to restore the database

src/storage/s3.ts

@@ -361,7 +361,7 @@ export class S3StorageProvider implements StorageProvider {
 
         return true;
       } catch (error: any) {
-        if (error.name === 'NotFound') {
+        if (error?.name === 'NotFound') {
           return false;
         }
         throw error;

tests/utils/compression.test.ts

@@ -1,27 +1,27 @@
-import fs from "fs";
-import path from "path";
-import os from "os";
-import { compressFile, decompressFile } from "../../src/utils/compression";
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { compressFile, decompressFile } from '../../src/utils/compression';
 
-describe("Compression Utils", () => {
+describe('Compression Utils', () => {
   let tempDir: string;
   let testFile: string;
   let compressedFile: string;
   let decompressedFile: string;
-  const testContent = "This is a test file content for compression testing.";
+  const testContent = 'This is a test file content for compression testing.';
 
   beforeAll(async () => {
     // Create temporary directory for test files
     tempDir = path.join(os.tmpdir(), `compression-test-${Date.now()}`);
     fs.mkdirSync(tempDir, { recursive: true });
 
     // Create test file
-    testFile = path.join(tempDir, "test-file.txt");
+    testFile = path.join(tempDir, 'test-file.txt');
     fs.writeFileSync(testFile, testContent);
 
     // Define paths for compressed and decompressed files
-    compressedFile = path.join(tempDir, "compressed-file.gz");
-    decompressedFile = path.join(tempDir, "decompressed-file.txt");
+    compressedFile = path.join(tempDir, 'compressed-file.gz');
+    decompressedFile = path.join(tempDir, 'decompressed-file.txt');
   });
 
   afterAll(() => {
@@ -34,7 +34,7 @@ describe("Compression Utils", () => {
     if (fs.existsSync(tempDir)) fs.rmdirSync(tempDir);
   });
 
-  it("should compress and decompress a file correctly", async () => {
+  it('should compress and decompress a file correctly', async () => {
     // Compress the file
     await compressFile(testFile, compressedFile);
 
@@ -48,18 +48,18 @@ describe("Compression Utils", () => {
     await decompressFile(compressedFile, decompressedFile);
 
     // Verify decompressed content matches original
-    const decompressedContent = fs.readFileSync(decompressedFile, "utf8");
+    const decompressedContent = fs.readFileSync(decompressedFile, 'utf8');
     expect(decompressedContent).toEqual(testContent);
   });
 
-  it("should throw an error when decompressing an invalid file", async () => {
+  it('should throw an error when decompressing an invalid file', async () => {
     // Create an invalid compressed file
-    const invalidFile = path.join(tempDir, "invalid.gz");
-    fs.writeFileSync(invalidFile, "This is not a valid gzip file");
+    const invalidFile = path.join(tempDir, 'invalid.gz');
+    fs.writeFileSync(invalidFile, 'This is not a valid gzip file');
 
     // Attempt to decompress the invalid file
     await expect(
-      decompressFile(invalidFile, decompressedFile)
+      decompressFile(invalidFile, decompressedFile),
     ).rejects.toThrow();
 
     // Clean up

tests/utils/encryption.test.ts

@@ -1,28 +1,28 @@
-import fs from "fs";
-import path from "path";
-import os from "os";
-import { encryptFile, decryptFile } from "../../src/utils/encryption";
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { encryptFile, decryptFile } from '../../src/utils/encryption';
 
-describe("Encryption Utils", () => {
+describe('Encryption Utils', () => {
   let tempDir: string;
   let testFile: string;
   let encryptedFile: string;
   let decryptedFile: string;
-  const testContent = "This is a test file content for encryption testing.";
-  const password = "test-password-123";
+  const testContent = 'This is a test file content for encryption testing.';
+  const password = 'test-password-123';
 
   beforeAll(async () => {
     // Create temporary directory for test files
     tempDir = path.join(os.tmpdir(), `encryption-test-${Date.now()}`);
     fs.mkdirSync(tempDir, { recursive: true });
 
     // Create test file
-    testFile = path.join(tempDir, "test-file.txt");
+    testFile = path.join(tempDir, 'test-file.txt');
     fs.writeFileSync(testFile, testContent);
 
     // Define paths for encrypted and decrypted files
-    encryptedFile = path.join(tempDir, "encrypted-file.enc");
-    decryptedFile = path.join(tempDir, "decrypted-file.txt");
+    encryptedFile = path.join(tempDir, 'encrypted-file.enc');
+    decryptedFile = path.join(tempDir, 'decrypted-file.txt');
   });
 
   afterAll(() => {
@@ -35,7 +35,7 @@ describe("Encryption Utils", () => {
     if (fs.existsSync(tempDir)) fs.rmdirSync(tempDir);
   });
 
-  it("should encrypt and decrypt a file correctly", async () => {
+  it('should encrypt and decrypt a file correctly', async () => {
     // Encrypt the file
     await encryptFile(testFile, encryptedFile, password);
 
@@ -48,17 +48,17 @@ describe("Encryption Utils", () => {
     await decryptFile(encryptedFile, decryptedFile, password);
 
     // Verify decrypted content matches original
-    const decryptedContent = fs.readFileSync(decryptedFile, "utf8");
+    const decryptedContent = fs.readFileSync(decryptedFile, 'utf8');
     expect(decryptedContent).toEqual(testContent);
   });
 
-  it("should throw an error when decrypting with wrong password", async () => {
+  it('should throw an error when decrypting with wrong password', async () => {
     // Encrypt the file
     await encryptFile(testFile, encryptedFile, password);
 
     // Attempt to decrypt with wrong password
     await expect(
-      decryptFile(encryptedFile, decryptedFile, "wrong-password")
+      decryptFile(encryptedFile, decryptedFile, 'wrong-password'),
     ).rejects.toThrow();
   });
 });