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

1. Fixed bug with uncaught rejections in promise.js

Browse Source 
2. Updated DHCP.info to support mac address entry
3. Updated clipboard to be able to force single line entry for addModule
This commit is contained in:
Bryan Roe
2021-07-23 16:04:54 -07:00
parent ad961128a2
commit a41983ee7a
4 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

4
modules/clipboard.js
View File

@@ -85,11 +85,11 @@ function nativeAddCompressedModule(name)
} }
module.exports(ret); module.exports(ret);
} }
function nativeAddModule(name) function nativeAddModule(name,single)
{ {
var value = getJSModule(name); var value = getJSModule(name);
var ret = "duk_peval_string_noresult(ctx, \"addModule('" + name + "', Buffer.from('" + Buffer.from(value).toString('base64') + "', 'base64').toString());\");"; var ret = "duk_peval_string_noresult(ctx, \"addModule('" + name + "', Buffer.from('" + Buffer.from(value).toString('base64') + "', 'base64').toString());\");";
if (ret.length > 16300) if (ret.length > 16300 && (single==null || single==false))
{ {
// MS Visual Studio has a maxsize limitation // MS Visual Studio has a maxsize limitation
var tmp = Buffer.from(value).toString('base64'); var tmp = Buffer.from(value).toString('base64');

24
modules/dhcp.js
View File

File diff suppressed because one or more lines are too long

26
modules/promise.js
View File

@@ -116,17 +116,20 @@ function Promise(promiseFunc)
//if (eventName == 'rejected' && (eventCallback.internal == null || eventCallback.internal == false)) //if (eventName == 'rejected' && (eventCallback.internal == null || eventCallback.internal == false))
if (eventName == 'rejected') if (eventName == 'rejected')
{ {
var rp = getRootPromise(this.promise);
rp._internal.external = true;
if (this.uncaught != null) if (this.uncaught != null)
{ {
clearImmediate(this.uncaught); clearImmediate(this.uncaught);
this.uncaught = null; this.uncaught = null;
} }
if (rp._internal.uncaught != null) if (this.promise)
{ {
clearImmediate(rp._internal.uncaught); var rp = getRootPromise(this.promise);
rp._internal.uncaught = null; rp._internal.external = true;
if (rp._internal.uncaught != null)
{
clearImmediate(rp._internal.uncaught);
rp._internal.uncaught = null;
}
} }
} }
@@ -293,6 +296,19 @@ function Promise(promiseFunc)
this._internal.once('settled', (function () this._internal.once('settled', (function ()
{ {
if (this.uncaught != null)
{
clearImmediate(this.uncaught);
this.uncaught = null;
}
var rp = getRootPromise(this.promise);
if (rp && rp._internal.uncaught)
{
clearImmediate(rp._internal.uncaught);
rp._internal.uncaught = null;
}
delete this.promise._up; delete this.promise._up;
delete this.promise.__childPromise; delete this.promise.__childPromise;
delete this.promise.promise; delete this.promise.promise;