fix(host): restore GLOBAL_HOST after nested plugin calls
Nested call_registered was clearing the process-wide host pointer to null, so web_listen lost context for later HTTP invoke rounds after an inner ABI call. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
55f1a37b3d
commit
5e51ee1bb2
4 files changed
+50
-28
No files matched your search
@@ -5,6 +5,7 @@
|
||||
### Added
|
||||
|
||||
### Fixed
|
||||
- **`host_query` / GLOBAL_HOST**:嵌套 `call_registered` 结束后恢复外层宿主指针,不再清空;`web_listen` 多轮 `invoke`(中间再调插件)不再报 `no active host context`。
|
||||
|
||||
### Changed
|
||||
|
||||
|
||||
+14
-5
@@ -571,17 +571,26 @@ pub fn call_registered(
|
||||
let mut out_ptr: *mut c_char = std::ptr::null_mut();
|
||||
let mut err_ptr: *mut c_char = std::ptr::null_mut();
|
||||
|
||||
CURRENT_HOST.with(|c| c.set(ctx as *mut HostContext));
|
||||
{
|
||||
// Nesting-safe: restore previous host pointers after this call. Clearing to
|
||||
// null would break a long-lived outer call (e.g. `web_listen`) so later
|
||||
// HTTP `invoke` / `host_query` on worker threads see no active context.
|
||||
let prev_tls = CURRENT_HOST.with(|c| {
|
||||
let prev = c.get();
|
||||
c.set(ctx as *mut HostContext);
|
||||
prev
|
||||
});
|
||||
let prev_global = {
|
||||
let mut g = global_host_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||
let prev = g.0;
|
||||
g.0 = ctx as *mut HostContext;
|
||||
}
|
||||
prev
|
||||
};
|
||||
let rc = unsafe { (reg.fn_ptr)(c_args.as_ptr(), &mut out_ptr, &mut err_ptr) };
|
||||
{
|
||||
let mut g = global_host_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||
g.0 = std::ptr::null_mut();
|
||||
g.0 = prev_global;
|
||||
}
|
||||
CURRENT_HOST.with(|c| c.set(std::ptr::null_mut()));
|
||||
CURRENT_HOST.with(|c| c.set(prev_tls));
|
||||
|
||||
let err_s = take_c_string(err_ptr);
|
||||
let out_s = take_c_string(out_ptr);
|
||||
|
||||
@@ -1,16 +1,23 @@
|
||||
---
|
||||
title: web hosting live helpers
|
||||
description: Tiny lib used by hosting live-server invoke route.
|
||||
description: Tiny lib used by hosting live-server invoke route (nested plugin call).
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
## echo
|
||||
+ `msg`=""
|
||||
+ `payload`=None
|
||||
|
||||
Nested plugin call (`web.page`) while `app.listen` is the outer plugin frame —
|
||||
must not clear GLOBAL_HOST so a second HTTP invoke still works.
|
||||
|
||||
*pg = > web.page title=`msg`*
|
||||
*title = pg[^title]*
|
||||
|
||||
`out` =
|
||||
|
||||
| ok | msg |
|
||||
|----|-----|
|
||||
| true | `msg` |
|
||||
| ok | msg | title |
|
||||
|----|-----|-------|
|
||||
| true | `msg` | `title` |
|
||||
|
||||
**out**
|
||||
+24
-19
@@ -2062,25 +2062,30 @@ fn ext_web_hosting_live() {
|
||||
"proxy sse body={body}"
|
||||
);
|
||||
|
||||
// Invoke: POST JSON → demo.echo
|
||||
let out = Command::new("curl")
|
||||
.args([
|
||||
"-s",
|
||||
"-X",
|
||||
"POST",
|
||||
&format!("{base}/api/echo"),
|
||||
"-H",
|
||||
"Content-Type: application/json",
|
||||
"-d",
|
||||
r#"{"msg":"hi"}"#,
|
||||
])
|
||||
.output()
|
||||
.expect("curl invoke");
|
||||
let body = String::from_utf8_lossy(&out.stdout);
|
||||
assert!(
|
||||
body.contains("\"ok\"") && body.contains("\"msg\":\"hi\""),
|
||||
"invoke body={body}"
|
||||
);
|
||||
// Invoke twice: demo.echo nests a web.page plugin call; the second request
|
||||
// must still see GLOBAL_HOST (listen outer frame) — regression for 0.3.7.
|
||||
for (msg, label) in [("hi", "first"), ("again", "second")] {
|
||||
let out = Command::new("curl")
|
||||
.args([
|
||||
"-s",
|
||||
"-X",
|
||||
"POST",
|
||||
&format!("{base}/api/echo"),
|
||||
"-H",
|
||||
"Content-Type: application/json",
|
||||
"-d",
|
||||
&format!(r#"{{"msg":"{msg}"}}"#),
|
||||
])
|
||||
.output()
|
||||
.expect("curl invoke");
|
||||
let body = String::from_utf8_lossy(&out.stdout);
|
||||
assert!(
|
||||
body.contains("\"ok\"")
|
||||
&& body.contains(&format!("\"msg\":\"{msg}\""))
|
||||
&& !body.contains("no active host context"),
|
||||
"invoke {label} body={body}"
|
||||
);
|
||||
}
|
||||
|
||||
let _ = child.kill();
|
||||
let _ = child.wait();
|
||||
|
||||
Reference in new issue
Block a user