From f75619c39e50c3dafa00664c33940d178d4e3b35 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 18 Feb 2023 02:55:26 -0500 Subject: [PATCH 1/6] Fix bodyshot.lua charapp appearance --- src/lua/bodyshot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lua/bodyshot.lua b/src/lua/bodyshot.lua index 1af7359..cfdf5f1 100644 --- a/src/lua/bodyshot.lua +++ b/src/lua/bodyshot.lua @@ -8,7 +8,7 @@ game:GetService("ContentProvider"):SetBaseUrl(baseUrl) game:GetService("ScriptContext").ScriptsDisabled = true local Player = game.Players:CreateLocalPlayer(0) -Player.CharacterAppearance = ("%s/users/%d/character"):format(baseUrl, assetId) +Player.CharacterAppearance = ("%s/Character?id=%d"):format(baseUrl, assetId) Player:LoadCharacter(false) game:GetService("RunService"):Run() From bb974f8f9c01f3964737c46bf203969f9d4a199f Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:04:16 -0500 Subject: [PATCH 2/6] Start work on gameservers --- src/lua/gameserver.lua | 84 ++++++++---------------------------------- 1 file changed, 15 insertions(+), 69 deletions(-) diff --git a/src/lua/gameserver.lua b/src/lua/gameserver.lua index 7d6b00f..3ef8549 100644 --- a/src/lua/gameserver.lua +++ b/src/lua/gameserver.lua @@ -1,52 +1,25 @@ -local jobId, type, baseUrl, placeId, port, owner = ... +local jobId, baseUrl, placeId, port = ... ------------------- UTILITY FUNCTIONS -------------------------- - function waitForChild(parent, childName) while true do local child = parent:findFirstChild(childName) - if child then - return child - end + if child then return child end parent.ChildAdded:wait() end end -function update(LeavingPlayer) - local names = {} - for _, player in pairs(game:GetService("Players"):GetPlayers()) do - if (player ~= LeavingPlayer) then - table.insert(names, player.Name) - end - end - - local str = (#names > 0) and (#names > 1) and (names[1] .. ",") or names[1] or "" - - for i = 2, #names -1, 1 do - str = str .. names[i] .. "," - end - - str = (#names > 0) and (#names > 1) and (str .. names[#names]) or names[1] or "" - return str -end - -function keepAlive(LeavingPlayer) - game:GetService("HttpService"):PostAsync("https://dungblx.cf/API/KeepAlive", game:GetService("HttpService"):JSONEncode({ - ["ServerIP"] = jobId, - ["PlaceId"] = game.PlaceId, - ["PlayerCount"] = #game:GetService("Players"):GetPlayers(), - ["PlayerList"] = update(LeavingPlayer), - })) -end - -----------------------------------END UTILITY FUNCTIONS ------------------------- -----------------------------------"CUSTOM" SHARED CODE---------------------------------- pcall(function() settings().Network.UseInstancePacketCache = true end) pcall(function() settings().Network.UsePhysicsPacketCache = true end) +-- pcall(function() settings()["Task Scheduler"].PriorityMethod = Enum.PriorityMethod.FIFO end) pcall(function() settings()["Task Scheduler"].PriorityMethod = Enum.PriorityMethod.AccumulatedError end) +-- settings().Network.PhysicsSend = 1 -- 1==RoundRobin +-- settings().Network.PhysicsSend = Enum.PhysicsSendMethod.ErrorComputation2 settings().Network.PhysicsSend = Enum.PhysicsSendMethod.TopNErrors settings().Network.ExperimentalPhysicsEnabled = true settings().Network.WaitingForCharacterLogRate = 100 @@ -54,20 +27,16 @@ pcall(function() settings().Diagnostics:LegacyScriptMode() end) -----------------------------------START GAME SHARED SCRIPT------------------------------ -local assetId = placeId - local scriptContext = game:GetService("ScriptContext") pcall(function() scriptContext:AddStarterScript(37801172) end) scriptContext.ScriptsDisabled = true -game:SetPlaceID(assetId, false) +game:SetPlaceID(placeId, false) game:GetService("ChangeHistoryService"):SetEnabled(false) -game:SetCreatorId(owner, Enum.CreatorType.User) -game:GetService("HttpService").HttpEnabled = true local ns = game:GetService("NetworkServer") -if baseUrl~=nil then +if baseUrl ~= nil then pcall(function() game:GetService("Players"):SetAbuseReportUrl(baseUrl .. "/AbuseReport/InGameChatHandler.ashx") end) pcall(function() game:GetService("ScriptInformationProvider"):SetAssetUrl(baseUrl .. "/Asset/") end) pcall(function() game:GetService("ContentProvider"):SetBaseUrl(baseUrl .. "/") end) @@ -84,53 +53,30 @@ if baseUrl~=nil then pcall(function() loadfile(baseUrl .. "/Game/LoadPlaceInfo.ashx?PlaceId=" .. placeId)() end) end +-- pcall(function() game:GetService("NetworkServer"):SetIsPlayerAuthenticationRequired(true) end) settings().Diagnostics.LuaRamLimit = 0 +-- settings().Network:SetThroughputSensitivity(0.08, 0.01) +-- settings().Network.SendRate = 35 +-- settings().Network.PhysicsSend = 0 -- 1==RoundRobin game:GetService("Players").PlayerAdded:connect(function(player) - keepAlive() print("Player " .. player.userId .. " added") - - player.CharacterAdded:connect(function(c) - game:GetObjects("rbxasset://fonts/characterCameraScript.rbxmx")[1].Parent = c - game:GetObjects("rbxasset://fonts/characterControlScript.rbxmx")[1].Parent = c - - for i,v in pairs(c:GetChildren()) do - print(v.Name) - end - - print(c.Animate.Source) - end) end) game:GetService("Players").PlayerRemoving:connect(function(player) - keepAlive(player) print("Player " .. player.userId .. " leaving") end) -if placeId~=nil and baseUrl~=nil then +if placeId ~= nil and baseUrl ~= nil then wait() - game:Load(baseUrl .. "/thumbs/staticimage?r=" .. jobId) + game:Load(baseUrl .. "/asset/?id=" .. placeId) end ------------------------------- RENEW GAME JOB SERVICE ------------------------------- - -spawn(function() - while true do - wait(30) - if #game.Players:GetPlayers() == 0 then - pcall(function() game:HttpGet(baseUrl .. "/arbiter/" .. jobId .. "/kill") end) - else - pcall(function() game:HttpGet(baseUrl .. "/arbiter/" .. jobId .. "/renew?s=360") end) - keepAlive() - end - end -end) - -------------------------------END START GAME SHARED SCRIPT-------------------------- - ns:Start(port) scriptContext:SetTimeout(10) scriptContext.ScriptsDisabled = false +------------------------------END START GAME SHARED SCRIPT-------------------------- + game:GetService("RunService"):Run() From 715d29b286019e49db86df999c3b214b4cc002c7 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:19:56 -0500 Subject: [PATCH 3/6] Gameservers --- src/lua/gameserver.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lua/gameserver.lua b/src/lua/gameserver.lua index 3ef8549..236344d 100644 --- a/src/lua/gameserver.lua +++ b/src/lua/gameserver.lua @@ -15,11 +15,8 @@ end pcall(function() settings().Network.UseInstancePacketCache = true end) pcall(function() settings().Network.UsePhysicsPacketCache = true end) --- pcall(function() settings()["Task Scheduler"].PriorityMethod = Enum.PriorityMethod.FIFO end) pcall(function() settings()["Task Scheduler"].PriorityMethod = Enum.PriorityMethod.AccumulatedError end) --- settings().Network.PhysicsSend = 1 -- 1==RoundRobin --- settings().Network.PhysicsSend = Enum.PhysicsSendMethod.ErrorComputation2 settings().Network.PhysicsSend = Enum.PhysicsSendMethod.TopNErrors settings().Network.ExperimentalPhysicsEnabled = true settings().Network.WaitingForCharacterLogRate = 100 @@ -53,11 +50,7 @@ if baseUrl ~= nil then pcall(function() loadfile(baseUrl .. "/Game/LoadPlaceInfo.ashx?PlaceId=" .. placeId)() end) end --- pcall(function() game:GetService("NetworkServer"):SetIsPlayerAuthenticationRequired(true) end) settings().Diagnostics.LuaRamLimit = 0 --- settings().Network:SetThroughputSensitivity(0.08, 0.01) --- settings().Network.SendRate = 35 --- settings().Network.PhysicsSend = 0 -- 1==RoundRobin game:GetService("Players").PlayerAdded:connect(function(player) print("Player " .. player.userId .. " added") From 7b44c0e4cfa0fb91428820f15bebfe31db1bc0c7 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:51:23 -0500 Subject: [PATCH 4/6] :d --- src/lib/classes/GameJob.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib/classes/GameJob.js b/src/lib/classes/GameJob.js index 8025e38..b9447c6 100644 --- a/src/lib/classes/GameJob.js +++ b/src/lib/classes/GameJob.js @@ -11,10 +11,6 @@ class GameJob extends Job { StartGame(id) { return new Promise(async (resolve, reject) => { - const response = await axios(`${process.env.BASE_URL}/API/Game/${id}?t=${process.env.ARBITER_TOKEN}`).catch((_) => reject(_)) - const { server_token, server_port, server_owner_id } = response.data - - this.id = server_token this.placeId = id const started = await this.Start() @@ -34,8 +30,8 @@ class GameJob extends Job { { type: "LUA_TSTRING", value: process.env.BASE_URL }, { type: "LUA_TNUMBER", value: id }, - { type: "LUA_TNUMBER", value: server_port }, - { type: "LUA_TNUMBER", value: server_owner_id }, + { type: "LUA_TNUMBER", value: 50001 }, + { type: "LUA_TNUMBER", value: 0 }, ], }, }).catch((e) => reject(e)) From 63fd9599c96d5e49c86eec003890b5a393f7de3d Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:52:46 -0500 Subject: [PATCH 5/6] :d --- src/lib/classes/GameJob.js | 1 - src/lua/gameserver.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/classes/GameJob.js b/src/lib/classes/GameJob.js index b9447c6..ef5a24c 100644 --- a/src/lib/classes/GameJob.js +++ b/src/lib/classes/GameJob.js @@ -31,7 +31,6 @@ class GameJob extends Job { { type: "LUA_TNUMBER", value: id }, { type: "LUA_TNUMBER", value: 50001 }, - { type: "LUA_TNUMBER", value: 0 }, ], }, }).catch((e) => reject(e)) diff --git a/src/lua/gameserver.lua b/src/lua/gameserver.lua index 236344d..4048234 100644 --- a/src/lua/gameserver.lua +++ b/src/lua/gameserver.lua @@ -1,4 +1,4 @@ -local jobId, baseUrl, placeId, port = ... +local jobId, type, baseUrl, placeId, port = ... ------------------- UTILITY FUNCTIONS -------------------------- function waitForChild(parent, childName) From 39878d9edf3b54486d77712621642359004687bf Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sun, 19 Feb 2023 03:07:51 -0500 Subject: [PATCH 6/6] Clean up exmaple.env, add authentication to endpoints --- example.env | 6 +++--- src/index.js | 30 +++++++++++++++--------------- src/lib/classes/RenderJob.js | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/example.env b/example.env index b757a14..1f72db2 100644 --- a/example.env +++ b/example.env @@ -1,10 +1,10 @@ +PORT= RCCSERVICE= -ARBITER_TOKEN= -ARBITER_PASSWORD= BASE_URL=https://sitetest.unexp.xyz -RENDER_FORMAT=PNG +ARBITER_TOKEN= +ARBITER_KEY= RENDER_USER_WIDTH=720 RENDER_USER_HEIGHT=720 diff --git a/src/index.js b/src/index.js index eff1167..b9d6f0b 100644 --- a/src/index.js +++ b/src/index.js @@ -6,13 +6,11 @@ const logger = require("./lib/logger.js") if (process.platform == "linux") logger.warn("Game hosting might not be fully compatible with Linux") -global.games = new Map() - -setInterval(() => { - global.games.forEach(async (value, key) => { - if (!(await value.Running())) value.Stop() - }) -}, 15000) +app.use(({ query }, response, next) => { + if (!query.key) return response.status(400).json({ error: "Missing key in query" }) + if (query.key !== process.env.ARBITER_KEY) return response.status(403).json({ error: "Incorrect key in query" }) + next() +}) app.use("/game/start", require("./routes/game/start.js")) app.use("/game/stop", require("./routes/game/stop.js")) @@ -22,17 +20,19 @@ app.use("/game/status", require("./routes/game/status.js")) app.use("/game/execute", require("./routes/game/execute.js")) app.use("/render/asset", require("./routes/render/asset.js")) -//app.use("/render/game", require("./routes/render/game.js")) -//app.use("/render/texture", require("./routes/render/texture.js")) +app.use("/render/game", require("./routes/render/game.js")) +app.use("/render/texture", require("./routes/render/texture.js")) app.use("/render/user", require("./routes/render/user.js")) app.use("/render/texture", require("./routes/render/texture.js")) app.use("*", require("./routes/index.js")) -app.listen(process.env.PORT || 64989, () => { - logger.boot(`Listening on http://127.0.0.1:${process.env.PORT || 64989}/`) -}) +process.on("uncaughtException", (err) => logger.error(err.message)) +global.games = new Map() +setInterval(() => { + global.games.forEach(async (value, key) => { + if (!(await value.Running())) value.Stop() + }) +}, 15000) -process.on("uncaughtException", (err) => { - logger.error(err.message) -}) +app.listen(process.env.PORT, () => logger.boot(`Listening on http://127.0.0.1:${process.env.PORT}/`)) diff --git a/src/lib/classes/RenderJob.js b/src/lib/classes/RenderJob.js index 4da4cf9..0439098 100644 --- a/src/lib/classes/RenderJob.js +++ b/src/lib/classes/RenderJob.js @@ -1,5 +1,5 @@ const { readFile } = require("fs/promises") -const chalk = require('chalk') +const chalk = require("chalk") const Job = require("./Job.js") const logger = require("../logger.js") @@ -31,7 +31,7 @@ class RenderJob extends Job { { type: "LUA_TSTRING", value: this.id }, { type: "LUA_TSTRING", value: "Headshot" }, - { type: "LUA_TSTRING", value: process.env.RENDER_FORMAT }, + { type: "LUA_TSTRING", value: "PNG" }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_WIDTH }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_HEIGHT }, @@ -70,7 +70,7 @@ class RenderJob extends Job { { type: "LUA_TSTRING", value: this.id }, { type: "LUA_TSTRING", value: "Bodyshot" }, - { type: "LUA_TSTRING", value: three_d ? "OBJ" : process.env.RENDER_FORMAT }, + { type: "LUA_TSTRING", value: three_d ? "OBJ" : "PNG" }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_WIDTH }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_HEIGHT }, @@ -110,7 +110,7 @@ class RenderJob extends Job { { type: "LUA_TSTRING", value: this.id }, { type: "LUA_TSTRING", value: "Asset" }, - { type: "LUA_TSTRING", value: three_d ? "OBJ" : process.env.RENDER_FORMAT }, + { type: "LUA_TSTRING", value: three_d ? "OBJ" : "PNG" }, { type: "LUA_TNUMBER", value: process.env.RENDER_ASSET_WIDTH }, { type: "LUA_TNUMBER", value: process.env.RENDER_ASSET_HEIGHT }, @@ -153,7 +153,7 @@ class RenderJob extends Job { { type: "LUA_TSTRING", value: this.id }, { type: "LUA_TSTRING", value: "Place" }, - { type: "LUA_TSTRING", value: process.env.RENDER_FORMAT }, + { type: "LUA_TSTRING", value: "PNG" }, { type: "LUA_TNUMBER", value: process.env.RENDER_PLACE_WIDTH }, { type: "LUA_TNUMBER", value: process.env.RENDER_PLACE_HEIGHT }, @@ -191,7 +191,7 @@ class RenderJob extends Job { { type: "LUA_TSTRING", value: this.id }, { type: "LUA_TSTRING", value: "Texture" }, - { type: "LUA_TSTRING", value: process.env.RENDER_FORMAT }, + { type: "LUA_TSTRING", value: "PNG" }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_WIDTH }, { type: "LUA_TNUMBER", value: process.env.RENDER_USER_HEIGHT },