Remove express in favor of next.js

Author: captbaritone

packages/skin-database/README.md

@@ -17,3 +17,4 @@ The discord bot allows us to:
 ## Server
 
 This package also includes a GraphQL interface for exploring skins. It is not currently used by anything, but can be useful for inspecting the data.
+sudo systemctl reload apache2

packages/skin-database/api/DiscordEventHandler.ts

@@ -1,4 +1,4 @@
-import { ApiAction } from "./app";
+import { ApiAction } from "./types";
 import Discord, { TextChannel } from "discord.js";
 import * as Config from "../config";
 import SkinModel from "../data/SkinModel";

packages/skin-database/api/__tests__/graphql.test.ts

@@ -1,18 +1,17 @@
-import { Application } from "express";
 import { knex } from "../../db";
-import request from "supertest"; // supertest is a framework that allows to easily test web apis
-import { createApp } from "../app";
 import SkinModel from "../../data/SkinModel";
 import * as S3 from "../../s3";
 import { processUserUploads } from "../processUserUploads";
 import UserContext from "../../data/UserContext";
 import { searchIndex } from "../../algolia";
+import { createYogaInstance } from "../../app/graphql/yoga";
+import { YogaServerInstance } from "graphql-yoga";
 jest.mock("../../s3");
 jest.mock("../../algolia");
 jest.mock("../processUserUploads");
 jest.mock("../auth");
 
-let app: Application;
+let yoga: YogaServerInstance<any, any>;
 const handler = jest.fn();
 const log = jest.fn();
 const logError = jest.fn();
@@ -22,12 +21,9 @@ let username: string | undefined;
 beforeEach(async () => {
   jest.clearAllMocks();
   username = "<MOCKED>";
-  app = createApp({
+  yoga = createYogaInstance({
     eventHandler: handler,
-    extraMiddleware: (req, res, next) => {
-      req.session.username = username;
-      next();
-    },
+    getUserContext: () => new UserContext(username),
     logger: { log, logError },
   });
   await knex.migrate.latest();
@@ -39,9 +35,12 @@ function gql(templateString: TemplateStringsArray): string {
 }
 
 async function graphQLRequest(query: string, variables?: any) {
-  const { body } = await request(app)
-    .post("/graphql")
-    .send({ query, variables: variables ?? {} });
+  const response = await yoga.fetch("/graphql", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ query, variables }),
+  });
+  const body = await response.json();
   if (body.errors && body.errors.length) {
     for (const err of body.errors) {
       console.warn(err.message);

packages/skin-database/api/app.ts

@@ -1,7 +1,7 @@
 import * as Skins from "../data/skins";
 import S3 from "../s3";
 import { addSkinFromBuffer } from "../addSkin";
-import { EventHandler } from "./app";
+import { EventHandler } from "./types";
 import DiscordEventHandler from "./DiscordEventHandler";
 
 async function* reportedUploads(): AsyncGenerator<

packages/skin-database/api/processUserUploads.ts

@@ -0,0 +1,54 @@
+import UserContext from "../data/UserContext";
+
+export type ApiAction =
+  | { type: "REVIEW_REQUESTED"; md5: string }
+  | { type: "REJECTED_SKIN"; md5: string }
+  | { type: "APPROVED_SKIN"; md5: string }
+  | { type: "MARKED_SKIN_NSFW"; md5: string }
+  | { type: "SKIN_UPLOADED"; md5: string }
+  | { type: "ERROR_PROCESSING_UPLOAD"; id: string; message: string }
+  | { type: "CLASSIC_SKIN_UPLOADED"; md5: string }
+  | { type: "MODERN_SKIN_UPLOADED"; md5: string }
+  | { type: "SKIN_UPLOAD_ERROR"; uploadId: string; message: string }
+  | {
+      type: "GOT_FEEDBACK";
+      message: string;
+      email?: string | null;
+      url?: string | null;
+    }
+  | {
+      type: "SYNCED_TO_ARCHIVE";
+      successes: number;
+      errors: number;
+      skips: number;
+    }
+  | { type: "STARTED_SYNC_TO_ARCHIVE"; count: number }
+  | {
+      type: "POPULAR_TWEET";
+      bracket: number;
+      url: string;
+      likes: number;
+      date: Date;
+    }
+  | { type: "TWEET_BOT_MILESTONE"; bracket: number; count: number };
+
+export type EventHandler = (event: ApiAction) => void;
+export type Logger = {
+  log(message: string, context: any): void;
+  logError(message: string, context: any): void;
+};
+
+// Add UserContext to req objects globally
+declare global {
+  namespace Express {
+    interface Request {
+      ctx: UserContext;
+      notify(action: ApiAction): void;
+      log(message: string): void;
+      logError(message: string): void;
+      session: {
+        username: string | undefined;
+      };
+    }
+  }
+}