@electric-sql/client 1.0.5 → 1.0.7

package/src/client.ts

@@ -398,22 +398,12 @@ export class ShapeStream<T extends Row<unknown> = Row>
       backOffOpts
     )
 
-    this.#fetchClient = createFetchWithConsumedMessages(
-      createFetchWithResponseHeadersCheck(
-        createFetchWithChunkBuffer(fetchWithBackoffClient)
-      )
-    )
-
-    const sseFetchWithBackoffClient = createFetchWithBackoff(
-      baseFetchClient,
-      backOffOpts,
-      true
-    )
-
     this.#sseFetchClient = createFetchWithResponseHeadersCheck(
-      createFetchWithChunkBuffer(sseFetchWithBackoffClient)
+      createFetchWithChunkBuffer(fetchWithBackoffClient)
     )
 
+    this.#fetchClient = createFetchWithConsumedMessages(this.#sseFetchClient)
+
     this.#subscribeToVisibilityChanges()
   }
 
@@ -498,7 +488,7 @@ export class ShapeStream<T extends Row<unknown> = Row>
         fetchUrl,
         requestAbortController,
         headers: requestHeaders,
-        resumingFromPause: true,
+        resumingFromPause,
       })
     } catch (e) {
       // Handle abort error triggered by refresh
@@ -671,9 +661,7 @@ export class ShapeStream<T extends Row<unknown> = Row>
     }
   }
 
-  async #onMessages(messages: string, schema: Schema, isSseMessage = false) {
-    const batch = this.#messageParser.parse(messages, schema)
-
+  async #onMessages(batch: Array<Message<T>>, isSseMessage = false) {
     // Update isUpToDate
     if (batch.length > 0) {
       const lastMessage = batch[batch.length - 1]
@@ -738,8 +726,9 @@ export class ShapeStream<T extends Row<unknown> = Row>
     const schema = this.#schema! // we know that it is not undefined because it is set by `this.#onInitialResponse`
     const res = await response.text()
     const messages = res || `[]`
+    const batch = this.#messageParser.parse<Array<Message<T>>>(messages, schema)
 
-    await this.#onMessages(messages, schema)
+    await this.#onMessages(batch)
   }
 
   async #requestShapeSSE(opts: {
@@ -750,6 +739,7 @@ export class ShapeStream<T extends Row<unknown> = Row>
     const { fetchUrl, requestAbortController, headers } = opts
     const fetch = this.#sseFetchClient
     try {
+      let buffer: Array<Message<T>> = []
       await fetchEventSource(fetchUrl.toString(), {
         headers,
         fetch,
@@ -759,11 +749,20 @@ export class ShapeStream<T extends Row<unknown> = Row>
         },
         onmessage: (event: EventSourceMessage) => {
           if (event.data) {
-            // Process the SSE message
-            // The event.data is a single JSON object, so we wrap it in an array
-            const messages = `[${event.data}]`
+            // event.data is a single JSON object
             const schema = this.#schema! // we know that it is not undefined because it is set in onopen when we call this.#onInitialResponse
-            this.#onMessages(messages, schema, true)
+            const message = this.#messageParser.parse<Message<T>>(
+              event.data,
+              schema
+            )
+            buffer.push(message)
+
+            if (isUpToDateMessage(message)) {
+              // Flush the buffer on up-to-date message.
+              // Ensures that we only process complete batches of operations.
+              this.#onMessages(buffer, true)
+              buffer = []
+            }
           }
         },
         onerror: (error: Error) => {

package/src/fetch.ts

@@ -38,8 +38,7 @@ export const BackoffDefaults = {
 
 export function createFetchWithBackoff(
   fetchClient: typeof fetch,
-  backoffOptions: BackoffOptions = BackoffDefaults,
-  sseMode: boolean = false
+  backoffOptions: BackoffOptions = BackoffDefaults
 ): typeof fetch {
   const {
     initialDelay,
@@ -67,12 +66,6 @@ export function createFetchWithBackoff(
         if (result.ok) return result
 
         const err = await FetchError.fromResponse(result, url.toString())
-        if (err.status === 409 && sseMode) {
-          // The json body is [ { headers: { control: 'must-refetch' } } ] in normal mode
-          // and is { headers: { control: 'must-refetch' } } in SSE mode
-          // So in SSE mode we need to wrap it in an array
-          err.json = [err.json]
-        }
 
         throw err
       } catch (e) {

package/src/helpers.ts

@@ -58,8 +58,9 @@ export function isUpToDateMessage<T extends Row<unknown> = Row>(
  * If we are not in SSE mode this function will return undefined.
  */
 export function getOffset(message: ControlMessage): Offset | undefined {
-  const lsn = Number(message.headers.global_last_seen_lsn)
-  if (lsn && !isNaN(lsn)) {
-    return `${lsn}_0`
+  const lsn = message.headers.global_last_seen_lsn
+  if (!lsn) {
+    return
   }
+  return `${lsn}_0` as Offset
 }

package/src/parser.ts

@@ -1,9 +1,8 @@
-import { ColumnInfo, GetExtensions, Message, Row, Schema, Value } from './types'
+import { ColumnInfo, GetExtensions, Row, Schema, Value } from './types'
 import { ParserNullValueError } from './error'
 
-type NullToken = null | `NULL`
-type Token = Exclude<string, NullToken>
-type NullableToken = Token | NullToken
+type Token = string
+type NullableToken = Token | null
 export type ParseFunction<Extensions = never> = (
   value: Token,
   additionalInfo?: Omit<ColumnInfo, `type` | `dims`>
@@ -40,7 +39,7 @@ export const defaultParser: Parser = {
 // Taken from: https://github.com/electric-sql/pglite/blob/main/packages/pglite/src/types.ts#L233-L279
 export function pgArrayParser<Extensions>(
   value: Token,
-  parser?: ParseFunction<Extensions>
+  parser?: NullableParseFunction<Extensions>
 ): Value<Extensions> {
   let i = 0
   let char = null
@@ -49,6 +48,12 @@ export function pgArrayParser<Extensions>(
   let last = 0
   let p: string | undefined = undefined
 
+  function extractValue(x: Token, start: number, end: number) {
+    let val: Token | null = x.slice(start, end)
+    val = val === `NULL` ? null : val
+    return parser ? parser(val) : val
+  }
+
   function loop(x: string): Array<Value<Extensions>> {
     const xs = []
     for (; i < x.length; i++) {
@@ -71,18 +76,16 @@ export function pgArrayParser<Extensions>(
         xs.push(loop(x))
       } else if (char === `}`) {
         quoted = false
-        last < i &&
-          xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))
+        last < i && xs.push(extractValue(x, last, i))
         last = i + 1
         break
       } else if (char === `,` && p !== `}` && p !== `"`) {
-        xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))
+        xs.push(extractValue(x, last, i))
         last = i + 1
       }
       p = char
     }
-    last < i &&
-      xs.push(parser ? parser(x.slice(last, i + 1)) : x.slice(last, i + 1))
+    last < i && xs.push(xs.push(extractValue(x, last, i + 1)))
     return xs
   }
 
@@ -98,7 +101,7 @@ export class MessageParser<T extends Row<unknown>> {
     this.parser = { ...defaultParser, ...parser }
   }
 
-  parse(messages: string, schema: Schema): Message<T>[] {
+  parse<Result>(messages: string, schema: Schema): Result {
     return JSON.parse(messages, (key, value) => {
       // typeof value === `object` && value !== null
       // is needed because there could be a column named `value`
@@ -117,7 +120,7 @@ export class MessageParser<T extends Row<unknown>> {
         })
       }
       return value
-    }) as Message<T>[]
+    }) as Result
   }
 
   // Parses the message values using the provided parser based on the schema information
@@ -166,7 +169,7 @@ function makeNullableParser<Extensions>(
   // but if the column value is an array that contains a NULL value
   // then it will be included in the array string as `NULL`, e.g.: `"{1,NULL,3}"`
   return (value: NullableToken) => {
-    if (isPgNull(value)) {
+    if (value === null) {
       if (!isNullable) {
         throw new ParserNullValueError(columnName ?? `unknown`)
       }
@@ -175,7 +178,3 @@ function makeNullableParser<Extensions>(
     return parser(value, columnInfo)
   }
 }
-
-function isPgNull(value: NullableToken): value is NullToken {
-  return value === null || value === `NULL`
-}

package/src/types.ts

@@ -17,7 +17,7 @@ export type Row<Extensions = never> = Record<string, Value<Extensions>>
 export type GetExtensions<T extends Row<unknown>> =
   T extends Row<infer Extensions> ? Extensions : never
 
-export type Offset = `-1` | `${number}_${number}`
+export type Offset = `-1` | `${number}_${number}` | `${bigint}_${number}`
 
 interface Header {
   [key: Exclude<string, `operation` | `control`>]: Value