@social-mail/social-mail-web-server 1.8.78 → 1.8.80

package/package.json

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

package/src/server/seed/ui/seed-ui.ts

@@ -5,7 +5,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.8.251"
+        version: "1.8.253"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

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

@@ -139,14 +139,9 @@ export default class CacheService {
 
         const now = DateTime.now;
 
-        await using rl = await this.rateLimiter.acquireDisposable("0.0.0.0", "file-cache", 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));
-
         const keys = { key, keyHash };
-        let cachedItem = await this.db.cachedItems.statements.select({}, keys);
         const { base: fileName } = parse(key);
 
         let added = false;
@@ -156,6 +151,22 @@ export default class CacheService {
 
         const expiry = now.add(ttl);
 
+        let cachedItem = await this.db.cachedItems.statements.select({}, keys);
+        if (cachedItem) {
+            if(DateTime.from(cachedItem.expiry).msSinceEpoch > Date.now()) {
+                if (cachedItem.slide) {
+                    await this.db.cachedItems.statements.update({
+                        expiry,
+                    },{ itemID: cachedItem.itemID });
+                }
+                cloudPath = `cache/${cachedItem.itemID}`;
+                return this.downloadCachedFile(ck, cachedItem, cloudPath, fileName);
+            }
+        }
+
+        await using _dbLock = await this.dbLockService.lock(`ci-${keyHash}`, DateTime.now.addMinutes(5));
+
+        cachedItem = await this.db.cachedItems.statements.select({}, keys);
         if (cachedItem) {
             if(DateTime.from(cachedItem.expiry).msSinceEpoch > Date.now()) {
                 if (cachedItem.slide) {
@@ -172,6 +183,8 @@ export default class CacheService {
             },{ itemID: cachedItem.itemID });
         }
 
+        await using _rl = await this.rateLimiter.acquireDisposable("0.0.0.0", "file-cache", 10);
+
         if (!cachedItem) {
             cachedItem = await this.db.cachedItems.statements.selectOrInsert( {
                 ... keys,