@jsii/kernel 1.62.0 → 1.63.0

package/lib/kernel.d.ts

@@ -13,7 +13,8 @@ export declare class Kernel {
     private nextid;
     private syncInProgress?;
     private installDir?;
-    private readonly sandbox;
+    /** The internal require function, used instead of the global "require" so that webpack does not transform it... */
+    private require?;
     /**
      * Creates a jsii kernel object.
      *
@@ -74,15 +75,5 @@ export declare class Kernel {
     private _findPropertyTarget;
     private _makecbid;
     private _makeprid;
-    private _wrapSandboxCode;
-    /**
-     * Executes arbitrary code in a VM sandbox.
-     *
-     * @param code       JavaScript code to be executed in the VM
-     * @param filename   the file name to use for the executed code
-     *
-     * @returns the result of evaluating the code
-     */
-    private _execute;
 }
 //# sourceMappingURL=kernel.d.ts.map

package/lib/kernel.js

@@ -5,10 +5,10 @@ const spec = require("@jsii/spec");
 const spec_1 = require("@jsii/spec");
 const cp = require("child_process");
 const fs = require("fs-extra");
+const module_1 = require("module");
 const os = require("os");
 const path = require("path");
 const tar = require("tar");
-const vm = require("vm");
 const api = require("./api");
 const api_1 = require("./api");
 const objects_1 = require("./objects");
@@ -23,8 +23,6 @@ class Kernel {
      *                        result (or throw an error).
      */
     constructor(callbackHandler) {
-        // `setImmediate` is required for tests to pass (it is otherwise
-        // impossible to wait for in-VM promises to complete)
         this.callbackHandler = callbackHandler;
         /**
          * Set to true for verbose debugging.
@@ -36,20 +34,6 @@ class Kernel {
         this.waiting = new Map();
         this.promises = new Map();
         this.nextid = 20000; // incrementing counter for objid, cbid, promiseid
-        // `Buffer` is required when using simple-resource-bundler.
-        // HACK: when we webpack @jsii/runtime, all "require" statements get transpiled,
-        // so modules can be resolved within the pack. However, here we actually want to
-        // let loaded modules to use the native node "require" method.
-        // I wonder if webpack has some pragma that allows opting-out at certain points
-        // in the code.
-        // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
-        const moduleLoad = require('module').Module._load;
-        const nodeRequire = (p) => moduleLoad(p, module, false);
-        this.sandbox = vm.createContext({
-            Buffer,
-            setImmediate,
-            require: nodeRequire, // modules need to "require"
-        });
     }
     load(req) {
         var _a, _b;
@@ -104,8 +88,8 @@ class Kernel {
         catch (e) {
             throw new Error(`Error for package tarball ${req.tarball}: ${e.message}`);
         }
-        // load the module and capture it's closure
-        const closure = this._execute(`require(String.raw\`${packageDir}\`)`, packageDir);
+        // load the module and capture its closure
+        const closure = this.require(packageDir);
         const assm = new Assembly(assmSpec, closure);
         this._addAssembly(assm);
         return {
@@ -164,7 +148,7 @@ class Kernel {
             throw new Error(`property ${symbol} is not static`);
         }
         const prototype = this._findSymbol(fqn);
-        const value = this._ensureSync(`property ${property}`, () => this._wrapSandboxCode(() => prototype[property]));
+        const value = this._ensureSync(`property ${property}`, () => prototype[property]);
         this._debug('value:', value);
         const ret = this._fromSandbox(value, ti, `of static property ${symbol}`);
         this._debug('ret', ret);
@@ -182,7 +166,7 @@ class Kernel {
             throw new Error(`static property ${symbol} is readonly`);
         }
         const prototype = this._findSymbol(fqn);
-        this._ensureSync(`property ${property}`, () => this._wrapSandboxCode(() => (prototype[property] = this._toSandbox(value, ti, `assigned to static property ${symbol}`))));
+        this._ensureSync(`property ${property}`, () => (prototype[property] = this._toSandbox(value, ti, `assigned to static property ${symbol}`)));
         return {};
     }
     get(req) {
@@ -198,7 +182,7 @@ class Kernel {
         const propertyToGet = this._findPropertyTarget(instance, property);
         // make the actual "get", and block any async calls that might be performed
         // by jsii overrides.
-        const value = this._ensureSync(`property '${objref[api_1.TOKEN_REF]}.${propertyToGet}'`, () => this._wrapSandboxCode(() => instance[propertyToGet]));
+        const value = this._ensureSync(`property '${objref[api_1.TOKEN_REF]}.${propertyToGet}'`, () => instance[propertyToGet]);
         this._debug('value:', value);
         const ret = this._fromSandbox(value, ti, `of property ${fqn}.${property}`);
         this._debug('ret:', ret);
@@ -213,7 +197,7 @@ class Kernel {
             throw new Error(`Cannot set value of immutable property ${req.property} to ${req.value}`);
         }
         const propertyToSet = this._findPropertyTarget(instance, property);
-        this._ensureSync(`property '${objref[api_1.TOKEN_REF]}.${propertyToSet}'`, () => this._wrapSandboxCode(() => (instance[propertyToSet] = this._toSandbox(value, propInfo, `assigned to property ${fqn}.${property}`))));
+        this._ensureSync(`property '${objref[api_1.TOKEN_REF]}.${propertyToSet}'`, () => (instance[propertyToSet] = this._toSandbox(value, propInfo, `assigned to property ${fqn}.${property}`)));
         return {};
     }
     invoke(req) {
@@ -228,7 +212,7 @@ class Kernel {
         }
         const fqn = (0, objects_1.jsiiTypeFqn)(obj);
         const ret = this._ensureSync(`method '${objref[api_1.TOKEN_REF]}.${method}'`, () => {
-            return this._wrapSandboxCode(() => fn.apply(obj, this._toSandboxValues(args, `method ${fqn ? `${fqn}#` : ''}${method}`, ti.parameters)));
+            return fn.apply(obj, this._toSandboxValues(args, `method ${fqn ? `${fqn}#` : ''}${method}`, ti.parameters));
         });
         const result = this._fromSandbox(ret, (_b = ti.returns) !== null && _b !== void 0 ? _b : 'void', `returned by method ${fqn ? `${fqn}#` : ''}${method}`);
         this._debug('invoke result', result);
@@ -250,7 +234,7 @@ class Kernel {
         const prototype = this._findSymbol(fqn);
         const fn = prototype[method];
         const ret = this._ensureSync(`method '${fqn}.${method}'`, () => {
-            return this._wrapSandboxCode(() => fn.apply(prototype, this._toSandboxValues(args, `static method ${fqn}.${method}`, ti.parameters)));
+            return fn.apply(prototype, this._toSandboxValues(args, `static method ${fqn}.${method}`, ti.parameters));
         });
         this._debug('method returned:', ret);
         return {
@@ -271,7 +255,7 @@ class Kernel {
             throw new Error(`Method ${method} is expected to be an async method`);
         }
         const fqn = (0, objects_1.jsiiTypeFqn)(obj);
-        const promise = this._wrapSandboxCode(() => fn.apply(obj, this._toSandboxValues(args, `async method ${fqn ? `${fqn}#` : ''}${method}`, ti.parameters)));
+        const promise = fn.apply(obj, this._toSandboxValues(args, `async method ${fqn ? `${fqn}#` : ''}${method}`, ti.parameters));
         // since we are planning to resolve this promise in a different scope
         // we need to handle rejections here [1]
         // [1]: https://stackoverflow.com/questions/40920179/should-i-refrain-from-handling-promise-rejection-asynchronously/40921505
@@ -402,6 +386,7 @@ class Kernel {
     _getPackageDir(pkgname) {
         if (!this.installDir) {
             this.installDir = fs.mkdtempSync(path.join(os.tmpdir(), 'jsii-kernel-'));
+            this.require = (0, module_1.createRequire)(this.installDir);
             fs.mkdirpSync(path.join(this.installDir, 'node_modules'));
             this._debug('creating jsii-kernel modules workdir:', this.installDir);
             onExit.removeSync(this.installDir);
@@ -417,7 +402,7 @@ class Kernel {
         const requestArgs = (_a = req.args) !== null && _a !== void 0 ? _a : [];
         const ctorResult = this._findCtor(fqn, requestArgs);
         const ctor = ctorResult.ctor;
-        const obj = this._wrapSandboxCode(() => new ctor(...this._toSandboxValues(requestArgs, `new ${fqn}`, ctorResult.parameters)));
+        const obj = new ctor(...this._toSandboxValues(requestArgs, `new ${fqn}`, ctorResult.parameters));
         const objref = this.objects.registerObject(obj, fqn, (_b = req.interfaces) !== null && _b !== void 0 ? _b : []);
         // overrides: for each one of the override method names, installs a
         // method on the newly created object which represents the remote "reverse proxy".
@@ -869,21 +854,6 @@ class Kernel {
     _makeprid() {
         return `jsii::promise::${this.nextid++}`;
     }
-    _wrapSandboxCode(fn) {
-        return fn();
-    }
-    /**
-     * Executes arbitrary code in a VM sandbox.
-     *
-     * @param code       JavaScript code to be executed in the VM
-     * @param filename   the file name to use for the executed code
-     *
-     * @returns the result of evaluating the code
-     */
-    _execute(code, filename) {
-        const script = new vm.Script(code, { filename });
-        return script.runInContext(this.sandbox, { displayErrors: true });
-    }
 }
 exports.Kernel = Kernel;
 class Assembly {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/kernel",
-  "version": "1.62.0",
+  "version": "1.63.0",
   "description": "kernel for jsii execution environment",
   "license": "Apache-2.0",
   "author": {
@@ -31,17 +31,17 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/spec": "^1.62.0",
+    "@jsii/spec": "^1.63.0",
     "fs-extra": "^10.1.0",
     "tar": "^6.1.11"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.62.0",
-    "@scope/jsii-calc-lib": "^1.62.0",
+    "@scope/jsii-calc-base": "^1.63.0",
+    "@scope/jsii-calc-lib": "^1.63.0",
     "@types/fs-extra": "^9.0.13",
     "@types/tar": "^6.1.1",
     "jest-expect-message": "^1.0.2",
-    "jsii-build-tools": "^1.62.0",
+    "jsii-build-tools": "^1.63.0",
     "jsii-calc": "^3.20.120"
   }
 }