@alicloud/console-os-browser-vm 1.4.24 → 1.4.25

package/es/Context.js

@@ -25,9 +25,10 @@ var Context = /*#__PURE__*/function () {
     this.window = new Window(conf, this, frame, location);
     this.allowResources = conf.allowResources || [];
     var body = conf.body;
-    if (conf.disableBody) {
+    var disableBody = conf.disableBody;
+    if (disableBody) {
       body = document.body;
-    } else if (!conf.body) {
+    } else if (!body) {
       body = document.createElement('body');
       document.documentElement.appendChild(body);
     }

package/es/Location.js

@@ -1,5 +1,8 @@
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+function isAboutBlank(loc) {
+  return loc && loc.href === 'about:blank';
+}
 var Location = /*#__PURE__*/_createClass(function Location(location) {
   _classCallCheck(this, Location);
   return new Proxy({}, {
@@ -23,9 +26,9 @@ var Location = /*#__PURE__*/_createClass(function Location(location) {
         case 'toString':
           return function () {
             try {
-              return location.toString();
+              return isAboutBlank(location) ? window.location.toString() : location.toString();
             } catch (e) {
-              return location.href;
+              return isAboutBlank(location) ? window.location.href : location.href;
             }
           };
         default:
@@ -33,6 +36,8 @@ var Location = /*#__PURE__*/_createClass(function Location(location) {
       }
       if (typeof location[name] === 'function') {
         return location[name].bind && location[name].bind(target);
+      } else if (isAboutBlank(location)) {
+        return window.location[name];
       } else {
         return location[name];
       }

package/es/Window.js

@@ -7,6 +7,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import { addEventListener, removeEventListener } from './events';
 import { isConstructable, isBoundedFunction } from './utils/common';
 var globalFnName = ['setTimeout', 'setInterval', 'clearInterval', 'clearTimeout'];
+var globalVars = ['location', 'history'];
 var defaultExternals = ['requestAnimationFrame', 'webkitRequestAnimationFrame', 'mozRequestAnimationFrame', 'oRequestAnimationFrame', 'msRequestAnimationFrame', 'cancelAnimationFrame', 'webkitCancelAnimationFrame', 'mozCancelAnimationFrame', 'oCancelAnimationFrame', 'msCancelAnimationFrame', 'matchMedia'];
 var Window = /*#__PURE__*/_createClass(function Window() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -15,12 +16,21 @@ var Window = /*#__PURE__*/_createClass(function Window() {
   _classCallCheck(this, Window);
   var externals = [].concat(defaultExternals, _toConsumableArray(options.externals || []));
   var __CONSOLE_OS_GLOBAL_VARS_ = {};
+
+  // 拦截全局方法
   globalFnName.forEach(function (name) {
     if (externals.includes(name)) {
       return;
     }
     __CONSOLE_OS_GLOBAL_VARS_[name] = frame.contentWindow[name].bind(frame.contentWindow);
   });
+
+  // 通过拦截外置的全局变量，指向外部变量
+  globalVars.forEach(function (name) {
+    if (externals.includes(name)) {
+      __CONSOLE_OS_GLOBAL_VARS_[name] = window[name];
+    }
+  });
   return new Proxy(frame.contentWindow, {
     set: function set(target, name, value) {
       target[name] = value;

package/lib/Context.js

@@ -30,9 +30,10 @@ var Context = /*#__PURE__*/function () {
     this.window = new _Window.default(conf, this, frame, location);
     this.allowResources = conf.allowResources || [];
     var body = conf.body;
-    if (conf.disableBody) {
+    var disableBody = conf.disableBody;
+    if (disableBody) {
       body = document.body;
-    } else if (!conf.body) {
+    } else if (!body) {
       body = document.createElement('body');
       document.documentElement.appendChild(body);
     }

package/lib/Location.js

@@ -7,6 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+function isAboutBlank(loc) {
+  return loc && loc.href === 'about:blank';
+}
 var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(location) {
   (0, _classCallCheck2.default)(this, Location);
   return new Proxy({}, {
@@ -30,9 +33,9 @@ var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(locatio
         case 'toString':
           return function () {
             try {
-              return location.toString();
+              return isAboutBlank(location) ? window.location.toString() : location.toString();
             } catch (e) {
-              return location.href;
+              return isAboutBlank(location) ? window.location.href : location.href;
             }
           };
         default:
@@ -40,6 +43,8 @@ var Location = /*#__PURE__*/(0, _createClass2.default)(function Location(locatio
       }
       if (typeof location[name] === 'function') {
         return location[name].bind && location[name].bind(target);
+      } else if (isAboutBlank(location)) {
+        return window.location[name];
       } else {
         return location[name];
       }

package/lib/Window.js

@@ -15,6 +15,7 @@ var _common = require("./utils/common");
  */
 
 var globalFnName = ['setTimeout', 'setInterval', 'clearInterval', 'clearTimeout'];
+var globalVars = ['location', 'history'];
 var defaultExternals = ['requestAnimationFrame', 'webkitRequestAnimationFrame', 'mozRequestAnimationFrame', 'oRequestAnimationFrame', 'msRequestAnimationFrame', 'cancelAnimationFrame', 'webkitCancelAnimationFrame', 'mozCancelAnimationFrame', 'oCancelAnimationFrame', 'msCancelAnimationFrame', 'matchMedia'];
 var Window = /*#__PURE__*/(0, _createClass2.default)(function Window() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -23,12 +24,21 @@ var Window = /*#__PURE__*/(0, _createClass2.default)(function Window() {
   (0, _classCallCheck2.default)(this, Window);
   var externals = [].concat(defaultExternals, (0, _toConsumableArray2.default)(options.externals || []));
   var __CONSOLE_OS_GLOBAL_VARS_ = {};
+
+  // 拦截全局方法
   globalFnName.forEach(function (name) {
     if (externals.includes(name)) {
       return;
     }
     __CONSOLE_OS_GLOBAL_VARS_[name] = frame.contentWindow[name].bind(frame.contentWindow);
   });
+
+  // 通过拦截外置的全局变量，指向外部变量
+  globalVars.forEach(function (name) {
+    if (externals.includes(name)) {
+      __CONSOLE_OS_GLOBAL_VARS_[name] = window[name];
+    }
+  });
   return new Proxy(frame.contentWindow, {
     set: function set(target, name, value) {
       target[name] = value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/console-os-browser-vm",
-  "version": "1.4.24",
+  "version": "1.4.25",
   "description": "browser virtual machine",
   "main": "lib/index.js",
   "module": "es/index.js",