Add 'fields' and 'fieldsExtSource' on method info
This commit is contained in:
parent
cf50254bae
commit
416592d7df
@ -28,7 +28,7 @@ function getFaviconMain () {
|
|||||||
return getBase64fromPath(global.config.source.favicon);
|
return getBase64fromPath(global.config.source.favicon);
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = () => ({
|
||||||
name: global.config.server.info.name,
|
name: global.config.server.info.name,
|
||||||
tag: global.config.server.info.tag,
|
tag: global.config.server.info.tag,
|
||||||
authMode: authModes[global.config.server["auth-mode"] ?? 1],
|
authMode: authModes[global.config.server["auth-mode"] ?? 1],
|
||||||
@ -37,4 +37,4 @@ module.exports = {
|
|||||||
bgmain: getBGMain(),
|
bgmain: getBGMain(),
|
||||||
favicon: getFaviconMain(),
|
favicon: getFaviconMain(),
|
||||||
}
|
}
|
||||||
};
|
});
|
||||||
|
@ -56,9 +56,11 @@ class ApiMethods extends ProtoApiMethods {
|
|||||||
super(api);
|
super(api);
|
||||||
}
|
}
|
||||||
|
|
||||||
async info () {
|
async info (fields = null, fieldsExtSource = null) {
|
||||||
return await super._protoMethod({
|
return await super._protoMethod({
|
||||||
method: "info",
|
method: "info",
|
||||||
|
fields: fields?.join(",") ?? "*",
|
||||||
|
fieldsExtSource: fieldsExtSource?.join(",") ?? "*",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,12 +20,15 @@ document.body.innerHTML = `<nav id="navbar-main" class="navbar navbar-connect-da
|
|||||||
</a>
|
</a>
|
||||||
<div class="collapse navbar-collapse noselect" id="navbarNav"><ul class="navbar-nav"><ul class="navbar-nav">
|
<div class="collapse navbar-collapse noselect" id="navbarNav"><ul class="navbar-nav"><ul class="navbar-nav">
|
||||||
<div class="vr"></div>
|
<div class="vr"></div>
|
||||||
<li class="nav-item">
|
<li class="nav-item" style="cursor: pointer;">
|
||||||
<a class="nav-link translate linked-btn noselect" aria-current="page" id="nav-home-btn"><i class="fas fa-home"></i> Home</a>
|
<a class="nav-link translate linked-btn noselect" aria-current="page" id="nav-home-btn"><i class="fas fa-home"></i> Home</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item" style="cursor: pointer;">
|
||||||
<a class="nav-link translate linked-btn noselect" aria-current="page" id="nav-docs-btn"><i class="fas fa-dice-d20"></i> Games</a>
|
<a class="nav-link translate linked-btn noselect" aria-current="page" id="nav-docs-btn"><i class="fas fa-dice-d20"></i> Games</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item" style="cursor: pointer;">
|
||||||
|
<a class="nav-link translate linked-btn noselect" aria-current="page" id="nav-docs-btn"><i class="fas fa-server"></i> Storage</a>
|
||||||
|
</li>
|
||||||
</ul></div>
|
</ul></div>
|
||||||
|
|
||||||
<div class="vr" style="margin-right:5px"></div>
|
<div class="vr" style="margin-right:5px"></div>
|
||||||
|
@ -168,6 +168,7 @@ fl.bindLoad("/connect", () => {
|
|||||||
ping = (new Date()) - ping;
|
ping = (new Date()) - ping;
|
||||||
socket.onmessage = (ev) => {
|
socket.onmessage = (ev) => {
|
||||||
const data = JSON.parse(ev.data).result;
|
const data = JSON.parse(ev.data).result;
|
||||||
|
console.debug("data:", data);
|
||||||
data.tls = serverItem.tls;
|
data.tls = serverItem.tls;
|
||||||
itemIDs.push({
|
itemIDs.push({
|
||||||
...data,
|
...data,
|
||||||
@ -188,6 +189,7 @@ fl.bindLoad("/connect", () => {
|
|||||||
};
|
};
|
||||||
socket.send(JSON.stringify({
|
socket.send(JSON.stringify({
|
||||||
method: "info",
|
method: "info",
|
||||||
|
fields: "name,tag",
|
||||||
trace_id
|
trace_id
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
@ -107,7 +107,11 @@ const translationTree = {
|
|||||||
"connection-failed": "Соединение оборвалось",
|
"connection-failed": "Соединение оборвалось",
|
||||||
"retry-connecting": "Повторить попытку",
|
"retry-connecting": "Повторить попытку",
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"/connect-area": {
|
||||||
|
"en-US": {},
|
||||||
|
"ru-RU": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.entries(translationTree).forEach(([page, langs]) => {
|
Object.entries(translationTree).forEach(([page, langs]) => {
|
||||||
|
32
server/package-lock.json
generated
32
server/package-lock.json
generated
@ -14,7 +14,6 @@
|
|||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"https": "^1.0.0",
|
"https": "^1.0.0",
|
||||||
"md5": "^2.3.0",
|
|
||||||
"net": "^1.0.2",
|
"net": "^1.0.2",
|
||||||
"path": "^0.12.7",
|
"path": "^0.12.7",
|
||||||
"selfsigned": "^2.4.1",
|
"selfsigned": "^2.4.1",
|
||||||
@ -108,14 +107,6 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/charenc": {
|
|
||||||
"version": "0.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
|
|
||||||
"integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
|
|
||||||
"engines": {
|
|
||||||
"node": "*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/content-disposition": {
|
"node_modules/content-disposition": {
|
||||||
"version": "0.5.4",
|
"version": "0.5.4",
|
||||||
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
|
||||||
@ -148,14 +139,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
|
||||||
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
|
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
|
||||||
},
|
},
|
||||||
"node_modules/crypt": {
|
|
||||||
"version": "0.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
|
|
||||||
"integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
|
|
||||||
"engines": {
|
|
||||||
"node": "*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/crypto": {
|
"node_modules/crypto": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
|
||||||
@ -452,21 +435,6 @@
|
|||||||
"node": ">= 0.10"
|
"node": ">= 0.10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/is-buffer": {
|
|
||||||
"version": "1.1.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
|
|
||||||
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
|
|
||||||
},
|
|
||||||
"node_modules/md5": {
|
|
||||||
"version": "2.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
|
|
||||||
"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
|
|
||||||
"dependencies": {
|
|
||||||
"charenc": "0.0.2",
|
|
||||||
"crypt": "0.0.2",
|
|
||||||
"is-buffer": "~1.1.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/media-typer": {
|
"node_modules/media-typer": {
|
||||||
"version": "0.3.0",
|
"version": "0.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"https": "^1.0.0",
|
"https": "^1.0.0",
|
||||||
"md5": "^2.3.0",
|
|
||||||
"net": "^1.0.2",
|
"net": "^1.0.2",
|
||||||
"path": "^0.12.7",
|
"path": "^0.12.7",
|
||||||
"selfsigned": "^2.4.1",
|
"selfsigned": "^2.4.1",
|
||||||
|
@ -197,12 +197,12 @@ const defaultConfigData = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const server = new Server();
|
global.server = new Server();
|
||||||
cfgHandle(server, defaultConfigData, logger);
|
cfgHandle(global.server, defaultConfigData, logger);
|
||||||
|
|
||||||
logger.log("Current config:", global.config);
|
logger.log("Current config:", global.config);
|
||||||
|
|
||||||
server.run(global.config.server.address, global.config.server.port);
|
global.server.run(global.config.server.address, global.config.server.port);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if (global.config.server.secureMode) {
|
if (global.config.server.secureMode) {
|
||||||
|
Loading…
Reference in New Issue
Block a user