Merge pull request #1 from surebeli/feat/3.9.0/context-aware

3.9.0-rc-902:

README.md

@@ -1,5 +1,5 @@
 # node-nertc-sdk
 
-3.9.0-rc-901
+3.9.0-rc-902
 
 based on 网易云信 https://netease.im/

just-task.js

@@ -5,21 +5,22 @@ const download = require('./scripts/download')
 const cleanup = require('./scripts/cleanup')
 const extract = require('./scripts/extract')
 
-option('electron_version', {default: '8.1.1'});
-option('runtime', {default: 'electron', choices: ['electron', 'node']});
-option('platform', {default: process.platform, choices: ['darwin', 'win32']});
-option('debug', {default: false, boolean: true});
-option('silent', {default: false, boolean: true});
-option('msvs_version', {default: '2015'});
+let electron_version = '8.5.5'
+let sdk_url = `http://yx-web.nos.netease.com/package/${process.platform}-sdk.zip`
+const projectDir = path.join(process.env.INIT_CWD, 'package.json')
+const pkgMeta = require(projectDir);
+if (pkgMeta.nertc_config) {
+  electron_version = pkg.pkgMeta.nertc_config.electron_version
+}
 
 // trigger when run npm install
 task('install', () => {
   return new Promise((resolve, reject) => {
     cleanup(path.join(__dirname, "./build")).then(() => {
       cleanup(path.join(__dirname, "./nertc_sdk")).then(() => {
-        download(`http://yx-web.nos.netease.com/package/${process.platform}-sdk.zip`, "../").then(f => {
+        download(sdk_url, "../").then(f => {
           extract(f, "../").then(() => {
-            build({})
+            build({electronVersion: electron_version})
             resolve()
           })
         })

nertc_sdk_node/nertc_node_engine.cpp

@@ -21,9 +21,12 @@ NertcNodeEngine::~NertcNodeEngine()
         rtc_engine_ = nullptr;
     }
 }
-void NertcNodeEngine::InitModule(Local<Object> &module)
+// void NertcNodeEngine::InitModule(Local<Object> &module)
+void NertcNodeEngine::InitModule(Local<Object> &exports,
+                        Local<Value> &module,
+                        Local<Context> &context)
 {
-    BEGIN_OBJECT_INIT(NertcNodeEngine, New, 5)
+    BEGIN_OBJECT_INIT_EX(NertcNodeEngine, New, 5)
     SET_PROTOTYPE(initialize)
     SET_PROTOTYPE(release)
     SET_PROTOTYPE(setChannelProfile)
@@ -128,7 +131,7 @@ void NertcNodeEngine::InitModule(Local<Object> &module)
     SET_PROTOTYPE(setDevice)
     SET_PROTOTYPE(getDevice)
 
-    END_OBJECT_INIT(NertcNodeEngine)
+    END_OBJECT_INIT_EX(NertcNodeEngine)
 }
 
 void NertcNodeEngine::New(const FunctionCallbackInfo<Value> &args)

nertc_sdk_node/nertc_node_engine.h

@@ -17,7 +17,10 @@ class NertcNodeEngine : public node::ObjectWrap
     /* data */
 public:
     static void New(const FunctionCallbackInfo<Value> &args);
-    static void InitModule(Local<Object> &module);
+    // static void InitModule(Local<Object> &module);
+    static void InitModule(Local<Object> &exports,
+                        Local<Value> &module,
+                        Local<Context> &context);
 
 public:
     NIM_SDK_NODE_API(initialize);

nertc_sdk_node/nertc_node_ext.cpp

@@ -2,9 +2,15 @@
 #include "nertc_node_engine.h"
 using v8::Object;
 
-void InitNertc(Local<Object> module)
-{
-    nertc_node::NertcNodeEngine::InitModule(module);
+// void InitNertc(Local<Object> module)
+// {
+//     nertc_node::NertcNodeEngine::InitModule(module);
+// }
+void InitNertc(Local<Object> exports,
+                        Local<Value> module,
+                        Local<Context> context) {
+    nertc_node::NertcNodeEngine::InitModule(exports, module, context);
 }
 
-NODE_MODULE(nertc, InitNertc)
+NODE_MODULE_CONTEXT_AWARE(nertc, InitNertc)
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nertc-sdk",
-  "version": "3.9.0-rc-901",
+  "version": "3.9.0-rc-902",
   "description": "node-nertc-sdk",
   "main": "js/nertc_sdk.js",
   "types": "types/nertc_sdk.d.ts",

scripts/build.js

@@ -22,7 +22,7 @@ module.exports = ({
   arch = 'ia32',
   distUrl = 'https://electronjs.org/headers'
 }) => {
-  logger.info('start building...');
+  logger.info(`start building...${runtime}-${electronVersion}`);
 
   /** get command string */
   const command = [`${gyp_exec} configure`];

shared/sdk_helper/nim_node_helper.h

@@ -61,6 +61,17 @@ TypeName& operator=(const TypeName&) = delete
     constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()); \
     module->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, #className, v8::NewStringType::kNormal).ToLocalChecked(), tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked());
 
+#define BEGIN_OBJECT_INIT_EX(className, constructor, fieldCount)              \
+    Isolate* isolate = context->GetIsolate();   \
+    Local<FunctionTemplate> tpl = FunctionTemplate::New(isolate, constructor); \
+    tpl->SetClassName(String::NewFromUtf8(isolate, #className, v8::NewStringType::kNormal).ToLocalChecked());               \
+    tpl->InstanceTemplate()->SetInternalFieldCount(fieldCount);
+
+#define END_OBJECT_INIT_EX(className) \
+    constructor.Reset(isolate, tpl->GetFunction(context).ToLocalChecked()); \
+    exports->Set(context, String::NewFromUtf8(isolate, #className, v8::NewStringType::kNormal).ToLocalChecked(), tpl->GetFunction(context).ToLocalChecked());
+
+
 #define NIM_SDK_NODE_API(m) \
     static void(m)(const FunctionCallbackInfo<Value> &args)