@cloudcare/browser-core 3.1.18 → 3.1.20

package/esm/helper/instrumentMethod.js

@@ -1,62 +1,67 @@
-import { noop } from './tools';
+import { noop, arrayFrom, startsWith } from './tools';
 import { setTimeout } from './timer';
 import { callMonitored } from './monitor';
-export function instrumentMethod(object, method, instrumentationFactory) {
-  var original = object[method];
-  var instrumentation = instrumentationFactory(original);
-  var instrumentationWrapper = function instrumentationWrapper() {
-    if (typeof instrumentation !== 'function') {
-      return undefined;
+import { createHandlingStack } from './errorTools';
+export function instrumentMethod(targetPrototype, method, onPreCall, opts) {
+  var computeHandlingStack = opts && opts.computeHandlingStack;
+  var original = targetPrototype[method];
+  if (typeof original !== 'function') {
+    if (startsWith(method, 'on')) {
+      original = noop;
+    } else {
+      return {
+        stop: noop
+      };
     }
+  }
+  var stopped = false;
+  var instrumentation = function instrumentation() {
+    if (stopped) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+      return original.apply(this, arguments);
+    }
+    var parameters = arrayFrom(arguments);
+    var postCallCallback;
+    callMonitored(onPreCall, null, [{
+      target: this,
+      parameters: parameters,
+      onPostCall: function onPostCall(callback) {
+        postCallCallback = callback;
+      },
+      handlingStack: computeHandlingStack ? createHandlingStack() : undefined
+    }]);
+    var result = original.apply(this, parameters);
+    if (postCallCallback) {
+      callMonitored(postCallCallback, null, [result]);
+    }
+
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return instrumentation.apply(this, arguments);
+    return result;
   };
-  object[method] = instrumentationWrapper;
+  targetPrototype[method] = instrumentation;
   return {
     stop: function stop() {
-      if (object[method] === instrumentationWrapper) {
-        object[method] = original;
-      } else {
-        instrumentation = original;
+      stopped = true;
+      // If the instrumentation has been removed by a third party, keep the last one
+      if (targetPrototype[method] === instrumentation) {
+        targetPrototype[method] = original;
       }
     }
   };
 }
-export function instrumentMethodAndCallOriginal(object, method, aliasOption) {
-  return instrumentMethod(object, method, function (original) {
-    return function () {
-      var result;
-      if (aliasOption && aliasOption.before) {
-        callMonitored(aliasOption.before, this, arguments);
-        // aliasOption.before.apply(this, arguments)
-      }
-
-      if (typeof original === 'function') {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        result = original.apply(this, arguments);
-      }
-      if (aliasOption && aliasOption.after) {
-        callMonitored(aliasOption.after, this, arguments);
-        // aliasOption.after.apply(this, arguments)
-      }
-
-      return result;
-    };
-  });
-}
-export function instrumentSetter(object, property, after) {
-  var originalDescriptor = Object.getOwnPropertyDescriptor(object, property);
+export function instrumentSetter(targetPrototype, property, after) {
+  var originalDescriptor = Object.getOwnPropertyDescriptor(targetPrototype, property);
   if (!originalDescriptor || !originalDescriptor.set || !originalDescriptor.configurable) {
     return {
       stop: noop
     };
   }
   var stoppedInstrumentation = noop;
-  var _instrumentation = function instrumentation(thisObject, value) {
+  var _instrumentation = function instrumentation(target, value) {
     // put hooked setter into event loop to avoid of set latency
     setTimeout(function () {
       if (_instrumentation !== stoppedInstrumentation) {
-        after(thisObject, value);
+        after(target, value);
       }
     }, 0);
   };
@@ -64,16 +69,15 @@ export function instrumentSetter(object, property, after) {
     originalDescriptor.set.call(this, value);
     _instrumentation(this, value);
   };
-  Object.defineProperty(object, property, {
+  Object.defineProperty(targetPrototype, property, {
     set: instrumentationWrapper
   });
   return {
     stop: function stop() {
-      if (Object.getOwnPropertyDescriptor(object, property) && Object.getOwnPropertyDescriptor(object, property).set === instrumentationWrapper) {
-        Object.defineProperty(object, property, originalDescriptor);
-      } else {
-        _instrumentation = stoppedInstrumentation;
+      if (Object.getOwnPropertyDescriptor(targetPrototype, property) && Object.getOwnPropertyDescriptor(targetPrototype, property).set === instrumentationWrapper) {
+        Object.defineProperty(targetPrototype, property, originalDescriptor);
       }
+      _instrumentation = stoppedInstrumentation;
     }
   };
 }

package/esm/helper/instrumentMethod.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentMethod.js","names":["noop","setTimeout","callMonitored","instrumentMethod","object","method","instrumentationFactory","original","instrumentation","instrumentationWrapper","undefined","apply","arguments","stop","instrumentMethodAndCallOriginal","aliasOption","result","before","after","instrumentSetter","property","originalDescriptor","Object","getOwnPropertyDescriptor","set","configurable","stoppedInstrumentation","thisObject","value","call","defineProperty"],"sources":["../../src/helper/instrumentMethod.js"],"sourcesContent":["import { noop } from './tools'\nimport { setTimeout } from './timer'\nimport { callMonitored } from './monitor'\nexport function instrumentMethod(object, method, instrumentationFactory) {\n  var original = object[method]\n\n  var instrumentation = instrumentationFactory(original)\n\n  var instrumentationWrapper = function () {\n    if (typeof instrumentation !== 'function') {\n      return undefined\n    }\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return instrumentation.apply(this, arguments)\n  }\n  object[method] = instrumentationWrapper\n  return {\n    stop: function () {\n      if (object[method] === instrumentationWrapper) {\n        object[method] = original\n      } else {\n        instrumentation = original\n      }\n    }\n  }\n}\n\nexport function instrumentMethodAndCallOriginal(object, method, aliasOption) {\n  return instrumentMethod(object, method, function (original) {\n    return function () {\n      var result\n      if (aliasOption && aliasOption.before) {\n        callMonitored(aliasOption.before, this, arguments)\n        // aliasOption.before.apply(this, arguments)\n      }\n      if (typeof original === 'function') {\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n        result = original.apply(this, arguments)\n      }\n      if (aliasOption && aliasOption.after) {\n        callMonitored(aliasOption.after, this, arguments)\n        // aliasOption.after.apply(this, arguments)\n      }\n      return result\n    }\n  })\n}\n\nexport function instrumentSetter(object, property, after) {\n  var originalDescriptor = Object.getOwnPropertyDescriptor(object, property)\n  if (\n    !originalDescriptor ||\n    !originalDescriptor.set ||\n    !originalDescriptor.configurable\n  ) {\n    return { stop: noop }\n  }\n  var stoppedInstrumentation = noop\n  var instrumentation = function (thisObject, value) {\n    // put hooked setter into event loop to avoid of set latency\n    setTimeout(function () {\n      if (instrumentation !== stoppedInstrumentation) {\n        after(thisObject, value)\n      }\n    }, 0)\n  }\n\n  var instrumentationWrapper = function (value) {\n    originalDescriptor.set.call(this, value)\n    instrumentation(this, value)\n  }\n\n  Object.defineProperty(object, property, {\n    set: instrumentationWrapper\n  })\n\n  return {\n    stop: function () {\n      if (\n        Object.getOwnPropertyDescriptor(object, property) &&\n        Object.getOwnPropertyDescriptor(object, property).set ===\n          instrumentationWrapper\n      ) {\n        Object.defineProperty(object, property, originalDescriptor)\n      } else {\n        instrumentation = stoppedInstrumentation\n      }\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"instrumentMethod.js","names":["noop","arrayFrom","startsWith","setTimeout","callMonitored","createHandlingStack","instrumentMethod","targetPrototype","method","onPreCall","opts","computeHandlingStack","original","stop","stopped","instrumentation","apply","arguments","parameters","postCallCallback","target","onPostCall","callback","handlingStack","undefined","result","instrumentSetter","property","after","originalDescriptor","Object","getOwnPropertyDescriptor","set","configurable","stoppedInstrumentation","value","instrumentationWrapper","call","defineProperty"],"sources":["../../src/helper/instrumentMethod.js"],"sourcesContent":["import { noop, arrayFrom, startsWith } from './tools'\nimport { setTimeout } from './timer'\nimport { callMonitored } from './monitor'\nimport { createHandlingStack } from './errorTools'\nexport function instrumentMethod(targetPrototype, method, onPreCall, opts) {\n  var computeHandlingStack = opts && opts.computeHandlingStack\n  var original = targetPrototype[method]\n\n  if (typeof original !== 'function') {\n    if (startsWith(method, 'on')) {\n      original = noop\n    } else {\n      return { stop: noop }\n    }\n  }\n\n  var stopped = false\n\n  var instrumentation = function () {\n    if (stopped) {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call\n      return original.apply(this, arguments)\n    }\n\n    var parameters = arrayFrom(arguments)\n\n    var postCallCallback\n\n    callMonitored(onPreCall, null, [\n      {\n        target: this,\n        parameters: parameters,\n        onPostCall: function (callback) {\n          postCallCallback = callback\n        },\n        handlingStack: computeHandlingStack ? createHandlingStack() : undefined\n      }\n    ])\n\n    var result = original.apply(this, parameters)\n\n    if (postCallCallback) {\n      callMonitored(postCallCallback, null, [result])\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-return\n    return result\n  }\n\n  targetPrototype[method] = instrumentation\n\n  return {\n    stop: function () {\n      stopped = true\n      // If the instrumentation has been removed by a third party, keep the last one\n      if (targetPrototype[method] === instrumentation) {\n        targetPrototype[method] = original\n      }\n    }\n  }\n}\n\nexport function instrumentSetter(targetPrototype, property, after) {\n  var originalDescriptor = Object.getOwnPropertyDescriptor(\n    targetPrototype,\n    property\n  )\n  if (\n    !originalDescriptor ||\n    !originalDescriptor.set ||\n    !originalDescriptor.configurable\n  ) {\n    return { stop: noop }\n  }\n\n  var stoppedInstrumentation = noop\n  var instrumentation = function (target, value) {\n    // put hooked setter into event loop to avoid of set latency\n    setTimeout(function () {\n      if (instrumentation !== stoppedInstrumentation) {\n        after(target, value)\n      }\n    }, 0)\n  }\n\n  var instrumentationWrapper = function (value) {\n    originalDescriptor.set.call(this, value)\n    instrumentation(this, value)\n  }\n\n  Object.defineProperty(targetPrototype, property, {\n    set: instrumentationWrapper\n  })\n\n  return {\n    stop: function () {\n      if (\n        Object.getOwnPropertyDescriptor(targetPrototype, property) &&\n        Object.getOwnPropertyDescriptor(targetPrototype, property).set ===\n          instrumentationWrapper\n      ) {\n        Object.defineProperty(targetPrototype, property, originalDescriptor)\n      }\n      instrumentation = stoppedInstrumentation\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/helper/tools.js

@@ -1536,6 +1536,19 @@ export function startsWith(candidate, search) {
 export function endsWith(candidate, search) {
   return candidate.slice(-search.length) === search;
 }
+export function removeDuplicates(array) {
+  var set = new Set();
+  array.forEach(function (item) {
+    set.add(item);
+  });
+  return arrayFrom(set);
+}
+export function removeItem(array, item) {
+  var index = array.indexOf(item);
+  if (index >= 0) {
+    array.splice(index, 1);
+  }
+}
 export function tryToClone(response) {
   try {
     return response.clone();