@alicloud/console-os-browser-vm 1.4.23 → 1.4.25-alpha.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Alibaba Cloud
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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/Elements.js

@@ -3,7 +3,7 @@ import injectScriptCallBack, { getJsonCallback } from './utils/injectScriptCallB
 import { isSSR } from './utils/isSSR';
 var makeElInjector = function makeElInjector(originMethod, methodName) {
   return function (el) {
-    var notAllowed = el.ownerContext && el.ownerContext.allowResources.indexOf(el.src) === -1 && el.ownerContext.allowResources !== '*';
+    var notAllowed = el && el.ownerContext && el.ownerContext.allowResources.indexOf(el.src) === -1 && el.ownerContext.allowResources !== '*';
 
     // 如果不在 BrowserVM 的白名单内，尝试通过 context 的 load script 通过 xhr 获取脚本内容，并在沙箱中执行
     if (el && el._evalScriptInSandbox && el.ownerContext && el.nodeName === 'SCRIPT' && el.src && notAllowed && !getJsonCallback(el.src)) {

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/Elements.js

@@ -9,7 +9,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var makeElInjector = function makeElInjector(originMethod, methodName) {
   return function (el) {
-    var notAllowed = el.ownerContext && el.ownerContext.allowResources.indexOf(el.src) === -1 && el.ownerContext.allowResources !== '*';
+    var notAllowed = el && el.ownerContext && el.ownerContext.allowResources.indexOf(el.src) === -1 && el.ownerContext.allowResources !== '*';
 
     // 如果不在 BrowserVM 的白名单内，尝试通过 context 的 load script 通过 xhr 获取脚本内容，并在沙箱中执行
     if (el && el._evalScriptInSandbox && el.ownerContext && el.nodeName === 'SCRIPT' && el.src && notAllowed && !(0, _injectScriptCallBack.getJsonCallback)(el.src)) {

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,19 +1,10 @@
 {
   "name": "@alicloud/console-os-browser-vm",
-  "version": "1.4.23",
+  "version": "1.4.25-alpha.0",
   "description": "browser virtual machine",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "index.d.ts",
-  "scripts": {
-    "prepublishOnly": "npm run clean && npm run build && npm run babel && npm run babel:esm",
-    "babel": "breezr build --engine babel",
-    "babel:esm": "breezr build --engine babel --es-module",
-    "build": "breezr build --engine webpack",
-    "storybook": "breezr start-storybook",
-    "test": "breezr test:unit --coverage --env jsdom",
-    "clean": "rm -rf es build lib yarn.lock"
-  },
   "author": "Boelroy",
   "license": "ISC",
   "devDependencies": {
@@ -30,5 +21,13 @@
     "js-beautify": "^1.10.1",
     "jsdom": "^16.2.2"
   },
-  "gitHead": "9c6fffdb53e1b42c98b80e3f4eb896a3e2ee0c86"
-}
+  "gitHead": "9c6fffdb53e1b42c98b80e3f4eb896a3e2ee0c86",
+  "scripts": {
+    "babel": "breezr build --engine babel",
+    "babel:esm": "breezr build --engine babel --es-module",
+    "build": "breezr build --engine webpack",
+    "storybook": "breezr start-storybook",
+    "test": "breezr test:unit --coverage --env jsdom",
+    "clean": "rm -rf es build lib yarn.lock"
+  }
+}