me/ucs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto formatting

Browse Source
This commit is contained in:
me 2025-03-15 17:23:14 +02:00
parent 803f53af7a
commit f7918b45f1
8 changed files with 104 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -13,7 +13,7 @@
"start": "nodemon src/main.mjs", "start": "nodemon src/main.mjs",
"prod": "NODE_ENV=production node src/main.mjs", "prod": "NODE_ENV=production node src/main.mjs",
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"format": "npx prettier . --write", "format": "npx prettier src --write --tab-width 4",
"lint": "npx eslint src" "lint": "npx eslint src"
}, },
"dependencies": { "dependencies": {

11
backend/src/api.mjs
View File

@ -1,7 +1,7 @@
import express from 'express'; import express from "express";
import utils from './utils.mjs'; import utils from "./utils.mjs";
import db from './db.mjs'; import db from "./db.mjs";
// server // server
@ -13,7 +13,7 @@ router.use(express.json());
// POST // POST
router.post('/:site/*', utils.post_limiter, (req, res) => { router.post("/:site/*", utils.post_limiter, (req, res) => {
const site_url = req.params.site; const site_url = req.params.site;
const path = req.params[0]; const path = req.params[0];
@ -46,9 +46,8 @@ router.post('/:site/*', utils.post_limiter, (req, res) => {
} }
}); });
// GET // GET
router.get('/:site/*', utils.get_limiter, (req, res) => { router.get("/:site/*", utils.get_limiter, (req, res) => {
const site = req.params.site; const site = req.params.site;
const path = req.params[0]; const path = req.params[0];
const comments = db.pageComments(site, path); const comments = db.pageComments(site, path);

4
backend/src/config.mjs
View File

@ -1,4 +1,4 @@
import config from 'config'; import config from "config";
const configuration = config.util.toObject(); const configuration = config.util.toObject();
@ -8,5 +8,5 @@ export default {
config: configuration, config: configuration,
getSite: (site_url) => { getSite: (site_url) => {
return configuration.sites[site_url]; return configuration.sites[site_url];
} },
}; };

39
backend/src/db.mjs
View File

@ -1,8 +1,8 @@
import Database from 'better-sqlite3'; import Database from "better-sqlite3";
import { migrate } from '@blackglory/better-sqlite3-migrations'; import { migrate } from "@blackglory/better-sqlite3-migrations";
import utils from './utils.mjs'; import utils from "./utils.mjs";
import config from './config.mjs'; import config from "./config.mjs";
// class // class
@ -31,8 +31,9 @@ export default db;
function migrations() { function migrations() {
return [ return [
{ version: 1, {
up: ` version: 1,
up: `
CREATE TABLE comment ( CREATE TABLE comment (
id integer not null, id integer not null,
site integer not null, site integer not null,
@ -45,10 +46,10 @@ CREATE TABLE comment (
PRIMARY KEY (site, path, id) PRIMARY KEY (site, path, id)
); );
`, `,
down: ` down: `
DROP TABLE comment; DROP TABLE comment;
` `,
} },
]; ];
} }
@ -56,7 +57,7 @@ DROP TABLE comment;
function createDB() { function createDB() {
const db = new Database(utils.db_path); const db = new Database(utils.db_path);
db.pragma('journal_mode = WAL'); db.pragma("journal_mode = WAL");
migrate(db, migrations(), 1); migrate(db, migrations(), 1);
return db; return db;
} }
@ -65,15 +66,19 @@ function createDB() {
function getSiteInfo(db, site_url) { function getSiteInfo(db, site_url) {
const site = config.getSite(site_url); const site = config.getSite(site_url);
if (!site || !site.info) { throw "Unknown site" } if (!site || !site.info) {
throw "Unknown site";
}
return site; return site;
} }
function insertPageComment(db, site_url, path, comment) { function insertPageComment(db, site_url, path, comment) {
const site = config.getSite(site_url); const site = config.getSite(site_url);
if (!site || !site.info.id) { throw "Unknown site" } if (!site || !site.info.id) {
throw "Unknown site";
}
let object = {...comment, site_id: site.info.id, path: path }; let object = { ...comment, site_id: site.info.id, path: path };
const stmt = db.prepare(` const stmt = db.prepare(`
INSERT INTO comment(id, site, path, user, user_website, message, reply_to) INSERT INTO comment(id, site, path, user, user_website, message, reply_to)
@ -102,7 +107,9 @@ function insertPageComment(db, site_url, path, comment) {
function getPageComments(db, site_url, path) { function getPageComments(db, site_url, path) {
const site = config.getSite(site_url); const site = config.getSite(site_url);
if (!site || !site.info.id) { return []; } if (!site || !site.info.id) {
return [];
}
const stmt = db.prepare(` const stmt = db.prepare(`
SELECT SELECT
id, id,
@ -120,7 +127,9 @@ function getPageComments(db, site_url, path) {
function getSiteComments(db, site_url) { function getSiteComments(db, site_url) {
const site = config.getSite(site_url); const site = config.getSite(site_url);
if (!site || !site.info.id) { return []; } if (!site || !site.info.id) {
return [];
}
const stmt = db.prepare(` const stmt = db.prepare(`
SELECT SELECT
id, id,

72
backend/src/feed.mjs
View File

@ -1,8 +1,8 @@
import express from 'express'; import express from "express";
import { Feed } from 'feed'; import { Feed } from "feed";
import utils from './utils.mjs'; import utils from "./utils.mjs";
import db from './db.mjs'; import db from "./db.mjs";
// Feed // Feed
@ -14,63 +14,63 @@ router.use(express.json());
const domain = utils.domain; const domain = utils.domain;
router.get('/:site', utils.get_limiter, (req, res) => { router.get("/:site", utils.get_limiter, (req, res) => {
const site = req.params.site; const site = req.params.site;
var feed = new Feed({ var feed = new Feed({
title: 'UCS', title: "UCS",
generator: 'UCS', generator: "UCS",
description: 'תגובות עבור האתר ' + site, description: "תגובות עבור האתר " + site,
id: domain + '/feed/' + site, id: domain + "/feed/" + site,
link: domain, link: domain,
language: 'he' language: "he",
}); });
const comments = db.siteComments(site); const comments = db.siteComments(site);
for (const comment of comments) { for (const comment of comments) {
feed.addItem({ feed.addItem({
title: `New message by '${comment.user}' on ${comment.path}`, title: `New message by '${comment.user}' on ${comment.path}`,
description: comment.message, description: comment.message,
id: `${comment.site}/${comment.path}#comment-${comment.id}`, id: `${comment.site}/${comment.path}#comment-${comment.id}`,
link: `${comment.site}/${comment.path}#comment-${comment.id}`, link: `${comment.site}/${comment.path}#comment-${comment.id}`,
date: new Date(comment.published) date: new Date(comment.published),
}); });
} }
var xml = feed.atom1(); var xml = feed.atom1();
res.set('Content-Type', 'text/xml'); res.set("Content-Type", "text/xml");
res.send(xml); res.send(xml);
}); });
router.get('/:site/*', utils.get_limiter, (req, res) => { router.get("/:site/*", utils.get_limiter, (req, res) => {
const site = req.params.site; const site = req.params.site;
const path = req.params[0]; const path = req.params[0];
var feed = new Feed({ var feed = new Feed({
title: 'UCS', title: "UCS",
generator: 'UCS', generator: "UCS",
description: 'תגובות עבור הדף ' + site + '/' + path, description: "תגובות עבור הדף " + site + "/" + path,
id: domain + '/feed/' + site, id: domain + "/feed/" + site,
link: domain, link: domain,
language: 'he' language: "he",
}); });
const comments = db.pageComments(site, path); const comments = db.pageComments(site, path);
for (const comment of comments) { for (const comment of comments) {
feed.addItem({ feed.addItem({
title: `New message by '${comment.user}' on ${path}`, title: `New message by '${comment.user}' on ${path}`,
description: comment.message, description: comment.message,
id: `${site}/${path}#comment-${comment.id}`, id: `${site}/${path}#comment-${comment.id}`,
link: `${site}/${path}#comment-${comment.id}`, link: `${site}/${path}#comment-${comment.id}`,
date: new Date(comment.published) date: new Date(comment.published),
}); });
} }
var xml = feed.atom1(); var xml = feed.atom1();
res.set('Content-Type', 'text/xml'); res.set("Content-Type", "text/xml");
res.send(xml); res.send(xml);
}); });

24
backend/src/main.mjs
View File

@ -1,20 +1,24 @@
import express from 'express'; import express from "express";
import path from 'node:path'; import path from "node:path";
import { fileURLToPath } from 'node:url'; import { fileURLToPath } from "node:url";
import { app } from './server.mjs'; import { app } from "./server.mjs";
import api from './api.mjs'; import api from "./api.mjs";
import feed from './feed.mjs'; import feed from "./feed.mjs";
import utils from './utils.mjs'; import utils from "./utils.mjs";
// server // server
app.use(utils.get_limiter); app.use(utils.get_limiter);
app.use(express.static(path.join(path.dirname(fileURLToPath(import.meta.url)), "../public"))); app.use(
express.static(
path.join(path.dirname(fileURLToPath(import.meta.url)), "../public"),
),
);
app.use('/api', api); app.use("/api", api);
app.use('/atom', feed); app.use("/atom", feed);
// Listen // Listen

22
backend/src/server.mjs
View File

@ -1,10 +1,10 @@
import express from 'express'; import express from "express";
import compression from 'compression'; import compression from "compression";
import helmet from 'helmet'; import helmet from "helmet";
import morgan from 'morgan'; import morgan from "morgan";
import cors from 'cors'; import cors from "cors";
import utils from './utils.mjs'; import utils from "./utils.mjs";
// server // server
@ -15,17 +15,17 @@ app.use(compression());
app.use( app.use(
helmet.contentSecurityPolicy({ helmet.contentSecurityPolicy({
directives: { directives: {
"script-src": ["'self'"] "script-src": ["'self'"],
}, },
}) }),
); );
app.use(morgan('combined')); app.use(morgan("combined"));
const corsOptions = { const corsOptions = {
origin: utils.cors, origin: utils.cors,
optionsSuccessStatus: 200 optionsSuccessStatus: 200,
}; };
app.use(cors(corsOptions)); app.use(cors(corsOptions));
app.set('trust proxy', '127.0.0.1'); app.set("trust proxy", "127.0.0.1");

20
backend/src/utils.mjs
View File

@ -1,6 +1,6 @@
import RateLimit from 'express-rate-limit'; import RateLimit from "express-rate-limit";
import config from './config.mjs'; import config from "./config.mjs";
// Constants // Constants
@ -10,10 +10,12 @@ const port = process.env.PORT || config.config.port || 8080;
const db_path = process.env.DB || config.config.db_path || "ucs.db"; const db_path = process.env.DB || config.config.db_path || "ucs.db";
const cors = (function() { const cors = (function () {
let origins = new Set(); let origins = new Set();
for (const site in config.config.sites) { for (const site in config.config.sites) {
config.config.sites[site].cors.forEach(origin => {origins.add(origin) }); config.config.sites[site].cors.forEach((origin) => {
origins.add(origin);
});
} }
return Array.from(origins); return Array.from(origins);
})(); })();
@ -31,11 +33,11 @@ function escapeHtml(unsafe) {
// limiters // limiters
const limiter = limit => RateLimit({ const limiter = (limit) =>
windowMs: 1 * 60 * 1000, RateLimit({
max: limit, windowMs: 1 * 60 * 1000,
}); max: limit,
});
export default { export default {
domain, domain,