Skip to content

Commit 8ffa400

Browse files
committed
fix: not releasing the context + linter
1 parent a0baa54 commit 8ffa400

3 files changed

Lines changed: 12 additions & 14 deletions

File tree

packages/host/cpp/RuntimeNodeApiAsync.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,12 @@ napi_status napi_async_destroy(napi_env env, napi_async_context async_context) {
197197
}
198198

199199
napi_status napi_make_callback(napi_env env,
200-
napi_async_context async_context,
200+
napi_async_context,
201201
napi_value recv,
202202
napi_value func,
203203
size_t argc,
204204
const napi_value* argv,
205205
napi_value* result) {
206-
const auto status = napi_call_function(env, recv, func, argc, argv, result);
207-
if (status == napi_pending_exception && async_context) {
208-
contexts_.release(async_context);
209-
}
210-
return status;
206+
return napi_call_function(env, recv, func, argc, argv, result);
211207
}
212208
} // namespace callstack::nodeapihost

packages/node-addon-examples/src/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ function assertLogs(cb: () => void, expectedMessages: string[]) {
1515
cb();
1616
if (expectedMessages.length > 0) {
1717
errors.push(
18-
new Error(`Missing expected message(s): ${expectedMessages.join(", ")}`)
18+
new Error(
19+
`Missing expected message(s): ${expectedMessages.join(", ")}`,
20+
),
1921
);
2022
}
2123
} finally {
@@ -83,6 +85,8 @@ export const suites: Record<
8385
require("../tests/buffers/addon.js");
8486
},
8587
async: () => require("../tests/async/addon.js") as () => Promise<void>,
86-
make_callback: () => require("../tests/make_callback/addon.js"),
88+
make_callback: () => {
89+
require("../tests/make_callback/addon.js");
90+
},
8791
},
8892
};

packages/node-addon-examples/tests/make_callback/addon.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-require-imports */
2-
/* eslint-disable no-undef */
31
const assert = require("assert");
42
const binding = require("bindings")("addon.node");
53
const makeCallback = binding.makeCallback;
@@ -26,7 +24,7 @@ module.exports = () => {
2624
assert.strictEqual(this, process);
2725
return 42;
2826
}),
29-
42
27+
42,
3028
);
3129

3230
assert.strictEqual(
@@ -39,13 +37,13 @@ module.exports = () => {
3937
assert.strictEqual(x, 1337);
4038
return 42;
4139
},
42-
1337
40+
1337,
4341
),
44-
42
42+
42,
4543
);
4644

4745
assert.strictEqual(
4846
makeCallback(resource, process, myMultiArgFunc, 1, 2, 3),
49-
42
47+
42,
5048
);
5149
};

0 commit comments

Comments
 (0)