Skip to content

Commit 23c8326

Browse files
committed
v1.0.4 Layout Update
1 parent 92f5939 commit 23c8326

11 files changed

Lines changed: 542 additions & 79 deletions

app.js

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ const app = express();
44
const port = 3000;
55
const path = require('path');
66
const request_lib = require('request');
7+
const multer = require('multer');
8+
const storage = multer.diskStorage({
9+
destination: function (req, file, cb) {
10+
cb(null, './uploads')
11+
},
12+
filename: function (req, file, cb) {
13+
cb(null, file.originalname)
14+
}
15+
})
16+
const upload = multer({
17+
storage: storage
18+
});
19+
720
var spParser = require("minecraft-server-properties");
821
const fs = require('fs');
922
var colors = require('colors');
@@ -34,7 +47,10 @@ var os = require('os');
3447
var cp = {};
3548
var serDeletes = {};
3649
const fse = require('fs-extra');
37-
const version = "v1.0.3-hotfix";
50+
const {
51+
response
52+
} = require('express');
53+
const version = "v1.0.4";
3854

3955
var customHeaderRequest = request_lib.defaults({
4056
headers: {
@@ -552,4 +568,26 @@ app.get('/file/download', (request, response) => {
552568
app.get('/tasks/progress', (request, response) => {
553569
response.set('Content-Type', 'application/json');
554570
response.send(JSON.stringify(cp));
571+
});
572+
573+
app.get('/kubek/version', (request, response) => {
574+
console.log(getTimeFormatted(), "GET", request.originalUrl.green);
575+
response.send(version);
576+
});
577+
578+
app.get('/kubek/usage', (request, response) => {
579+
var data = {};
580+
osutils.cpuUsage(function (value) {
581+
data["cpu"] = Math.round(value * 100);
582+
totalmem = os.totalmem();
583+
usedmem = totalmem - os.freemem();
584+
data["usedmem"] = usedmem;
585+
data["totalmem"] = totalmem;
586+
response.send(data);
587+
});
588+
});
589+
590+
app.post('/core/uploadOwn', upload.single('avatar'), (req, res) => {
591+
console.log(req.file, req.body);
592+
res.send("uploaded");
555593
});

package-lock.json

Lines changed: 148 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
"cross-spawn": "^7.0.3",
1212
"express": "^4.17.1",
1313
"external-ip": "^2.3.1",
14+
"file-dialog": "0.0.8",
1415
"fs-extra": "^10.0.0",
1516
"iconv-lite": "^0.6.3",
1617
"minecraft-server-properties": "^1.0.0",
1718
"minecraft-status": "^1.1.0",
1819
"morgan": "^1.10.0",
20+
"multer": "^1.4.4",
1921
"nodemon": "^2.0.15",
2022
"os-utils": "0.0.14",
2123
"pidusage": "^3.0.0",

0 commit comments

Comments
 (0)