aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/bun.js')
m---------src/bun.js/WebKit0
-rw-r--r--src/bun.js/bindings/webcore/HTTPHeaderMap.h3
-rw-r--r--src/bun.js/bindings/webcore/HTTPHeaderNames.h4
-rw-r--r--src/bun.js/bindings/webcore/JSFetchHeaders.cpp2
-rw-r--r--src/bun.js/bindings/webcore/WebSocket.cpp56
-rw-r--r--src/bun.js/bindings/webcore/WebSocket.h2
-rw-r--r--src/bun.js/bindings/webcrypto/CryptoKeyOKPOpenSSL.cpp4
7 files changed, 35 insertions, 36 deletions
diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
-Subproject eb1570290ba3e8555feb53b2a0feb68d2df6556
+Subproject 14b2943d99284c42993fa9ce27af0c8dd16c243
diff --git a/src/bun.js/bindings/webcore/HTTPHeaderMap.h b/src/bun.js/bindings/webcore/HTTPHeaderMap.h
index e96e31f86..13fc806cb 100644
--- a/src/bun.js/bindings/webcore/HTTPHeaderMap.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderMap.h
@@ -86,8 +86,7 @@ public:
String asciiLowerCaseName() const
{
if (keyAsHTTPHeaderName) {
- auto view = WTF::httpHeaderNameStringImpl(keyAsHTTPHeaderName.value());
- return String(view);
+ return WTF::httpHeaderNameStringImpl(keyAsHTTPHeaderName.value());
}
return key.convertToASCIILowercase();
diff --git a/src/bun.js/bindings/webcore/HTTPHeaderNames.h b/src/bun.js/bindings/webcore/HTTPHeaderNames.h
index 870c4980f..bee82e54e 100644
--- a/src/bun.js/bindings/webcore/HTTPHeaderNames.h
+++ b/src/bun.js/bindings/webcore/HTTPHeaderNames.h
@@ -238,7 +238,7 @@ template<> struct EnumTraits<WebCore::HTTPHeaderName> {
WebCore::HTTPHeaderName::XXSSProtection>;
};
-static StaticStringImpl* staticHeaderNames[] = {
+static const NeverDestroyed<String> staticHeaderNames[] = {
MAKE_STATIC_STRING_IMPL("accept"),
MAKE_STATIC_STRING_IMPL("accept-charset"),
MAKE_STATIC_STRING_IMPL("accept-encoding"),
@@ -334,7 +334,7 @@ static StaticStringImpl* staticHeaderNames[] = {
MAKE_STATIC_STRING_IMPL("x-xss-protection"),
};
-static WTF::StaticStringImpl* httpHeaderNameStringImpl(WebCore::HTTPHeaderName headerName)
+static const WTF::String& httpHeaderNameStringImpl(WebCore::HTTPHeaderName headerName)
{
return staticHeaderNames[static_cast<size_t>(headerName)];
}
diff --git a/src/bun.js/bindings/webcore/JSFetchHeaders.cpp b/src/bun.js/bindings/webcore/JSFetchHeaders.cpp
index 3d1b6dbef..2e75cdc86 100644
--- a/src/bun.js/bindings/webcore/JSFetchHeaders.cpp
+++ b/src/bun.js/bindings/webcore/JSFetchHeaders.cpp
@@ -406,7 +406,7 @@ static inline JSC::EncodedJSValue jsFetchHeadersPrototypeFunction_toJSONBody(JSC
for (auto it = vec.begin(); it != vec.end(); ++it) {
auto& name = it->key;
auto& value = it->value;
- obj->putDirect(vm, Identifier::fromString(vm, String(WTF::httpHeaderNameStringImpl(name))), jsString(vm, value), 0);
+ obj->putDirect(vm, Identifier::fromString(vm, WTF::httpHeaderNameStringImpl(name)), jsString(vm, value), 0);
}
}
diff --git a/src/bun.js/bindings/webcore/WebSocket.cpp b/src/bun.js/bindings/webcore/WebSocket.cpp
index c2acb0b98..404336050 100644
--- a/src/bun.js/bindings/webcore/WebSocket.cpp
+++ b/src/bun.js/bindings/webcore/WebSocket.cpp
@@ -864,7 +864,7 @@ void WebSocket::didReceiveBinaryData(Vector<uint8_t>&& binaryData)
// });
}
-void WebSocket::didReceiveMessageError(unsigned short code, WTF::StringImpl::StaticStringImpl* reason)
+void WebSocket::didReceiveMessageError(unsigned short code, WTF::String reason)
{
LOG(Network, "WebSocket %p didReceiveErrorMessage()", this);
// queueTaskKeepingObjectAlive(*this, TaskSource::WebSocket, [this, reason = WTFMove(reason)] {
@@ -874,7 +874,7 @@ void WebSocket::didReceiveMessageError(unsigned short code, WTF::StringImpl::Sta
if (auto* context = scriptExecutionContext()) {
this->incPendingActivityCount();
// https://html.spec.whatwg.org/multipage/web-sockets.html#feedback-from-the-protocol:concept-websocket-closed, we should synchronously fire a close event.
- dispatchEvent(CloseEvent::create(code < 1002, code, WTF::String(reason)));
+ dispatchEvent(CloseEvent::create(code < 1002, code, reason));
this->decPendingActivityCount();
}
}
@@ -1000,158 +1000,158 @@ void WebSocket::didFailWithErrorCode(int32_t code)
}
// invalid_response
case 1: {
- auto message = MAKE_STATIC_STRING_IMPL("Invalid response");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Invalid response");
didReceiveMessageError(1002, message);
break;
}
// expected_101_status_code
case 2: {
- auto message = MAKE_STATIC_STRING_IMPL("Expected 101 status code");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Expected 101 status code");
didReceiveMessageError(1002, message);
break;
}
// missing_upgrade_header
case 3: {
- auto message = MAKE_STATIC_STRING_IMPL("Missing upgrade header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Missing upgrade header");
didReceiveMessageError(1002, message);
break;
}
// missing_connection_header
case 4: {
- auto message = MAKE_STATIC_STRING_IMPL("Missing connection header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Missing connection header");
didReceiveMessageError(1002, message);
break;
}
// missing_websocket_accept_header
case 5: {
- auto message = MAKE_STATIC_STRING_IMPL("Missing websocket accept header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Missing websocket accept header");
didReceiveMessageError(1002, message);
break;
}
// invalid_upgrade_header
case 6: {
- auto message = MAKE_STATIC_STRING_IMPL("Invalid upgrade header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Invalid upgrade header");
didReceiveMessageError(1002, message);
break;
}
// invalid_connection_header
case 7: {
- auto message = MAKE_STATIC_STRING_IMPL("Invalid connection header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Invalid connection header");
didReceiveMessageError(1002, message);
break;
}
// invalid_websocket_version
case 8: {
- auto message = MAKE_STATIC_STRING_IMPL("Invalid websocket version");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Invalid websocket version");
didReceiveMessageError(1002, message);
break;
}
// mismatch_websocket_accept_header
case 9: {
- auto message = MAKE_STATIC_STRING_IMPL("Mismatch websocket accept header");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Mismatch websocket accept header");
didReceiveMessageError(1002, message);
break;
}
// missing_client_protocol
case 10: {
- auto message = MAKE_STATIC_STRING_IMPL("Missing client protocol");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Missing client protocol");
didReceiveMessageError(1002, message);
break;
}
// mismatch_client_protocol
case 11: {
- auto message = MAKE_STATIC_STRING_IMPL("Mismatch client protocol");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Mismatch client protocol");
didReceiveMessageError(1002, message);
break;
}
// timeout
case 12: {
- auto message = MAKE_STATIC_STRING_IMPL("Timeout");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Timeout");
didReceiveMessageError(1013, message);
break;
}
// closed
case 13: {
- auto message = MAKE_STATIC_STRING_IMPL("Closed by client");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Closed by client");
didReceiveMessageError(1000, message);
break;
}
// failed_to_write
case 14: {
- auto message = MAKE_STATIC_STRING_IMPL("Failed to write");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Failed to write");
didReceiveMessageError(1006, message);
break;
}
// failed_to_connect
case 15: {
- auto message = MAKE_STATIC_STRING_IMPL("Failed to connect");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Failed to connect");
didReceiveMessageError(1006, message);
break;
}
// headers_too_large
case 16: {
- auto message = MAKE_STATIC_STRING_IMPL("Headers too large");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Headers too large");
didReceiveMessageError(1007, message);
break;
}
// ended
case 17: {
- auto message = MAKE_STATIC_STRING_IMPL("Closed by server");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Closed by server");
didReceiveMessageError(1001, message);
break;
}
// failed_to_allocate_memory
case 18: {
- auto message = MAKE_STATIC_STRING_IMPL("Failed to allocate memory");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Failed to allocate memory");
didReceiveMessageError(1001, message);
break;
}
// control_frame_is_fragmented
case 19: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - control frame is fragmented");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - control frame is fragmented");
didReceiveMessageError(1002, message);
break;
}
// invalid_control_frame
case 20: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - invalid control frame");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - invalid control frame");
didReceiveMessageError(1002, message);
break;
}
// compression_unsupported
case 21: {
- auto message = MAKE_STATIC_STRING_IMPL("Compression not implemented yet");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Compression not implemented yet");
didReceiveMessageError(1011, message);
break;
}
// unexpected_mask_from_server
case 22: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - unexpected mask from server");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - unexpected mask from server");
didReceiveMessageError(1002, message);
break;
}
// expected_control_frame
case 23: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - expected control frame");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - expected control frame");
didReceiveMessageError(1002, message);
break;
}
// unsupported_control_frame
case 24: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - unsupported control frame");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - unsupported control frame");
didReceiveMessageError(1002, message);
break;
}
// unexpected_opcode
case 25: {
- auto message = MAKE_STATIC_STRING_IMPL("Protocol error - unexpected opcode");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Protocol error - unexpected opcode");
didReceiveMessageError(1002, message);
break;
}
// invalid_utf8
case 26: {
- auto message = MAKE_STATIC_STRING_IMPL("Server sent invalid UTF8");
+ static NeverDestroyed<String> message = MAKE_STATIC_STRING_IMPL("Server sent invalid UTF8");
didReceiveMessageError(1003, message);
break;
}
diff --git a/src/bun.js/bindings/webcore/WebSocket.h b/src/bun.js/bindings/webcore/WebSocket.h
index 59b551ea0..2c1bc3524 100644
--- a/src/bun.js/bindings/webcore/WebSocket.h
+++ b/src/bun.js/bindings/webcore/WebSocket.h
@@ -140,7 +140,7 @@ private:
void refEventTarget() final { ref(); }
void derefEventTarget() final { deref(); }
- void didReceiveMessageError(unsigned short code, WTF::StringImpl::StaticStringImpl* reason);
+ void didReceiveMessageError(unsigned short code, WTF::String reason);
void didUpdateBufferedAmount(unsigned bufferedAmount);
void didStartClosingHandshake();
diff --git a/src/bun.js/bindings/webcrypto/CryptoKeyOKPOpenSSL.cpp b/src/bun.js/bindings/webcrypto/CryptoKeyOKPOpenSSL.cpp
index 8c6a25f19..ea3a4d498 100644
--- a/src/bun.js/bindings/webcrypto/CryptoKeyOKPOpenSSL.cpp
+++ b/src/bun.js/bindings/webcrypto/CryptoKeyOKPOpenSSL.cpp
@@ -127,7 +127,7 @@ RefPtr<CryptoKeyOKP> CryptoKeyOKP::importSpki(CryptoAlgorithmIdentifier identifi
return nullptr;
++index;
- return create(identifier, namedCurve, CryptoKeyType::Public, Span<const uint8_t> { keyData.data() + index, keyData.size() - index }, extractable, usages);
+ return create(identifier, namedCurve, CryptoKeyType::Public, std::span<const uint8_t> { keyData.data() + index, keyData.size() - index }, extractable, usages);
}
constexpr uint8_t OKPOIDFirstByte = 6;
@@ -254,7 +254,7 @@ RefPtr<CryptoKeyOKP> CryptoKeyOKP::importPkcs8(CryptoAlgorithmIdentifier identif
if (keyData.size() < index + 1)
return nullptr;
- return create(identifier, namedCurve, CryptoKeyType::Private, Span<const uint8_t> { keyData.data() + index, keyData.size() - index }, extractable, usages);
+ return create(identifier, namedCurve, CryptoKeyType::Private, std::span<const uint8_t> { keyData.data() + index, keyData.size() - index }, extractable, usages);
}
ExceptionOr<Vector<uint8_t>> CryptoKeyOKP::exportPkcs8() const
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-29 23:59:16 +0000