Optimize container memory usage.

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

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"]

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",

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 {

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 {

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<void> => {
   const playerManager = container.get<PlayerManager>(TYPES.Managers.Player);

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';

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 () => {

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))

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 {

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';

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,

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<Setting> {
   const config = await prisma.setting.findUnique({where: {guildId}});

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"]