Merge stable into release

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.24.0] - Not released
+
 ## [2.23.8] - 2025-02-17
 ### Fixed
 - Fix the case when the uploaded video original is for some reason missing at

app/models/attachment.js

@@ -17,6 +17,7 @@ import { createPrepareVideoJob } from '../jobs/attachment-prepare-video';
 import { PubSub as pubSub } from '../models';
 import { TooManyRequestsException } from '../support/exceptions';
 import { setExtension } from '../support/media-files/file-ext';
+import { unlinkIfExists } from '../support/unlink-if-exists';
 
 const mvAsync = util.promisify(mv);
 
@@ -363,17 +364,7 @@ export function addModel(dbAdapter) {
       } finally {
         // Remove the rest of local files
         const paths = [originalPath, ...Object.values(files).map(({ path }) => path)];
-        await Promise.all(
-          paths.map((path) => {
-            try {
-              fs.unlink(path);
-            } catch (err) {
-              if (err.code !== 'ENOENT') {
-                throw err;
-              }
-            }
-          }),
-        );
+        await Promise.all(paths.map((path) => unlinkIfExists(path)));
       }
     }
 
@@ -544,16 +535,7 @@ export function addModel(dbAdapter) {
         );
       } else {
         await Promise.all(
-          this.allRelFilePaths().map(async (path) => {
-            try {
-              await fs.unlink(storageConfig.rootDir + path);
-            } catch (err) {
-              // It is ok if file isn't found
-              if (err.code !== 'ENOENT') {
-                throw err;
-              }
-            }
-          }),
+          this.allRelFilePaths().map((path) => unlinkIfExists(storageConfig.rootDir + path)),
         );
       }
     }
@@ -652,14 +634,12 @@ export function addModel(dbAdapter) {
         return true;
       } finally {
         try {
-          await fs.unlink(localFile);
+          await unlinkIfExists(localFile);
         } catch (err) {
-          if (err.code !== 'ENOENT') {
-            debugError(`sanitizeOriginal: cannot remove temporary file: ${localFile}`);
-            Raven.captureException(err, {
-              extra: { err: `sanitizeOriginal: cannot remove temporary file: ${localFile}` },
-            });
-          }
+          debugError(`sanitizeOriginal: cannot remove temporary file: ${localFile}`);
+          Raven.captureException(err, {
+            extra: { err: `sanitizeOriginal: cannot remove temporary file: ${localFile}` },
+          });
         }
       }
     }

app/support/is-no-entry.ts

@@ -0,0 +1,6 @@
+/**
+ * Type safe check for ENOENT errors
+ */
+export function isNoEntryError(error: unknown): error is NodeJS.ErrnoException {
+  return error instanceof Error && 'code' in error && error.code === 'ENOENT';
+}

app/support/unlink-if-exists.ts

@@ -0,0 +1,13 @@
+import { unlink } from 'fs/promises';
+
+import { isNoEntryError } from './is-no-entry';
+
+export async function unlinkIfExists(path: string) {
+  try {
+    await unlink(path);
+  } catch (err) {
+    if (!isNoEntryError(err)) {
+      throw err;
+    }
+  }
+}

package.json

@@ -3,7 +3,7 @@
   "name": "freefeed-server",
   "description": "FreeFeed is an open source FriendFeed clone (yes, it is free and open!) based on Pepyatka open-source FriendFeed clone (yes, that one is also free and open). Basically, this is a social real-time feed aggregator that allows you to share cute kittens, coordinate upcoming events, discuss any other cool stuff on the Internet or setup a private Pepyatka instance in your company.",
   "homepage": "https://freefeed.net",
-  "version": "2.23.9",
+  "version": "2.24.0",
   "private": true,
   "scripts": {
     "start": "cross-env TZ=UTC yarn babel index.js",