From c81a6ffe33d59eb7951d9bcad5cff0cc514558a7 Mon Sep 17 00:00:00 2001 From: Richard Coucoules Date: Wed, 10 Jun 2026 12:36:46 -0700 Subject: [PATCH 1/3] add Docker build instructions --- .dockerignore | 6 ++++++ Dockerfile | 23 +++++++++++++++++++++++ package.json | 4 +++- src/app.ts | 6 +++--- src/engine/OnDemand.ts | 2 +- src/engine/World.ts | 10 +++++----- src/server/login/LoginThread.ts | 2 +- src/server/login/{index.d.ts => index.ts} | 0 tsconfig.json | 2 +- 9 files changed, 43 insertions(+), 12 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile rename src/server/login/{index.d.ts => index.ts} (100%) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..1738b9612 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +node_modules +out +*/data +!*/data/config/private.pem +!*/data/config/public.pem +!*/data/raw \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..0e35dc6f2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +FROM node:lts-slim as build +COPY package.json package-lock.json . +RUN npm ci +COPY . . +RUN npm run compile + + +FROM node:lts-slim +ENV NODE_ENV=production +EXPOSE 8888/tcp +WORKDIR /opt/server/engine +COPY package.json package-lock.json . +RUN npm ci --omit dev --ignore-scripts + +# build output +COPY --from=build out out + +# local non-node dependencies +COPY --from=build public public +COPY --from=build data data +COPY --from=build view view + +ENTRYPOINT ["node", "out/src/app.js"] \ No newline at end of file diff --git a/package.json b/package.json index 3abc617bc..dc79c7f8f 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "scripts": { "build": "tsx tools/pack/Build.ts", "clean": "tsx tools/pack/Clean.ts", + "compile": "npx -p typescript tsc && npx tsc-alias && cp -r src/3rdparty out/src", "db:migrate": "tsx tools/server/prisma-multi.ts migrate deploy", "db:reset": "tsx tools/server/prisma-multi.ts migrate reset --force", "db:schema": "tsx tools/server/prisma-multi.ts migrate dev", @@ -27,7 +28,8 @@ "sqlite:migrate": "prisma migrate deploy --schema prisma/singleworld/schema.prisma", "sqlite:reset": "prisma migrate reset --force --schema prisma/singleworld/schema.prisma", "sqlite:schema": "prisma migrate dev --schema prisma/singleworld/schema.prisma", - "start": "npm install && tsx src/app.ts" + "start": "npm install && tsx src/app.ts", + "start:compiled": "node out/src/app.js" }, "lint-staged": { "*.{js,ts}": [ diff --git a/src/app.ts b/src/app.ts index 3bcdc74a1..83df84af7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -28,9 +28,9 @@ if (OnDemand.cache.count(0) !== 9 || OnDemand.cache.count(2) === 0 || !fs.exists } if (Environment.easyStartup) { - new Worker(new URL('./login.ts', import.meta.url)); - new Worker(new URL('./friend.ts', import.meta.url)); - new Worker(new URL('./logger.ts', import.meta.url)); + new Worker(new URL('./login.js', import.meta.url)); + new Worker(new URL('./friend.js', import.meta.url)); + new Worker(new URL('./logger.js', import.meta.url)); } await World.start(); diff --git a/src/engine/OnDemand.ts b/src/engine/OnDemand.ts index 6e63914b3..fc2b73023 100644 --- a/src/engine/OnDemand.ts +++ b/src/engine/OnDemand.ts @@ -105,7 +105,7 @@ class OnDemand { return this.worker; } - const worker = new Worker(new URL('./OnDemandThread.ts', import.meta.url)) as WorkerWithTransfers; + const worker = new Worker(new URL('./OnDemandThread.js', import.meta.url)) as WorkerWithTransfers; this.worker = worker; worker.on('message', (msg: OnDemandWorkerMessage) => this.onWorkerMessage(msg)); diff --git a/src/engine/World.ts b/src/engine/World.ts index 64a64b91f..abd376026 100644 --- a/src/engine/World.ts +++ b/src/engine/World.ts @@ -72,7 +72,7 @@ import { FriendsServerOpcodes } from '#/server/friend/FriendServer.js'; import { FriendThreadMessage } from '#/server/friend/FriendThread.js'; import { LoggerEventType } from '#/server/logger/LoggerEventType.js'; import { filteredEventTypes, groupedEventTypes } from '#/server/logger/WealthEventType.js'; -import { type GenericLoginThreadResponse, isPlayerLoginResponse, isPlayerLogoutResponse } from '#/server/login/index.d.js'; +import { type GenericLoginThreadResponse, isPlayerLoginResponse, isPlayerLogoutResponse } from '#/server/login/index.js'; import { trackCycleBandwidthInBytes, trackCycleBandwidthOutBytes, @@ -109,9 +109,9 @@ type LogoutRequest = { }; class World { - private loginThread = new Worker(new URL('../server/login/LoginThread.ts', import.meta.url)); - private friendThread = new Worker(new URL('../server/friend/FriendThread.ts', import.meta.url)); - private loggerThread = new Worker(new URL('../server/logger/LoggerThread.ts', import.meta.url)); + private loginThread = new Worker(new URL('../server/login/LoginThread.js', import.meta.url)); + private friendThread = new Worker(new URL('../server/friend/FriendThread.js', import.meta.url)); + private loggerThread = new Worker(new URL('../server/logger/LoggerThread.js', import.meta.url)); private devThread: Worker | null = null; private static readonly PLAYERS: number = 2047; @@ -1740,7 +1740,7 @@ class World { } private createDevThread() { - this.devThread = new Worker(new URL('../cache/DevThread.ts', import.meta.url)); + this.devThread = new Worker(new URL('../cache/DevThread.js', import.meta.url)); this.devThread.on('message', msg => { try { diff --git a/src/server/login/LoginThread.ts b/src/server/login/LoginThread.ts index 9cfe73afd..0e2d5f8c6 100644 --- a/src/server/login/LoginThread.ts +++ b/src/server/login/LoginThread.ts @@ -4,7 +4,7 @@ import { parentPort } from 'worker_threads'; import { LoginClient } from '#/server/login/LoginClient.js'; import Environment from '#/util/Environment.js'; -import { type GenericLoginThreadResponse } from './index.d.js'; +import { type GenericLoginThreadResponse } from './index.js'; import { trackLoginAttempts, trackLoginTime } from './LoginMetrics.js'; const client = new LoginClient(Environment.node.id); diff --git a/src/server/login/index.d.ts b/src/server/login/index.ts similarity index 100% rename from src/server/login/index.d.ts rename to src/server/login/index.ts diff --git a/tsconfig.json b/tsconfig.json index 2b6106637..22c098a4d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,5 +23,5 @@ "allowUnreachableCode": true }, "include": ["src/**/*.ts", "src/**/*.js", "tools/**/*.ts", "tools/**/*.js"], - "exclude": ["node_modules", "/**"] + "exclude": ["node_modules", "/**", "src/3rdparty"] } From 8618f807c6495350ff93953a2a806d3cdc238408 Mon Sep 17 00:00:00 2001 From: Richard Coucoules Date: Wed, 10 Jun 2026 16:52:46 -0700 Subject: [PATCH 2/3] bugfix: resolve aliases correctly in transpiled files --- Dockerfile | 2 +- package-lock.json | 504 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 18 +- 3 files changed, 519 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e35dc6f2..68e7f2348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,4 @@ COPY --from=build public public COPY --from=build data data COPY --from=build view view -ENTRYPOINT ["node", "out/src/app.js"] \ No newline at end of file +ENTRYPOINT ["node", "--conditions=production", "out/src/app.js"] \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 90324f2f6..261340be0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,7 @@ "prettier": "3.8.3", "prisma": "6.19.3", "prisma-kysely": "2.3.0", + "tsc-alias": "^1.8.17", "tsx": "4.22.3", "typescript-eslint": "8.60.0" }, @@ -1319,6 +1320,44 @@ "node": ">=16" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@opentelemetry/api": { "version": "1.4.1", "license": "Apache-2.0", @@ -1902,11 +1941,48 @@ "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==", "license": "MIT" }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/arg": { "version": "5.0.2", "dev": true, "license": "MIT" }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/await-to-js": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/await-to-js/-/await-to-js-3.0.0.tgz", @@ -1932,6 +2008,19 @@ "node": ">=20" } }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bintrees": { "version": "1.0.2", "license": "MIT" @@ -1942,6 +2031,19 @@ "integrity": "sha512-cTEHk2jLrPyi+12M3dhpEbnnPOsaZuq7C45ylbbQIiWgDFZq4UVYPEY5mlqjvsj/6gJv9qX5sa+ebDzLXT28Vw==", "license": "MIT" }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/c12": { "version": "3.1.0", "dev": true, @@ -2048,6 +2150,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/commander": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || >=14" + } + }, "node_modules/confbox": { "version": "0.2.2", "dev": true, @@ -2123,6 +2235,19 @@ "dev": true, "license": "MIT" }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/effect": { "version": "3.21.0", "resolved": "https://registry.npmjs.org/effect/-/effect-3.21.0.tgz", @@ -2463,6 +2588,36 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -2475,6 +2630,16 @@ "dev": true, "license": "MIT" }, + "node_modules/fastq": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", + "dev": true, + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -2528,6 +2693,19 @@ "url": "https://github.com/sindresorhus/file-type?sponsor=1" } }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/find-up": { "version": "5.0.0", "dev": true, @@ -2609,6 +2787,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-tsconfig": { + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz", + "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/gifwrap": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.10.1.tgz", @@ -2659,6 +2850,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -2745,6 +2957,19 @@ "node": ">=0.8.19" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "dev": true, @@ -2780,6 +3005,16 @@ "node": ">=0.10.0" } }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-property": { "version": "1.0.2", "license": "MIT" @@ -3081,6 +3316,43 @@ "url": "https://github.com/sponsors/wellwelwel" } }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", @@ -3110,6 +3382,20 @@ "version": "2.1.3", "license": "MIT" }, + "node_modules/mylas": { + "version": "2.1.14", + "resolved": "https://registry.npmjs.org/mylas/-/mylas-2.1.14.tgz", + "integrity": "sha512-BzQguy9W9NJgoVn2mRWzbFrFWWztGCcng2QI9+41frfk+Athwgx3qhqhvStz7ExeUUu7Kzw427sNzHpEZNINog==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/raouldeheer" + } + }, "node_modules/mysql2": { "version": "3.22.3", "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.3.tgz", @@ -3163,6 +3449,16 @@ "node": ">= 6.13.0" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/nypm": { "version": "0.6.2", "dev": true, @@ -3296,6 +3592,16 @@ "node": ">=8" } }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/pathe": { "version": "2.0.3", "dev": true, @@ -3350,6 +3656,19 @@ "pathe": "^2.0.3" } }, + "node_modules/plimit-lit": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/plimit-lit/-/plimit-lit-1.6.1.tgz", + "integrity": "sha512-B7+VDyb8Tl6oMJT9oSO2CW8XC/T4UcJGrwOVoNGwOQsQYhlpfajmrMj5xeejqaASq3V/EqThyOeATEOMuSEXiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "queue-lit": "^1.5.1" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/pngjs": { "version": "7.0.0", "license": "MIT", @@ -3497,6 +3816,37 @@ ], "license": "MIT" }, + "node_modules/queue-lit": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/queue-lit/-/queue-lit-1.5.2.tgz", + "integrity": "sha512-tLc36IOPeMAubu8BkW8YDBV+WyIgKlYU7zUNs0J5Vk9skSZ4JfGlPOqplP0aHdfv7HL0B2Pg6nwiq60Qc6M2Hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/rc9": { "version": "2.1.2", "dev": true, @@ -3523,6 +3873,16 @@ "dev": true, "license": "MIT" }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/restore-cursor": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", @@ -3540,6 +3900,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -3547,6 +3918,30 @@ "dev": true, "license": "MIT" }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -3621,6 +4016,16 @@ "dev": true, "license": "MIT" }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/slice-ansi": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz", @@ -3763,6 +4168,19 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/token-types": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.2.tgz", @@ -3794,6 +4212,92 @@ "typescript": ">=4.8.4" } }, + "node_modules/tsc-alias": { + "version": "1.8.17", + "resolved": "https://registry.npmjs.org/tsc-alias/-/tsc-alias-1.8.17.tgz", + "integrity": "sha512-EIduCZHqbNwPm8BZYfq1aD7BQ697A4h6uSGMOFQfYGoQwfrYFTKwYfy9Bv42YxHkduVBcn9Zx0DkX111DKskyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^3.5.3", + "commander": "^9.0.0", + "get-tsconfig": "^4.10.0", + "globby": "^11.0.4", + "mylas": "^2.1.9", + "normalize-path": "^3.0.0", + "plimit-lit": "^1.2.6" + }, + "bin": { + "tsc-alias": "dist/bin/index.js" + }, + "engines": { + "node": ">=16.20.2" + } + }, + "node_modules/tsc-alias/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/tsc-alias/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/tsc-alias/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/tsc-alias/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/tsx": { "version": "4.22.3", "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.3.tgz", diff --git a/package.json b/package.json index dc79c7f8f..3c2c940b1 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,18 @@ "node": ">=24" }, "imports": { - "#3rdparty/*": "./src/3rdparty/*", - "#/*": "./src/*", - "#tools/*": "./tools/*" + "#3rdparty/*": { + "production": "./out/src/3rdparty/*", + "default": "./src/3rdparty/*" + }, + "#/*": { + "production": "./out/src/*", + "default": "./src/*" + }, + "#tools/*": { + "production": "./out/tools/*", + "default": "./tools/*" + } }, "scripts": { "build": "tsx tools/pack/Build.ts", @@ -29,7 +38,7 @@ "sqlite:reset": "prisma migrate reset --force --schema prisma/singleworld/schema.prisma", "sqlite:schema": "prisma migrate dev --schema prisma/singleworld/schema.prisma", "start": "npm install && tsx src/app.ts", - "start:compiled": "node out/src/app.js" + "start:compiled": "node --conditions=production out/src/app.js" }, "lint-staged": { "*.{js,ts}": [ @@ -66,6 +75,7 @@ "prettier": "3.8.3", "prisma": "6.19.3", "prisma-kysely": "2.3.0", + "tsc-alias": "^1.8.17", "tsx": "4.22.3", "typescript-eslint": "8.60.0" }, From 34a55b6a9d012c1b888e2289897085716136386e Mon Sep 17 00:00:00 2001 From: Richard Coucoules Date: Wed, 10 Jun 2026 17:52:23 -0700 Subject: [PATCH 3/3] Add local sqlite migration step --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 68e7f2348..7e52e7f49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ COPY package.json package-lock.json . RUN npm ci COPY . . RUN npm run compile +RUN npm run sqlite:migrate FROM node:lts-slim @@ -14,6 +15,7 @@ RUN npm ci --omit dev --ignore-scripts # build output COPY --from=build out out +COPY --from=build db.sqlite db.sqlite # local non-node dependencies COPY --from=build public public