MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-06 00:13:33 +00:00
Code Issues Releases Wiki Activity

Add explicit close to win-dispatcher

Browse Source 
Add #ifdef exclusion for kvm-helper on macos
This commit is contained in:
Bryan Roe
2022-08-22 09:46:12 -07:00
parent ad03c83c22
commit b2e64e2147
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

30
modules/win-dispatcher.js
View File

@@ -17,14 +17,17 @@ limitations under the License.
function empty_func()
{
var p = this.parent;
p._ipc.parent = null;
p._ipc2.parent = null;
p._client._parent = null;
if (p != null)
{
if (p._ipc) { p._ipc.parent = null };
if (p._ipc2) { p._ipc2.parent = null; }
if (p._client) { p._client._parent = null; }
p._client = null;
p._control._parent = null;
if (p._control) { p._control._parent = null; }
p._control = null;
p = null;
}
}
function empty_func2()
{
}
@@ -46,6 +49,14 @@ function ipc2_finalized()
{
//console.log('IPC2 Finalized');
}
function ipc1_server_finalized()
{
//console.log('IPC1 Server Finalized');
}
function ipc2_server_finalized()
{
//console.log('IPC2 Server Finalized');
}
function ipc2_connection(s)
{
this.parent._control = s;
@@ -78,6 +89,14 @@ function ipc_connection(s)
this.parent.emit('connection', s);
}
function dispatcher_shutdown()
{
this._ipc.close();
this._ipc2.close();
this._ipc = null;
this._ipc2 = null;
}
function dispatch(options)
{
if (!options || !options.modules || !options.launch || !options.launch.module || !options.launch.method || !options.launch.args) { throw ('Invalid Parameters'); }
@@ -90,6 +109,8 @@ function dispatch(options)
ret._ipc2 = require('net').createServer(); ret._ipc2.parent = ret;
ret._ipc.on('close', empty_func);
ret._ipc2.on('close', empty_func);
ret._ipc.once('~', ipc1_server_finalized);
ret._ipc2.once('~', ipc2_server_finalized);
while (true)
{
@@ -109,6 +130,7 @@ function dispatch(options)
var str = Buffer.from("require('win-console').hide();require('win-dispatcher').connect('" + ipcInteger + "');").toString('base64');
ret._ipc2.once('connection', ipc2_connection);
ret._ipc.once('connection', ipc_connection);
ret.close = dispatcher_shutdown;
try
{