XTerm improvements.
Ylian Saint-Hilaire committed
Jan 25, 2020 at 14:17 UTC
3a8d5bc3e739d3f4a84343858cb2c70595ee7f42
4 files changed
+10
-12
MeshCentralServer.njsproj
+1
@@ -288,6 +288,7 @@
288
<Content Include="views\messenger.handlebars" />
289
<Content Include="views\terms-mobile.handlebars" />
290
<Content Include="views\terms.handlebars" />
291
+ <Content Include="views\xterm.handlebars" />
292
</ItemGroup>
293
<ItemGroup>
294
<Folder Include="agents\" />
agents/meshcore.js
+2
-2
@@ -1793,9 +1793,9 @@ function createMeshCore(agent) {
1793
} else {
1794
if (ws.httprequest.process == null || !ws.httprequest.process.pty) return;
1795
// ILibDuktape_ChildProcess kill doesn't support sending signals
1796
- if (fs.existsSync("/bin/kill")) {
1796
+ if (fs.existsSync('/bin/kill')) {
1797
// We need to send signal to the child of the process, since the child is the shell
1798
- childProcess.execFile('/bin/bash', ['bash', "-c", "kill -SIGWINCH $(pgrep -P " + ws.httprequest.process.pid + ")"]);
1798
+ childProcess.execFile('/bin/bash', ['bash', '-c', 'kill -SIGWINCH $(pgrep -P ' + ws.httprequest.process.pid + ')']);
1799
}
1800
}
1801
break;
meshcentral.js
+6
-8
@@ -2171,24 +2171,22 @@ function InstallModules(modules, func) {
2171
var dependencies = require("./package.json").dependencies;
2172
for (var i in modules) {
2173
// Modules may contain a version tag (foobar@1.0.0), remove it so the module can be found using require
2174
- var moduleInfo = modules[i].split("@", 2);
2174
+ var moduleNameAndVersion = modules[i];
2175
+ var moduleInfo = moduleNameAndVersion.split("@", 2);
2176
var moduleName = moduleInfo[0];
2177
var moduleVersion = moduleInfo[1];
2178
try {
2179
// Does the module need a specific version?
2180
if (moduleVersion) {
2180
- if (require(`${moduleName}/package.json`).version != moduleVersion)
2181
- throw new Error();
2182
- }
2183
- else {
2181
+ if (require(`${moduleName}/package.json`).version != moduleVersion) { throw new Error(); }
2182
+ } else {
2183
// For all other modules, do the check here.
2184
// Is the module in package.json? Install exact version.
2186
- if (typeof dependencies[moduleName] != undefined)
2187
- moduleVersion = dependencies[moduleName];
2185
+ if (typeof dependencies[moduleName] != undefined) { moduleVersion = dependencies[moduleName]; }
2186
require(moduleName);
2187
}
2188
} catch (e) {
2191
- if (previouslyInstalledModules[modules[i]] !== true) { missingModules.push(`${moduleName}${moduleVersion ? `@${moduleVersion}` : ""}`); }
2189
+ if (previouslyInstalledModules[modules[i]] !== true) { missingModules.push(moduleNameAndVersion); }
2190
}
2191
}
2192
if (missingModules.length > 0) { InstallModule(missingModules.shift(), InstallModules, modules, func); } else { func(); }
package.json
+1
-2
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.7-w",
3
+ "version": "0.4.7-x",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
@@ -42,7 +42,6 @@
42
"multiparty": "^4.2.1",
43
"nedb": "^1.8.0",
44
"node-forge": "^0.8.4",
45
- "otplib": "^12.0.1",
45
"ws": "^6.2.1",
46
"xmldom": "^0.1.27",
47
"yauzl": "^2.10.0"