@adminforth/storage-adapter-local 1.0.10 → 1.0.12

package/dist/index.js

@@ -74,43 +74,14 @@ class AdminForthStorageAdapterLocalFilesystem {
     }
     markKeyForDeletation(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            afLogger.error("Method \"markKeyForDeletation\" is deprecated, use markKeyForDeletion instead");
-            const metadata = yield this.metadataDb.get(key).catch((e) => {
-                afLogger.error(`Could not read metadata from db: ${e}`);
-                throw new Error(`Could not read metadata from db: ${e}`);
-            });
-            if (!metadata) {
-                afLogger.error(`Metadata for key ${key} not found`);
-                return;
-            }
-            const metadataParsed = JSON.parse(metadata);
-            try {
-                yield this.candidatesForDeletionDb.get(key);
-                // if key already exists, do nothing
-                return;
-            }
-            catch (e) {
-                // if key does not exist, continue
-            }
-            try {
-                yield this.candidatesForDeletionDb.put(key, metadataParsed.createdAt);
-            }
-            catch (e) {
-                afLogger.error(`Could not write metadata to db: ${e}`);
-                throw new Error(`Could not write metadata to db: ${e}`);
-            }
+            afLogger.warn("Method \"markKeyForDeletation\" is deprecated. Please update upload plugin");
+            this.markKeyForDeletion(key);
         });
     }
     markKeyForNotDeletation(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            afLogger.error("Method \"markKeyForNotDeletation\" is deprecated, use markKeyForNotDeletion instead");
-            try {
-                // if key exists, delete it
-                yield this.candidatesForDeletionDb.del(key);
-            }
-            catch (e) {
-                // if key does not exist, do nothing
-            }
+            afLogger.warn("Method \"markKeyForNotDeletation\" is deprecated. Please update upload plugin");
+            this.markKeyForNotDeletion(key);
         });
     }
     markKeyForDeletion(key) {
@@ -305,7 +276,9 @@ class AdminForthStorageAdapterLocalFilesystem {
                 }, (err) => {
                     if (err) {
                         afLogger.error(`Could not send file ${filePath}: ${err}`);
-                        res.status(500).send("Could not send file");
+                        if (!res.headersSent) {
+                            res.status(500).send("Could not send file");
+                        }
                     }
                 });
             }));

package/index.ts

@@ -99,40 +99,13 @@ export default class AdminForthStorageAdapterLocalFilesystem implements StorageA
   }
 
   async markKeyForDeletation(key: string): Promise<void> {
-    afLogger.error("Method \"markKeyForDeletation\" is deprecated, use markKeyForDeletion instead");
-    const metadata = await this.metadataDb.get(key).catch((e) => {
-      afLogger.error(`Could not read metadata from db: ${e}`);
-      throw new Error(`Could not read metadata from db: ${e}`);
-    });
-    if (!metadata) {
-      afLogger.error(`Metadata for key ${key} not found`);
-      return;
-    }
-    const metadataParsed = JSON.parse(metadata);
-
-    try {
-      await this.candidatesForDeletionDb.get(key);
-      // if key already exists, do nothing
-      return;
-    } catch (e) {
-      // if key does not exist, continue
-    }
-    try {
-      await this.candidatesForDeletionDb.put(key, metadataParsed.createdAt)
-    } catch (e) {
-      afLogger.error(`Could not write metadata to db: ${e}`);
-      throw new Error(`Could not write metadata to db: ${e}`);
-    }
+    afLogger.warn("Method \"markKeyForDeletation\" is deprecated. Please update upload plugin");
+    this.markKeyForDeletion(key);
   }
 
   async markKeyForNotDeletation(key: string): Promise<void> {
-    afLogger.error("Method \"markKeyForNotDeletation\" is deprecated, use markKeyForNotDeletion instead");
-    try {
-      // if key exists, delete it
-      await this.candidatesForDeletionDb.del(key);
-    } catch (e) {
-      // if key does not exist, do nothing
-    }
+    afLogger.warn("Method \"markKeyForNotDeletation\" is deprecated. Please update upload plugin");
+    this.markKeyForNotDeletion(key);
   }
 
   async markKeyForDeletion(key: string): Promise<void> {
@@ -343,7 +316,10 @@ export default class AdminForthStorageAdapterLocalFilesystem implements StorageA
         (err) => {
           if (err) {
             afLogger.error(`Could not send file ${filePath}: ${err}`);
-            res.status(500).send("Could not send file");
+
+            if (!res.headersSent) {
+              res.status(500).send("Could not send file");
+            }
           }
         }
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/storage-adapter-local",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",