Skip to content
Merged
Changes from 1 commit
Commits
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
40 changes: 19 additions & 21 deletions src/sql_jsc/postgres/PostgresSQLConnection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3040,7 +3040,7 @@
}
MessageType::NotificationResponse => {
let resp = protocol::NotificationResponse::decode_internal(reader.reborrow())?;
self.on_notification(resp.channel.slice(), resp.payload.slice());
self.on_notification(resp.channel.slice(), resp.payload.slice())?;
}
MessageType::EmptyQueryResponse => {
reader.eat_message(&protocol::EMPTY_QUERY_RESPONSE)?;
Expand Down Expand Up @@ -3091,22 +3091,21 @@

const MAX_INTERNED_CHANNELS: usize = 256;

fn channel_name_js(&self, global: &JSGlobalObject, channel: &[u8]) -> Option<JSValue> {
fn channel_name_js(
&self,
global: &JSGlobalObject,
channel: &[u8],
) -> Result<JSValue, AnyPostgresError> {
if let Some(entry) = self
.channel_names
.get()
.iter()
.find(|entry| entry.bytes.as_ref() == channel)
{
return Some(entry.js.get());
return Ok(entry.js.get());
}
let js = match bun_string_jsc::create_utf8_for_js(global, channel) {
Ok(js) => js,
Err(e) => {
global.report_active_exception_as_unhandled(e);
return None;
}
};
let js = bun_string_jsc::create_utf8_for_js(global, channel)
.map_err(|_| AnyPostgresError::JSError)?;
if self.channel_names.get().len() < Self::MAX_INTERNED_CHANNELS {
self.channel_names.with_mut(|names| {
names.push(InternedChannel {
Expand All @@ -3115,30 +3114,29 @@
})
});
}
Some(js)
Ok(js)
}

fn on_notification(&self, channel: &[u8], payload: &[u8]) {
/// A conversion the VM cut short (OOM, a worker's termination) is this connection's
/// failure like any other in [`Self::on`]: `JSError` takes the pending exception.
fn on_notification(&self, channel: &[u8], payload: &[u8]) -> Result<(), AnyPostgresError> {
let Some(this_value) = self.js_value.get().try_get() else {
return;
return Ok(());
};
let Some(callback) = js::onnotification_get_cached(this_value) else {
return;
return Ok(());
};
let global = self.global();
let Some(channel_js) = self.channel_name_js(global, channel) else {
return;
};
let payload_js = match bun_string_jsc::create_utf8_for_js(global, payload) {
Ok(js) => js,
Err(e) => return global.report_active_exception_as_unhandled(e),
};
let channel_js = self.channel_name_js(global, channel)?;
let payload_js = bun_string_jsc::create_utf8_for_js(global, payload)
.map_err(|_| AnyPostgresError::JSError)?;

Check warning on line 3132 in src/sql_jsc/postgres/PostgresSQLConnection.rs

View check run for this annotation

Claude / Claude Code Review

Use crate helper js_error_to_postgres instead of hand-rolled JsError→AnyPostgresError mapping

Use the crate's documented helper `.map_err(crate::jsc::js_error_to_postgres)?` instead of hand-rolling `|_| AnyPostgresError::JSError` (same at line 3108). Every other `JsResult → AnyPostgresError` site in this crate goes through that helper, and it preserves the `JsError::OutOfMemory → AnyPostgresError::OutOfMemory` mapping rather than collapsing both variants into `JSError`.
Comment thread
dylan-conway marked this conversation as resolved.
Outdated
self.event_loop().run_callback(
callback,
global,
JSValue::UNDEFINED,
&[channel_js, payload_js],
);
Ok(())
}

pub(crate) fn consume_on_connect_callback(
Expand Down
Loading