@social-mail/social-mail-web-server 1.7.463 → 1.7.464

package/package.json

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

package/src/server/services/cache/CacheService.ts

@@ -16,6 +16,7 @@ import CachedItem from "../../model/entities/CachedItem.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { appendFile } from "fs/promises";
 import DbLockService from "../db-lock/DbLockService.js";
+import RateLimiterService from "../rate-limiter/RateLimiterService.js";
 
 export class CachedFile implements Disposable {
 
@@ -52,6 +53,9 @@ export default class CacheService {
     @Inject
     private dbLockService: DbLockService;
 
+    @Inject
+    private rateLimiter: RateLimiterService;
+
     public async clear() {
         const now = DateTime.now;
         const files = await this.db.cachedItems.where({ now }, (p) => (x) => x.expiry <= p.now)
@@ -125,13 +129,18 @@ export default class CacheService {
     }
 
 
-    public async get({
-        key,
-        ttl,
-        factory
-    }: { key: string, ttl: TimeSpan, factory: (c?: CachedItem) => Promise<LocalFile> }) {
+    public async get(ck: { key: string, ttl: TimeSpan, factory: (c?: CachedItem) => Promise<LocalFile> }) {
+
+        const {
+            key,
+            ttl,
+            factory
+        } = ck;
+
         const now = DateTime.now;
 
+        await using rl = await this.rateLimiter.acquireDisposable("0.0.0.0", "file-cache", 1/10);
+
         const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
 
         await using dbLock = await this.dbLockService.lock(`ci-${keyHash}`, DateTime.now.addMinutes(5));
@@ -155,11 +164,7 @@ export default class CacheService {
                     },{ itemID: cachedItem.itemID });
                 }
                 cloudPath = `cache/${cachedItem.itemID}`;
-                try {
-                    return await this.tempFileService.downloadCloudFile(cloudPath, fileName);
-                } catch (error) {
-                    console.error(error);
-                }
+                return this.downloadCachedFile(ck, cachedItem, cloudPath, fileName);
             }
             cachedItem.expiry = DateTime.now.addDays(30);
             await this.db.cachedItems.statements.update({
@@ -198,6 +203,17 @@ export default class CacheService {
         return await this.tempFileService.downloadCloudFile(cloudPath, fileName);
     }
 
+    async downloadCachedFile(ck, c: CachedItem, cloudPath: string, fileName: string) {
+        try {
+            return await this.tempFileService.downloadCloudFile(cloudPath, fileName);
+        } catch (error) {
+            await this.db.cachedItems.statements.delete({ itemID: c.itemID });
+            return this.get(ck);
+            console.error(error);
+        }
+
+    }
+
 
     // private async lockCachedItem(item: CachedItem, max = DateTime.now.addMinutes(1)) {
 

package/src/server/services/convert/FileConversionService.ts

@@ -46,7 +46,7 @@ export default class FileConversionService {
             return await this.cacheService.get({ key, ttl,
                 factory: async () => {
 
-                    await using tx = await this.rateLimiterService.expirableAcquire("any", "ic" + process.pid , 2);
+                    await using tx = await this.rateLimiterService.acquireDisposable("any", "ic" + process.pid , 2);
 
                     file = await this.downloadFileContent(appFile, fileContentID);
                     // resize...
@@ -59,7 +59,7 @@ export default class FileConversionService {
         if (/^(pdf|html|webm(\-branded)?)$/i.test(type)) {
             return await this.cacheService.get({ key, ttl,
                 factory: async () => {
-                    await using tx = await this.rateLimiterService.expirableAcquire("any", "vc" + process.pid, 1);
+                    await using tx = await this.rateLimiterService.acquireDisposable("any", "vc" + process.pid, 1);
                     file = await this.downloadFileContent(appFile, fileContentID);
                     const ics = this;
                     return await ics[StringFormat.toCamelCase(type)](file, fileName );

package/src/server/services/rate-limiter/RateLimiterService.ts

@@ -47,7 +47,11 @@ export default class RateLimiterService {
         return null;
     }
 
-    async expirableAcquire(ip: string, group: string, maxPerSecond = 1/15 ) {
+    async acquireDisposable(
+        ip: string,
+        group: string,
+        maxPerSecond = 1/15
+    ) {
         const { db } = this;
         let now = DateTime.now;