Skip to content

Commit a8de08f

Browse files
committed
Remove instances of index.ts in backend; rename SquirrelContext to BackendContext
1 parent 3b76db8 commit a8de08f

96 files changed

Lines changed: 283 additions & 297 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { moduleLogger } from "#common/logger/index.ts";
1+
import { moduleLogger } from "#common/logger/logger.ts";
22
import type { Plugin } from "#plugin.ts";
33
import { checkMigrationsOrExit } from "#storage/migration.ts";
44
import {
@@ -9,15 +9,15 @@ import { readdir } from "node:fs/promises";
99
import path from "node:path";
1010
import { Pool } from "pg";
1111

12-
export interface SquirrelContext {
12+
export interface BackendContext {
1313
plugins: Map<string, Plugin>;
1414
db: Pool;
1515
dbNotifs: NotifDispatcher;
1616
}
1717

1818
const logger = moduleLogger();
1919

20-
export async function squirrelInit(): Promise<SquirrelContext> {
20+
export async function backendInit(): Promise<BackendContext> {
2121
preInit();
2222

2323
const db = new Pool();
@@ -50,7 +50,7 @@ export async function squirrelInit(): Promise<SquirrelContext> {
5050
};
5151
}
5252

53-
export async function squirrelShutdown(ctx: SquirrelContext): Promise<void> {
53+
export async function backendShutdown(ctx: BackendContext): Promise<void> {
5454
ctx.dbNotifs.disconnect();
5555
await ctx.db.end();
5656
}
@@ -94,7 +94,7 @@ async function loadPlugins(): Promise<Map<string, Plugin>> {
9494
continue;
9595
}
9696

97-
const index = path.join(entry.parentPath, entry.name, "index.ts");
97+
const index = path.join(entry.parentPath, entry.name, "plugin.ts");
9898
const { default: plugin } = (await import(index)) as {
9999
default: Plugin;
100100
};

backend/src/common/pg/transaction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { moduleLogger } from "#common/logger/index.ts";
1+
import { moduleLogger } from "#common/logger/logger.ts";
22
import { ClientBase, Pool, type PoolClient } from "pg";
33

44
const logger = moduleLogger();

backend/src/common/pollingScheduler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { moduleLogger } from "#common/logger/index.ts";
1+
import { moduleLogger } from "#common/logger/logger.ts";
22
import { dateToHMSString } from "#common/time.ts";
33

44
const logger = moduleLogger();

backend/src/common/shutdownHook.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Awaitable } from "#common/general.ts";
2-
import { moduleLogger } from "#common/logger/index.ts";
2+
import { moduleLogger } from "#common/logger/logger.ts";
33

44
const logger = moduleLogger();
55

backend/src/discord/discord.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import type { BackendContext } from "#backend.ts";
2+
import { Client } from "oceanic.js";
3+
4+
export interface BackendDiscordContext extends BackendContext {
5+
bot: Client;
6+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { SquirrelDiscordContext } from "#discord/index.ts";
1+
import type { BackendDiscordContext } from "#discord/discord.ts";
22
import { makeEventExtensionPoint } from "#extensionPoint.ts";
33

44
export const onBotInit =
5-
makeEventExtensionPoint<[ctx: SquirrelDiscordContext]>();
5+
makeEventExtensionPoint<[ctx: BackendDiscordContext]>();

backend/src/discord/index.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

backend/src/discord/main.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { moduleLogger } from "#common/logger/index.ts";
1+
import { backendInit, backendShutdown } from "#backend.ts";
2+
import { moduleLogger } from "#common/logger/logger.ts";
23
import { setupShutdownHook } from "#common/shutdownHook.ts";
34
import { onBotInit } from "#discord/extensionPoints.ts";
45
import { BOT_TOKEN, CACHE_PATH } from "#environment.ts";
5-
import { squirrelInit, squirrelShutdown } from "#index.ts";
66
import { mkdir } from "node:fs/promises";
77
import { Client, Constants } from "oceanic.js";
88

9-
const baseCtx = await squirrelInit();
9+
const baseCtx = await backendInit();
1010
await mkdir(CACHE_PATH, { recursive: true });
1111

1212
const logger = moduleLogger();
@@ -32,7 +32,7 @@ bot.once("ready", async () => {
3232

3333
setupShutdownHook(async () => {
3434
bot.disconnect(false);
35-
await squirrelShutdown(ctx);
35+
await backendShutdown(ctx);
3636
});
3737

3838
logger.debug?.("Firing onBotInit");

backend/src/http/extensionPoints.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ import {
22
makeArrayExtensionPoint,
33
makeMultiMapExtensionPoint,
44
} from "#extensionPoint.ts";
5-
import type { SquirrelHTTPContext } from "#http/index.ts";
5+
import type { BackendHTTPContext } from "#http/http.ts";
66
import type { GuildAuthVars } from "#http/middleware/guildAuth.ts";
77
import type { Plugin } from "#plugin.ts";
88
import type { Hono } from "hono";
99

1010
/** Added to plugins/[YOUR PLUGIN] */
1111
export const definePluginRoutes =
1212
makeArrayExtensionPoint<
13-
(squirrelCtx: SquirrelHTTPContext, plugin: Plugin, app: Hono) => void
13+
(backendCtx: BackendHTTPContext, plugin: Plugin, app: Hono) => void
1414
>();
1515
/** Added to guilds/[*]/plugins/[YOUR PLUGIN] */
1616
export const definePluginGuildRoutes =
1717
makeMultiMapExtensionPoint<
1818
(
19-
squirrelCtx: SquirrelHTTPContext,
19+
backendCtx: BackendHTTPContext,
2020
app: Hono<{ Variables: GuildAuthVars }>,
2121
) => void
2222
>();
2323
/** Added to guilds/[*]/plugins/[*] */
2424
export const defineGlobalPluginGuildRoutes =
2525
makeArrayExtensionPoint<
2626
(
27-
squirrelCtx: SquirrelHTTPContext,
27+
backendCtx: BackendHTTPContext,
2828
plugin: Plugin,
2929
app: Hono<{ Variables: GuildAuthVars }>,
3030
) => void

0 commit comments

Comments
 (0)