monoid/ionian
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Compare commits

base: monoid:76d1c6b33d8d9db9e599dc8d1fab464e2bba540c
Branches Tags
monoid:main
...
compare: monoid:9ea7f880f3bc2515487128809b35a3adabeb6093
Branches Tags
monoid:main

4 Commits
76d1c6b33d ... 9ea7f880f3

Author SHA1 Message Date
monoid
9ea7f880f3 chore 2024-04-16 21:27:31 +09:00
monoid
4db00f3482 serve assets 2024-04-16 21:27:25 +09:00
monoid
dcafbada0d chore: ignore comic_config 2024-04-16 21:26:59 +09:00
monoid
0f233183ac fix: close before streaming 2024-04-16 21:24:27 +09:00
6 changed files with 43 additions and 44 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,6 +12,8 @@ db.sqlite3
build/** build/**
app/** app/**
settings.json settings.json
comic_config.json
**/comic_config.json
.pnpm-store/** .pnpm-store/**
.env .env

3
packages/server/comic_config.json
View File

@ -1,3 +0,0 @@
{
"watch": ["testdata"]
}

17
packages/server/index.html
View File

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<title>Ionian</title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' fonts.googleapis.com;
font-src 'self' fonts.gstatic.com">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/dist/bundle.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<!--MetaTag-Outlet-->
</head>
<body>
<div id="root"></div>
<script src="/dist/bundle.js"></script>
</body>
</html>

2
packages/server/package.json
View File

@ -6,7 +6,7 @@
"scripts": { "scripts": {
"compile": "swc src --out-dir dist", "compile": "swc src --out-dir dist",
"dev": "nodemon -r @swc-node/register --enable-source-maps --exec node app.ts", "dev": "nodemon -r @swc-node/register --enable-source-maps --exec node app.ts",
"start": "node build/app.js" "start": "node dist/app.js"
}, },
"author": "", "author": "",
"license": "ISC", "license": "ISC",

8
packages/server/src/route/comic.ts
View File

@ -94,11 +94,15 @@ async function renderZipImage(ctx: Context, path: string, page: number) {
}, },
})); }));
nodeReadableStream.on("error", (err) => { nodeReadableStream.on("error", (err) => {
console.error(err); console.error("readalbe stream error",err);
releaseZip(path); setTimeout(()=>{
releaseZip(path)
},100);
}); });
nodeReadableStream.on("close", () => { nodeReadableStream.on("close", () => {
setTimeout(()=>{
releaseZip(path); releaseZip(path);
},100);
}); });
ctx.body = nodeReadableStream; ctx.body = nodeReadableStream;

55
packages/server/src/server.ts
View File

@ -18,6 +18,7 @@ import type { DocumentAccessor, TagAccessor, UserAccessor } from "./model/mod";
import { getTagRounter } from "./route/tags"; import { getTagRounter } from "./route/tags";
import { config } from "dotenv"; import { config } from "dotenv";
import { extname, join } from "node:path";
config(); config();
class ServerApplication { class ServerApplication {
@ -38,7 +39,7 @@ class ServerApplication {
this.diffManger = new DiffManager(this.documentController); this.diffManger = new DiffManager(this.documentController);
this.app = new Koa(); this.app = new Koa();
this.index_html = readFileSync("index.html", "utf-8"); this.index_html = readFileSync("dist/index.html", "utf-8");
} }
private async setup() { private async setup() {
const setting = get_setting(); const setting = get_setting();
@ -195,26 +196,38 @@ class ServerApplication {
} }
} }
private serve_static_file(router: Router) { private serve_static_file(router: Router) {
const static_file_server = (path: string, type: string) => { router.get("/assets/(.*)", async (ctx, next) => {
router.get(`/${path}`, async (ctx, next) => { const setting = get_setting();
const setting = get_setting(); const ext = extname(ctx.path);
ctx.type = type; ctx.type = ext;
ctx.body = createReadStream(path); ctx.body = createReadStream(join("dist",`.${ctx.path}`));
ctx.set("x-content-type-options", "no-sniff"); ctx.set("x-content-type-options", "no-sniff");
if (setting.mode === "development") { if (setting.mode === "development") {
ctx.set("cache-control", "no-cache"); ctx.set("cache-control", "no-cache");
} else { } else {
ctx.set("cache-control", "public, max-age=3600"); ctx.set("cache-control", "public, max-age=3600");
} }
}); });
}; // const static_file_server = (path: string, type: string) => {
const setting = get_setting(); // router.get(`/${path}`, async (ctx, next) => {
static_file_server("dist/bundle.css", "css"); // const setting = get_setting();
static_file_server("dist/bundle.js", "js"); // ctx.type = type;
if (setting.mode === "development") { // ctx.body = createReadStream(path);
static_file_server("dist/bundle.js.map", "text"); // ctx.set("x-content-type-options", "no-sniff");
static_file_server("dist/bundle.css.map", "text"); // if (setting.mode === "development") {
} // ctx.set("cache-control", "no-cache");
// } else {
// ctx.set("cache-control", "public, max-age=3600");
// }
// });
// };
// const setting = get_setting();
// static_file_server("dist/bundle.css", "css");
// static_file_server("dist/bundle.js", "js");
// if (setting.mode === "development") {
// static_file_server("dist/bundle.js.map", "text");
// static_file_server("dist/bundle.css.map", "text");
// }
} }
start_server() { start_server() {
const setting = get_setting(); const setting = get_setting();