Skip to content

Revert "compat(http2) validations and some behavior fixes (#19558)" #19616

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

Merged
Jarred-Sumner merged 1 commit into from
May 13, 2025
Merged

Revert "compat(http2) validations and some behavior fixes (#19558)" #19616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions src/bun.js/api/bun/h2_frame_parser.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3041,6 +3041,9 @@ pub const H2FrameParser = struct {
}

const error_code = error_arg.toU32();
if (error_code > 13) {
return globalObject.throw("Invalid ErrorCode", .{});
}

this.endStream(stream, @enumFromInt(error_code));

Expand Down Expand Up @@ -3469,16 +3472,6 @@ pub const H2FrameParser = struct {
return stream_id;
}

pub fn setNextStreamID(this: *H2FrameParser, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments();
bun.debugAssert(args_list.len >= 1);
const stream_id_arg = args_list.ptr[0];
bun.debugAssert(stream_id_arg.isNumber());
this.lastStreamID = stream_id_arg.to(u32);
return .undefined;
}

pub fn hasNativeRead(this: *H2FrameParser, _: *JSC.JSGlobalObject, _: *JSC.CallFrame) bun.JSError!JSValue {
return JSC.JSValue.jsBoolean(this.native_socket == .tcp or this.native_socket == .tls);
}
Expand Down Expand Up @@ -3569,7 +3562,6 @@ pub const H2FrameParser = struct {
}
return .undefined;
}

pub fn emitErrorToAllStreams(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSC.JSValue {
JSC.markBinding(@src());

Expand Down
4 changes: 0 additions & 4 deletions src/bun.js/api/h2.classes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ export default [
fn: "hasNativeRead",
length: 1,
},
setNextStreamID: {
fn: "setNextStreamID",
length: 1,
},
getAllStreams: {
fn: "getAllStreams",
length: 0,
Expand Down
2 changes: 0 additions & 2 deletions src/bun.js/bindings/ErrorCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ const errors: ErrorCodeMapping = [
["ERR_HTTP2_STREAM_ERROR", Error],
["ERR_HTTP2_TRAILERS_ALREADY_SENT", Error],
["ERR_HTTP2_TRAILERS_NOT_READY", Error],
["ERR_HTTP2_TOO_MANY_CUSTOM_SETTINGS", Error],
["ERR_HTTP2_UNSUPPORTED_PROTOCOL", Error],
["ERR_ILLEGAL_CONSTRUCTOR", TypeError],
["ERR_INCOMPATIBLE_OPTION_PAIR", TypeError],
["ERR_INVALID_ADDRESS", Error],
Expand Down
11 changes: 4 additions & 7 deletions src/bun.js/bindings/NodeValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,14 +615,11 @@ JSC_DEFINE_HOST_FUNCTION(jsFunction_validateBuffer, (JSC::JSGlobalObject * globa
auto buffer = callFrame->argument(0);
auto name = callFrame->argument(1);

if (!buffer.isUndefined()) {
if (!buffer.isCell()) return Bun::ERR::INVALID_ARG_TYPE(scope, globalObject, name, "Buffer, TypedArray, or DataView"_s, buffer);
if (!buffer.isCell()) return JSValue::encode(jsUndefined());
auto ty = buffer.asCell()->type();

auto ty = buffer.asCell()->type();

if (JSC::typedArrayType(ty) == NotTypedArray) {
return Bun::ERR::INVALID_ARG_TYPE(scope, globalObject, name, "Buffer, TypedArray, or DataView"_s, buffer);
}
if (JSC::typedArrayType(ty) == NotTypedArray) {
return Bun::ERR::INVALID_ARG_TYPE(scope, globalObject, name, "Buffer, TypedArray, or DataView"_s, buffer);
}
return JSValue::encode(jsUndefined());
}
Expand Down
Loading