From b21c7c380ec9ab46dbecdd2f260dd83e247895c7 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Wed, 21 Sep 2022 00:58:21 -0700 Subject: [PATCH] 1. Updated global-tunnel to always use the object cached by the module loader, fixing a bug where the native and JS instances didn't match 2. Updated proxy-helper to always end a global-tunnel before fetching the auto-proxy script, fixing a bug where auto-proxy couldn't be fetched correctly after autoproxy was configured --- microscript/ILibDuktape_Polyfills.c | 2 +- microscript/ILibDuktape_net.c | 16 +++++++++++++--- modules/proxy-helper.js | 4 ++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c index 56edf17..3b69964 100644 --- a/microscript/ILibDuktape_Polyfills.c +++ b/microscript/ILibDuktape_Polyfills.c @@ -2630,7 +2630,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx) free(_notifybardesktop); // proxy-helper, refer to modules/proxy-helper.js - duk_peval_string_noresult(ctx, "addCompressedModule('proxy-helper', Buffer.from('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', 'base64'), '2022-06-14T12:14:57.000-07:00');"); + duk_peval_string_noresult(ctx, "addCompressedModule('proxy-helper', Buffer.from('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', 'base64'), '2022-09-20T20:03:43.000-07:00');"); // daemon helper, refer to modules/daemon.js duk_peval_string_noresult(ctx, "addCompressedModule('daemon', Buffer.from('eJyVVU1v2zgQvQvQf5jNoZYKVU6zaA8OcnBTdyu0dRa2u0VPC0Ya2wRkUktScYLA/70z+rbjXWB1oTScr/fmkRq/9r1bXTwZudk6uLq8uoREOczhVptCG+GkVr7ne19lispiBqXK0IDbIkwLkdLS7ETwFxpL3nAVX0LADhfN1kV47XtPuoSdeAKlHZQWKYO0sJY5Aj6mWDiQClK9K3IpVIqwl25bVWlyxL73s8mg750gZ0HuBX2th24gHHcL9GydKybj8X6/j0XVaazNZpzXfnb8NbmdzZezN9QtR3xXOVoLBv8ppSGY908gCmomFffUYi72oA2IjUHac5qb3RvppNpEYPXa7YVB38ukdUbel+6Ip7Y1wjt0IKaEgovpEpLlBXyYLpNl5Hs/ktXnu+8r+DFdLKbzVTJbwt0Cbu/mH5NVcjenr08wnf+EL8n8YwRILFEVfCwMd08tSmYQM6JriXhUfq3rdmyBqVzLlECpTSk2CBv9gEYRFijQ7KTlKVpqLvO9XO6kq0RgXyKiIq/HTJ7vrUuVshdYl+nSfabgHE2Qhr73XI9DrlkU0sYFUaVcu+iiSh7XcSE8Q2F0SmAaS8w0IyW6hoPvHQaV8FH2dXSG/16qrZEaYbcLtE4YB69eAUfBbzdwzpezh3W6Jis/D4II2BVwA1WSE0BuG8EJRLFDR8ciOleDT0WbeLidbmWeUQkqVL//l1/zAUcomoBDvWBu8QWSYSKkGQejTCschX3o4WSujLfGOMTVYjkivzHCzQ2oMs95qp0Jng/XbWcD34rwMwGNHS67IJ6BQbZ1TpP2hXtz2wmc9jkZvMOhwdic9WCED8SCHYXxjF9mxAb5xanI84AK0exMiWFPHekIhcPK+YQ2co8t3aS1LKnFnr/OGgxFzugC1vbZBLHFfE1ZyHrdM9bGFrlwdKh3LOHRXqrfr0bD1FoFo2Xyx2q2+DaKThKHHZtsbwXXEVIZ/m4SES/4iOknuqrPzJ/jT/Tcpey12QPoN5vzzW1mwgnq8ejueJmNttGY/xHAnkwweQ4ui4FfaRTwiNl0LHe6Fmm4vapZdMJsWL8tv/T50KTindjy3wKDtxG8bUs0h6abNaZ/VgSyf0SjGl5Ik0pmdacTeP/u/Ts4hDVYVljUS+m8gDoMO52VOdIG/b5ddeCgKVAtUY1tUi8kvF/A95P8', 'base64'));"); diff --git a/microscript/ILibDuktape_net.c b/microscript/ILibDuktape_net.c index cb7648f..ce9bac0 100644 --- a/microscript/ILibDuktape_net.c +++ b/microscript/ILibDuktape_net.c @@ -1998,7 +1998,18 @@ ILibDuktape_globalTunnel_data* ILibDuktape_GetNewGlobalTunnelEx(duk_context *ctx { ILibDuktape_globalTunnel_data *retVal; - if (native != 0) { duk_push_heap_stash(ctx); } // [stash] + if (native != 0) + { + // + // If native is calling us, we will use JavaScript to return the pointer value, becuase + // JS module loader caches entries, so we need to make sure we don't instantiate a new structure, + // but instead re-use the existing one. + // + duk_eval_string(ctx, "require('global-tunnel')"); // [global-tunnel] + retVal = (ILibDuktape_globalTunnel_data*)Duktape_GetBufferProperty(ctx, -1, ILibDuktape_GlobalTunnel_DataPtr); + duk_pop(ctx); // ... + return(retVal); + } duk_push_object(ctx); // [stash][tunnel] duk_dup(ctx, -1); // [stash][tunnel][dup] @@ -2018,7 +2029,6 @@ ILibDuktape_globalTunnel_data* ILibDuktape_GetNewGlobalTunnelEx(duk_context *ctx ILibDuktape_CreateEventWithGetter_SetEnumerable(ctx, "isProxying", ILibDuktape_globalTunnel_isProxying, 1); ILibDuktape_CreateFinalizer(ctx, ILibDuktape_globalTunnel_finalizer); - if (native != 0) { duk_pop(ctx); } // ... return retVal; } @@ -2035,7 +2045,7 @@ void ILibDuktape_globalTunnel_PUSH(duk_context *ctx, void *chain) else { ILibDuktape_GetNewGlobalTunnelEx(ctx, 0); // [tunnel] - } + } return; } ILibDuktape_globalTunnel_data* ILibDuktape_GetGlobalTunnel(duk_context *ctx) diff --git a/modules/proxy-helper.js b/modules/proxy-helper.js index 37a64ad..a1e9796 100644 --- a/modules/proxy-helper.js +++ b/modules/proxy-helper.js @@ -582,6 +582,10 @@ function windows_getProxy() function auto_proxy_helper(target) { + // The first thing we need to do, is disable any existing proxy settings, otherwise we won't be able to find the autoconfig script + require('global-tunnel').end(); + + var promise = require('promise'); var ret = new promise(promise.defaultInit);