Cloudflare Worker fixes (#379)

surrealdb · Nov 20, 2024 · 39c950b · 39c950b
1 parent 794092a
commit 39c950b
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/engines/ws.ts b/src/engines/ws.ts
@@ -65,7 +65,11 @@ export class WebsocketEngine extends AbstractEngine {
 
 			socket.addEventListener("error", (e) => {
 				const error = new UnexpectedConnectionError(
-					"error" in e ? e.error : "An unexpected error occurred",
+					"detail" in e
+						? e.detail
+						: "error" in e
+							? e.error
+							: "An unexpected error occurred",
 				);
 				this.setStatus(ConnectionStatus.Error, error);
 				reject(error);
@@ -78,12 +82,14 @@ export class WebsocketEngine extends AbstractEngine {
 			socket.addEventListener("message", async ({ data }) => {
 				try {
 					const decoded = this.decodeCbor(
-						data instanceof Blob
-							? await data.arrayBuffer()
-							: data.buffer.slice(
-									data.byteOffset,
-									data.byteOffset + data.byteLength,
-								),
+						data instanceof ArrayBuffer
+							? data
+							: data instanceof Blob
+								? await data.arrayBuffer()
+								: data.buffer.slice(
+										data.byteOffset,
+										data.byteOffset + data.byteLength,
+									),
 					);
 
 					if (