refactor: group related modules into subpackages

Author: shiftinv

scripts/sign.ts

@@ -1,4 +1,4 @@
-import { sign } from "../src/crypto.ts";
+import { sign } from "../src/server/crypto.ts";
 
 if (import.meta.main) {
     const arg = Deno.args[0] ?? "";

src/formatter.ts src/discord/formatter.tssrc/formatter.ts renamed to src/discord/formatter.ts

@@ -1,6 +1,6 @@
-import config from "./config.ts";
-import { getRequestLog } from "./context.ts";
-import { sleep } from "./util.ts";
+import config from "../config.ts";
+import { getRequestLog } from "../server/context.ts";
+import { sleep } from "../util.ts";
 
 export async function sendWebhook(
     id: string,

src/webhook.ts src/discord/webhook.tssrc/webhook.ts renamed to src/discord/webhook.ts

@@ -1,9 +1,9 @@
 import { WebhookEvent, WebhookEventMap, WebhookEventName } from "@octokit/webhooks-types";
 
-import { getRequestLog } from "./context.ts";
 import { getAndIncrementKV } from "./kv.ts";
-import { UrlConfig } from "./types.d.ts";
-import { wildcardMatch } from "./util.ts";
+import { getRequestLog } from "../server/context.ts";
+import { UrlConfig } from "../types.d.ts";
+import { wildcardMatch } from "../util.ts";
 
 const COMMON_CI_BOTS = ["coveralls[bot]", "netlify[bot]", "pre-commit-ci[bot]", "dependabot[bot]"];
 

src/filter.ts src/filter/index.tssrc/filter.ts renamed to src/filter/index.ts

@@ -1,5 +1,5 @@
-import config from "./config.ts";
-import type { RequestLog } from "./util.ts";
+import config from "../config.ts";
+import type { RequestLog } from "../util.ts";
 
 const KEY_EXPIRY = 3; // seconds
 const MAX_RETRIES = 50;

src/kv.ts src/filter/kv.tssrc/kv.ts renamed to src/filter/kv.ts

@@ -1,12 +1,12 @@
 import { HTTPException } from "@hono/hono/http-exception";
 import { WebhookEvent } from "@octokit/webhooks-types";
 
-import { getRequestLog } from "./context.ts";
-import filterWebhook from "./filter.ts";
-import fixupEmbeds from "./formatter.ts";
+import fixupEmbeds from "./discord/formatter.ts";
+import { sendWebhook } from "./discord/webhook.ts";
+import filterWebhook from "./filter/index.ts";
+import { getRequestLog } from "./server/context.ts";
 import { UrlConfig } from "./types.d.ts";
 import { parseBool } from "./util.ts";
-import { sendWebhook } from "./webhook.ts";
 
 export default async function handle(
     json: Record<string, any>,

src/handler.ts

@@ -1,61 +1,5 @@
-import { Hono } from "@hono/hono";
-import { HTTPException } from "@hono/hono/http-exception";
-import { logger } from "@hono/hono/logger";
-
 import config from "./config.ts";
-import { contextMiddleware, getRequestLog } from "./context.ts";
-import { hasKey, verify } from "./crypto.ts";
-import handler from "./handler.ts";
-import { setMetaHeader } from "./util.ts";
-
-const app = new Hono();
-
-app.use(contextMiddleware);
-
-// use context's requestlog for server logs
-app.use(logger((...args) => getRequestLog().log(...args)));
-
-// add deploy header to responses
-app.use(async (c, next) => {
-    await next();
-    setMetaHeader(c, "deploy", config.deployId);
-});
-
-if (config.mainRedirect) {
-    app.get("/", (c) => {
-        return c.redirect(config.mainRedirect!);
-    });
-}
-
-app.post("/:id/:token", async (c) => {
-    const { id, token } = c.req.param();
-
-    // verify signature
-    if (hasKey) {
-        const signature = c.req.query("sig");
-        if (!signature || !(await verify(`${id}/${token}`, signature))) {
-            throw new HTTPException(403);
-        }
-    }
-
-    const data = await c.req.json();
-    let [res, meta] = await handler(data, c.req.header(), c.req.query(), id, token);
-
-    // clone response to make headers mutable
-    res = new Response(res.body, res);
-
-    // set metadata headers
-    for (const [key, value] of Object.entries(meta)) {
-        setMetaHeader(c, key, value);
-    }
-
-    // remove other headers that don't make sense here
-    for (const header of ["set-cookie", "alt-svc"]) {
-        res.headers.delete(header);
-    }
-
-    return res;
-});
+import app from "./server/index.ts";
 
 if (import.meta.main) {
     if (config.signKey) {

src/main.ts

@@ -1,7 +1,7 @@
 import { createMiddleware } from "@hono/hono/factory";
 import { AsyncLocalStorage } from "node:async_hooks";
 
-import { RequestLog, requestLog } from "./util.ts";
+import { RequestLog, requestLog } from "../util.ts";
 
 interface ContextData {
     requestLog: RequestLog;

src/context.ts src/server/context.tssrc/context.ts renamed to src/server/context.ts

@@ -1,6 +1,6 @@
 import { decodeHex, encodeHex } from "@std/encoding";
 
-import config from "./config.ts";
+import config from "../config.ts";
 
 export const hasKey = !!config.signKey;
 

src/crypto.ts src/server/crypto.tssrc/crypto.ts renamed to src/server/crypto.ts

@@ -0,0 +1,59 @@
+import { Hono } from "@hono/hono";
+import { HTTPException } from "@hono/hono/http-exception";
+import { logger } from "@hono/hono/logger";
+
+import config from "../config.ts";
+import { contextMiddleware, getRequestLog } from "./context.ts";
+import { hasKey, verify } from "./crypto.ts";
+import handler from "../handler.ts";
+import { setMetaHeader } from "../util.ts";
+
+const app = new Hono();
+export default app;
+
+app.use(contextMiddleware);
+
+// use context's requestlog for server logs
+app.use(logger((...args) => getRequestLog().log(...args)));
+
+// add deploy header to responses
+app.use(async (c, next) => {
+    await next();
+    setMetaHeader(c, "deploy", config.deployId);
+});
+
+if (config.mainRedirect) {
+    app.get("/", (c) => {
+        return c.redirect(config.mainRedirect!);
+    });
+}
+
+app.post("/:id/:token", async (c) => {
+    const { id, token } = c.req.param();
+
+    // verify signature
+    if (hasKey) {
+        const signature = c.req.query("sig");
+        if (!signature || !(await verify(`${id}/${token}`, signature))) {
+            throw new HTTPException(403);
+        }
+    }
+
+    const data = await c.req.json();
+    let [res, meta] = await handler(data, c.req.header(), c.req.query(), id, token);
+
+    // clone response to make headers mutable
+    res = new Response(res.body, res);
+
+    // set metadata headers
+    for (const [key, value] of Object.entries(meta)) {
+        setMetaHeader(c, key, value);
+    }
+
+    // remove other headers that don't make sense here
+    for (const header of ["set-cookie", "alt-svc"]) {
+        res.headers.delete(header);
+    }
+
+    return res;
+});