Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ext/webstorage): IndexedDB #14035

Closed
wants to merge 16 commits into from
Closed

feat(ext/webstorage): IndexedDB #14035

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ec4973a
basic webidl
crowlKats Mar 3, 2022
276afec
work
crowlKats Mar 7, 2022
0f52deb
work
crowlKats Mar 8, 2022
cc37762
work
crowlKats Mar 10, 2022
acaf2b3
work
crowlKats Mar 13, 2022
2b23d7e
work
crowlKats Mar 17, 2022
ef1f7bf
Merge branch 'main' into indexeddb
crowlKats Mar 17, 2022
fbdf3be
objectstore.delete
crowlKats Mar 17, 2022
3552ec6
work
crowlKats Mar 17, 2022
b42aaba
work
crowlKats Mar 18, 2022
d2893e5
more work
crowlKats Mar 19, 2022
5e468ee
Merge branch 'main' into indexeddb
crowlKats Mar 22, 2022
1b00304
work
crowlKats Mar 24, 2022
2757414
work
crowlKats Mar 26, 2022
d450979
work
crowlKats Mar 29, 2022
7356517
fix
crowlKats Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 16 additions & 2 deletions core/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ fn decode(

struct SerializeDeserialize<'a> {
host_objects: Option<v8::Local<'a, v8::Array>>,
disallow_sab: bool,
}

impl<'a> v8::ValueSerializerImpl for SerializeDeserialize<'a> {
Expand All @@ -929,6 +930,9 @@ impl<'a> v8::ValueSerializerImpl for SerializeDeserialize<'a> {
scope: &mut HandleScope<'s>,
shared_array_buffer: Local<'s, SharedArrayBuffer>,
) -> Option<u32> {
if self.disallow_sab {
return None;
}
let state_rc = JsRuntime::state(scope);
let state = state_rc.borrow_mut();
if let Some(shared_array_buffer_store) = &state.shared_array_buffer_store {
Expand Down Expand Up @@ -1055,6 +1059,7 @@ fn serialize(
let options = options.unwrap_or(SerializeDeserializeOptions {
host_objects: None,
transfered_array_buffers: None,
disallow_sab: false,
});

let host_objects = match options.host_objects {
Expand All @@ -1079,7 +1084,10 @@ fn serialize(
None => None,
};

let serialize_deserialize = Box::new(SerializeDeserialize { host_objects });
let serialize_deserialize = Box::new(SerializeDeserialize {
host_objects,
disallow_sab: options.disallow_sab,
});
let mut value_serializer =
v8::ValueSerializer::new(scope, serialize_deserialize);

Expand Down Expand Up @@ -1150,6 +1158,8 @@ fn serialize(
struct SerializeDeserializeOptions<'a> {
host_objects: Option<serde_v8::Value<'a>>,
transfered_array_buffers: Option<serde_v8::Value<'a>>,
#[serde(default)]
disallow_sab: bool,
}

fn deserialize(
Expand Down Expand Up @@ -1177,6 +1187,7 @@ fn deserialize(
let options = options.unwrap_or(SerializeDeserializeOptions {
host_objects: None,
transfered_array_buffers: None,
disallow_sab: false,
});

let host_objects = match options.host_objects {
Expand All @@ -1201,7 +1212,10 @@ fn deserialize(
None => None,
};

let serialize_deserialize = Box::new(SerializeDeserialize { host_objects });
let serialize_deserialize = Box::new(SerializeDeserialize {
host_objects,
disallow_sab: options.disallow_sab,
});
let mut value_deserializer =
v8::ValueDeserializer::new(scope, serialize_deserialize, &zero_copy);

Expand Down
1 change: 1 addition & 0 deletions ext/web/02_event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,7 @@
listenerCount,
};
window.__bootstrap.event = {
_canceledFlag,
setIsTrusted,
setTarget,
defineEventHandler,
Expand Down
10 changes: 10 additions & 0 deletions ext/webidl/00_webidl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,16 @@
converters.DOMString,
);

converters["sequence<DOMString> or DOMString"] = (V, opts) => {
// Union for (sequence<DOMString> or DOMString)
if (type(V) === "Object" && V !== null) {
if (V[SymbolIterator] !== undefined) {
return converters["sequence<DOMString>"](V, opts);
}
}
return converters.DOMString(V, opts);
};

function requiredArguments(length, required, opts = {}) {
if (length < required) {
const errMsg = `${
Expand Down
10 changes: 0 additions & 10 deletions ext/websocket/01_websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@
SymbolIterator,
} = window.__bootstrap.primordials;

webidl.converters["sequence<DOMString> or DOMString"] = (V, opts) => {
// Union for (sequence<DOMString> or DOMString)
if (webidl.type(V) === "Object" && V !== null) {
if (V[SymbolIterator] !== undefined) {
return webidl.converters["sequence<DOMString>"](V, opts);
}
}
return webidl.converters.DOMString(V, opts);
};

webidl.converters["WebSocketSend"] = (V, opts) => {
// Union for (Blob or ArrayBufferView or ArrayBuffer or USVString)
if (ObjectPrototypeIsPrototypeOf(BlobPrototype, V)) {
Expand Down
Loading