diff --git a/server/esbuild.bundle.js b/server/esbuild.bundle.js index 63dadd9..b9104c6 100644 --- a/server/esbuild.bundle.js +++ b/server/esbuild.bundle.js @@ -12,8 +12,20 @@ build({ platform: "node", // format: "esm", bundle: true, + minify: true, + outfile: "dist/main.js", plugins: [ makeAllPackagesExternalPlugin ], +}) +build({ + entryPoints: ["src/autoupdater.ts"], + platform: "node", + bundle: true, + minify: true, + outfile: "dist/autoupdater.js", + plugins: [ + makeAllPackagesExternalPlugin + ], }) \ No newline at end of file diff --git a/server/package.json b/server/package.json index 2911657..a0f4577 100644 --- a/server/package.json +++ b/server/package.json @@ -4,9 +4,9 @@ "description": "", "main": "src/main.ts", "scripts": { - "start": "tsx src/main.ts", + "start": "tsx src/main.ts --start", "dev": "nodemon -x tsx src/dev.ts", - "prod": "node esbuild.bundle.js && pkg src/main.js" + "prod": "node esbuild.bundle.js && pkg dist/main.js --targets node18 -o dist/adrift-server && pkg dist/autoupdater.js --targets node18 -o dist/adrift-server-autoupdate" }, "keywords": [], "author": "", @@ -45,4 +45,4 @@ "@types/ws": "^8.5.5", "nodemon": "^3.0.1" } -} +} \ No newline at end of file diff --git a/server/src/autoupdater.ts b/server/src/autoupdater.ts index 43c2333..3619a27 100644 --- a/server/src/autoupdater.ts +++ b/server/src/autoupdater.ts @@ -53,5 +53,4 @@ function start() { } -// downloadAndStart(); -start(); \ No newline at end of file +downloadAndStart(); \ No newline at end of file diff --git a/server/src/main.ts b/server/src/main.ts index e99717f..bea186f 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -20,6 +20,8 @@ import { exit } from "process"; import { datadir } from "./lib"; import { PROTOCOL_VERSION } from "protocol"; +export const SERVER_MILESTONE = "1.0"; + async function config() { let dir = datadir(); @@ -102,6 +104,7 @@ async function login(credentials: any) { async function start() { let dir = datadir(); + let conf; try { conf = JSON.parse(fs.readFileSync(`${dir}/config.json`).toString()); @@ -111,6 +114,8 @@ async function start() { let tracker = TrackerList[conf.tracker as keyof typeof TrackerList]; console.log(chalk.blue("Starting server!")); + console.log(chalk.blue(`Server version: ${SERVER_MILESTONE} - Protocol version: ${PROTOCOL_VERSION}`)); + if (conf.type == "swarm") { let connect = () => { let trackerws = new WebSocket(`${tracker.tracker}/join?protocol=${PROTOCOL_VERSION}`); diff --git a/tracker-list/src/index.ts b/tracker-list/src/index.ts index fb0ae8f..0edd7e0 100644 --- a/tracker-list/src/index.ts +++ b/tracker-list/src/index.ts @@ -26,5 +26,5 @@ let trackers = { tracker: "wss://rafftracker.mercurywork.shop", description: "a second official backup tracker", } -}; +} as const; export default trackers;