MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-14 14:33:18 +00:00
Code Issues Releases Wiki Activity

Fixed circular references impacting GC

Browse Source
This commit is contained in:
Bryan Roe
2021-03-11 11:17:39 -08:00
parent 8f6bb1a527
commit d1e1d67a88
7 changed files with 334 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
modules/promise.js
View File

@@ -16,6 +16,12 @@ limitations under the License.
var refTable = {};
function promiseInitializer(r,j)
{
this._res = r;
this._rej = j;
}
function getRootPromise(obj)
{
while(obj.parentPromise)
@@ -35,6 +41,20 @@ function event_forwarder(sourceObj, sourceName, targetObj, targetName)
sourceObj.on(sourceName, targetObj.emit.bind(targetObj));
}
function return_resolved()
{
var parms = ['resolved'];
for (var ai in arguments)
{
parms.push(arguments[ai]);
}
this._XSLF.emit.apply(this._XSLF, parms);
}
function return_rejected()
{
this._XSLF.promise.__childPromise._rej(e);
}
function Promise(promiseFunc)
{
this._ObjectID = 'promise';
@@ -58,7 +78,21 @@ function Promise(promiseFunc)
this._up = value;
}
});
Object.defineProperty(this, "descriptorMetadata",
{
get: function ()
{
return (require('events').getProperty.call(this._internal, '?_FinalizerDebugMessage'));
},
set: function (value)
{
require('events').setProperty.call(this._internal, '?_FinalizerDebugMessage', value);
}
});
this._internal.on('~', function ()
{
this.completedArgs = [];
});
this._internal.on('newListener', (function (eventName, eventCallback)
{
//console.log('newListener', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
@@ -98,7 +132,6 @@ function Promise(promiseFunc)
eventCallback.apply(this, []);
}
}).internal);
this._internal.resolver = (function _resolver()
{
if (_resolver._self.completed) { return; }
@@ -123,19 +156,7 @@ function Promise(promiseFunc)
{
var pr = getRootPromise(_resolver._self.promise);
args[1]._XSLF = _resolver._self;
args[1].then(function _returnResolved()
{
var parms = ['resolved'];
for (var ai in arguments)
{
parms.push(arguments[ai]);
}
this._XSLF.emit.apply(this._XSLF, parms);
},
function _returnRejected(e)
{
this._XSLF.promise.__childPromise._rej(e);
});
args[1].then(return_resolved, return_rejected);
}
else
{
@@ -181,13 +202,16 @@ function Promise(promiseFunc)
};
this.then = function (resolved, rejected)
{
if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func.internal); }
if (resolved)
{
this._internal.once('resolved', event_switcher(this, resolved).func.internal);
}
if (rejected)
{
this._internal.once('rejected', event_switcher(this, rejected).func.internal);
}
var retVal = new Promise(function (r, j) { this._rej = j; });
var retVal = new Promise(promiseInitializer);
retVal.parentPromise = this;
if (this._internal.completed)
@@ -218,9 +242,9 @@ function Promise(promiseFunc)
this._internal.once('resolved', retVal._internal.resolver);
this._internal.once('rejected', retVal._internal.rejector);
}
this.__childPromise = retVal;
return (retVal);
this.__childPromise = retVal;
return(retVal);
};
this._internal.resolver._self = this._internal;
@@ -266,6 +290,8 @@ function Promise(promiseFunc)
delete this._up;
delete this.__childPromise;
delete this.promise;
this.removeAllListeners('resolved');
this.removeAllListeners('rejected');
}).internal);
}

101
modules/win-message-pump.js
View File

@@ -30,11 +30,16 @@ function WindowsMessagePump(options)
emitterUtils.createEvent('exit');
this._msg = GM.CreateVariable(GM.PointerSize == 4 ? 28 : 48);
this._msg.descriptorMetadata = 'MESSAGE';
this._kernel32 = GM.CreateNativeProxy('Kernel32.dll');
this._kernel32.mp = this;
this._kernel32.CreateMethod('GetLastError');
this._kernel32.CreateMethod('GetModuleHandleA');
this._user32 = GM.CreateNativeProxy('User32.dll');
this._user32.mp = this;
this._user32.CreateMethod('CreateWindowExW');
@@ -48,13 +53,14 @@ function WindowsMessagePump(options)
this._user32.CreateMethod('ShowWindow');
this._user32.CreateMethod('TranslateMessage');
this.wndclass = GM.CreateVariable(GM.PointerSize == 4 ? 48 : 80);
this.wndclass.descriptorMetadata = 'wndclass';
this.wndclass.mp = this;
this.wndclass.hinstance = this._kernel32.GetModuleHandleA(0);
//this.wndclass.cname = GM.CreateVariable('MainWWWClass');
this.wndclass.cnamew = GM.CreateVariable('MainWWWClass', { wide: true });
this.wndclass.wndproc = GM.GetGenericGlobalCallback(4);
this.wndclass.wndproc.descriptorMetadata = 'wndproc';
this.wndclass.wndproc.mp = this;
this.wndclass.toBuffer().writeUInt32LE(this.wndclass._size);
this.wndclass.cnamew.pointerBuffer().copy(this.wndclass.Deref(GM.PointerSize == 4 ? 40 : 64, GM.PointerSize).toBuffer());
@@ -63,6 +69,11 @@ function WindowsMessagePump(options)
this.wndclass.wndproc.on('GlobalCallback', function onWndProc(xhwnd, xmsg, wparam, lparam)
{
var processed = false;
xhwnd.descriptorMetadata = 'win-message-pump: xhwnd';
xmsg.descriptorMetadata = 'win-message-pump: xmsg';
wparam.descriptorMetadata = 'win-message-pump: wparam';
lparam.descriptorMetadata = 'win-message-pump: lparam';
if (this.mp._hwnd != null && this.mp._hwnd.Val == xhwnd.Val)
{
// This is for us
@@ -75,11 +86,15 @@ function WindowsMessagePump(options)
{
// We need to call DefWindowProcA, becuase this message was not handled
var p = this.mp._user32.DefWindowProcW.async(d, xhwnd, xmsg, wparam, lparam);
p.descriptorMetadata = 'win-message-pump: DefWindowProcW(1)';
p.dispatcher = this;
p.then(function (ret)
var xk = p.then(function (ret)
{
this.dispatcher.EndDispatcher(ret);
});
xk.descriptorMetadata = 'DefWindowProcW_Result'
xk = null;
p = null;
}
else
{
@@ -92,21 +107,22 @@ function WindowsMessagePump(options)
{
// This message was generated from our CreateWindowExA method
processed = true;
var d = this.StartDispatcher();
this.mp.emit('message', { message: xmsg.Val, wparam: wparam.Val, lparam: lparam.Val, lparam_hex: lparam.pointerBuffer().toString('hex'), hwnd: xhwnd, dispatcher: d });
var msgRet = this.mp.emit_returnValue('message');
if (msgRet == null)
{
{
// We need to call DefWindowProcA, becuase this message was not handled
var p = this.mp._user32.DefWindowProcW.async(d, xhwnd, xmsg, wparam, lparam);
p.descriptorMetadata = 'win-message-pump: DefWindowProcW(2)';
p.dispatcher = this;
p.then(function (ret)
{
this.dispatcher.EndDispatcher(ret);
});
p = null;
}
else
{
@@ -116,11 +132,15 @@ function WindowsMessagePump(options)
}
}
if (processed) { _debugGC(); }
xhwnd = null;
xmsg = null;
wparam = null;
lparam = null;
});
this._user32.RegisterClassExW.async(this.wndclass).then(function ()
{
this.descriptorMetadata = 'RegisterClassExW';
if (!this.nativeProxy.mp._options) { this.nativeProxy.mp._options = {}; }
if (!this.nativeProxy.mp._options.window) { this.nativeProxy.mp._options.window = {}; }
if (this.nativeProxy.mp._options.window.exstyles == null) { this.nativeProxy.mp._options.window.exstyles = 0x00000088; } // TopMost Tool Window
@@ -133,8 +153,9 @@ function WindowsMessagePump(options)
this.nativeProxy.CreateWindowExW.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._options.window.exstyles, this.nativeProxy.mp.wndclass.cnamew,
this.nativeProxy.mp._options.window.title == null ? 0 : GM.CreateVariable(this.nativeProxy.mp._options.window.title, { wide: true }), this.nativeProxy.mp._options.window.winstyles, this.nativeProxy.mp._options.window.x, this.nativeProxy.mp._options.window.y,
this.nativeProxy.mp._options.window.width, this.nativeProxy.mp._options.window.height, 0, 0, 0, 0)
.then(function(h)
.then(function (h)
{
this.descriptorMetadata = 'CreateWindowExW';
if (h.Val == 0)
{
// Error creating hidden window
@@ -150,34 +171,43 @@ function WindowsMessagePump(options)
});
this._startPump = function _startPump()
{
this._user32.GetMessageW.async(this._user32.RegisterClassExW.async, this._msg, this._hwnd, 0, 0).then(function (r)
{
if(r.Val > 0)
this._user32.GetMessageW.async(this._user32.RegisterClassExW.async, this._msg, this._hwnd, 0, 0)
.then(function (r)
{
this.nativeProxy.TranslateMessage.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._msg).then(function ()
var val = r.Val;
r.descriptorMetadata = 'RegisterClassExW_result';
r = null;
if (val > 0)
{
this.nativeProxy.DispatchMessageW.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._msg).then(function ()
this.nativeProxy.TranslateMessage.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._msg).then(function ()
{
this.nativeProxy.mp._startPump();
this.descriptorMetadata = 'TranslateMessage';
this.nativeProxy.DispatchMessageW.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._msg).then(function ()
{
this.descriptorMetadata = 'DispatchMessageW';
this.nativeProxy.mp._startPump();
});
});
});
}
else
{
// We got a 'QUIT' message
this.nativeProxy.DestroyWindow.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._hwnd).then(function ()
}
else
{
this.nativeProxy.RegisterClassExW.async.abort();
delete this.nativeProxy.mp._hwnd;
this.nativeProxy.mp.emit('exit', 0);
this.nativeProxy.mp.wndclass.wndproc.removeAllListeners('GlobalCallback');
this.nativeProxy.mp.wndclass.wndproc = null;
});
}
}, function (err) { this.nativeProxy.mp.stop(); });
// We got a 'QUIT' message
this.nativeProxy.DestroyWindow.async(this.nativeProxy.RegisterClassExW.async, this.nativeProxy.mp._hwnd).then(function ()
{
this.descriptorMetadata = 'DestroyWindow';
this.nativeProxy.RegisterClassExW.async.abort();
delete this.nativeProxy.mp._hwnd;
this.nativeProxy.mp.wndclass.wndproc.removeAllListeners('GlobalCallback');
this.nativeProxy.mp.wndclass.wndproc.mp = null;
this.nativeProxy.mp.wndclass.wndproc = null;
this.nativeProxy.mp.emit('exit', 0);
});
}
}, function (err)
{
this.nativeProxy.mp.stop();
});
}
this.stop = function stop()
{
if (this._hwnd)
@@ -196,10 +226,23 @@ function WindowsMessagePump(options)
};
this.once('~', function ()
{
this._msg = null;
this.stop();
});
this.once('exit', (function ()
{
setImmediate(function (j)
{
j._kernel32.mp = null;
j._user32.mp = null;
if (j.wndclass) { j.wndclass.mp = null; }
if (j.wndclass.wndproc) { j.wndclass.wndproc.mp = null; }
j.removeAllListeners();
}, this);
}).internal);
}
module.exports = WindowsMessagePump;
module.exports.WindowStyles =
{
@@ -218,3 +261,5 @@ module.exports.WindowStylesEx =
WS_EX_NOREDIRECTIONBITMAP: 0x00200000, WS_EX_RIGHT: 0x00001000, WS_EX_RIGHTSCROLLBAR: 0x00000000, WS_EX_RTLREADING: 0x00002000,
WS_EX_STATICEDGE: 0x00020000, WS_EX_TOOLWINDOW: 0x00000080, WS_EX_TOPMOST: 0x00000008, WS_EX_TRANSPARENT: 0x00000020, WS_EX_WINDOWEDGE: 0x00000100
};