From 1e85acb98bb12f58c9f8e9480e0fb875dca1c7e1 Mon Sep 17 00:00:00 2001 From: ninele7 Date: Thu, 19 Oct 2023 03:50:18 +0500 Subject: [PATCH 1/3] Optimize container memory usage. --- CHANGELOG.md | 2 ++ Dockerfile | 21 +++++++++++++++++---- package.json | 3 ++- src/commands/config.ts | 2 +- src/commands/loop.ts | 2 +- src/events/voice-state-update.ts | 2 +- src/inversify.config.ts | 2 +- src/scripts/migrate-and-start.ts | 7 ++++++- src/scripts/print-database-url.ts | 4 ++++ src/services/add-query-to-queue.ts | 2 +- src/services/get-songs.ts | 2 +- src/services/player.ts | 2 +- src/utils/get-guild-settings.ts | 4 ++-- tsconfig.json | 4 ++-- 14 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 src/scripts/print-database-url.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f2774a1..cd3a99e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Optimized Docker container to run JS code directly with node instead of yarn, npm and tsx. Reduces memory usage. + ## [2.4.3] - 2023-09-10 ### Fixed diff --git a/Dockerfile b/Dockerfile index 6ec862d9..cb2cf724 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,18 +14,29 @@ COPY package.json . COPY yarn.lock . RUN yarn install --prod +RUN cp -R node_modules /usr/app/prod_node_modules + +RUN yarn install + +FROM dependencies AS builder + +COPY . . + +# Run tsc build +RUN yarn prisma generate +RUN yarn build # Only keep what's necessary to run FROM base AS runner WORKDIR /usr/app -COPY --from=dependencies /usr/app/node_modules node_modules +COPY --from=builder /usr/app/dist ./dist +COPY --from=dependencies /usr/app/prod_node_modules node_modules +COPY --from=builder /usr/app/node_modules/.prisma/client ./node_modules/.prisma/client COPY . . -RUN yarn prisma generate - ARG COMMIT_HASH=unknown ARG BUILD_DATE=unknown @@ -34,4 +45,6 @@ ENV NODE_ENV production ENV COMMIT_HASH $COMMIT_HASH ENV BUILD_DATE $BUILD_DATE -CMD ["tini", "--", "yarn", "start"] +RUN echo "DATABASE_URL=$(node dist/scripts/print-database-url.js)" > .env + +CMD ["tini", "--", "node", "dist/scripts/migrate-and-start.js"] diff --git a/package.json b/package.json index 62f38e7b..1e1b98fc 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ "migrations:run": "npm run prisma:with-env migrate deploy", "prisma:with-env": "npm run env:set-database-url prisma", "env:set-database-url": "tsx src/scripts/run-with-database-url.ts", - "release": "release-it" + "release": "release-it", + "build": "tsc" }, "devDependencies": { "@release-it/keep-a-changelog": "^2.3.0", diff --git a/src/commands/config.ts b/src/commands/config.ts index 158f4f47..ae3bc458 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -3,7 +3,7 @@ import {ChatInputCommandInteraction, EmbedBuilder, PermissionFlagsBits} from 'di import {injectable} from 'inversify'; import {prisma} from '../utils/db.js'; import Command from './index.js'; -import {getGuildSettings} from '../utils/get-guild-settings'; +import {getGuildSettings} from '../utils/get-guild-settings.js'; @injectable() export default class implements Command { diff --git a/src/commands/loop.ts b/src/commands/loop.ts index 3b609a50..6618e842 100644 --- a/src/commands/loop.ts +++ b/src/commands/loop.ts @@ -4,7 +4,7 @@ import {inject, injectable} from 'inversify'; import PlayerManager from '../managers/player.js'; import Command from '.'; import {SlashCommandBuilder} from '@discordjs/builders'; -import {STATUS} from '../services/player'; +import {STATUS} from '../services/player.js'; @injectable() export default class implements Command { diff --git a/src/events/voice-state-update.ts b/src/events/voice-state-update.ts index e941a707..15784db7 100644 --- a/src/events/voice-state-update.ts +++ b/src/events/voice-state-update.ts @@ -3,7 +3,7 @@ import container from '../inversify.config.js'; import {TYPES} from '../types.js'; import PlayerManager from '../managers/player.js'; import {getSizeWithoutBots} from '../utils/channels.js'; -import {getGuildSettings} from '../utils/get-guild-settings'; +import {getGuildSettings} from '../utils/get-guild-settings.js'; export default async (oldState: VoiceState, _: VoiceState): Promise => { const playerManager = container.get(TYPES.Managers.Player); diff --git a/src/inversify.config.ts b/src/inversify.config.ts index 1a3b85c1..65a02581 100644 --- a/src/inversify.config.ts +++ b/src/inversify.config.ts @@ -21,7 +21,7 @@ import Config from './commands/config.js'; import Disconnect from './commands/disconnect.js'; import Favorites from './commands/favorites.js'; import ForwardSeek from './commands/fseek.js'; -import Loop from './commands/loop'; +import Loop from './commands/loop.js'; import Move from './commands/move.js'; import Next from './commands/next.js'; import NowPlaying from './commands/now-playing.js'; diff --git a/src/scripts/migrate-and-start.ts b/src/scripts/migrate-and-start.ts index d9717458..e6f2a19e 100644 --- a/src/scripts/migrate-and-start.ts +++ b/src/scripts/migrate-and-start.ts @@ -15,7 +15,12 @@ import {DATA_DIR} from '../services/config.js'; const client = new Prisma.PrismaClient(); const migrateFromSequelizeToPrisma = async () => { - await execa('prisma', ['migrate', 'resolve', '--applied', '20220101155430_migrate_from_sequelize'], {preferLocal: true}); + await execa('prisma', ['migrate', 'resolve', '--applied', '20220101155430_migrate_from_sequelize'], { + preferLocal: true, + env: { + DATABASE_URL: process.env.DATABASE_URL, + }, + }); }; const doesUserHaveExistingDatabase = async () => { diff --git a/src/scripts/print-database-url.ts b/src/scripts/print-database-url.ts new file mode 100644 index 00000000..fda2f6d6 --- /dev/null +++ b/src/scripts/print-database-url.ts @@ -0,0 +1,4 @@ +import createDatabaseUrl from '../utils/create-database-url.js'; +import {DATA_DIR} from '../services/config.js'; + +console.log(createDatabaseUrl(DATA_DIR)); diff --git a/src/services/add-query-to-queue.ts b/src/services/add-query-to-queue.ts index b5367a29..79bfdcd8 100644 --- a/src/services/add-query-to-queue.ts +++ b/src/services/add-query-to-queue.ts @@ -9,7 +9,7 @@ import {SongMetadata, STATUS} from './player.js'; import PlayerManager from '../managers/player.js'; import {buildPlayingMessageEmbed} from '../utils/build-embed.js'; import {getMemberVoiceChannel, getMostPopularVoiceChannel} from '../utils/channels.js'; -import {getGuildSettings} from '../utils/get-guild-settings'; +import {getGuildSettings} from '../utils/get-guild-settings.js'; @injectable() export default class AddQueryToQueue { diff --git a/src/services/get-songs.ts b/src/services/get-songs.ts index 1c68e7e5..b9577347 100644 --- a/src/services/get-songs.ts +++ b/src/services/get-songs.ts @@ -1,6 +1,6 @@ import {inject, injectable} from 'inversify'; import * as spotifyURI from 'spotify-uri'; -import {SongMetadata, QueuedPlaylist, MediaSource} from './player'; +import {SongMetadata, QueuedPlaylist, MediaSource} from './player.js'; import {TYPES} from '../types.js'; import ffmpeg from 'fluent-ffmpeg'; import YoutubeAPI from './youtube-api.js'; diff --git a/src/services/player.ts b/src/services/player.ts index c888896a..9754a42f 100644 --- a/src/services/player.ts +++ b/src/services/player.ts @@ -18,7 +18,7 @@ import { } from '@discordjs/voice'; import FileCacheProvider from './file-cache.js'; import debug from '../utils/debug.js'; -import {getGuildSettings} from '../utils/get-guild-settings'; +import {getGuildSettings} from '../utils/get-guild-settings.js'; export enum MediaSource { Youtube, diff --git a/src/utils/get-guild-settings.ts b/src/utils/get-guild-settings.ts index f001aabb..3d9e965a 100644 --- a/src/utils/get-guild-settings.ts +++ b/src/utils/get-guild-settings.ts @@ -1,6 +1,6 @@ import {Setting} from '@prisma/client'; -import {prisma} from './db'; -import {createGuildSettings} from '../events/guild-create'; +import {prisma} from './db.js'; +import {createGuildSettings} from '../events/guild-create.js'; export async function getGuildSettings(guildId: string): Promise { const config = await prisma.setting.findUnique({where: {guildId}}); diff --git a/tsconfig.json b/tsconfig.json index c02ad2f0..fdf03074 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,9 +7,9 @@ "strict": true, "experimentalDecorators": true, "esModuleInterop": true, - "sourceMap": true, + "sourceMap": false, "resolveJsonModule": true, - "noEmit": true + "outDir": "dist" }, "include": ["src"], "exclude": ["node_modules"] From 559c4b37f60ed6a3ceb62aae68f0f67998441a96 Mon Sep 17 00:00:00 2001 From: ninele7 Date: Thu, 9 Nov 2023 18:16:57 +0500 Subject: [PATCH 2/3] Review fix --- Dockerfile | 4 +--- src/scripts/migrate-and-start.ts | 11 ++++------- src/scripts/print-database-url.ts | 4 ---- tsconfig.json | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 src/scripts/print-database-url.ts diff --git a/Dockerfile b/Dockerfile index cb2cf724..a3d20ac8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,4 @@ ENV NODE_ENV production ENV COMMIT_HASH $COMMIT_HASH ENV BUILD_DATE $BUILD_DATE -RUN echo "DATABASE_URL=$(node dist/scripts/print-database-url.js)" > .env - -CMD ["tini", "--", "node", "dist/scripts/migrate-and-start.js"] +CMD ["tini", "--", "node", "--enable-source-maps", "dist/scripts/migrate-and-start.js"] diff --git a/src/scripts/migrate-and-start.ts b/src/scripts/migrate-and-start.ts index e6f2a19e..50b553ec 100644 --- a/src/scripts/migrate-and-start.ts +++ b/src/scripts/migrate-and-start.ts @@ -9,18 +9,15 @@ import Prisma from '@prisma/client'; import ora from 'ora'; import {startBot} from '../index.js'; import logBanner from '../utils/log-banner.js'; -import {createDatabasePath} from '../utils/create-database-url.js'; +import createDatabaseUrl, {createDatabasePath} from '../utils/create-database-url.js'; import {DATA_DIR} from '../services/config.js'; const client = new Prisma.PrismaClient(); +process.env.DATABASE_URL = process.env.DATABASE_URL || createDatabaseUrl(DATA_DIR) + const migrateFromSequelizeToPrisma = async () => { - await execa('prisma', ['migrate', 'resolve', '--applied', '20220101155430_migrate_from_sequelize'], { - preferLocal: true, - env: { - DATABASE_URL: process.env.DATABASE_URL, - }, - }); + await execa('prisma', ['migrate', 'resolve', '--applied', '20220101155430_migrate_from_sequelize'], {preferLocal: true}); }; const doesUserHaveExistingDatabase = async () => { diff --git a/src/scripts/print-database-url.ts b/src/scripts/print-database-url.ts deleted file mode 100644 index fda2f6d6..00000000 --- a/src/scripts/print-database-url.ts +++ /dev/null @@ -1,4 +0,0 @@ -import createDatabaseUrl from '../utils/create-database-url.js'; -import {DATA_DIR} from '../services/config.js'; - -console.log(createDatabaseUrl(DATA_DIR)); diff --git a/tsconfig.json b/tsconfig.json index fdf03074..5685334e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "strict": true, "experimentalDecorators": true, "esModuleInterop": true, - "sourceMap": false, + "sourceMap": true, "resolveJsonModule": true, "outDir": "dist" }, From 4860adb9f168517e2680fed8781c92cd38a206fc Mon Sep 17 00:00:00 2001 From: ninele7 Date: Thu, 9 Nov 2023 18:20:52 +0500 Subject: [PATCH 3/3] fix lint --- src/scripts/migrate-and-start.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/migrate-and-start.ts b/src/scripts/migrate-and-start.ts index 50b553ec..41197e47 100644 --- a/src/scripts/migrate-and-start.ts +++ b/src/scripts/migrate-and-start.ts @@ -14,7 +14,7 @@ import {DATA_DIR} from '../services/config.js'; const client = new Prisma.PrismaClient(); -process.env.DATABASE_URL = process.env.DATABASE_URL || createDatabaseUrl(DATA_DIR) +process.env.DATABASE_URL = process.env.DATABASE_URL ?? createDatabaseUrl(DATA_DIR); const migrateFromSequelizeToPrisma = async () => { await execa('prisma', ['migrate', 'resolve', '--applied', '20220101155430_migrate_from_sequelize'], {preferLocal: true});