@social-mail/social-mail-web-server 1.4.929 → 1.4.930

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.929",
+  "version": "1.4.930",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/seed/seed.ts

@@ -8,6 +8,7 @@ import seedTags from "./tags/seed-tags.js";
 import DbLockContext from "../services/db-lock/DbLockContext.js";
 import LockFile from "../storage/LockFile.js";
 import { globalEnv } from "../../common/globalEnv.js";
+import BaseStorage from "../storage/BaseStorage.js";
 
 export default async function seed() {
 
@@ -17,6 +18,11 @@ export default async function seed() {
         // making sure multiple workers don't interfere
         using fl = await LockFile.lock(`seed-lock-${globalEnv.serverID}.lock`);
 
+        // verify storage...
+        const storage = scope.resolve(BaseStorage as any) as BaseStorage;
+
+        await storage.verify();
+
         // const migrationConfig = { version: globalEnv.version };
 
         const version = globalEnv.version;

package/src/server/storage/BaseStorage.ts

@@ -39,6 +39,8 @@ export default abstract class BaseStorage {
     @Inject
     private diskCache: DiskCacheService;
 
+    abstract verify(): Promise<any>;
+
     abstract createFile(cloudPath: string, file: LocalFile): Promise<string>;
 
     abstract deleteFile(cloudPath: string): Promise<void>;

package/src/server/storage/azure/AzureStorage.ts

@@ -20,6 +20,10 @@ export default class AzureStorage extends BaseStorage {
         this.container = client.getContainerClient(container);
     }
 
+    async verify() {
+        await this.container.getProperties();
+    }
+
     async createFile(cloudPath: string, file: LocalFile) {
         const body = file.openReadStream();
         const md5 = await this.cryptoService.md5Buffer(file.openRead(), "base64");

package/src/server/storage/db/DbStorage.ts

@@ -16,6 +16,12 @@ let seeded = false;
 
 export default class DbStorage extends BaseStorage {
 
+    async verify() {
+        using scope = await this.createScope();
+        const db = scope.resolve(DbStorageContext);
+        await db.dbFiles.asQuery().first();
+    }
+
     async createFile(cloudPath: string, file: LocalFile): Promise<string> {
 
         const sha256 = await this.cryptoService.hashBuffer(file.openRead(), "base64");

package/src/server/storage/s3/S3Storage.ts

@@ -1,7 +1,7 @@
 import { Readable, Stream } from "stream";
 import BaseStorage from "../BaseStorage.js";
 
-import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
+import { S3Client, GetObjectCommand, PutObjectCommand, DeleteObjectCommand, ListBucketsCommand } from "@aws-sdk/client-s3";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 
@@ -28,6 +28,13 @@ export default class S3Storage extends BaseStorage {
         });
 
     }
+
+    async verify() {
+        await this.client.send(new ListBucketsCommand({
+            Bucket
+        }));
+    }
+
     async streamFile(Key: string): Promise<{ contentType: string, stream: Stream }> {
         const r = await this.client.send(new GetObjectCommand({
             Bucket,

package/src/server/storage/volume/VolumeStorage.ts

@@ -2,7 +2,7 @@ import { Stream } from "stream";
 import BaseStorage from "../BaseStorage.js";
 import path from "path";
 import { unlink, writeFile } from "fs/promises";
-import { createReadStream, existsSync } from "fs";
+import { createReadStream, existsSync, mkdirSync } from "fs";
 import sleep from "../../../common/sleep.js";
 import ensureDir, { ensureParentFolder } from "../../../common/FileApi.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
@@ -14,6 +14,13 @@ export default class VolumeStorage extends BaseStorage {
         ensureDir(root);
     }
 
+    verify(): Promise<any> {
+        if(!existsSync(this.root)) {
+            mkdirSync(this.root, { recursive: true });
+        }
+        return Promise.resolve();
+    }
+
     async createFile(cloudPath: string, file: LocalFile) {
         const filePath = this.toFilePath(cloudPath, true);
         await writeFile(filePath, file.openRead());