chore: cleanup

Author: uetchy

.gitignore

@@ -1,6 +1,4 @@
 .vscode
-package-lock.json
-yarn.lock
 .envrc
 /lib
 /tmp

docker-compose.development.yml

@@ -8,11 +8,11 @@ services:
 
   bot:
     build: .
-    command: node ./lib/server.js
+    command: yarn dev
     ports:
       - "3000:3000"
     volumes:
-      - ./lib:/app/lib
+      - ./src:/app/src
     env_file: .env
     environment:
       MONGODB_URL: mongodb://mongo:27017/shipid

docker-compose.yml

@@ -10,11 +10,15 @@ services:
   bot:
     build: .
     restart: unless-stopped
-    command: yarn start
+    command: node .
     env_file: .env
     environment:
       MONGODB_URL: mongodb://mongo:27017/shipid
-      DEBUG: shipid
-      VIRTUAL_HOST: shipid.holodata.org
-      VIRTUAL_PORT: 3000
-      LETSENCRYPT_HOST: shipid.holodata.org
+      NODE_ENV: production
+    networks:
+      - default
+      - webproxy
+
+networks:
+  webproxy:
+    external: true

package.json

@@ -6,11 +6,15 @@
   "scripts": {
     "build": "tsc",
     "clean": "shx rm -rf lib",
-    "dev": "tsc -w",
+    "dev": "run-p dev:*",
+    "dev:server": "nodemon -w lib ./lib/server.js",
+    "dev:tsc": "tsc -w",
+    "devcontainer": "docker-compose -f docker-compose.development.yml up",
     "prepare": "husky install",
+    "start": "node ./lib/server.js",
     "test": "jest"
   },
-  "main": "lib/server.js",
+  "main": "./lib/server.js",
   "files": [
     "lib"
   ],

src/modules/discord/commands/pair.ts

@@ -1,7 +1,7 @@
-import { PREFIX } from "../../../constants";
-import { findOrCreateGuild } from "../../../db";
 import { HandlerOptions } from "../interfaces";
 import { checkModPermission } from "../util";
+import { PREFIX } from "/@/constants";
+import { findOrCreateGuild } from "/@/db";
 
 export const pair = {
   // !sid pair <channelId> <role name>

src/modules/discord/commands/verify.ts

@@ -1,8 +1,8 @@
-import { getUserByDiscordId } from "../../../db";
 import { HandlerOptions } from "../interfaces";
 import { applyRolesPhase } from "../phases/applyRolesPhase";
 import { onboardingPhase } from "../phases/onboardingPhase";
 import { verificationPhase } from "../phases/verificationPhase";
+import { getUserByDiscordId } from "/@/db";
 
 export const verify = {
   // !sid verify

src/modules/discord/index.ts

@@ -1,8 +1,8 @@
 import Discord from "discord.js";
-import { HB_MONGO_URI } from "../../constants";
-import { log } from "../../util";
-import { Honeybee } from "../honeybee";
 import { commands } from "./commands";
+import { HB_MONGO_URI } from "/@/constants";
+import { Honeybee } from "/@/modules/honeybee";
+import { log } from "/@/util";
 
 export function createBot({ prefix }: { prefix: string }) {
   const hb = new Honeybee(HB_MONGO_URI);
@@ -17,7 +17,7 @@ export function createBot({ prefix }: { prefix: string }) {
       const args = payload;
 
       if (!commandName) return;
-      console.log(`command: ${commandName}`, payload);
+      log(`command: ${commandName}`, payload);
 
       const command = commands.find(
         (command) => command.command === commandName

src/modules/discord/interfaces.ts

@@ -1,5 +1,5 @@
 import Discord from "discord.js";
-import { Honeybee } from "../honeybee";
+import { Honeybee } from "/@/modules/honeybee";
 
 export interface HandlerOptions {
   message: Discord.Message;

src/modules/discord/phases/onboardingPhase.ts

@@ -1,10 +1,11 @@
-import jwt from "jsonwebtoken";
-import { HOST, JWT_SECRET } from "../../../constants";
-import { JwtToken } from "../../../auth";
 import { Message } from "discord.js";
+import jwt from "jsonwebtoken";
+import { JwtToken } from "/@/auth";
+import { HOST, JWT_SECRET } from "/@/constants";
+import { log } from "/@/util";
 
 export function onboardingPhase(message: Message) {
-  console.log("onboardingPhase");
+  log("onboardingPhase");
   const payload: JwtToken = {
     discordId: message.author.id,
     iat: Date.now(),

src/modules/discord/phases/verificationPhase.ts

@@ -1,8 +1,8 @@
-import { getRoleMapsForGuild } from "../../../db";
 import { Message } from "discord.js";
-import { User } from "../../../models/user";
-import { Honeybee } from "../../honeybee";
 import { RoleChangeset } from "../interfaces";
+import { getRoleMapsForGuild } from "/@/db";
+import { User } from "/@/models/user";
+import { Honeybee } from "/@/modules/honeybee";
 
 export async function verificationPhase(
   message: Message,

src/modules/honeybee/db.ts

@@ -1,5 +1,4 @@
-import { getModelForClass, ReturnModelType } from "@typegoose/typegoose";
-import { BeAnObject } from "@typegoose/typegoose/lib/types";
+import { getModelForClass } from "@typegoose/typegoose";
 import mongoose from "mongoose";
 import { Chat } from "./chat";
 

src/modules/youtube/index.ts

@@ -1,9 +1,9 @@
 import { Request, Response, Router } from "express";
 import { Auth, google, youtube_v3 } from "googleapis";
 import jwt from "jsonwebtoken";
-import { JWT_SECRET } from "../../constants";
-import { JwtToken } from "../../auth";
-import UserModel from "../../models/user";
+import { JwtToken } from "/@/auth";
+import { JWT_SECRET } from "/@/constants";
+import UserModel from "/@/models/user";
 
 export function createYouTubeHandler({
   clientId,

src/server.ts

@@ -6,6 +6,7 @@ import {
   GOOGLE_CLIENT_ID,
   GOOGLE_CLIENT_SECRET,
   HOST,
+  isDev,
   MONGODB_URL,
   PORT,
   PREFIX,
@@ -33,6 +34,6 @@ app.use(youtubeHandler);
 const server = http.createServer(app);
 
 server.listen(PORT, () => {
-  console.log("http://localhost:" + PORT);
+  console.log(`Listening ${PREFIX} at ${HOST} (${isDev ? "dev" : "prod"})`);
   bot.login(DISCORD_TOKEN);
 });

tsconfig.json

@@ -46,8 +46,10 @@
 
     /* Module Resolution Options */
     // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    "baseUrl": "./" /* Base directory to resolve non-absolute module names. */,
+    "paths": {
+      "/@/*": ["./src/*"]
+    } /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                             /* List of folders to include type definitions from. */
     // "types": [],                                 /* Type declaration files to be included in compilation. */