Update dependencies

BHSPitMonkey · Jun 2, 2024 · 3be1f82 · 3be1f82
1 parent 3ade0f7
commit 3be1f82
Show file tree

Hide file tree

Showing 8 changed files with 203 additions and 269 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v20.5.1
+v22.2.0
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:22
 
 LABEL org.opencontainers.image.source=https://github.com/BHSPitMonkey/news2reader
 LABEL org.opencontainers.image.description=" Serve online articles directly to your e-reader using OPDS"
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.licenses=MIT
 WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 
-# Note: The node:18 image ships with Yarn 1.x, not 2/3
+# Note: The node:22  image ships with Yarn 1.x, not 2/3
 RUN yarn install --immutable --network-timeout 600000
 COPY dist/ ./dist/
 

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ You will need to mount a config directory at `/root/.config/news2reader/` in the
 
 ### Run via Node.js
 
-(Tested using Node 20.x)
+(Tested using Node 22.x)
 
 ```shell
 yarn install

diff --git a/dist/epub.js b/dist/epub.js
@@ -4,6 +4,11 @@ import Epub from "epub-gen";
 import jsdom from "jsdom";
 import { Readability } from "@mozilla/readability";
 import got from "got";
+const HEADERS = {
+    'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+    'cache-control': 'no-cache',
+    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.3',
+};
 export async function articleToEpub(url, preferredTitle) {
     var _a;
     const urlObj = new URL(url);
@@ -12,7 +17,9 @@ export async function articleToEpub(url, preferredTitle) {
     const outputPath = "/tmp/news2opds-out.epub";
     const virtualConsole = new jsdom.VirtualConsole();
     console.log(`Processing article at URL ${url} to path ${outputPath}`);
-    const { body } = await got(url);
+    const { body } = await got(url, {
+        headers: HEADERS
+    });
     console.log(`Fetched ${body.length} chars from ${url}`);
     // Create a JSDOM
     const dom = new jsdom.JSDOM(body, { url, virtualConsole });

diff --git a/package.json b/package.json
@@ -14,24 +14,24 @@
     "./src/provider/pocket": "./dist/src/provider/pocket.js"
   },
   "engines": {
-    "node": ">= 20.0.0"
+    "node": ">= 22.0.0"
   },
   "dependencies": {
     "@folder/xdg": "^4.0.1",
     "@mozilla/readability": "^0.5.0",
-    "@types/jsdom": "^21.1.6",
+    "@types/jsdom": "^21.1.7",
     "epub-gen": "^0.1.0",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "feed": "^4.2.2",
     "got": "^12.6.1",
-    "jsdom": "^23.2.0",
+    "jsdom": "^24.1.0",
     "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
-    "@types/node": "^20.11.0",
+    "@types/node": "^20.13.0",
     "concurrently": "^8.2.2",
-    "nodemon": "^3.0.2",
+    "nodemon": "^3.1.2",
     "typescript": "^5.3.3"
   }
 }
diff --git a/src/epub.ts b/src/epub.ts
@@ -5,6 +5,12 @@ import jsdom from "jsdom";
 import { Readability } from "@mozilla/readability";
 import got from "got";
 
+const HEADERS = {
+  'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+  'cache-control': 'no-cache',
+  'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.3',
+};
+
 export async function articleToEpub(
   url: string,
   preferredTitle: string | null
@@ -18,7 +24,9 @@ export async function articleToEpub(
 
   console.log(`Processing article at URL ${url} to path ${outputPath}`);
 
-  const { body } = await got(url);
+  const { body } = await got(url, {
+    headers: HEADERS
+  });
   console.log(`Fetched ${body.length} chars from ${url}`);
 
   // Create a JSDOM