feat: render interactive manuscript from Endor through generic graphics
This commit is contained in:
@@ -845,3 +845,258 @@ fn canvas_in_world_ui_uses_ray_uv_coordinates_for_real_http_camera_events() {
|
||||
assert_eq!(value("canvas.camera.zoom"), 2.);
|
||||
assert!(namespace.read().unwrap().document.frame.fault.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn native_pointer_kinds_cross_real_http_route_with_local_coordinates_and_strict_versions() {
|
||||
let server = Arc::new(Server::http("127.0.0.1:0").unwrap());
|
||||
let namespace = Arc::new(RwLock::new(NamespaceState {
|
||||
viewport: Some(crate::layout::Size {
|
||||
width: 500.,
|
||||
height: 400.,
|
||||
}),
|
||||
..Default::default()
|
||||
}));
|
||||
let api = start_server(server.clone(), namespace.clone(), Arc::new(|| {})).unwrap();
|
||||
let client = TestServer {
|
||||
address: server.server_addr().to_ip().unwrap(),
|
||||
server,
|
||||
api: Some(api),
|
||||
};
|
||||
let source = r#"
|
||||
class Tracker {
|
||||
x:Number
|
||||
y:Number
|
||||
held:Number
|
||||
function move(self:Tracker,e:Event):Unit {self.x=e.x self.y=e.y}
|
||||
function down(self:Tracker,e:Event):Unit {self.held=1}
|
||||
function up(self:Tracker,e:Event):Unit {self.held=0}
|
||||
}
|
||||
tracker=Tracker(0,0,0)
|
||||
target=RectBlock(200,100,0)
|
||||
a=target.on("pointermove",tracker.move)
|
||||
b=target.on("pointerdown",tracker.down)
|
||||
c=target.on("pointerup",tracker.up)
|
||||
d=target.on("pointerleave",tracker.up)
|
||||
e=target.on("pointercancel",tracker.up)
|
||||
page=Page()
|
||||
page.render(Column(20,0,target))
|
||||
"#;
|
||||
let put = client.request("PUT", "/v1/namespaces/app.main/code", source);
|
||||
assert_eq!(put.0, 200, "{}", put.2);
|
||||
let input = |kind: &str| {
|
||||
let current = namespace.read().unwrap();
|
||||
let frame = ¤t.document.frame;
|
||||
let mount = frame.mounts.iter().find(|m| m.pointer_events).unwrap();
|
||||
crate::events::Input {
|
||||
window: 1,
|
||||
session: frame.session,
|
||||
layout_version: frame.layout_version,
|
||||
mount: mount.id,
|
||||
kind: kind.into(),
|
||||
point: Some([mount.x + 35., mount.y + 27.]),
|
||||
press_point: None,
|
||||
delta: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
}
|
||||
};
|
||||
let body = serde_json::to_string(&input("pointermove")).unwrap();
|
||||
let response = client.request("POST", "/v1/namespaces/app.main/events", &body);
|
||||
assert_eq!(response.0, 200, "{}", response.2);
|
||||
// Tracker state alone need not publish a new picture. Expire the frame
|
||||
// through a real visual mutation before asserting strict stale rejection.
|
||||
assert_eq!(
|
||||
client
|
||||
.request("POST", "/v1/namespaces/app.main/repl", "target.width=201")
|
||||
.0,
|
||||
200
|
||||
);
|
||||
assert_eq!(
|
||||
client
|
||||
.request("POST", "/v1/namespaces/app.main/events", &body)
|
||||
.0,
|
||||
409
|
||||
);
|
||||
for (expr, expected) in [("tracker.x", "35"), ("tracker.y", "27")] {
|
||||
let r = client.request("POST", "/v1/namespaces/app.main/repl", expr);
|
||||
assert_eq!(r.0, 200);
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&r.2).unwrap()["value"],
|
||||
expected
|
||||
);
|
||||
}
|
||||
for (kind, expected) in [
|
||||
("pointerdown", "1"),
|
||||
("pointerup", "0"),
|
||||
("pointerdown", "1"),
|
||||
("pointerleave", "0"),
|
||||
("pointerdown", "1"),
|
||||
("pointercancel", "0"),
|
||||
] {
|
||||
let response = client.request(
|
||||
"POST",
|
||||
"/v1/namespaces/app.main/events",
|
||||
&serde_json::to_string(&input(kind)).unwrap(),
|
||||
);
|
||||
assert_eq!(response.0, 200, "{}", response.2);
|
||||
let r = client.request("POST", "/v1/namespaces/app.main/repl", "tracker.held");
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&r.2).unwrap()["value"],
|
||||
expected
|
||||
);
|
||||
}
|
||||
let mut invalid = input("pointermove");
|
||||
invalid.point = None;
|
||||
assert_eq!(
|
||||
client
|
||||
.request(
|
||||
"POST",
|
||||
"/v1/namespaces/app.main/events",
|
||||
&serde_json::to_string(&invalid).unwrap()
|
||||
)
|
||||
.0,
|
||||
400
|
||||
);
|
||||
assert!(namespace.read().unwrap().document.frame.fault.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn native_envelopes_rebase_after_animation_but_reject_replaced_sessions() {
|
||||
let server = Arc::new(Server::http("127.0.0.1:0").unwrap());
|
||||
let namespace = Arc::new(RwLock::new(NamespaceState {
|
||||
viewport: Some(crate::layout::Size {
|
||||
width: 500.,
|
||||
height: 400.,
|
||||
}),
|
||||
..Default::default()
|
||||
}));
|
||||
let native = Arc::new(OnceLock::new());
|
||||
let api = start_server_observed(
|
||||
server.clone(),
|
||||
namespace.clone(),
|
||||
Arc::new(|| {}),
|
||||
Arc::new(Mutex::new(ActivityLog::default())),
|
||||
Arc::new(|| {}),
|
||||
None,
|
||||
Some(native.clone()),
|
||||
)
|
||||
.unwrap();
|
||||
let client = TestServer {
|
||||
address: server.server_addr().to_ip().unwrap(),
|
||||
server,
|
||||
api: Some(api),
|
||||
};
|
||||
let source = r#"
|
||||
class Tracker {
|
||||
x:Number
|
||||
held:Number
|
||||
function move(self:Tracker,e:Event):Unit {self.x=e.x}
|
||||
function down(self:Tracker,e:Event):Unit {self.held=1}
|
||||
function up(self:Tracker,e:Event):Unit {self.held=0}
|
||||
}
|
||||
tracker=Tracker(0,0)
|
||||
target=RectBlock(200,100,0)
|
||||
a=target.on("pointermove",tracker.move)
|
||||
b=target.on("pointerdown",tracker.down)
|
||||
c=target.on("pointerup",tracker.up)
|
||||
page=Page()
|
||||
page.render(Column(20,0,target))
|
||||
"#;
|
||||
assert_eq!(
|
||||
client
|
||||
.request("PUT", "/v1/namespaces/app.main/code", source)
|
||||
.0,
|
||||
200
|
||||
);
|
||||
let old = {
|
||||
let state = namespace.read().unwrap();
|
||||
let f = &state.document.frame;
|
||||
let m = f.mounts.iter().find(|m| m.pointer_events).unwrap();
|
||||
crate::events::Input {
|
||||
window: 1,
|
||||
session: f.session,
|
||||
layout_version: f.layout_version,
|
||||
mount: m.id,
|
||||
kind: "pointermove".into(),
|
||||
point: Some([m.x + 37., m.y + 20.]),
|
||||
press_point: None,
|
||||
delta: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
}
|
||||
};
|
||||
let send_native = |input: crate::events::Input| {
|
||||
let state = namespace.read().unwrap();
|
||||
let epoch = state.submission;
|
||||
let name = state.name.clone();
|
||||
drop(state);
|
||||
let (done, complete) = sync_channel(1);
|
||||
native
|
||||
.get()
|
||||
.unwrap()
|
||||
.send(BuildRequest {
|
||||
request: RequestReply::Native(done),
|
||||
native: Some(input),
|
||||
kind: RequestKind::Event,
|
||||
source: String::new(),
|
||||
namespace: name,
|
||||
submission: epoch,
|
||||
})
|
||||
.unwrap_or_else(|_| panic!("native worker stopped"));
|
||||
complete
|
||||
.recv_timeout(Duration::from_secs(5))
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
};
|
||||
// Every native gesture deliberately carries the old picture version; each
|
||||
// intervening visual mutation simulates an animation publishing a frame.
|
||||
for (i, kind) in ["pointermove", "pointerdown", "pointerup"]
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
{
|
||||
assert_eq!(
|
||||
client
|
||||
.request(
|
||||
"POST",
|
||||
"/v1/namespaces/app.main/repl",
|
||||
&format!("target.width={}", 201 + i)
|
||||
)
|
||||
.0,
|
||||
200
|
||||
);
|
||||
let mut sample = old.clone();
|
||||
sample.kind = kind.into();
|
||||
send_native(sample);
|
||||
}
|
||||
for (code, value) in [("tracker.x", "37"), ("tracker.held", "0")] {
|
||||
let r = client.request("POST", "/v1/namespaces/app.main/repl", code);
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&r.2).unwrap()["value"],
|
||||
value
|
||||
);
|
||||
}
|
||||
assert_eq!(
|
||||
client
|
||||
.request(
|
||||
"POST",
|
||||
"/v1/namespaces/app.main/events",
|
||||
&serde_json::to_string(&old).unwrap()
|
||||
)
|
||||
.0,
|
||||
409
|
||||
);
|
||||
assert_eq!(
|
||||
client
|
||||
.request("PUT", "/v1/namespaces/app.main/code", source)
|
||||
.0,
|
||||
200
|
||||
);
|
||||
let mut stale = old;
|
||||
stale.kind = "pointerdown".into();
|
||||
send_native(stale);
|
||||
let r = client.request("POST", "/v1/namespaces/app.main/repl", "tracker.held");
|
||||
assert_eq!(
|
||||
serde_json::from_str::<serde_json::Value>(&r.2).unwrap()["value"],
|
||||
"0"
|
||||
);
|
||||
}
|
||||
|
||||
@@ -337,19 +337,28 @@ impl Worker {
|
||||
return RequestProgress::Pending(PendingRequest::BeforeInput);
|
||||
}
|
||||
let event = if job.kind == RequestKind::Event {
|
||||
let input: crate::events::Input = match serde_json::from_str(&job.source) {
|
||||
Ok(input) => input,
|
||||
Err(error) => {
|
||||
return RequestProgress::Complete(error_response(
|
||||
StatusCode(400),
|
||||
error.to_string(),
|
||||
));
|
||||
let mut input: crate::events::Input = if let Some(input) = &job.native {
|
||||
input.clone()
|
||||
} else {
|
||||
match serde_json::from_str(&job.source) {
|
||||
Ok(input) => input,
|
||||
Err(error) => {
|
||||
return RequestProgress::Complete(error_response(
|
||||
StatusCode(400),
|
||||
error.to_string(),
|
||||
));
|
||||
}
|
||||
}
|
||||
};
|
||||
if !input.kind.starts_with("developer-open:")
|
||||
&& !matches!(
|
||||
input.kind.as_str(),
|
||||
"click"
|
||||
| "pointermove"
|
||||
| "pointerdown"
|
||||
| "pointerup"
|
||||
| "pointerleave"
|
||||
| "pointercancel"
|
||||
| "focus"
|
||||
| "scroll"
|
||||
| "page-pan"
|
||||
@@ -383,6 +392,16 @@ impl Worker {
|
||||
));
|
||||
}
|
||||
};
|
||||
// Rebase trusted captured native gestures only after BeforeInput
|
||||
// has drained the prior refresh. External HTTP remains strict.
|
||||
if job.native.is_some()
|
||||
&& !crate::events::refresh_continuous_input(&mut input, ¤t)
|
||||
{
|
||||
return RequestProgress::Complete(error_response(
|
||||
StatusCode(409),
|
||||
"native target was replaced or detached",
|
||||
));
|
||||
}
|
||||
let frame = if input.window == crate::window::MAIN_WINDOW {
|
||||
¤t.document.frame
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user