Added basic shack creation.

2023-06-03 23:32:50 +02:00 · 2023-06-03 23:32:50 +02:00 · de757efc6e
parent bc9fec207b
commit de757efc6e
23 changed files with 274 additions and 216 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 node_modules/
 dist/
 config/
+log/
 !config/default.js
 assets/js/config/
 !assets/js/config/default.js
--- a/log/2023-05-29.log
+++ b/log/2023-05-29.log
@ -26,3 +26,61 @@
 2023-05-29 00:35:22 [32minfo[39m [server] Server running at 0.0.0.0:7477
 2023-05-29 00:42:59 [32minfo[39m [redis] Redis module initialized
 2023-05-29 00:42:59 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 00:55:18 [32minfo[39m [redis] Redis module initialized
+2023-05-29 00:55:18 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 02:07:51 [32minfo[39m [redis] Redis module initialized
+2023-05-29 02:07:51 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 02:08:43 [32minfo[39m [redis] Redis module initialized
+2023-05-29 02:08:43 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:17:42 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:17:43 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:18:29 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:18:29 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:18:40 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:18:40 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:20:45 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:20:45 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:26:36 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:26:36 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:27:24 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:27:25 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:28:06 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:28:07 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:28:49 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:28:49 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 16:28:52 [33mwarn[39m [error] Failed to fulfill request to /: [vite-plugin-ssr@0.4.126][Wrong Usage] pageContext.httpResponse.body can't be used because the render() hook defined by /renderer/_default.page.server.js > `export { render }` provides a Readable Node.js Stream. Use `pageContext.httpResponse.pipe()` or `pageContext.httpResponse.getBody()` instead. See https://vite-plugin-ssr.com/stream for more information.
+2023-05-29 16:28:52 [31merror[39m [error] Error: [vite-plugin-ssr@0.4.126][Wrong Usage] pageContext.httpResponse.body can't be used because the render() hook defined by /renderer/_default.page.server.js > `export { render }` provides a Readable Node.js Stream. Use `pageContext.httpResponse.pipe()` or `pageContext.httpResponse.getBody()` instead. See https://vite-plugin-ssr.com/stream for more information.
+    at get body [as body] (/home/niels/Projects/shack/node_modules/vite-plugin-ssr/dist/cjs/node/runtime/renderPage/createHttpResponseObject.js:51:41)
+    at defaultHandler (file:///home/niels/Projects/shack/src/web/default.js:19:4)
+2023-05-29 16:42:10 [33mwarn[39m [error] Failed to fulfill request to /: [vite-plugin-ssr@0.4.126][Wrong Usage] pageContext.httpResponse.body can't be used because the render() hook defined by /renderer/_default.page.server.js > `export { render }` provides a Readable Node.js Stream. Use `pageContext.httpResponse.pipe()` or `pageContext.httpResponse.getBody()` instead. See https://vite-plugin-ssr.com/stream for more information.
+2023-05-29 16:42:10 [31merror[39m [error] Error: [vite-plugin-ssr@0.4.126][Wrong Usage] pageContext.httpResponse.body can't be used because the render() hook defined by /renderer/_default.page.server.js > `export { render }` provides a Readable Node.js Stream. Use `pageContext.httpResponse.pipe()` or `pageContext.httpResponse.getBody()` instead. See https://vite-plugin-ssr.com/stream for more information.
+    at get body [as body] (/home/niels/Projects/shack/node_modules/vite-plugin-ssr/dist/cjs/node/runtime/renderPage/createHttpResponseObject.js:51:41)
+    at defaultHandler (file:///home/niels/Projects/shack/src/web/default.js:19:4)
+2023-05-29 16:43:01 [32minfo[39m [redis] Redis module initialized
+2023-05-29 16:43:01 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:00:19 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:00:20 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:00:45 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:00:45 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:01:19 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:01:19 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:03:49 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:03:49 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:14:16 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:14:17 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:15:52 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:15:52 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:27:43 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:27:44 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:29:14 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:29:14 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:29:33 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:29:33 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:32:52 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:32:52 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:37:32 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:37:32 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:45:26 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:45:26 [32minfo[39m [server] Server running at 0.0.0.0:7477
+2023-05-29 17:49:05 [32minfo[39m [redis] Redis module initialized
+2023-05-29 17:49:05 [32minfo[39m [server] Server running at 0.0.0.0:7477
--- a/package-lock.json
+++ b/package-lock.json
@ -5,6 +5,7 @@
  "requires": true,
  "packages": {
    "": {
+      "name": "shack",
      "version": "0.1.0",
      "dependencies": {
        "@babel/cli": "^7.21.5",
@ -21,6 +22,7 @@
        "config": "^3.3.9",
        "connect-redis": "^7.1.0",
        "cross-env": "^7.0.3",
+        "error-stack-parser": "^2.1.4",
        "eslint": "^8.41.0",
        "eslint-config-airbnb-base": "^15.0.0",
        "eslint-plugin-vue": "^9.14.0",
@ -3530,6 +3532,14 @@
        "url": "https://github.com/fb55/entities?sponsor=1"
      }
    },
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "dependencies": {
+        "stackframe": "^1.3.4"
+      }
+    },
    "node_modules/errors": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/errors/-/errors-0.2.0.tgz",
@ -6808,6 +6818,11 @@
        "node": "*"
      }
    },
+    "node_modules/stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
+    },
    "node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@ -10228,6 +10243,14 @@
      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
    },
+    "error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+      "requires": {
+        "stackframe": "^1.3.4"
+      }
+    },
    "errors": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/errors/-/errors-0.2.0.tgz",
@ -12564,6 +12587,11 @@
      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="
    },
+    "stackframe": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
+      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
+    },
    "statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
--- a/package.json
+++ b/package.json
@ -3,21 +3,22 @@
  "version": "0.1.0",
  "description": "Shack is a self-hosted social news aggregate",
  "main": "src/web/server.js",
+  "type": "module",
  "repository": {
-	  "type": "git",
-	  "url": "https://gitea.unknown.name/DebaucheryLibrarian/shack"
+    "type": "git",
+    "url": "https://gitea.unknown.name/DebaucheryLibrarian/shack"
  },
  "keywords": [
-	  "aggregate",
-	  "social",
-	  "communities"
+    "aggregate",
+    "social",
+    "communities"
  ],
  "author": "DebaucheryLibrarian",
  "scripts": {
    "dev": "npm run server",
    "prod": "npm run build && npm run server:prod",
    "build": "vite build",
-    "server": "node ./src/web/server",
+    "server": "node --experimental-specifier-resolution=node ./src/web/server",
    "server:prod": "cross-env NODE_ENV=production node ./src/web/server",
    "migrate-make": "knex-migrate generate",
    "migrate": "knex-migrate up",
@ -38,6 +39,7 @@
    "config": "^3.3.9",
    "connect-redis": "^7.1.0",
    "cross-env": "^7.0.3",
+    "error-stack-parser": "^2.1.4",
    "eslint": "^8.41.0",
    "eslint-config-airbnb-base": "^15.0.0",
    "eslint-plugin-vue": "^9.14.0",
--- a/pages/index/index.page.vue
+++ b/pages/index/index.page.vue
@ -21,5 +21,22 @@
 				class="link"
 			>Sign up</a></li>
 		</ul>
+
+		<ul>
+			<li
+				v-for="shelf in shelves"
+				:key="shelf.id"
+			><a
+				:href="`/s/${shelf.slug}`"
+				class="link"
+			>{{ shelf.slug }}</a></li>
+		</ul>
 	</div>
 </template>
+
+<script setup>
+import { usePageContext } from '../../renderer/usePageContext';
+
+const { pageData } = usePageContext();
+const { shelves } = pageData;
+</script>
--- a/pages/shelf/@id/index.page.vue
+++ b/pages/shelf/@id/index.page.vue
@ -1,71 +0,0 @@
-<template>
-	<div class="content">
-		<a
-			href="/"
-			class="link"
-		>Go back home</a>
-
-		<h3>{{ shuck }}</h3>
-
-		<form
-			class="form compose"
-			@submit.prevent="submitPost"
-		>
-			<div class="form-row">
-				<input
-					v-model="title"
-					placeholder="Title"
-					class="input"
-				>
-			</div>
-
-			<div class="form-row">
-				<input
-					v-model="link"
-					class="input"
-					placeholder="Link"
-				>
-			</div>
-
-			<div class="form-row">
-				<textarea
-					v-model="body"
-					placeholder="Body"
-					class="input body"
-				/>
-			</div>
-
-			<div class="form-actions">
-				<button class="button button-submit">Post</button>
-			</div>
-		</form>
-	</div>
-</template>
-
-<script setup>
-import { ref } from 'vue';
-
-const shuck = 'Eratic';
-
-// const route = useRoute();
-// const res = await useFetch(`/api/shucks/${route.params.id}/posts`);
-
-const title = ref();
-const link = ref();
-const body = ref();
-
-async function submitPost() {
-	console.log('POST', link.value);
-
-	/*
-	await useFetch(`/api/shucks/${route.params.id}/posts`, {
-		method: 'post',
-		body: {
-			title,
-			link,
-			body,
-		},
-	});
-	*/
-}
-</script>
--- a/renderer/_default.page.server.js
+++ b/renderer/_default.page.server.js
@ -1,35 +1,20 @@
-import { renderToString as renderToString_ } from '@vue/server-renderer';
-import { escapeInject, dangerouslySkipEscape } from 'vite-plugin-ssr/server';
+// import { renderToString as renderToString_ } from '@vue/server-renderer';
+import { renderToNodeStream } from '@vue/server-renderer';
+import { escapeInject } from 'vite-plugin-ssr/server';

 import { createApp } from './app';
 import { useUser } from '../stores/user';
 import logoUrl from './logo.svg';

-async function renderToString(app) {
-	let err;
-
-	// Workaround: renderToString_() swallows errors in production, see https://github.com/vuejs/core/issues/7876
-	app.config.errorHandler = (err_) => { // eslint-disable-line no-param-reassign
-		err = err_;
-	};
-
-	const appHtml = await renderToString_(app);
-
-	if (err) {
-		throw err;
-	}
-
-	return appHtml;
-}
-
 async function render(pageContext) {
-	const appHtml = await renderToString(pageContext.app);
-
 	// See https://vite-plugin-ssr.com/head
 	const { documentProps } = pageContext.exports;
 	const title = (documentProps && documentProps.title) || 'shack';
 	const desc = (documentProps && documentProps.description) || 'Shack';

+	const { app, store } = createApp(pageContext);
+	const stream = renderToNodeStream(app);
+
 	const documentHtml = escapeInject`
 		<!DOCTYPE html>
 		<html lang="en">
@ -41,40 +26,26 @@ async function render(pageContext) {
 			<title>${title}</title>
 		  </head>
 		  <body>
-			<div id="app">${dangerouslySkipEscape(appHtml)}</div>
+			<div id="app">${stream}</div>
 		  </body>
 		</html>
 	`;

-	return {
-		documentHtml,
-	};
-}
-
-async function onBeforeRender(pageContext) {
-	if (!pageContext.Page) {
-		throw new Error('My render() hook expects pageContext.Page to be defined');
-	}
-
-	const { app, store } = createApp(pageContext);
 	const userStore = useUser();

 	userStore.user = pageContext.session.user;

 	return {
+		documentHtml,
 		pageContext: {
-			app,
 			initialState: store.state.value,
-			pageData: {
-				user: pageContext.session.user,
-			},
+			enableEagerStreaming: true,
 		},
 	};
 }

 export {
 	render,
-	onBeforeRender,
 };

-export const passToClient = ['urlPathname', 'initialState', 'pageData'];
+export const passToClient = ['urlPathname', 'initialState', 'pageData', 'pageProps'];
--- a/renderer/_error.page.vue
+++ b/renderer/_error.page.vue
@ -1,14 +1,24 @@
 <template>
-  <div v-if="is404">
-    <h1>404 Page Not Found</h1>
-    <p>This page could not be found.</p>
-  </div>
-  <div v-else>
-    <h1>500 Internal Error</h1>
-    <p>Something went wrong.</p>
-  </div>
+	<div class="content">
+		<div v-if="is404">
+			<h1>404 Page Not Found</h1>
+
+			<p v-if="errorInfo">{{ errorInfo }}</p>
+			<p v-else>This page could not be found.</p>
+		</div>
+
+		<div v-else>
+			<h1>500 Internal Error</h1>
+
+			<p v-if="errorInfo">{{ errorInfo }}</p>
+			<p v-else>Something went wrong.</p>
+		</div>
+	</div>
 </template>

 <script setup>
-defineProps(['is404'])
+import { usePageContext } from './usePageContext';
+
+const { pageProps } = usePageContext();
+const { is404, errorInfo } = pageProps;
 </script>
--- a/renderer/container.vue
+++ b/renderer/container.vue
@ -49,7 +49,7 @@ const { user } = storeToRefs(userStore);

 async function logout() {
 	await del('/api/session');
-	window.location.reload();
+	window.location.href = '/account/login';
 }
 </script>

--- a/src/.eslintrc
+++ b/src/.eslintrc
@ -4,7 +4,7 @@
    "parserOptions": {
 		"parser": "@babel/eslint-parser",
        "ecmaVersion": 2019,
-		"sourceType": "script",
+		"sourceType": "module",
 		"requireConfigFile": false
    },
    "rules": {
--- a/src/cli.js
+++ b/src/cli.js
@ -1,5 +1,5 @@
-// const config = require('config');
-const yargs = require('yargs');
+// import config from 'config';
+import yargs from 'yargs';

 const { argv } = yargs
 	.command('npm start')
@ -8,4 +8,4 @@ const { argv } = yargs
 		type: 'string',
 	});

-module.exports = argv;
+export default argv;
--- a/src/errors.js
+++ b/src/errors.js
@ -9,4 +9,4 @@ class HttpError extends Error {
 	}
 }

-module.exports = { HttpError };
+export { HttpError };
--- a/src/knex.js
+++ b/src/knex.js
@ -1,7 +1,7 @@
-const config = require('config');
-const knex = require('knex');
+import config from 'config';
+import knex from 'knex';

-module.exports = knex({
+export default knex({
 	client: 'pg',
 	connection: config.database,
 	// performance overhead, don't use asyncStackTraces in production
--- a/src/logger.js
+++ b/src/logger.js
@ -1,13 +1,14 @@
-const util = require('util');
-const path = require('path');
-const winston = require('winston');
-
-require('winston-daily-rotate-file');
+import util from 'util';
+import path from 'path';
+import * as winston from 'winston';
+import 'winston-daily-rotate-file';
+import stackParser from 'error-stack-parser';

 // import args from './args';

-module.exports = function initLogger(filepath) {
-	const contextLabel = path.basename(filepath, '.js');
+export default function initLogger(customLabel) {
+	const filepath = stackParser.parse(new Error())[1]?.fileName;
+	const contextLabel = customLabel || path.basename(filepath, '.js');

 	return winston.createLogger({
 		format: winston.format.combine(
@ -32,4 +33,4 @@ module.exports = function initLogger(filepath) {
 			}),
 		],
 	});
-};
+}
--- a/src/redis.js
+++ b/src/redis.js
@ -1,6 +1,9 @@
-const config = require('config');
-const redis = require('redis');
-const logger = require('./logger')(__filename);
+import config from 'config';
+import redis from 'redis';
+
+import initLogger from './logger';
+
+const logger = initLogger();

 const client = redis.createClient({
 	socket: config.redis,
@ -9,6 +12,4 @@ const client = redis.createClient({
 client.connect();
 logger.info('Redis module initialized');

-module.exports = {
-	client,
-};
+export { client };
--- a/src/shelves.js
+++ b/src/shelves.js
@ -1,17 +1,54 @@
-const knex = require('./knex');
+import knex from './knex';

-async function createShelf(shelf) {
-	console.log('create', shelf);
+function curateDatabaseShelf(shelf) {
+	if (!shelf) {
+		return null;
+	}

-	const shelfEntry = await knex('shelves').insert({
+	return {
+		id: shelf.id,
 		slug: shelf.slug,
-	});
+	};
+}
+
+async function fetchShelf(shelfId) {
+	const shelfEntry = await knex('shelves')
+		.where((builder) => {
+			const id = Number(shelfId);
+
+			if (Number.isNaN(id)) {
+				builder.where('slug', shelfId);
+				return;
+			}
+
+			builder.where('id', shelfId);
+		})
+		.first();
+
+	return curateDatabaseShelf(shelfEntry);
+}
+
+async function fetchShelves({ limit = 10 } = {}) {
+	const shelfEntries = await knex('shelves').limit(limit);
+
+	return shelfEntries.map((shelfEntry) => curateDatabaseShelf(shelfEntry));
+}
+
+async function createShelf(shelf, user) {
+	const shelfEntry = await knex('shelves')
+		.insert({
+			slug: shelf.slug,
+			founder_id: user.id,
+		})
+		.returning('*');

 	console.log('entry', shelfEntry);

-	return true;
+	return curateDatabaseShelf(shelfEntry);
 }

-module.exports = {
+export {
+	fetchShelf,
+	fetchShelves,
 	createShelf,
 };
--- a/src/users.js
+++ b/src/users.js
@ -1,12 +1,13 @@
-const config = require('config');
-const util = require('util');
-const crypto = require('crypto');
-const bhttp = require('bhttp');
+import config from 'config';
+import util from 'util';
+import crypto from 'crypto';
+import bhttp from 'bhttp';

-const logger = require('./logger')(__filename);
-const { HttpError } = require('./errors');
-const knex = require('./knex');
+import initLogger from './logger';
+import { HttpError } from './errors';
+import knex from './knex';

+const logger = initLogger();
 const scrypt = util.promisify(crypto.scrypt);

 function curateDatabaseUser(user) {
@ -141,7 +142,7 @@ async function createUser(credentials, context) {
 	}
 }

-module.exports = {
+export {
 	createUser,
 	login,
 };
--- a/src/web/default.js
+++ b/src/web/default.js
@ -1,6 +1,6 @@
-const { renderPage } = require('vite-plugin-ssr/server');
+import { renderPage } from 'vite-plugin-ssr/server';

-async function initDefaultHandler() {
+export default async function initDefaultHandler() {
 	async function defaultHandler(req, res, next) {
 		const pageContextInit = {
 			urlOriginal: req.originalUrl,
@ -16,9 +16,13 @@ async function initDefaultHandler() {
 		}

 		const {
-			body, statusCode, contentType, earlyHints,
+			statusCode, contentType, earlyHints,
 		} = httpResponse;

+		const body = await httpResponse.getBody();
+
+		console.log(pageContext.pageData);
+
 		if (res.writeEarlyHints) {
 			res.writeEarlyHints({ link: earlyHints.map((e) => e.earlyHintLink) });
 		}
@ -28,5 +32,3 @@ async function initDefaultHandler() {

 	return defaultHandler;
 }
-
-module.exports = initDefaultHandler;
--- a/src/web/error.js
+++ b/src/web/error.js
@ -1,6 +1,8 @@
-const logger = require('../logger')(__filename);
+import initLogger from '../logger';

-function errorHandler(error, req, res, _next) {
+const logger = initLogger();
+
+export default function errorHandler(error, req, res, _next) {
 	logger.warn(`Failed to fulfill request to ${req.path}: ${error.message}`);

 	if (process.env.NODE_ENV === 'development') {
@ -18,5 +20,3 @@ function errorHandler(error, req, res, _next) {

 	res.status(500).send('Something didn\'t quite go as expected... Our apologies for the inconvenience.');
 }
-
-module.exports = errorHandler;
--- a/src/web/ip.js
+++ b/src/web/ip.js
@ -1,6 +1,6 @@
-const IPCIDR = require('ip-cidr');
+import IPCIDR from 'ip-cidr';

-function setIp(req, res, next) {
+export default function setIp(req, res, next) {
 	const ip = req.headers['x-forwarded-for']
 		? req.headers['x-forwarded-for'].split(',')[0]
 		: req.connection.remoteAddress;
@ -14,5 +14,3 @@ function setIp(req, res, next) {

 	next();
 }
-
-module.exports = setIp;
--- a/src/web/server.js
+++ b/src/web/server.js
@ -1,32 +1,31 @@
-// Note that this file isn't processed by Vite, see https://github.com/brillout/vite-plugin-ssr/issues/562
-const config = require('config');
-const express = require('express');
-const Router = require('express-promise-router');
-const session = require('express-session');
-const RedisStore = require('connect-redis').default;
-const bodyParser = require('body-parser');
-const compression = require('compression');
-const sirv = require('sirv');
-const vite = require('vite');
+import config from 'config';
+import express from 'express';
+import Router from 'express-promise-router';
+import bodyParser from 'body-parser';
+import session from 'express-session';
+import RedisStore from 'connect-redis';
+import compression from 'compression';
+import sirv from 'sirv';
+import * as vite from 'vite';

-const logger = require('../logger')(__filename);
-const redis = require('../redis').client;
+import { client as redis } from '../redis';

-const initDefaultHandler = require('./default');
+import initLogger from '../logger';
+import initDefaultHandler from './default';
+import setIp from './ip';
+import errorHandler from './error';

-const setIp = require('./ip');
-const errorHandler = require('./error');
-
-const {
+import {
+	setUser,
 	login,
 	logout,
 	fetchUser,
 	createUser,
-} = require('./users');
+} from './users';

-const { createShelf } = require('./shelves');
+import { createShelf } from './shelves';

-const root = `${__dirname}/../..`;
+const logger = initLogger();

 async function startServer() {
 	const app = express();
@ -38,16 +37,17 @@ async function startServer() {
 	app.disable('x-powered-by');
 	app.set('trust proxy', 1);

-	router.use(session({ ...config.web.session, store: sessionStore }));
-	router.use(setIp);
-	router.use(bodyParser.json({ strict: false }));
 	app.use(compression());

+	router.use(session({ ...config.web.session, store: sessionStore }));
+	router.use(setIp);
+	router.use(setUser);
+	router.use(bodyParser.json({ strict: false }));
+
 	if (process.env.NODE_ENV === 'production') {
-		app.use(sirv(`${root}/dist/client`));
+		app.use(sirv('dist/client'));
 	} else {
 		const viteDevMiddleware = (await vite.createServer({
-			root,
 			server: { middlewareMode: true },
 		})).middlewares;

--- a/src/web/shelves.js
+++ b/src/web/shelves.js
@ -1,13 +1,11 @@
-const { createShelf } = require('../shelves');
+import { createShelf } from '../shelves';

 async function createShelfApi(req) {
-	console.log('create shelf', req.body);
-
-	const shelf = await createShelf(req.body);
+	const shelf = await createShelf(req.body, req.user);

 	return shelf;
 }

-module.exports = {
-	createShelf: createShelfApi,
+export {
+	createShelfApi as createShelf,
 };
--- a/src/web/users.js
+++ b/src/web/users.js
@ -1,7 +1,10 @@
-const {
-	login,
-	createUser,
-} = require('../users');
+import { login, createUser } from '../users';
+
+async function setUser(req, res, next) {
+	req.user = req.session.user; // eslint-disable-line no-param-reassign
+
+	next();
+}

 async function fetchUserApi(req, res) {
 	res.send(req.session.user);
@ -25,9 +28,10 @@ async function createUserApi(req, res) {
 	res.send(user);
 }

-module.exports = {
-	login: loginApi,
-	logout: logoutApi,
-	fetchUser: fetchUserApi,
-	createUser: createUserApi,
+export {
+	setUser,
+	loginApi as login,
+	logoutApi as logout,
+	fetchUserApi as fetchUser,
+	createUserApi as createUser,
 };