@social-mail/social-mail-web-server 1.8.6 → 1.8.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.6",
+  "version": "1.8.8",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.499",
-    "@entity-access/server-pages": "^1.1.502",
+    "@entity-access/server-pages": "^1.1.503",
     "@peculiar/asn1-schema": "^2.3.15",
     "@social-mail/shared": "^1.0.29",
     "@socket.io/cluster-adapter": "^0.2.2",

package/src/common/FileApi.ts

@@ -13,13 +13,8 @@ export default function ensureDir(folder: string) {
         return;
     }
 
-    const parent = dirname(folder);
-    if (parent !== "/") {
-        ensureDir(parent);
-    }
-
     try {
-        mkdirSync(folder);
+        mkdirSync(folder, { recursive: true});
     } catch (error) {
         if (existsSync(folder)) {
             return;

package/src/server/storage/BaseStorage.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { Stream } from "stream";
+import { Readable, Stream } from "stream";
 // import TempFileService, { LocalFile } from "./TempFileService.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../model/SocialMailContext.js";
@@ -43,7 +43,7 @@ export default abstract class BaseStorage {
 
     abstract deleteFile(cloudPath: string): Promise<void>;
 
-    abstract streamFile(cloudPath: string): Promise<{ contentType: string, stream: Stream }>;
+    abstract streamFile(cloudPath: string): Promise<{ contentType: string, stream: Readable }>;
 
     async getContentHash(file: LocalFile) {
         return await this.cryptoService.hashBuffer(file.openRead());

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

@@ -40,11 +40,11 @@ export default class AzureStorage extends BaseStorage {
         const blob = this.container.getBlockBlobClient(cloudPath);
         await blob.deleteIfExists();
     }
-    async streamFile(cloudPath: string): Promise<{ contentType: string; stream: Stream; }> {
+    async streamFile(cloudPath: string): Promise<{ contentType: string; stream: Readable; }> {
         const blob = this.container.getBlockBlobClient(cloudPath);
         const buffer = await blob.download();
         const contentType = buffer.contentType ?? "application/octet-stream";
-        return { contentType, stream: buffer.readableStreamBody as any as Stream };
+        return { contentType, stream: buffer.readableStreamBody as any as Readable };
     }
 
 }

package/src/server/storage/compression/gz.ts

@@ -1,26 +1,26 @@
 
-import { promisify } from "node:util";
-import { pipeline, Stream, Writable } from "node:stream";
+import { Stream, Writable } from "node:stream";
 import * as zlib from "node:zlib";
 import { createWriteStream } from "node:fs";
-
-const pipe = promisify(pipeline);
+import { pipeline } from "node:stream/promises";
 
 export default class GZip {
 
-    static unzipFile(input: Stream, output: string) {
-        return new Promise<void>((resolve, reject) => {
-            const outputStream = createWriteStream(output);
-            input.pipe(zlib.createGunzip()).pipe(outputStream).on("finish", (error) => error ? reject(error) : resolve());
-        });
-    }
-
-
-    static unzip(input: Stream, output: Writable) {
-        return new Promise<void>((resolve, reject) => {
-            input.pipe(zlib.createGunzip()).pipe(output).on("finish", (error) => error ? reject(error) : resolve());
-        });
-    }
+    // static unzipFile(input: Stream, output: string) {
+    //     const outputStream = createWriteStream(output);
+    //     return pipeline(input, zlib.createGunzip())
+    //     // return new Promise<void>((resolve, reject) => {
+    //     //     const outputStream = createWriteStream(output);
+    //     //     input.pipe(zlib.createGunzip()).pipe(outputStream).on("finish", (error) => error ? reject(error) : resolve());
+    //     // });
+    // }
+
+
+    // static unzip(input: Stream, output: Writable) {
+    //     return new Promise<void>((resolve, reject) => {
+    //         input.pipe(zlib.createGunzip()).pipe(output).on("finish", (error) => error ? reject(error) : resolve());
+    //     });
+    // }
 
     static zip(input: Stream) {
         return input.pipe(zlib.createGzip());

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

@@ -65,7 +65,7 @@ export default class DbStorage extends BaseStorage {
             .delete(file, (p) => (x) => x.fileID === p.fileID);
     }
 
-    async streamFile(cloudPath: string): Promise<{ contentType: string; stream: Stream; }> {
+    async streamFile(cloudPath: string): Promise<{ contentType: string; stream: Readable; }> {
         using scope = await this.createScope();
         const db = scope.resolve(DbStorageContext);
         const file = await db.dbFiles.where({ cloudPath }, (p) => (x) => x.path === p.cloudPath ).first();

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

@@ -36,14 +36,14 @@ export default class S3Storage extends BaseStorage {
         }));
     }
 
-    async streamFile(Key: string): Promise<{ contentType: string, stream: Stream }> {
+    async streamFile(Key: string): Promise<{ contentType: string, stream: Readable }> {
         const r = await this.client.send(new GetObjectCommand({
             Bucket,
             Key
         }));
         return {
             contentType: r.ContentType,
-            stream: r.Body as Stream
+            stream: r.Body as Readable
         } ;
     }
 

package/src/server/storage/tempDiskCache.ts

@@ -5,7 +5,7 @@ import ensureDir from "../../common/FileApi.js";
 
 
 const tmpdir = path.join(globalEnv.tmpDir, "t");
-ensureDir(tmpdir);
+// ensureDir(tmpdir);
 export const tempDiskCache = new BaseDiskCache({
     root: tmpdir,
     keepTTLSeconds: 4 * 60 * 60,