1.2.13

Seeroy · Seeroy · commit e28ab4837709 · 2022-06-23T12:00:14.000+03:00
diff --git a/app.js b/app.js
@@ -59,13 +59,14 @@ var serDeletes = {};
 var servers_logs = [];
 var servers_instances = [];
 var updatesByIntArray = {};
+var forgesIns = [];
 
 const {
   response
 } = require('express');
 
 // Kubek version
-const version = "v1.2.12";
+const version = "v1.2.13";
 
 const rateLimit = require('express-rate-limit');
 const authLimiter = rateLimit({
@@ -668,7 +669,8 @@ app.get("/server/log", function (request, response) {
       response.redirect("/login.html");
     } else {
       if (typeof (configjson[request.query.server]) !== 'undefined') {
-        response.send(servers_logs[request.query.server]);
+        spl = servers_logs[request.query.server].split(/\r?\n/).slice(-100);
+        response.send(spl.join("\r\n"));
       } else {
         response.send("false");
       }
@@ -779,11 +781,12 @@ function startServer(server) {
         }
         fsock = io.sockets.sockets;
         for (const socket of fsock) {
+          spl = servers_logs[server].split(/\r?\n/).slice(-100);
           socket[1].emit("handleUpdate", {
             type: "console",
             data: {
               server: server,
-              data: servers_logs[server]
+              data: spl.join("\r\n")
             }
           });
         }
@@ -796,11 +799,12 @@ function startServer(server) {
       servers_logs[server] = servers_logs[server] + data.toString();
       fsock = io.sockets.sockets;
       for (const socket of fsock) {
+        spl = servers_logs[server].split(/\r?\n/).slice(-100);
         socket[1].emit("handleUpdate", {
           type: "console",
           data: {
             server: server,
-            data: servers_logs[server]
+            data: spl.join("\r\n")
           }
         });
       }
@@ -830,11 +834,12 @@ function startServer(server) {
       servers_logs[server] = servers_logs[server] + "ERROR: " + data.toString();
       fsock = io.sockets.sockets;
       for (const socket of fsock) {
+        spl = servers_logs[server].split(/\r?\n/).slice(-100);
         socket[1].emit("handleUpdate", {
           type: "console",
           data: {
             server: server,
-            data: servers_logs[server]
+            data: spl.join("\r\n")
           }
         });
       }
@@ -949,10 +954,9 @@ app.get("/core/list", (request, response) => {
     } else {
       showRequestInLogs(request);
       response.set('Content-Type', 'application/json');
-      possbileCores = ['Spigot', 'Paper', 'Forge'];
+      possbileCores = ['Spigot', 'Paper'];
       paperVers = [];
       spigotVers = [];
-      forgeVers = [];
       cores.getPaperCores(function (cores_p) {
         cores_p = cores_p.reverse();
         cores_p.forEach(function (core) {
@@ -965,8 +969,7 @@ app.get("/core/list", (request, response) => {
           let jsn = {
             possible: possbileCores,
             paper: paperVers,
-            spigot: spigotVers,
-            forge: forgeVers
+            spigot: spigotVers
           }
           response.send(jsn);
         });
@@ -1434,4 +1437,68 @@ app.get("/fmapi/newdirFM", (request, response) => {
       showRequestInLogs(request);
     }
   }
-});
+});
+
+app.get("/forgeInstaller", (request, response) => {
+  ip = request.headers['x-forwarded-for'] || request.socket.remoteAddress;
+  ip = ip.replace("::ffff:", "").replace("::1", "127.0.0.1");
+  if (cfg['internet-access'] == false && ip != "127.0.0.1") {
+    response.send("Cannot be accessed from the internet");
+  } else {
+    if (typeof request.cookies !== "undefined" && typeof request.cookies["__auth__"] !== "undefined" && !isAuth(request.cookies["__auth__"])) {
+      response.redirect("/login.html");
+    } else {
+      showRequestInLogs(request);
+      startForgeInstaller(request.query.server, request.query.filename);
+      response.send("true");
+    }
+  }
+});
+
+app.get("/forge/installProgress", (request, response) => {
+  ip = request.headers['x-forwarded-for'] || request.socket.remoteAddress;
+  ip = ip.replace("::ffff:", "").replace("::1", "127.0.0.1");
+  if (cfg['internet-access'] == false && ip != "127.0.0.1") {
+    response.send("Cannot be accessed from the internet");
+  } else {
+    if (typeof request.cookies !== "undefined" && typeof request.cookies["__auth__"] !== "undefined" && !isAuth(request.cookies["__auth__"])) {
+      response.redirect("/login.html");
+    } else {
+      response.send(forgesIns[request.query.server]);
+    }
+  }
+});
+
+function startForgeInstaller(server, file) {
+  fp = "./servers/" + server + "/" + file;
+
+  if (process.platform == "win32") {
+    fs.writeFileSync("./servers/" + server + "/finstall.bat", "@echo off\nchcp 65001>nul\ncd servers\ncd " + server + "\njava -jar " + file + " -i .");
+    startFile = path.resolve("./servers/" + server + "/finstall.bat");
+    fi = spawn(startFile);
+  } else if (process.platform == "linux") {
+    fs.writeFileSync("./servers/" + server + "/finstall.sh", "cd servers\ncd " + server + "\njava -jar " + file + " -i .");
+    startFile = path.resolve("./servers/" + server + "/finstall.sh");
+    fi = spawn('sh', [startFile]);
+  } else {
+    console.log(colors.red(getTimeFormatted() + " " + process.platform + " not supported"));
+  }
+
+  fi.on('close', (code) => {
+    if(code == 0){
+      console.log(colors.green("Forge installed successfully on " + server));
+      forgesIns[server] = "ok,installed";
+      fs.unlinkSync(fp);
+    } else {
+      console.log(colors.red("Forge failed on " + server + " with code " + code));
+    }
+  });
+  fi.stdout.on('data', (data) => {
+    data = iconvlite.decode(data, "win1251");
+    forgesIns[server] = forgesIns[server] + "\n" + data.toString();
+  });
+  fi.stderr.on('data', (data) => {
+    data = iconvlite.decode(data, "win1251");
+    forgesIns[server] = forgesIns[server] + "\n" + data.toString();
+  });
+}
diff --git a/translations/en.json b/translations/en.json
@@ -75,5 +75,7 @@
   "{{aredelete}}": "Are you really want to delete?",
   "{{yesdelete}}": "Yes, delete it",
   "{{new-directory}}": "NEW DIRECTORY",
-  "{{resonerr}}": "Restart server on crash (detecting by error code)"
+  "{{resonerr}}": "Restart server on crash (detecting by error code)",
+  "{{ifuuplForge}}": "If you upload the Forge installation file here, the installation will be done automatically when you create the server",
+  "{{ifuuplWarn}}": "Supported versions of Forge: 1.5.2 - 1.16.5 | Tested versions: 1.12.2, 1.16.5"
 }
diff --git a/translations/nl.json b/translations/nl.json
@@ -75,5 +75,7 @@
   "{{aredelete}}": "Wil je echt verwijderen?",
   "{{yesdelete}}": "Ja, verwijder het",
   "{{new-directory}}": "NIEUWE DIRECTORY",
-  "{{resonerr}}": "Herstart server bij crash (gecontroleerd door afsluitcode)"
+  "{{resonerr}}": "Herstart server bij crash (gecontroleerd door afsluitcode)",
+  "{{ifuuplForge}}": "Als u het Forge-installatiebestand hier uploadt, wordt de installatie automatisch uitgevoerd wanneer u de server maakt",
+  "{{ifuuplWarn}}": "Ondersteunde versies van Forge: 1.5.2 - 1.16.5 | Geteste versies: 1.12.2, 1.16.5"
 }
diff --git a/translations/ru.json b/translations/ru.json
@@ -75,5 +75,7 @@
   "{{aredelete}}": "Вы действительно хотите удалить?",
   "{{yesdelete}}": "Да, удалить",
   "{{new-directory}}": "НОВАЯ ДИРЕКТОРИЯ",
-  "{{resonerr}}": "Перезапускать сервер при краше (проверяется по коду выхода)"
+  "{{resonerr}}": "Перезапускать сервер при краше (проверяется по коду выхода)",
+  "{{ifuuplForge}}": "Если вы загрузите сюда установочный файл Forge, установка будет произведена автоматически при создании сервера",
+  "{{ifuuplWarn}}": "Поддерживаемые версии Forge: 1.5.2 - 1.16.5 | Протестированные версии: 1.12.2, 1.16.5"
 }
diff --git a/www/assets/cores/jar.png b/www/assets/cores/jar.png
diff --git a/www/new.server.html b/www/new.server.html
@@ -44,6 +44,9 @@
         <div class="progress-bar" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0"
           aria-valuemax="100"></div>
       </div>
+      <div
+        style="background: rgb(240,240,240); width: 700px; height: 500px; overflow: auto; margin-top: 6px; border-radius: 4px; display: none;"
+        id="forgeins"></div>
     </div>
   </div>
 
@@ -79,8 +82,7 @@
           </li>
           <li class="nav-item" role="presentation">
             <a class="nav-link" id="coreseltab-tab-2" data-mdb-toggle="tab" href="#coreseltab-tabs-2" role="tab"
-              aria-controls="coreseltab-tabs-2" aria-selected="false"
-              onclick='$("#final-core").text("Own")'>{{upload-own}}</a>
+              aria-controls="coreseltab-tabs-2" aria-selected="false">{{upload-own}}</a>
           </li>
         </ul>
 
@@ -97,6 +99,8 @@
             <form id="g-core-form" enctype="multipart/form-data">
               <input type="file" class="form-control" id="g-core-input" name="g-core-input" accept=".jar" />
             </form>
+            <p style="font-size: 11pt; color: rgb(170,170,170);">{{ifuuplForge}}</p>
+            <span style="font-size: 11pt; color: var(--mdb-red);">{{ifuuplWarn}}</span>
           </div>
         </div>
       </div>
@@ -187,8 +191,15 @@
     $("#fsc").val(sl);
 
     $("#final-mem").html($("#xmx").val() + " GB");
+    fn = $("#g-core-input")[0].value.split(/(\\|\/)/g).pop();
     if ($("#coreseltab-tabs-2").css("display") == "block") {
-      $("#final-core").html("Own");
+      if (fn.match(/forge-/gm) && fn.match(/-installer\.jar/gm)) {
+        $("#final-core").text("Forge");
+        $(".card-body").find(".rounded-circle").attr("src", "assets/cores/forge.png");
+      } else {
+        $("#final-core").text("Own (Non-Forge)");
+        $(".card-body").find(".rounded-circle").attr("src", "assets/cores/jar.png");
+      }
     } else {
       setActiveTab1();
     }
@@ -282,15 +293,8 @@
             }, 100);
           }
         });
-      } else if (core.substring(0, 1) == "F") {
-        data = "http://m91237kd.beget.tech/forges/" + core.substring(6) + ".tar";
-        $("#progress-card p").html("Downloading core");
-        $.get("/file/download?url=" + data + "&server=" + sname + "&filename=" + data.substring(data
-          .lastIndexOf('/') + 1) + "&type=core");
-        rr = setInterval(function () {
-          getProgress(data.substring(data.lastIndexOf('/') + 1), sname, startLine, port, onlineMode)
-        }, 100);
-      } else if (core.substring(0, 1) == "O" && $("#g-core-input").val().toString().length > 2) {
+      } else if (core.substring(0, 2) == "Ow" || core.substring(0, 2) == "Fo" && $("#g-core-input").val().toString()
+        .length > 2) {
         var formData = new FormData($("#g-core-form")[0]);
         jQuery.ajax({
           url: '/core/upload?server=' + sname,
@@ -300,10 +304,30 @@
             jarfile = $("#g-core-input")[0].value.split(/(\\|\/)/g).pop();
             $("#progress-card .progress-bar").css("width", "100%");
             $("#progress-card p").html("Completion");
-            $.get("/server/completion?server=" + encodeURI(sname) + "&jf=" + jarfile + "&startcmd=" + btoa(
+            $.get("/server/completion?server=" + encodeURI(sname) + "&jf=" + jarfile.replace(/-installer/gm, "") + "&startcmd=" + btoa(
               startLine) + "&port=" + port + "&onMode=" + onlineMode, function (data) {
               if (data == "Success") {
-                window.location = "/index.html?server=" + encodeURI(sname);
+                if (core.substring(0, 2) == "Fo") {
+                  $("#progress-card .progress-bar").css("width", "0%");
+                  $("#progress-card p").html("Installing Forge");
+                  $("#progress-card #forgeins").show();
+                  $("#progress-card #forgeins").text("");
+                  $.get("/forgeInstaller?server=" + encodeURI(sname) + "&filename=" + jarfile);
+                  iint = setInterval(function(){
+                    $.get("/forge/installProgress?server=" + encodeURI(sname), function(get){
+                      if(get != "ok,installed"){
+                        get = get.split(/\r?\n/).slice(-100);
+                        get = get.join("<br>");
+                        $("#progress-card #forgeins").html(get);
+                        $("#progress-card #forgeins").scrollTop($("#progress-card #forgeins")[0].scrollHeight);
+                      } else {
+                        window.location = "/index.html?server=" + encodeURI(sname);
+                      }
+                    });
+                  }, 500);
+                } else {
+                  window.location = "/index.html?server=" + encodeURI(sname);
+                }
               }
             });
           },
@@ -332,6 +356,29 @@
   }
 
   $(document).ready(function () {
+    $("#g-core-input").val("");
+
+    $("#g-core-input").change(function () {
+      fn = $("#g-core-input")[0].value.split(/(\\|\/)/g).pop();
+      if (fn.match(/forge-/gm) && fn.match(/-installer\.jar/gm)) {
+        $("#final-core").text("Forge");
+        $(".card-body").find(".rounded-circle").attr("src", "assets/cores/forge.png");
+      } else {
+        $("#final-core").text("Own (Non-Forge)");
+        $(".card-body").find(".rounded-circle").attr("src", "assets/cores/jar.png");
+      }
+    });
+
+    $("#coreseltab-tab-2").click(function () {
+      fn = $("#g-core-input")[0].value.split(/(\\|\/)/g).pop();
+      if (fn.match(/forge-/gm) && fn.match(/-installer\.jar/gm)) {
+        $("#final-core").text("Forge");
+        $(".card-body").find(".rounded-circle").attr("src", "assets/cores/forge.png");
+      } else {
+        $("#final-core").text("Own (Non-Forge)");
+        $(".card-body").find(".rounded-circle").attr("src", "");
+      }
+    });
     $("#server-name").keyup(function () {
       $('#final-sname').text($(this).val());
     });

Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,7 @@`
`75`	`75`	`"{{aredelete}}": "Are you really want to delete?",`
`76`	`76`	`"{{yesdelete}}": "Yes, delete it",`
`77`	`77`	`"{{new-directory}}": "NEW DIRECTORY",`
`78`		`- "{{resonerr}}": "Restart server on crash (detecting by error code)"`
	`78`	`+ "{{resonerr}}": "Restart server on crash (detecting by error code)",`
	`79`	`+ "{{ifuuplForge}}": "If you upload the Forge installation file here, the installation will be done automatically when you create the server",`
	`80`	`+ "{{ifuuplWarn}}": "Supported versions of Forge: 1.5.2 - 1.16.5 \| Tested versions: 1.12.2, 1.16.5"`
`79`	`81`	`}`