Progress towards OSX agent, not ready yet.
Ylian Saint-Hilaire committed
Nov 13, 2018 at 19:31 UTC
cf63f78564547b73b079f194ac07ad98ac05f3e8
5 files changed
+26
-4
agents/MeshAgentOSXPackager.zip
Binary files a/agents/MeshAgentOSXPackager.zip and b/agents/MeshAgentOSXPackager.zip differ
agents/meshagent_osx-x86-64
Binary files a/agents/meshagent_osx-x86-64 and b/agents/meshagent_osx-x86-64 differ
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.2.2-x",
3
+ "version": "0.2.3-a",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default.handlebars
+22
@@ -1995,6 +1995,7 @@
1995
desk.m.showmouse = true;
1996
desk.m.onKvmData = function (data) { console.log('KVM Data received in multi-desktop mode, this is not supported.'); }; // KVM Data Channel not supported in multi-desktop right now.
1997
//desk.m.onScreenSizeChange = deskAdjust;
1998
+ if (debugmode > 0) { desk.m.onScreenSizeChange = mdeskAdjust; } // Multi-Desktop Adjust
1999
desk.Start(nodeid, 16994, '*', '*', 0);
2000
desk.contype = 2;
2001
multiDesktop[nodeid] = desk;
@@ -2009,6 +2010,7 @@
2010
desk.m.FrameRateTimer = multidesktopsettings.framerate;
2011
//desk.m.onDisplayinfo = deskDisplayInfo;
2012
//desk.m.onScreenSizeChange = deskAdjust;
2013
+ if (debugmode > 0) { desk.m.onScreenSizeChange = mdeskAdjust; } // Multi-Desktop Adjust
2014
desk.Start(nodeid);
2015
desk.contype = 1;
2016
multiDesktop[nodeid] = desk;
@@ -3967,6 +3969,26 @@
3969
}
3970
}
3971
3972
+ function mdeskAdjust(mod, sw, sh, cv) {
3973
+ if (!mod || !sw || !sh || !cv) return;
3974
+
3975
+ // Check if we are in single desktop mode
3976
+ if (cv.id == "Desk") { deskAdjust(); return; }
3977
+
3978
+ // Figure out and adjust the size to fill the width of the div
3979
+ var vsize = [{ x: 180, y: 101 }, { x: 302, y: 169 }, { x: 454, y: 255 }][Q('sizeselect').selectedIndex];
3980
+ var realw = vsize.x + 2, tw = Q('xdevices').clientWidth - 30, xw = Math.floor(tw / realw);
3981
+ xw = realw + Math.floor((tw - (xw * realw)) / xw);
3982
+ vsize.y = vsize.y * (xw / vsize.x);
3983
+ vsize.x = xw;
3984
+ var mh = vsize.y, mw = vsize.x;
3985
+ if (mod.State != 0) { mh = vsize.y; mw = (sw / sh) * vsize.y; }
3986
+ QS(cv.id)['max-height'] = mh + 'px';
3987
+ QS(cv.id)['max-width'] = mw + 'px';
3988
+ QS(cv.id)['margin-top'] = '0';
3989
+ QS(cv.id)['margin-bottom'] = '0';
3990
+ }
3991
+
3992
// Remote desktop special key combos for Windows
3993
function deskSendKeys() {
3994
if (xxdialogMode || desktop == null || desktop.State != 3) return;
webserver.js
+3
-3
@@ -1682,7 +1682,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1682
// Skip all folder entries
1683
zipfile.readEntry();
1684
} else {
1685
- if (entry.fileName == 'Mesh Agent.mpkg/Contents/distribution.dist') {
1685
+ if (entry.fileName == 'Meshcentral_MeshAgent.mpkg/Contents/distribution.dist') {
1686
// This is a special file entry, we need to fix it.
1687
zipfile.openReadStream(entry, function (err, readStream) {
1688
readStream.on("data", function (data) { if (readStream.xxdata) { readStream.xxdata += data; } else { readStream.xxdata = data; } });
@@ -1704,8 +1704,8 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1704
}
1705
});
1706
zipfile.on("end", function () {
1707
- archive.file(argentInfo.path, { name: "Mesh Agent.mpkg/Contents/Packages/meshagent.pkg/Contents/MeshAgent" });
1708
- archive.append(meshsettings, { name: "Mesh Agent.mpkg/Contents/Packages/meshagent.pkg/Contents/MeshAgent.msh" });
1707
+ archive.file(argentInfo.path, { name: "Meshcentral_MeshAgent.mpkg/Contents/Packages/meshagentosx64.pkg/Contents/meshagent_osx64.bin" });
1708
+ archive.append(meshsettings, { name: "Meshcentral_MeshAgent.mpkg/Contents/Packages/meshagentosx64.pkg/Contents/meshagent_osx64.msh" });
1709
archive.finalize();
1710
});
1711
});