lib: fix AsyncResource.bind not using 'this' from the caller by default

PR-URL: #42177
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
Reviewed-By: Bryan English <bryan@bryanenglish.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: rochdev

doc/api/async_context.md

@@ -446,6 +446,10 @@ added:
  - v14.8.0
  - v12.19.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/42177
+ description: Changed the default when `thisArg` is undefined to use `this`
+ from the caller.
  - version: v16.0.0
  pr-url: https://github.com/nodejs/node/pull/36782
  description: Added optional thisArg.
@@ -468,6 +472,10 @@ added:
  - v14.8.0
  - v12.19.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/42177
+ description: Changed the default when `thisArg` is undefined to use `this`
+ from the caller.
  - version: v16.0.0
  pr-url: https://github.com/nodejs/node/pull/36782
  description: Added optional thisArg.

lib/async_hooks.js

@@ -5,6 +5,7 @@ const {
  ArrayPrototypeIndexOf,
  ArrayPrototypePush,
  ArrayPrototypeSplice,
+ ArrayPrototypeUnshift,
  FunctionPrototypeBind,
  NumberIsSafeInteger,
  ObjectDefineProperties,
@@ -223,15 +224,19 @@ class AsyncResource {
 returnthis[trigger_async_id_symbol];
 }
 
-bind(fn,thisArg=this){
+bind(fn,thisArg){
 validateFunction(fn,'fn');
-constret=
-FunctionPrototypeBind(
-this.runInAsyncScope,
-this,
-fn,
-thisArg);
-ObjectDefineProperties(ret,{
+letbound;
+if(thisArg===undefined){
+constresource=this;
+bound=function(...args){
+ArrayPrototypeUnshift(args,fn,this);
+returnReflectApply(resource.runInAsyncScope,resource,args);
+};
+}else{
+bound=FunctionPrototypeBind(this.runInAsyncScope,this,fn,thisArg);
+}
+ObjectDefineProperties(bound,{
 'length': {
 configurable: true,
 enumerable: false,
@@ -245,7 +250,7 @@ class AsyncResource {
 writable: true,
 }
 });
-returnret;
+returnbound;
 }
 
 staticbind(fn,type,thisArg){

test/parallel/test-asyncresource-bind.js

@@ -41,11 +41,16 @@ const fn3 = asyncResource.bind(common.mustCall(function() {
 fn3();
 
 constfn4=asyncResource.bind(common.mustCall(function(){
-assert.strictEqual(this,asyncResource);
+assert.strictEqual(this,undefined);
 }));
 fn4();
 
 constfn5=asyncResource.bind(common.mustCall(function(){
 assert.strictEqual(this,false);
 }),false);
 fn5();
+
+constfn6=asyncResource.bind(common.mustCall(function(){
+assert.strictEqual(this,'test');
+}));
+fn6.call('test');