From 56c9e917f027e42155c4fdaea3aef2b5c58c829f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2023 10:52:02 +0000
Subject: [PATCH 1/2] Bump axios from 1.6.0 to 1.6.1

Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.6.0...v1.6.1)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b478c9e9..80cd43a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@marlon360/express-queue": "^1.0.3",
-        "axios": "^1.3.2",
+        "axios": "^1.6.1",
         "compression": "^1.7.4",
         "cors": "^2.8.5",
         "cron": "^1.8.2",
@@ -4259,9 +4259,9 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -21934,9 +21934,9 @@
       "dev": true
     },
     "axios": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-      "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index b15e036d..441bf540 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "license": "ISC",
   "dependencies": {
     "@marlon360/express-queue": "^1.0.3",
-    "axios": "^1.3.2",
+    "axios": "^1.6.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cron": "^1.8.2",

From c81c60a7bffd6132b7c35e4cc8e9fb49da5e08e3 Mon Sep 17 00:00:00 2001
From: Peter Markewitz <peter@markewitz.org>
Date: Tue, 21 Nov 2023 20:20:21 +0000
Subject: [PATCH 2/2] bump all modules to the newest version, exept csv-parse!

---
 docker/Dockerfile |   2 +-
 package-lock.json | 168 +++++++++-------------------------------------
 package.json      |  17 +++--
 src/utils.ts      |   1 -
 4 files changed, 41 insertions(+), 147 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d615654b..c0ebb48c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,7 +8,6 @@ ARG VIPS_VERSION=8.14.5
 
 # System update, build dependencies, compile vips-x.xx.x and cleanup.
 RUN set -x -o pipefail \
-  && wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
   && apk update \
   && apk upgrade \
   && apk add \
@@ -24,6 +23,7 @@ RUN set -x -o pipefail \
     zlib-dev libxml2-dev glib-dev gobject-introspection-dev libjpeg-turbo-dev \
     lcms2-dev fftw-dev giflib-dev libpng-dev orc-dev tiff-dev poppler-dev \
     librsvg-dev libimagequant-dev pango-dev py-gobject3-dev \
+  && wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
   && cd /tmp/vips-${VIPS_VERSION} \
   && meson setup build  --prefix=/usr --buildtype release \
   && cd build \                       
diff --git a/package-lock.json b/package-lock.json
index 80cd43a5..ae471247 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,24 +13,23 @@
         "axios": "^1.6.1",
         "compression": "^1.7.4",
         "cors": "^2.8.5",
-        "cron": "^1.8.2",
         "csv-parse": "^4.16.3",
-        "express": "^4.17.3",
+        "express": "^4.18.2",
         "express-async-errors": "^3.1.1",
-        "express-redis-cache-next": "^1.2.0",
+        "express-redis-cache-next": "^1.2.1",
         "lzma-native": "^8.0.6",
-        "pm2": "^5.1.2",
+        "pm2": "^5.3.0",
         "sharp": "^0.32.6",
-        "svgson": "^5.2.1",
-        "xlsx": "^0.17.4"
+        "svgson": "^5.3.1",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
-        "@types/express": "^4.17.13",
+        "@types/express": "^4.17.21",
         "@types/lzma-native": "^4.0.4",
-        "@types/node": "^16.11.6",
+        "@types/node": "^16.18.62",
         "prettier": "2.4.1",
         "typescript": "^4.4.4",
-        "vuepress": "^1.9.5"
+        "vuepress": "^1.9.10"
       },
       "engines": {
         "node": ">=16.0.0 <17"
@@ -2520,9 +2519,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.18.61",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.61.tgz",
-      "integrity": "sha512-k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q==",
+      "version": "16.18.62",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.62.tgz",
+      "integrity": "sha512-/zbPnIBkef8sT+6vw6BxdvU3dCxRI0v6rBu/6IvXnRNtOPILucigqhUBPYxtQ/8JdAna0JLTAcNTCDmQ77QYkQ==",
       "dev": true
     },
     "node_modules/@types/q": {
@@ -3683,16 +3682,9 @@
       }
     },
     "node_modules/adler-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
-      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
-      "dependencies": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
-      },
-      "bin": {
-        "adler32": "bin/adler32.njs"
-      },
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
       "engines": {
         "node": ">=0.8"
       }
@@ -5210,14 +5202,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/cfb/node_modules/adler-32": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
-      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/chalk": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -6175,14 +6159,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "node_modules/cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "dependencies": {
-        "moment-timezone": "^0.5.x"
-      }
-    },
     "node_modules/croner": {
       "version": "4.1.97",
       "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
@@ -7796,14 +7772,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -11221,25 +11189,6 @@
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
       "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="
     },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "dependencies": {
-        "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -13362,17 +13311,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/printj": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
-      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
-      "bin": {
-        "printj": "bin/printj.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/prismjs": {
       "version": "1.29.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
@@ -18411,14 +18349,14 @@
       }
     },
     "node_modules/xlsx": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.5.tgz",
-      "integrity": "sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==",
+      "version": "0.18.5",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
       "dependencies": {
-        "adler-32": "~1.2.0",
-        "cfb": "^1.1.4",
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
         "codepage": "~1.15.0",
-        "crc-32": "~1.2.0",
+        "crc-32": "~1.2.1",
         "ssf": "~0.11.2",
         "wmf": "~1.0.1",
         "word": "~0.3.0"
@@ -20458,9 +20396,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.18.61",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.61.tgz",
-      "integrity": "sha512-k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q==",
+      "version": "16.18.62",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.62.tgz",
+      "integrity": "sha512-/zbPnIBkef8sT+6vw6BxdvU3dCxRI0v6rBu/6IvXnRNtOPILucigqhUBPYxtQ/8JdAna0JLTAcNTCDmQ77QYkQ==",
       "dev": true
     },
     "@types/q": {
@@ -21485,13 +21423,9 @@
       "dev": true
     },
     "adler-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
-      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
-      "requires": {
-        "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
-      }
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
     },
     "agent-base": {
       "version": "7.1.0",
@@ -22678,13 +22612,6 @@
       "requires": {
         "adler-32": "~1.3.0",
         "crc-32": "~1.2.0"
-      },
-      "dependencies": {
-        "adler-32": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
-          "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
-        }
       }
     },
     "chalk": {
@@ -23456,14 +23383,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "cron": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz",
-      "integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
-      "requires": {
-        "moment-timezone": "^0.5.x"
-      }
-    },
     "croner": {
       "version": "4.1.97",
       "resolved": "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz",
@@ -24729,11 +24648,6 @@
         "strip-eof": "^1.0.0"
       }
     },
-    "exit-on-epipe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
-    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -27421,19 +27335,6 @@
       "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz",
       "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A=="
     },
-    "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-    },
-    "moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "requires": {
-        "moment": "^2.29.4"
-      }
-    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -29169,11 +29070,6 @@
       "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
       "dev": true
     },
-    "printj": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
-      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
-    },
     "prismjs": {
       "version": "1.29.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
@@ -33196,14 +33092,14 @@
       "dev": true
     },
     "xlsx": {
-      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.5.tgz",
-      "integrity": "sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==",
+      "version": "0.18.5",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
       "requires": {
-        "adler-32": "~1.2.0",
-        "cfb": "^1.1.4",
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
         "codepage": "~1.15.0",
-        "crc-32": "~1.2.0",
+        "crc-32": "~1.2.1",
         "ssf": "~0.11.2",
         "wmf": "~1.0.1",
         "word": "~0.3.0"
diff --git a/package.json b/package.json
index 441bf540..3e830594 100644
--- a/package.json
+++ b/package.json
@@ -20,23 +20,22 @@
     "axios": "^1.6.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
-    "cron": "^1.8.2",
     "csv-parse": "^4.16.3",
-    "express": "^4.17.3",
+    "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
-    "express-redis-cache-next": "^1.2.0",
+    "express-redis-cache-next": "^1.2.1",
     "lzma-native": "^8.0.6",
-    "pm2": "^5.1.2",
+    "pm2": "^5.3.0",
     "sharp": "^0.32.6",
-    "svgson": "^5.2.1",
-    "xlsx": "^0.17.4"
+    "svgson": "^5.3.1",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
-    "@types/node": "^16.11.6",
+    "@types/express": "^4.17.21",
+    "@types/node": "^16.18.62",
     "prettier": "2.4.1",
     "typescript": "^4.4.4",
-    "vuepress": "^1.9.5",
+    "vuepress": "^1.9.10",
     "@types/lzma-native": "^4.0.4"
   },
   "engines": {
diff --git a/src/utils.ts b/src/utils.ts
index 775efdf6..a1d3df54 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -522,7 +522,6 @@ export async function getMetaData(): Promise<MetaData> {
       const oldMetaData: MetaData = JSON.parse(redisEntryMeta[0].body);
       const oldModified = oldMetaData.modified;
       const newModified = metaData.modified;
-      newModified > oldModified;
       if (newModified > oldModified) {
         const validToMs = AddDaysToDate(
           new Date(metaData.modified),