Merge pull request #660 from 2anki/fix/server-endpoints

revert: "chore: Separate server start and api setup logic"
2anki · Jun 5, 2022 · b6211b2 · b6211b2
2 parents 98d32fe + 1647f26
commit b6211b2
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 134 deletions.
diff --git a/server/getApi.ts b/server/getApi.ts
diff --git a/server/routes/login/index.ts b/server/routes/login/index.ts
diff --git a/server/routes/search/index.ts b/server/routes/search/index.ts
diff --git a/server/server.ts b/server/server.ts
@@ -1,41 +1,128 @@
-import ConversionJob from './lib/jobs/ConversionJob';
-import DB from './lib/storage/db';
 import { existsSync } from 'fs';
-import { getApi } from './getApi';
 import path from 'path';
-import { ScheduleCleanup } from './lib/jobs/JobHandler';
-import { IsDebug } from './lib/debug';
-import KnexConfig from './KnexConfig';
+
+import morgan from 'morgan';
+import express from 'express';
+import cookieParser from 'cookie-parser';
 import * as dotenv from 'dotenv';
 
+import { IsDebug } from './lib/debug';
 if (IsDebug()) {
   const localEnvFile = path.join(__dirname, '.env');
   if (existsSync(localEnvFile)) {
     dotenv.config({ path: localEnvFile });
   }
 }
 
-(async function (): Promise<void> {
-  try {
-    const templateDir = path.join(__dirname, 'templates');
-    const api = getApi(templateDir);
+import { ALLOWED_ORIGINS, BUILD_DIR, INDEX_FILE } from './lib/constants';
+import ErrorHandler from './lib/misc/ErrorHandler';
 
-    await DB.raw('SELECT 1');
-    console.info('DB is ready');
+// Server Endpoints
+import _settings from './routes/settings';
+import checks from './routes/checks';
+import version from './routes/version';
+import upload from './routes/upload';
+import users from './routes/users';
+import notion from './routes/notion';
+import rules from './routes/rules';
+import download from './routes/download/u';
+import favorite from './routes/favorite';
+
+import DB from './lib/storage/db';
+import KnexConfig from './KnexConfig';
+import TokenHandler from './lib/misc/TokenHandler';
+import CrashReporter from './lib/CrashReporter';
+import { ScheduleCleanup } from './lib/jobs/JobHandler';
+import ConversionJob from './lib/jobs/ConversionJob';
+import RequireAuthentication from './middleware/RequireAuthentication';
+
+function serve() {
+  const templateDir = path.join(__dirname, 'templates');
+  const app = express();
+
+  app.use(express.json());
+  app.use(cookieParser());
+  if (process.env.NODE_ENV === 'production') {
+    CrashReporter.Configure(app);
+  }
+
+  if (process.env.SPACES_DEFAULT_BUCKET_NAME !== 'dev.2anki.net') {
+    app.use(morgan('combined'));
+  }
 
-    const cwd = process.cwd();
-    if (process.env.MIGRATIONS_DIR) {
-      process.chdir(path.join(process.env.MIGRATIONS_DIR, '..'));
+  app.use('/templates', express.static(templateDir));
+  app.use(express.static(BUILD_DIR));
+  app.use('/checks', checks);
+  app.use('/version', version);
+
+  app.get('/search*', RequireAuthentication, async (_req, res) => {
+    res.sendFile(INDEX_FILE);
+  });
+
+  app.get('/login', async (req, res) => {
+    const user = await TokenHandler.GetUserFrom(req.cookies.token);
+    if (!user) {
+      res.sendFile(INDEX_FILE);
+    } else {
+      res.redirect('/search');
     }
-    ScheduleCleanup(DB);
-    /* @ts-ignore */
-    await DB.migrate.latest(KnexConfig);
+  });
+  app.get('/api/uploads*', RequireAuthentication, upload);
+
+  app.use('/api/upload', upload);
+  app.use('/api/users', users);
+  app.use('/api/notion', notion);
+  app.use('/api/rules', rules);
+  app.use('/api/settings', _settings);
+  app.use('/api/download', download);
+  app.use('/api/favorite', favorite);
+
+  // Note: this has to be the last handler
+  app.get('*', (_req, res) => {
+    res.sendFile(INDEX_FILE);
+  });
+
+  app.use(
+    (
+      _req: express.Request,
+      res: express.Response,
+      next: express.NextFunction
+    ) => {
+      res.header('Access-Control-Allow-Origin', ALLOWED_ORIGINS.join(','));
+      res.header(
+        'Access-Control-Allow-Headers',
+        'Origin, X-Requested-With, Content-Type, Accept, Content-Disposition'
+      );
+      next();
+    }
+  );
+
+  if (process.env.NODE_ENV === 'production') {
+    CrashReporter.AddErrorHandler(app);
+  }
+
+  app.use((err: Error, _req: express.Request, res: express.Response) =>
+    ErrorHandler(res, err)
+  );
 
+  process.on('uncaughtException', (err: Error) => {
+    console.error(err);
+  });
+
+  DB.raw('SELECT 1').then(() => {
+    console.info('DB is ready');
+  });
+  const cwd = process.cwd();
+  if (process.env.MIGRATIONS_DIR) {
+    process.chdir(path.join(process.env.MIGRATIONS_DIR, '..'));
+  }
+  ScheduleCleanup(DB);
+  /* @ts-ignore */
+  DB.migrate.latest(KnexConfig).then(() => {
     process.chdir(cwd);
     process.env.SECRET ||= 'victory';
     const port = process.env.PORT || 2020;
-
-    const server = api.listen(port, () => {
+    const server = app.listen(port, () => {
       console.info(`🟢 Running on http://localhost:${port}`);
     });
 
@@ -50,15 +137,13 @@ if (IsDebug()) {
         await HandleStartedJobs();
       });
     });
-
     process.on('SIGINT', async () => {
       server.close(async () => {
         console.debug('HTTP server closed');
         await HandleStartedJobs();
       });
     });
-  } catch (ex: unknown) {
-    console.info('uncaught exception');
-    console.error(ex);
-  }
-})();
+  });
+}
+
+serve();