Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sandbox, feat: passout callbackArgs in 'SandBox::CustomExtLoader::run' #455

Merged
merged 1 commit into from Aug 13, 2018
Merged

sandbox, feat: passout callbackArgs in 'SandBox::CustomExtLoader::run' #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions fibjs/src/sandbox/loaders/custom_loader.cpp
View file
Open in desktop
Expand Up @@ -22,15 +22,25 @@ result_t SandBox::CustomExtLoader::run(SandBox::Context* ctx, Buffer_base* src,
{
Isolate* isolate = ctx->m_sb->holder();

v8::Local<v8::String> soname = isolate->NewString(name);
v8::Local<v8::String> filename = isolate->NewString(name);
exlib::string pname;
path_base::dirname(name, pname);

v8::Local<v8::Value> require_fn = ctx->m_sb->GetPrivate(SandBox::_get_extloader_pname(m_ext));

// transpile with customFile first :start
// read filecontent :start
std::vector<v8::Local<v8::Value>> transpileArgs;
transpileArgs.resize(1);
transpileArgs.resize(2);

src->valueOf(transpileArgs[0]);

obj_ptr<NObject> requireInfo = new NObject();
requireInfo->add("dirname", pname);
requireInfo->add("filename", name);

v8::Local<v8::Value> callbackObj;
requireInfo->valueOf(callbackObj);
transpileArgs[1] = callbackObj;

src->valueOf(transpileArgs[0]);

Expand All @@ -47,7 +57,7 @@ result_t SandBox::CustomExtLoader::run(SandBox::Context* ctx, Buffer_base* src,
} else
return CHECK_ERROR(Runtime::setError(GetException(try_catch, 0)));
}
// transpile with customFile first :end
// read filecontent :end

v8::Local<v8::Object> module = v8::Local<v8::Object>::Cast(args[5]);
module->Set(isolate->NewString("exports"), fileContent);
Expand Down
34 changes: 26 additions & 8 deletions test/vm_test.js
View file
Open in desktop
Expand Up @@ -170,7 +170,7 @@ describe("vm", () => {
})
sbox.require('./vm_test/custom_ext.abc', __dirname);

sbox.setModuleLoader('.abc', function (content) {
sbox.setModuleLoader('.abc', function (buf) {
});
sbox.require('./vm_test/custom_ext', __dirname);
})
Expand All @@ -180,29 +180,47 @@ describe("vm", () => {

var testVarValue = 'lalala'

sbox.setModuleLoader('.abc', function (content) {
sbox.setModuleLoader('.abc', function (buf) {
return testVarValue;
});

var testVar = sbox.require('./vm_test/custom_ext', __dirname);
assert.equal(testVar, 'lalala');

assert.throws(() => {
(new SandBox({})).setModuleLoader('^abc', function (content) {
(new SandBox({})).setModuleLoader('^abc', function (buf) {
return testVarValue;
});
(new SandBox({})).setModuleLoader('-abc', function (content) {
});
assert.throws(() => {
(new SandBox({})).setModuleLoader('-abc', function (buf) {
return testVarValue;
});
})
})

it("setModuleLoader: requireInfo", () => {
var sbox = new vm.SandBox({});

sbox.setModuleLoader('.abc', function (buf, requireInfo) {
return requireInfo;
});

var expectedRequireInfo = {
dirname: path.resolve(__dirname, './vm_test'),
filename: path.resolve(__dirname, './vm_test/custom_ext.abc')
}

var testArgs = sbox.require('./vm_test/custom_ext', __dirname);
assert.deepEqual(testArgs, expectedRequireInfo);
})

it("setModuleLoader: cached require", () => {
var sbox = new vm.SandBox({});

var testVarValue = 'I am not increasing:'
var initialCnt = cnt = 0;
sbox.setModuleLoader('.abc', function (content) {
sbox.setModuleLoader('.abc', function (buf) {
var _return = testVarValue + cnt;

cnt++;
Expand All @@ -224,7 +242,7 @@ describe("vm", () => {
var testVarValue = 'miaomiaomiao'

var t0 = Date.now();
sbox1.setModuleLoader('.abc', function (content) {
sbox1.setModuleLoader('.abc', function (buf) {
return { test: testVarValue + t0 };
});

Expand All @@ -249,7 +267,7 @@ describe("vm", () => {
it's better to delete the sandbox and build new one, then re-require all modules.
*/
sbox1 = new vm.SandBox({})
sbox1.setModuleLoader('.abc', function (content) {
sbox1.setModuleLoader('.abc', function (buf) {
return testVarValue;
});
testVar1 = sbox1.require('./vm_test/custom_ext', __dirname);
Expand All @@ -258,7 +276,7 @@ describe("vm", () => {
var t = Date.now();

var testVar2;
sbox2.setModuleLoader('.abc', function (content) {
sbox2.setModuleLoader('.abc', function (buf) {
return testVarValue + t;
});
testVar2 = sbox2.require('./vm_test/custom_ext.abc', __dirname);
Expand Down