From 71c2f1b3d67d7125a2d5b77c68ae3a64fe100db2 Mon Sep 17 00:00:00 2001 From: Hri7566 Date: Mon, 2 Sep 2024 16:19:44 -0400 Subject: [PATCH] Remove docker stuff --- .dockerignore | 13 ------------- Dockerfile | 16 ---------------- config/notifications.yml | 4 +++- scripts/dev.sh | 2 ++ scripts/start_docker.sh | 3 --- src/index.ts | 2 -- src/util/metrics.ts | 37 ------------------------------------- 7 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile create mode 100755 scripts/dev.sh delete mode 100755 scripts/start_docker.sh delete mode 100644 src/util/metrics.ts diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index beaace2..0000000 --- a/.dockerignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -Dockerfile* -docker-compose* -.dockerignore -.git -.gitignore -README.md -LICENSE -.vscode -.env.template -.gitmodules -.prettierrc -.eslintrc.js diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8a29583..0000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM oven/bun:latest AS base -WORKDIR /usr/src/app - -COPY src src -COPY public public -COPY config config -COPY *.json ./ -COPY mppkey ./mppkey - -RUN bun install -RUN bunx prisma generate - -# Mount ./prisma to /usr/src/app/prisma - -EXPOSE 8443/tcp -ENTRYPOINT [ "bun", "." ] diff --git a/config/notifications.yml b/config/notifications.yml index 3b994da..7581b3a 100644 --- a/config/notifications.yml +++ b/config/notifications.yml @@ -10,6 +10,8 @@ maxDuration: 60000 # The default duration of a notification in milliseconds, if not specified. defaultDuration: 7000 -# The target used to send notifications to every socket on the server. +# The target ID to use to send notifications to every socket on the server. # This is not used for the "target" parameter, instead this is for "targetChannel"/"targetUser". +# This will allow notifications to be sent to every socket on the server. +# This is configurable because it's potentially dangerous to allow every allTarget: all diff --git a/scripts/dev.sh b/scripts/dev.sh new file mode 100755 index 0000000..08e042b --- /dev/null +++ b/scripts/dev.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +bun . diff --git a/scripts/start_docker.sh b/scripts/start_docker.sh deleted file mode 100755 index de2396d..0000000 --- a/scripts/start_docker.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -docker build --pull -t mpp-server-dev2 . && docker run -p 8443:8443 mpp-server-dev2 diff --git a/src/index.ts b/src/index.ts index 93d8b06..a0a7eea 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,7 +19,6 @@ import { loadForcedStartupChannels } from "./channel/forceLoad"; import { Logger } from "./util/Logger"; // docker hates this next one import { startReadline } from "./util/readline"; -import { startMetricsServer } from "./util/metrics"; // wrapper for some reason export function startServer() { @@ -37,4 +36,3 @@ export function startServer() { } startServer(); -startMetricsServer(); diff --git a/src/util/metrics.ts b/src/util/metrics.ts deleted file mode 100644 index 1171c0c..0000000 --- a/src/util/metrics.ts +++ /dev/null @@ -1,37 +0,0 @@ -import client, { Registry } from "prom-client"; -import { Logger } from "./Logger"; - -const logger = new Logger("Metrics Server"); - -export function startMetricsServer() { - client.collectDefaultMetrics(); - logger.info("Starting Prometheus metrics server..."); - - const server = Bun.serve({ - port: 9100, - async fetch(req) { - const res = new Response(await client.register.metrics()); - res.headers.set("Content-Type", client.register.contentType); - return res; - } - }); - - enableMetrics(); -} - -export const metrics = { - concurrentUsers: new client.Histogram({ - name: "concurrent_users", - help: "Number of concurrent users", - }), - callbacks: [], - addCallback(callback: (...args: any[]) => void | Promise) { - (this.callbacks as ((...args: any[]) => void)[]).push(callback); - } -} - -function enableMetrics() { - setInterval(() => { - (metrics.callbacks as ((...args: any[]) => void)[]).forEach(callback => callback()); - }, 5000); -}