Route tests

.c8rc.json

@@ -11,6 +11,7 @@
     "frontend",
     "coverage",
     "test",
-    "**/@types"
+    "**/@types",
+    "server.js"
   ]
 }

lib/createRespondingActivity.js

@@ -1,4 +1,4 @@
-import { Activity } from "./Activity.js";
+import { Activity } from "toot-sweet/models";
 import log from "./logger.js";
 import { randomUUID } from "node:crypto";
 

lib/index.js

@@ -0,0 +1,88 @@
+import * as Sentry from "@sentry/node";
+import { ProfilingIntegration } from "@sentry/profiling-node";
+import * as Tracing from "@sentry/tracing";
+import createExpress from "express";
+import helmet from "helmet";
+import {
+  bodyParser,
+  errorHandler,
+  ipCheckMiddleware,
+  logActivities,
+  logRequestMiddleware,
+  notFoundHandler,
+  requestLogger
+} from "toot-sweet/middleware";
+import { apiRouter, nodeinfoRouter, peopleRouter, wellKnownRouter } from "toot-sweet/routes";
+import CreateCompression from "compression";
+
+export const app = createExpress();
+
+
+
+
+Sentry.init({
+  dsn: "https://[email protected]/4504277664661504",
+  // Set tracesSampleRate to 1.0 to capture 100%
+  // of transactions for performance monitoring.
+  // We recommend adjusting this value in production
+  tracesSampleRate: 1.0,
+  profilesSampleRate: 1.0, // Profiling sample rate is relative to tracesSampleRate
+  tracesSampler: samplingContext => {
+    if (samplingContext.request?.url === "/robots.txt") {
+      return 0
+    } else {
+      return 1.0
+    }
+  },
+  integrations: [
+    // enable HTTP calls tracing
+    new Sentry.Integrations.Http({ tracing: true }),
+    // enable Express.js middleware tracing
+    new Tracing.Integrations.Express({ app }),
+    // Add profiling integration to list of integrations
+    new ProfilingIntegration(),
+  ],
+});
+
+// RequestHandler creates a separate execution context using domains, so that every
+// transaction/span/breadcrumb is attached to its own Hub instance
+app.use(Sentry.Handlers.requestHandler());
+// TracingHandler creates a trace for every incoming request
+app.use(Sentry.Handlers.tracingHandler());
+
+app.disable("x-powered-by");
+
+app.use(ipCheckMiddleware);
+
+apiRouter.use(CreateCompression())
+
+app.use(helmet());
+
+app.use(logRequestMiddleware);
+
+app.use(bodyParser);
+
+app.use(logActivities);
+
+app.use("/api", apiRouter);
+
+app.use(requestLogger);
+
+app.use("/.well-known", wellKnownRouter);
+
+app.use("/nodeinfo", nodeinfoRouter);
+
+app.use("/people", peopleRouter);
+
+// This needs to redirect to /people
+app.use("/users", peopleRouter);
+
+//  static files
+app.use(createExpress.static("./build"));
+
+// custom 404
+app.use(notFoundHandler);
+
+// custom error handler
+app.use(errorHandler);
+

lib/json404.js

@@ -1,13 +1,14 @@
 /**
  *
- * @param {import("node:http").ServerResponse} response
+ * @param {import("express").Response} res
  * @param {string} [reason]
  */
-export function json404(response, reason='Not found') {
-  response.statusCode = 404;
-  response.setHeader('content-type', 'application/json');
-  return response.end(JSON.stringify({
+export function json404(res, reason='Not found') {
+  res.statusCode = 404;
+  res.setHeader('content-type', 'application/json');
+  res.json({
     code: 404,
     reason
-  }));
+  });
+  res.flushHeaders()
 }

lib/middleware/errorHandler.js

@@ -20,6 +20,7 @@ log.error(logLine);
   // The error id is attached to `res.sentry` to be returned
   // and optionally displayed to the user for support.
   res.statusCode = 500;
-  res.end(res.get("sentry") + "\n");
+  res.send(res.get("sentry") + "\n")
+  res.flushHeaders();
 
 }

lib/middleware/ipCheckMiddleware.js

@@ -14,7 +14,8 @@ const grouper = Grouper.getGrouper();
 export function ipCheckMiddleware(request, response, next) {
   const blockedIPsGroup = grouper.findGroup("blockedIPs");
   if (blockedIPsGroup.findId (request.socket.remoteAddress ?? "")) {
-    return request.socket.end();
+    request.socket.end();
+    return
   }
   next();
 }

lib/middleware/logActivities.js

@@ -1,4 +1,4 @@
-import { Activity } from "../Activity.js";
+import { Activity } from "toot-sweet/models";
 import { Grouper } from "../Grouper.js";
 
 /**

lib/Activity.js → lib/models/Activity.js

@@ -1,4 +1,4 @@
-import { ActivityStreamObject } from "./ActivityStreamObject.js";
+import { ActivityStreamObject } from "../ActivityStreamObject.js";
 import Avj from "ajv";
 
 /**

lib/models/index.js

@@ -1,3 +1,4 @@
+import { Activity } from "./Activity.js";
 import { Person } from "./Person.js";
 
-export { Person };
+export { Person, Activity };

lib/routes/groups.js

@@ -3,14 +3,14 @@ import { Grouper } from "../Grouper.js"
 
 const router = express.Router()
 
-router.get("/getAll", (request, response) => {
+router.get("/getAll", (request, res) => {
   const groups = Grouper.getGrouper()
 
-  response.setHeader('content-type', 'application/json')
+  res.setHeader('content-type', 'application/json')
 
   const allItems = groups.getAll()
 
-  return response.end(JSON.stringify(allItems))
+  res.json(allItems)
 })
 
 

lib/routes/index.js

@@ -1,12 +1,16 @@
 import { apiRouter } from "./api.js";
 import { nodeinfoRouter } from "./nodeinfo.js";
-import { peopleRouter } from "./people.js";
+import { peopleRouter, getStatus, getPerson, getCollection, handlePOSTToCollection } from "./people.js";
 import { wellKnownRouter } from "./wellknown.js";
 
 export {
     apiRouter,
     nodeinfoRouter,
     peopleRouter,
     wellKnownRouter,
+    getStatus,
+    getPerson,
+    getCollection,
+    handlePOSTToCollection
 };
 

lib/routes/logsRouter.js

@@ -3,14 +3,14 @@ import { Queue } from "../Queue.js"
 
 const router = express.Router()
 
-router.get("/getAll", (request, response) => {
+router.get("/getAll", (request, res) => {
   const logQueue = Queue.getQueue()
 
-  response.setHeader('content-type', 'application/json')
+  res.setHeader('content-type', 'application/json')
 
   const allItems = logQueue.getAll()
 
-  return response.end(JSON.stringify(allItems))
+  res.json(allItems)
 })
 
 

lib/routes/nodeinfo.js

@@ -22,9 +22,9 @@ router.get("/2.1", getNodeinfo)
  *
  * @author Drazi Crendraven
  * @param {Request} request
- * @param {Response} response
+ * @param {Response} res
  */
-function getNodeinfo(request, response) {
+function getNodeinfo(request, res) {
   const nodeInfo = JSON.stringify({
     "version": "2.1",
     "software": {
@@ -45,9 +45,10 @@ function getNodeinfo(request, response) {
     "metadata": {}
   })
 
-  response.setHeader('content-type', 'application/json');
+  res.setHeader('content-type', 'application/json');
 
-  return response.end(nodeInfo)
+  res.json(nodeInfo)
+  res.flushHeaders()
 }
 
 export { router as nodeinfoRouter }