fix: image not displayed in book summary page, html contains error when handing <> with jpStyle, and more

Author: imzlh

2epub.ts

@@ -62,7 +62,7 @@ type SpecialTag = {
 const specialTag: SpecialTag = {
     'dialog': ['「', '」'],
     'quote': ['【', '『', '】', '』'],
-    'comment': ['<', '>', '(', ')']
+    'comment': ['(', ')']
 };
 
 function addTags(text: string, sTag = specialTag): string {
@@ -238,7 +238,7 @@ export function processTXTContent(text: string, jpFormat = false) {
         return it ? `<img src="${it.replaceAll('一', '-')}" referrerpolicy="no-referrer" />` : ''
     });
     // [comment]
-    text = text.replaceAll(/\[comment\](.+?)\[\/comment\]/g, '<!-- $1 -->');
+    text = text.replaceAll(/\[comment\](.+?)\[\/comment\]/g, (_, it) => '<!-- ' + removeTags(it) + ' -->');
     const tagSt = [] as Array<string>;
     text = text.replaceAll(/\[(\/)?([a-z]{1,10})\]/g, (_, has_slash, tag) => {
         const popRes = has_slash ? tagSt.pop() : undefined;

server.ts

@@ -20,7 +20,7 @@
     后续服务端传输HTML到前端，直接显示到dialog
  */
 
-import { checkIsTraditional, downloadNovel, exists, Status, getAppDataDir, defaultGetInfo, traditionalAsyncWrapper, moduleExists } from "./main.ts";
+import { checkIsTraditional, downloadNovel, exists, Status, getAppDataDir, defaultGetInfo, traditionalAsyncWrapper, moduleExists, sleep } from "./main.ts";
 import mainPage from "./static/server.html" with { type: "text" };
 import { render } from "npm:ejs";
 import { processTXTContent } from "./2epub.ts";
@@ -230,7 +230,7 @@ async function handleContentRequest(_: Request, url: URL) {
     // 使用SQLite缓存
     const cachedInfo = await cache.get(novelURL.href);
     if (cachedInfo) {
-        Deno.stdout.writeSync(new TextEncoder().encode('HIT  '));
+        await Deno.stdout.write(new TextEncoder().encode('HIT '));
         info = cachedInfo;
     } else {
         let basicInfo: TraditionalConfig;
@@ -336,6 +336,8 @@ async function handleContentRequest(_: Request, url: URL) {
         });
     } else if (info.content) {
         info.content = processTXTContent(info.content, info.jpStyle);
+    } else if (info.summary) {
+        info.summary = processTXTContent(info.summary, info.jpStyle);
     }
 
     // render page
@@ -524,9 +526,16 @@ export default async function main() {
         return res;
     });
 
+    let $shutting = false;
     Deno.addSignalListener("SIGINT", async () => {
+        if($shutting) return console.log("Server is already shutting down...");
+        $shutting = true;
         kv.close();
-        await $s.shutdown();
+        console.log("Server shutting down...(timeout 3s)");
+        await Promise.race([
+            $s.shutdown(),
+            sleep(3)
+        ]);
         console.log("Server stopped");
         Deno.exit(0);
     });

static/chapter.html.ejs

@@ -98,26 +98,6 @@
                     margin: 2rem auto;
                 }
                 
-                article {
-                    font-size: 1.1rem;
-                    line-height: 1.8;
-                }
-                
-                article p {
-                    text-indent: 2em;
-                    margin-bottom: 1.5rem;
-                    overflow: hidden;
-                    word-wrap: break-word;
-                }
-
-                article img {
-                    max-width: 100%;
-                    display: block;
-                    margin: 1rem auto;
-                    border-radius: 8px;
-                    box-shadow: var(--shadow);
-                }
-                
                 .progress-bar {
                     height: 4px;
                     background-color: var(--light-gray);
@@ -142,6 +122,11 @@
                     overflow: hidden;
                 }
 
+                .info {
+                    word-break: break-all;
+                    word-break: break-word;
+                }
+
                 @media screen and (min-width: 512px) {
                     .main {
                         display: flex;
@@ -162,13 +147,41 @@
                     margin: 2rem 0;
                     text-align: left;
                     padding: 0 1rem;
+
+                    max-height: 60vh;
+                    overflow-y: auto;
+                    overflow-x: hidden;
+
+                    /* for scrollbar */
+                    margin-right: -1rem;
+                    padding-right: .5rem;
                 }
                 
                 .start-button {
                     padding: 1rem 2rem;
                     font-size: 1.1rem;
                 }
             /* <% } %> */
+
+            article {
+                font-size: 1.1rem;
+                line-height: 1.8;
+            }
+                
+            article p {
+                text-indent: 2em;
+                margin-bottom: 1.5rem;
+                overflow: hidden;
+                word-wrap: break-word;
+            }
+
+            article img {
+                max-width: 100%;
+                display: block;
+                margin: 1rem auto;
+                border-radius: 8px;
+                box-shadow: var(--shadow);
+            }
             
             @media (max-width: 768px) {
                 .container {
@@ -295,9 +308,9 @@
                         </h1>
                         
                         <% if(summary) { %>
-                            <div class="summary">
-                                <p><%= summary %></p>
-                            </div>
+                            <article class="summary">
+                                <p><%- summary %></p>
+                            </article>
                         <% } %>
                         
                         <div class="navigation">