-
Notifications
You must be signed in to change notification settings - Fork 460
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Remove MakeCallback overload that defaulted to undefined receiver, because node::MakeCallback requires an object. - Allow the AsyncWorker constructor to optionally specify a receiver object, that is persisted and used as of an async callback. - Persist async errors as strings, because an Error object cannot be created outside of a JS context. - Remove overridable AsyncWorker::WorkComplete() because it wasn't useful and caused confusion. OnOK() and/or OnError() should be (optionally) overridden instead. - Add tests to validate basic success and error scenarios for AsyncWorker. - Also add necessary cast to Object when calling Unwrap.
- Loading branch information
Showing
7 changed files
with
112 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #include "napi.h" | ||
|
|
||
| using namespace Napi; | ||
|
|
||
| class TestWorker : public AsyncWorker { | ||
| public: | ||
| static void DoWork(const CallbackInfo& info) { | ||
| bool succeed = info[0].As<Boolean>(); | ||
| Function cb = info[1].As<Function>(); | ||
| Value data = info[2]; | ||
|
|
||
| TestWorker* worker = new TestWorker(cb); | ||
| worker->Receiver().Set("data", data); | ||
| worker->_succeed = succeed; | ||
| worker->Queue(); | ||
| } | ||
|
|
||
| protected: | ||
| void Execute() override { | ||
| if (!_succeed) { | ||
| SetError("test error"); | ||
| } | ||
| } | ||
|
|
||
| private: | ||
| TestWorker(Function cb) : AsyncWorker(cb) {} | ||
| bool _succeed; | ||
| }; | ||
|
|
||
| Object InitAsyncWorker(Env env) { | ||
| Object exports = Object::New(env); | ||
| exports["doWork"] = Function::New(env, TestWorker::DoWork); | ||
| return exports; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| 'use strict'; | ||
| const buildType = process.config.target_defaults.default_configuration; | ||
| const binding = require(`./build/${buildType}/binding.node`); | ||
| const assert = require('assert'); | ||
|
|
||
| // Use setTimeout() when asserting after async callbacks because | ||
| // unhandled JS exceptions in async callbacks are currently ignored. | ||
| // See the TODO comment in AsyncWorker::OnWorkComplete(). | ||
|
|
||
| binding.asyncworker.doWork(true, function (e) { | ||
| setTimeout(() => { | ||
| assert.strictEqual(typeof e, 'undefined'); | ||
| assert.strictEqual(typeof this, 'object'); | ||
| assert.strictEqual(this.data, 'test data'); | ||
| }); | ||
| }, 'test data'); | ||
|
|
||
| binding.asyncworker.doWork(false, function (e) { | ||
| setTimeout(() => { | ||
| assert.ok(e instanceof Error); | ||
| assert.strictEqual(e.message, 'test error'); | ||
| assert.strictEqual(typeof this, 'object'); | ||
| assert.strictEqual(this.data, 'test data'); | ||
| }); | ||
| }, 'test data'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters