fixed sandbox resource injection; fixed minified version; changed sandbox idleTimeout default value;

Author: DigitalBrainJS

.gitignore

@@ -1,4 +1,5 @@
 /dist/
 /node_modules/
 /lib/
+/trash/
 /.idea/

.npmignore

@@ -1,8 +1,9 @@
 /node_modules/
 /.idea/
-.babelrc
+/.babelrc
 /public/
 /test/
 /src/
-gulpfile.js
-.travis.yml
+/trash/
+/gulpfile.js
+/.travis.yml

README.md

@@ -139,7 +139,7 @@ sharedOptions.abort();
       Default `undefined` value means prefer sandboxed mode, but allow non-sandboxed query if the environment doesn't 
       support it. In sandboxed mode all requests will be done in invisible iframe proxy, created temporally for each 
       origin 
-      - `idleTimeout: Number= 15000` idle timeout for each sandbox in ms
+      - `idleTimeout: Number= 60000` idle timeout for each sandbox in ms
       - `params: Object` Object with query params to combine with a URL string
       - `timeout: Number= 15000` max query pending time in ms. Default: `15000` (15 seconds)
       - `preventCache: Boolean= true` force disable cache by adding timestamp to a query param `_rnd`

gulpfile.js

@@ -35,13 +35,12 @@ function createBuildTask(entryFile, buildOptions) {
             minify
         } = buildOptions || {};
 
-
     const taskName = `build:${taskTargetName}`;
 
     const rollupPlugins = [
         resolve({jsnext: true}),
         commonjs({
-            include: include === false ? undefined : include,
+            include: include !== false ? include : undefined,
             exclude
         })
     ];
@@ -95,6 +94,7 @@ const clientBuildTaskES = createBuildTask(clientEntryFile, {format: "esm"});
 const clientBuildTests = createBuildTask("test/safe-jsonp.spec.js", {
     taskTargetName: "test",
     format: "cjs",
+    include: ["node_modules/**", "dist/**"],
     toES5: true,
     destPath: "./test/"
 });

package-lock.json

@@ -9,7 +9,7 @@
 
     <script>
         var origin = location.origin || (location.protocol + "//" + location.host);
-        var src = origin.indexOf('localhost') ? "/dist/safe-jsonp.umd.js" : "https://unpkg.com/safe-jsonp/dist/safe-jsonp.umd.js";
+        var src = origin.indexOf('localhost') ? "/dist/safe-jsonp.umd.min.js" : "https://unpkg.com/safe-jsonp/dist/safe-jsonp.umd.min.js";
 
         document.write("<script src='" + src + "'></" + "script>")
     </script>

public/index.html

@@ -1,3 +1,5 @@
+import fetch from "./fetch";
+
 export default function proxy() {
     const queries = {},
         response = (data) => {

src/lib/proxy.js

@@ -3,39 +3,30 @@ import {parseURL, whenDOMReady, addEvent} from "./browser";
 import fetch from "./fetch";
 import proxy from "./proxy";
 
-const injectResource = (imports) => Object.keys(imports).map((name) => {
-    const resource = imports[name];
-
-    switch (getType(resource)) {
-        case "string":
+const injectResources = (imports) => imports.map((resource) => {
+        if (getType(resource) === "function") {
+            const {name} = resource;
+            if (!name) {
+                throw Error(`Cannot resolve fn resource name`);
+            }
+            return `var ${name}=function ` + resource.toString().replace(/^function\s?/, "");
+        } else {
             return resource;
-        case "function":
-            return `var ${name}= ${resource.toString()}`;
-        default:
-            return resource.toString();
+        }
     }
-
-}).join(";\n");
+).join(";\n");
 
 
 const sandboxes = {};
 
 export default function Sandbox(options) {
-    const sandbox = this,
-        imports = {
-            fetch,
-            proxy,
-            mixin,
-            encodeParams,
-            randomStr,
-            generateUniquePropName
-        };
+    const sandbox = this;
 
     let iframe = document.createElement("iframe"),
         queries = {},
         {
             origin,
-            idleTimeout = 15000,
+            idleTimeout = 60000,
             mode = "data"
         } = options || {},
         isReady = false,
@@ -51,8 +42,15 @@ export default function Sandbox(options) {
     const content = [
         "<!DOCTYPE html><html><body>iframe:sandbox<",
         "script>",
-        injectResource(imports),
-        ";proxy();</",
+        injectResources([
+            fetch,
+            proxy,
+            mixin,
+            encodeParams,
+            randomStr,
+            generateUniquePropName
+        ]),
+        `;${proxy.name}();</`,
         "script></body></html>"
     ].join("");
 

src/lib/sandbox.js

@@ -13,7 +13,7 @@ export function randomStr(length = 6) {
     return str;
 }
 
-export const generateUniquePropName= (obj, generator= (i)=>`${i.toString(36)}`, maxIterations= 1000)=>{
+export function generateUniquePropName(obj, generator = (i) => `${i.toString(36)}`, maxIterations = 1000) {
     let key, i= 0;
     while((key= generator.call(obj, i)) && key in obj){
         if(i++>maxIterations) return null;
@@ -85,7 +85,9 @@ export function mixin(obj) {
     return obj;
 }
 
-export const encodeParams = (params) => Object.keys(params).map(param => {
-    let rawValue = params[param];
-    return `${param}=${encodeURIComponent(rawValue && typeof rawValue == "object" ? JSON.stringify(rawValue) : ("" + rawValue))}`;
-}).join("&");
+export function encodeParams(params) {
+    return Object.keys(params).map(param => {
+        let rawValue = params[param];
+        return `${param}=${encodeURIComponent(rawValue && typeof rawValue == "object" ? JSON.stringify(rawValue) : ("" + rawValue))}`;
+    }).join("&")
+};

src/lib/utils.js

@@ -41,7 +41,7 @@ export default function JSONP(url, options, callback) {
 
         let {
             sandbox,
-            idleTimeout = 5000,
+            idleTimeout = 60000,
             timeout,
             preventCache,
             cbParam,

src/safe-jsonp.js

@@ -1,8 +1,7 @@
-//const chai = require("chai");
-
+import JSONP from "../dist/safe-jsonp.umd.min";
+import chai from "chai";
 
 const {expect}= chai;
-/*const JSONP = require("../dist/safe-jsonp.umd");*/
 
 const JSONP_URL_VALID = "http://www.mocky.io/v2/5c069fbf3300006c00ef2b3e";
 const JSONP_URL_VALID2 = "http://www.mocky.io/v2/5c06a4bb3300006300ef2b61";
@@ -15,11 +14,6 @@ const JSONP_URL_CB_TOO_MANY_ARGS = "http://www.mocky.io/v2/5c06a20e3300006c00ef2
 
 describe("JSONP: remote endpoint test", function () {
 
-    const params = {
-            y: 2
-        },
-        expected = {x: 1};
-
     describe("constructor", function () {
 
         it("should throw if the first argument is not a string", function () {
@@ -130,6 +124,4 @@ describe("JSONP: remote endpoint test", function () {
 
     makeTests({sandbox: false});
     makeTests({sandbox: true});
-
-
 });

test/safe-jsonp.spec.js

@@ -10,15 +10,11 @@
 <div id="mocha"></div>
 <script src="http://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.0.0/polyfill.min.js"></script>
 <script src="../node_modules/mocha/mocha.js"></script>
-<script src="../node_modules/chai/chai.js"></script>
-
 
 <script>
     window.initMochaPhantomJS && window.initMochaPhantomJS();
     mocha.setup('bdd');
 </script>
-<script src="../dist/safe-jsonp.umd.js"></script>
-<!--<script src="safe-jsonp.spec.js"></script>-->
 <script src="../test/safe-jsonp.spec.cjs.js"></script>
 <script>
     mocha.run();