Skip to content

Commit

Permalink
Merge pull request #267 from RMartinOscar/patch-1
Browse files Browse the repository at this point in the history
Change base image to already include Node & NPM
  • Loading branch information
parkervcp authored Nov 1, 2024
2 parents a98977b + 0568f68 commit 67f65ee
Show file tree
Hide file tree
Showing 3 changed files with 145 additions and 147 deletions.
12 changes: 5 additions & 7 deletions games/rust/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim
FROM --platform=$TARGETOS/$TARGETARCH node:18-slim

ENV DEBIAN_FRONTEND=noninteractive

RUN dpkg --add-architecture i386 \
&& apt update \
&& apt upgrade -y \
&& apt install -y lib32gcc-s1 lib32stdc++6 unzip curl iproute2 tzdata libgdiplus libsdl2-2.0-0:i386 \
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt install -y nodejs \
&& mkdir /node_modules \
&& npm install --prefix / ws \
&& mkdir /wrapper \
&& npm install --prefix /wrapper ws \
&& useradd -d /home/container -m container

USER container
Expand All @@ -18,6 +16,6 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container

COPY ./entrypoint.sh /entrypoint.sh
COPY ./wrapper.js /wrapper.js
COPY ./wrapper.js /wrapper/wrapper.js

CMD [ "/bin/bash", "/entrypoint.sh" ]
CMD [ "/bin/bash", "/entrypoint.sh" ]
2 changes: 1 addition & 1 deletion games/rust/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ fi
export LD_LIBRARY_PATH=$(pwd)/RustDedicated_Data/Plugins/x86_64:$(pwd)

# Run the Server
wrapper "${MODIFIED_STARTUP}"
/wrapper/wrapper.js "${MODIFIED_STARTUP}"
278 changes: 139 additions & 139 deletions games/rust/wrapper.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,140 +1,140 @@
#!/usr/bin/env node

var startupCmd = "";
const fs = require("fs");
fs.writeFile("latest.log", "", (err) => {
if (err) console.log("Callback error in appendFile:" + err);
});

var args = process.argv.splice(process.execArgv.length + 2);
for (var i = 0; i < args.length; i++) {
if (i === args.length - 1) {
startupCmd += args[i];
} else {
startupCmd += args[i] + " ";
}
}

if (startupCmd.length < 1) {
console.log("Error: Please specify a startup command.");
process.exit();
}

const seenPercentage = {};

function filter(data) {
const str = data.toString();
if (str.startsWith("Loading Prefab Bundle ")) { // Rust seems to spam the same percentage, so filter out any duplicates.
const percentage = str.substr("Loading Prefab Bundle ".length);
if (seenPercentage[percentage]) return;

seenPercentage[percentage] = true;
}

console.log(str);
}

var exec = require("child_process").exec;
console.log("Starting Rust...");

var exited = false;
const gameProcess = exec(startupCmd);
gameProcess.stdout.on('data', filter);
gameProcess.stderr.on('data', filter);
gameProcess.on('exit', function (code, signal) {
exited = true;

if (code) {
console.log("Main game process exited with code " + code);
// process.exit(code);
}
});

function initialListener(data) {
const command = data.toString().trim();
if (command === 'quit') {
gameProcess.kill('SIGTERM');
} else {
console.log('Unable to run "' + command + '" due to RCON not being connected yet.');
}
}
process.stdin.resume();
process.stdin.setEncoding("utf8");
process.stdin.on('data', initialListener);

process.on('exit', function (code) {
if (exited) return;

console.log("Received request to stop the process, stopping the game...");
gameProcess.kill('SIGTERM');
});

var waiting = true;
var poll = function () {
function createPacket(command) {
var packet = {
Identifier: -1,
Message: command,
Name: "WebRcon"
};
return JSON.stringify(packet);
}

var serverHostname = process.env.RCON_IP ? process.env.RCON_IP : "localhost";
var serverPort = process.env.RCON_PORT;
var serverPassword = process.env.RCON_PASS;
var WebSocket = require("ws");
var ws = new WebSocket("ws://" + serverHostname + ":" + serverPort + "/" + serverPassword);

ws.on("open", function open() {
console.log("Connected to RCON. Generating the map now. Please wait until the server status switches to \"Running\".");
waiting = false;

// Hack to fix broken console output
ws.send(createPacket('status'));

process.stdin.removeListener('data', initialListener);
gameProcess.stdout.removeListener('data', filter);
gameProcess.stderr.removeListener('data', filter);
process.stdin.on('data', function (text) {
ws.send(createPacket(text));
});
});

ws.on("message", function (data, flags) {
try {
var json = JSON.parse(data);
if (json !== undefined) {
if (json.Message !== undefined && json.Message.length > 0) {
console.log(json.Message);
const fs = require("fs");
fs.appendFile("latest.log", "\n" + json.Message, (err) => {
if (err) console.log("Callback error in appendFile:" + err);
});
}
} else {
console.log("Error: Invalid JSON received");
}
} catch (e) {
if (e) {
console.log(e);
}
}
});

ws.on("error", function (err) {
waiting = true;
console.log("Waiting for RCON to come up...");
setTimeout(poll, 5000);
});

ws.on("close", function () {
if (!waiting) {
console.log("Connection to server closed.");

exited = true;
process.exit();
}
});
}
#!/usr/bin/env node

var startupCmd = "";
const fs = require("fs");
fs.writeFile("latest.log", "", (err) => {
if (err) console.log("Callback error in appendFile:" + err);
});

var args = process.argv.splice(process.execArgv.length + 2);
for (var i = 0; i < args.length; i++) {
if (i === args.length - 1) {
startupCmd += args[i];
} else {
startupCmd += args[i] + " ";
}
}

if (startupCmd.length < 1) {
console.log("Error: Please specify a startup command.");
process.exit();
}

const seenPercentage = {};

function filter(data) {
const str = data.toString();
if (str.startsWith("Loading Prefab Bundle ")) { // Rust seems to spam the same percentage, so filter out any duplicates.
const percentage = str.substr("Loading Prefab Bundle ".length);
if (seenPercentage[percentage]) return;

seenPercentage[percentage] = true;
}

console.log(str);
}

var exec = require("child_process").exec;
console.log("Starting Rust...");

var exited = false;
const gameProcess = exec(startupCmd);
gameProcess.stdout.on('data', filter);
gameProcess.stderr.on('data', filter);
gameProcess.on('exit', function (code, signal) {
exited = true;

if (code) {
console.log("Main game process exited with code " + code);
// process.exit(code);
}
});

function initialListener(data) {
const command = data.toString().trim();
if (command === 'quit') {
gameProcess.kill('SIGTERM');
} else {
console.log('Unable to run "' + command + '" due to RCON not being connected yet.');
}
}
process.stdin.resume();
process.stdin.setEncoding("utf8");
process.stdin.on('data', initialListener);

process.on('exit', function (code) {
if (exited) return;

console.log("Received request to stop the process, stopping the game...");
gameProcess.kill('SIGTERM');
});

var waiting = true;
var poll = function () {
function createPacket(command) {
var packet = {
Identifier: -1,
Message: command,
Name: "WebRcon"
};
return JSON.stringify(packet);
}

var serverHostname = process.env.RCON_IP ? process.env.RCON_IP : "localhost";
var serverPort = process.env.RCON_PORT;
var serverPassword = process.env.RCON_PASS;
var WebSocket = require("ws");
var ws = new WebSocket("ws://" + serverHostname + ":" + serverPort + "/" + serverPassword);

ws.on("open", function open() {
console.log("Connected to RCON. Generating the map now. Please wait until the server status switches to \"Running\".");
waiting = false;

// Hack to fix broken console output
ws.send(createPacket('status'));

process.stdin.removeListener('data', initialListener);
gameProcess.stdout.removeListener('data', filter);
gameProcess.stderr.removeListener('data', filter);
process.stdin.on('data', function (text) {
ws.send(createPacket(text));
});
});

ws.on("message", function (data, flags) {
try {
var json = JSON.parse(data);
if (json !== undefined) {
if (json.Message !== undefined && json.Message.length > 0) {
console.log(json.Message);
const fs = require("fs");
fs.appendFile("latest.log", "\n" + json.Message, (err) => {
if (err) console.log("Callback error in appendFile:" + err);
});
}
} else {
console.log("Error: Invalid JSON received");
}
} catch (e) {
if (e) {
console.log(e);
}
}
});

ws.on("error", function (err) {
waiting = true;
console.log("Waiting for RCON to come up...");
setTimeout(poll, 5000);
});

ws.on("close", function () {
if (!waiting) {
console.log("Connection to server closed.");

exited = true;
process.exit();
}
});
}
poll();

0 comments on commit 67f65ee

Please sign in to comment.