Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

n-api: enable napi_wrap() to work with any object #269

Closed
wants to merge 3 commits into from
Closed

n-api: enable napi_wrap() to work with any object #269

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5df5646
n-api: enable napi_wrap() to work with any object
jasongin May 25, 2017
1eed263
Handle prototype chain insertions
jasongin May 31, 2017
d72d02f
Address review feedback
jasongin Jun 2, 2017
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
72 changes: 35 additions & 37 deletions src/node_api_jsrt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ struct CallbackInfo {
uint16_t argc;
napi_value* argv;
void* data;
napi_value returnValue;
};

struct napi_env__ {
Expand Down Expand Up @@ -219,30 +218,9 @@ class ExternalCallback {
CallbackInfo cbInfo;
cbInfo.thisArg = reinterpret_cast<napi_value>(arguments[0]);
cbInfo.isConstructCall = isConstructCall;

if (isConstructCall) {
// For constructor callbacks, replace the 'this' arg with a new external
// object, to support wrapping a native object in the external object.
JsValueRef externalThis;
if (JsNoError == JsCreateExternalObject(
nullptr, jsrtimpl::ExternalData::Finalize, &externalThis)) {
// Copy the prototype from the default 'this' arg to the new
// 'external' this arg.
if (arguments[0] != nullptr) {
JsValueRef thisPrototype;
if (JsNoError == JsGetPrototype(arguments[0], &thisPrototype)) {
JsSetPrototype(externalThis, thisPrototype);
}
}

cbInfo.thisArg = reinterpret_cast<napi_value>(externalThis);
}
}

cbInfo.argc = argumentCount - 1;
cbInfo.argv = reinterpret_cast<napi_value*>(arguments + 1);
cbInfo.data = externalCallback->_data;
cbInfo.returnValue = reinterpret_cast<napi_value>(undefinedValue);

napi_value result = externalCallback->_cb(
externalCallback->_env, reinterpret_cast<napi_callback_info>(&cbInfo));
Expand Down Expand Up @@ -986,21 +964,12 @@ napi_status napi_typeof(napi_env env, napi_value vv, napi_valuetype* result) {
case JsError: *result = napi_object; break;

default:
// An "external" value is represented in JSRT as an Object that has
// external data and DOES NOT allow extensions. (A wrapped object has
// external data and DOES allow extensions.)
bool hasExternalData;
if (JsHasExternalData(value, &hasExternalData) != JsNoError) {
hasExternalData = false;
}

bool isExtensionAllowed;
if (JsGetExtensionAllowed(value, &isExtensionAllowed) != JsNoError) {
isExtensionAllowed = false;
}

*result =
(hasExternalData && !isExtensionAllowed) ? napi_external : napi_object;
*result = hasExternalData ? napi_external : napi_object;
break;
}
return napi_ok;
Expand Down Expand Up @@ -1385,17 +1354,47 @@ napi_status napi_wrap(napi_env env,
env, native_object, finalize_cb, finalize_hint);
if (externalData == nullptr) return napi_set_last_error(napi_generic_failure);

CHECK_JSRT(JsSetExternalData(value, externalData));
// Create an external object that will hold the external data pointer.
JsValueRef external;
CHECK_JSRT(JsCreateExternalObject(
externalData, jsrtimpl::ExternalData::Finalize, &external));

// Insert the external object into the value's prototype chain.
JsValueRef valuePrototype;
CHECK_JSRT(JsGetPrototype(value, &valuePrototype));
CHECK_JSRT(JsSetPrototype(external, valuePrototype));
CHECK_JSRT(JsSetPrototype(value, external));

if (result != nullptr) {
napi_create_reference(env, js_object, 0, result);
CHECK_NAPI(napi_create_reference(env, js_object, 0, result));
}

return napi_ok;
}

napi_status napi_unwrap(napi_env env, napi_value jsObject, void** result) {
return napi_get_value_external(env, jsObject, result);
napi_status napi_unwrap(napi_env env, napi_value js_object, void** result) {
JsValueRef value = reinterpret_cast<JsValueRef>(js_object);

// Search the object's prototype chain for the wrapper with external data.
// Usually the wrapper would be the first in the chain, but it is OK for
// other objects to be inserted in the prototype chain.
JsValueRef wrapper = value;
bool hasExternalData = false;
do {
CHECK_JSRT(JsGetPrototype(wrapper, &wrapper));
if (wrapper == JS_INVALID_REFERENCE) {
return napi_invalid_arg;
}
CHECK_JSRT(JsHasExternalData(wrapper, &hasExternalData));
} while (!hasExternalData);

jsrtimpl::ExternalData* externalData;
CHECK_JSRT(JsGetExternalData(
wrapper, reinterpret_cast<void**>(&externalData)));

*result = (externalData != nullptr ? externalData->Data() : nullptr);

return napi_ok;
}

napi_status napi_create_external(napi_env env,
Expand All @@ -1413,7 +1412,6 @@ napi_status napi_create_external(napi_env env,
externalData,
jsrtimpl::ExternalData::Finalize,
reinterpret_cast<JsValueRef*>(result)));
CHECK_JSRT(JsPreventExtension(*reinterpret_cast<JsValueRef*>(result)));

return napi_ok;
}
Expand Down