From da3436db194f343ed4b0c2b261c92257774c738f Mon Sep 17 00:00:00 2001 From: unexp Date: Fri, 20 Jan 2023 08:40:44 -0300 Subject: [PATCH] Billions must commit --- src/index.js | 6 +++--- src/lib/classes/RCCService.js | 14 ++++++++++---- src/lib/logger.js | 10 ++++++---- src/routes/index.js | 6 +++--- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/index.js b/src/index.js index 58bf831..8de671e 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ const logger = require("./lib/logger.js") const express = require("express") const app = express() -process.env.RCCSERVICE_PATH = "/tmp/Release" +process.env.RCCSERVICE_PATH = "D:\\Projects\\Roblox\\Source\\UploadBits\\Win32-Release-RCCService\\" app.use("/game/start", require("./routes/game/start.js")) app.use("/game/stop", require("./routes/game/stop.js")) @@ -15,9 +15,9 @@ app.use("/render/game", require("./routes/render/game.js")) app.use("*", require("./routes/index.js")) app.listen(process.env.PORT || 5173, () => { - logger.info(`Listening on http://127.0.0.1:${process.env.PORT || 5173}/`) + logger.boot(`Listening on http://127.0.0.1:${process.env.PORT || 5173}/`) }) process.on("uncaughtException", (err) => { - console.log(err) + logger.error(err) }) diff --git a/src/lib/classes/RCCService.js b/src/lib/classes/RCCService.js index cd6101c..142e980 100644 --- a/src/lib/classes/RCCService.js +++ b/src/lib/classes/RCCService.js @@ -1,5 +1,6 @@ const EventEmitter = require("events") const child_process = require("child_process") +const logger = require(`${__dirname}\\..\\logger.js`) class RCCService extends EventEmitter { constructor(path = process.env.RCCSERVICE_PATH) { @@ -10,19 +11,24 @@ class RCCService extends EventEmitter { start(port, options = { cwd: this.path }) { return new Promise((resolve, reject) => { try { - this.proc = child_process.spawn("wine", ["RCCService.exe", "-console", "-placeid:-1", `-port`, port], options) - this.proc.once("spawn", resolve(this.proc)) + this.proc = child_process.spawn("RCCService.exe", ["-Console", "-PlaceId:-1", `-Port`, port], options) + this.proc.once("spawn", () => { + logger.info(`Spawning RCCService instance on port ${port}`); + resolve(this.proc) + }) this.proc.once("exit", () => { - this.proc = null + this.proc = null; + logger.info(`Job has ended, closing RCCService on port ${port}`) }) } catch (_) { + logger.error(_); reject(_) } }) } stop(signal = "SIGTERM") { - if (!this.proc) throw new Error("Process is not running") + if (!this.proc) { logger.error("RCCService process is not running"); throw new Error("Process is not running") } return this.proc.kill(signal) } } diff --git a/src/lib/logger.js b/src/lib/logger.js index 427c78a..38adbe7 100644 --- a/src/lib/logger.js +++ b/src/lib/logger.js @@ -1,10 +1,12 @@ const chalk = require("chalk") const logger = { - info: (_) => console.log(chalk.blue("[info]"), _), - success: (_) => console.log(chalk.green("[success]"), _), - warn: (_) => console.log(chalk.yellow("[warn]"), _), - error: (_) => console.log(chalk.red("[error]"), _), + // Omg just like tadah :D (Tadahjak face) + boot: (_) => console.log(chalk.greenBright("[BOOT]"), _), + info: (_) => console.log(chalk.blue("[INFO]"), _), + success: (_) => console.log(chalk.green("[SUCCESS]"), _), + warn: (_) => console.log(chalk.yellow("[WARN]"), _), + error: (_) => console.log(chalk.red("[ERROR]"), _), } module.exports = logger diff --git a/src/routes/index.js b/src/routes/index.js index 97227af..d28a199 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -10,7 +10,7 @@ app.all("*", async (request, response) => { const proc = await rcc.start(64989) if (proc.exitCode !== null) return response.json(false) - await wait(1000) + await wait(5000) const jobId = "RenderTest" const client = await soap.createClientAsync(__dirname + "/../lib/RCCService.wsdl", {}, "http://127.0.0.1:64989/") @@ -23,7 +23,7 @@ app.all("*", async (request, response) => { }, script: { name: jobId, - script: readFileSync(__dirname + "/../lua/user_headshot.lua", { encoding: "utf-8" }), + script: readFileSync(__dirname + "/../lua/user.lua", { encoding: "utf-8" }), arguments: { LuaValue: [ { @@ -48,7 +48,7 @@ app.all("*", async (request, response) => { }, { type: "LUA_TSTRING", - value: "https://economy.ittblox.gay", + value: "https://sitetest.unexp.xyz", }, { type: "LUA_TNUMBER",