added compression and modified build command

lostmypillow · Aug 23, 2024 · f93b6a4 · f93b6a4
1 parent 086e7bc
commit f93b6a4
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 server/node_modules/
-node_modules
+node_modules
+app-out.js
diff --git a/app.js b/app.js
@@ -1,14 +1,12 @@
 var createError = require('http-errors');
+const compression = require('compression')
 var express = require('express');
 var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
-
-// var indexRouter = require('./routes/index');
-// var usersRouter = require('./routes/users');
 var newsRouter = require('./routes/news');
 var app = express();
-
+app.use(compression())
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'pug');
@@ -19,8 +17,7 @@ app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
-// app.use('/', indexRouter);
-// app.use('/users', usersRouter);
+
 app.use('/news', newsRouter);
 
 // catch 404 and forward to error handler
@@ -41,7 +38,7 @@ app.use(function(err, req, res, next) {
 
 
 
-app.use((req, res, next) => {
+// app.use((req, res, next) => {
   //   res.setHeader(
   //     "Access-Control-Allow-Origin",
   //     "https://lostmypillow.github.io/jDMS-web"

diff --git a/lib/scrapeContent.js b/lib/scrapeContent.js
@@ -4,7 +4,7 @@ let failedLinkList = []
 async function scrapeContent(link) {
   var title = "";
   var date_source_author = "";
-  var content;
+  var content = [];
   let dateParts;
   const $ = cheerio.load(await getHTML(link));
 
@@ -31,11 +31,11 @@ async function scrapeContent(link) {
     ////// ePrice bug related links
     case link.includes("eprice"):
       title = $("h1.title").text().trim();
-      const entry = $("span.date")
-        .text()
-        .match(/\d{4}-\d{2}-\d{2}/)[0];
+      // const entry = $("span.date")
+      //   .text()
+      //   .match(/\d{4}-\d{2}-\d{2}/)[0];
       const author = $("a.nickname").attr("title");
-      date_source_author = `${entry} / ePrice / ${author}`;
+      date_source_author = `/ ePrice / ${author}`;
       content = $("div.user-comment-block")
         .text()
         .split("來源：")[0]

diff --git a/package.json b/package.json
@@ -4,11 +4,12 @@
   "private": true,
   "scripts": {
     "dev": "nodemon ./bin/www",
-    "build": "esbuild app.js --bundle --platform=node --outfile=app-out.js --external:typescript",
-    "production":  "node ./bin/www_prod"
+    "build": "pnpm i && esbuild app.js --bundle --platform=node --outfile=app-out.js --external:typescript",
+    "production": "node ./bin/www_prod"
   },
   "dependencies": {
     "cheerio": "^1.0.0",
+    "compression": "^1.7.4",
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
     "esbuild": "^0.23.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/index.html b/public/index.html
@@ -10,15 +10,22 @@
 <body>
     <main class="container-fluid">
         <h1>JDMS</h1>
-        <p>yo</p>
         <form hx-post="/news" hx-target="#content" hx-swap="innerHTML">
             <fieldset role="group">
-              <input name="link" type="text" placeholder="Enter an URL" />
-              <button type="submit">Submit</button>
+              <textarea name="link" type="text" placeholder="Enter an URL"></textarea>
+              <button id="meow" type="submit">Submit</button>
             </fieldset>
           </form>
-    <div id="content"></div>
+    <div id="content"></div> 
     </main>
-
+    <script>
+      document.getElementById('meow').addEventListener('htmx:beforeRequest', function(event) {
+    this.setAttribute('aria-busy', 'true');
+  });
+
+  document.getElementById('meow').addEventListener('htmx:afterRequest', function(event) {
+    this.setAttribute('aria-busy', 'false');
+  });
+    </script>
 </body>
 </html>
diff --git a/routes/news.js b/routes/news.js
@@ -1,13 +1,21 @@
-var express = require('express');
+var express = require("express");
 var router = express.Router();
 const scrapeContent = require("../lib/scrapeContent");
 
-// 
+//
 
+router.post("/", async function (req, res) {
+  const resuts = [];
+  let queue = req.body.link.split("\n");
+  console.log(queue);
+  for (const item of queue) {
+    const result = await scrapeContent(item);
+    resuts.push(result);
+  }
+  console.log(resuts);
 
-router.post('/', async function(req, res) {
-    res.render('result', await scrapeContent(req.body.link))
-  });
+  res.render("result", { results: resuts });
+  // res.send("ok");
+});
 
-
-module.exports = router
+module.exports = router;
diff --git a/views/result.pug b/views/result.pug
@@ -1,11 +1,13 @@
-p
-  | #{title}
+each result in results
+  p
+  | #{result.title}
   br
-  | #{date_source_author}
+  | #{result.date_source_author}
   br
-  a(href=link) #{link}
+  a(href=result.link) #{result.link}
   br
-  each c in content
+
+  each c in result.content
     | #{c}
     br
     br