diff --git a/.gitignore b/.gitignore index 89d4fa9..c1b07d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /coverage/ *.exe *.7z +yarn-error.log diff --git a/.vscode/settings.json b/.vscode/settings.json index 3662b37..69db3ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,5 @@ { + "editor.formatOnSave": false, + "eslint.autoFixOnSave": true, "typescript.tsdk": "node_modules/typescript/lib" -} \ No newline at end of file +} diff --git a/README.md b/README.md index 2e46a40..4aabb81 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This repository includes the dedicated server software. For the client please vi ## Server List -There is a [public server list](https://smmdb.ddns.net/net64) of all Net64+ server, that have enabled listing. +There is a [public server list](https://smmdb.net/net64) of all Net64+ server, that have enabled listing. ## Downloads @@ -21,6 +21,8 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn - download and install [Node 8](https://nodejs.org/en/download/) - you can try using a later version of Node, but you will need to install C++ compilers + - on Windows you can do the following: `npm i -g windows-build-tools` / or use `yarn global add` +- install yarn. It's a package manager for npm, which is generally faster - `git clone` this repository or [download as zip](https://github.com/Tarnadas/net64plus-server/archive/master.zip) - modify `settings.json` @@ -38,7 +40,7 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn } ``` -- (OPTIONAL) if you want your server to be listed, go to [SMMDB](https://smmdb.ddns.net), login with Google, go to profile and get your API key +- (OPTIONAL) if you want your server to be listed, go to [SMMDB](https://smmdb.net), login with Google, go to profile and get your API key - _Do not share your API key, because it gives full access to your account_ - You can only list one server per API key - `name` will be shortened to 40 characters at most @@ -47,14 +49,14 @@ The prebuilt version is bundled with the [Net64+ Client](https://github.com/Tarn - open a terminal in the folder of your server and execute the following commands ``` -$ npm install -$ npm start +$ yarn install +$ yarn start ``` - (OPTIONAL) if you want to run your server indefinitely with auto restarts, I suggest to use pm2 ``` -$ npm i -g pm2 -$ npm run build +$ yarn global add pm2 +$ yarn build $ pm2 start ./dist --name="net64 server" ``` diff --git a/build.js b/build.js index 6ec42f1..bbfb09a 100644 --- a/build.js +++ b/build.js @@ -30,7 +30,7 @@ function build (platform, platformName, arch) { nexe.compile({ input: buildPath, output: path.join('compile', `net64plus-server_${pjson.version}_${platform}-${arch}`), - target: `${platformName}-${arch}-8.15.0`, + target: `${platformName}-${arch}-8.16.0`, native: { uws: { additionalFiles: [ diff --git a/changelog/2.2.4.md b/changelog/2.2.4.md new file mode 100644 index 0000000..d54a409 --- /dev/null +++ b/changelog/2.2.4.md @@ -0,0 +1,6 @@ +## [2.2.4](https://github.com/Tarnadas/net64plus-server/compare/2.1.2...2.2.4) (2019-11-09) + + +### Bug Fixes + +* new domain ([df248b6](https://github.com/Tarnadas/net64plus-server/commit/df248b6)) diff --git a/package.json b/package.json index 6655cfc..a0ec751 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "net64plus-server", - "version": "2.2.3", + "version": "2.2.4", "compatVersion": "1.0", "description": "Net64+ Dedicated Server", "main": "dist/index.js", diff --git a/src/WebHook.ts b/src/WebHook.ts index b32dd59..621ad60 100644 --- a/src/WebHook.ts +++ b/src/WebHook.ts @@ -4,7 +4,7 @@ import { webSocketServer } from './globals' import { Settings } from './models/Settings.model' import { Server } from './models/Server.model' -export const URL_API = 'https://smmdb.ddns.net/api/net64server' +export const URL_API = 'https://smmdb.net/api/net64server' const apiKey = Symbol('apiKey') diff --git a/src/index.ts b/src/index.ts index 8b62e3d..1d156b7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,7 +7,7 @@ import { Server } from './models/Server.model' import { Arguments } from './Arguments' const UPDATE_INTERVAL = 32 -const PORT_CHECK_API = 'https://smmdb.ddns.net/api/v2/net64/portcheck' +const PORT_CHECK_API = 'https://smmdb.net/api/v2/net64/portcheck' const args = new Arguments() const settings = args.settings