@electric-sql/client 0.3.4 → 0.4.1

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parser.ts","../src/helpers.ts","../src/client.ts"],"sourcesContent":["import { ColumnInfo, Message, Row, Schema, Value } from './types'\n\ntype NullToken = null | `NULL`\ntype Token = Exclude<string, NullToken>\ntype NullableToken = Token | NullToken\nexport type ParseFunction = (\n  value: Token,\n  additionalInfo?: Omit<ColumnInfo, `type` | `dims`>\n) => Value\ntype NullableParseFunction = (\n  value: NullableToken,\n  additionalInfo?: Omit<ColumnInfo, `type` | `dims`>\n) => Value\nexport type Parser = { [key: string]: ParseFunction }\n\nconst parseNumber = (value: string) => Number(value)\nconst parseBool = (value: string) => value === `true` || value === `t`\nconst parseBigInt = (value: string) => BigInt(value)\nconst parseJson = (value: string) => JSON.parse(value)\nconst identityParser: ParseFunction = (v: string) => v\n\nexport const defaultParser: Parser = {\n  int2: parseNumber,\n  int4: parseNumber,\n  int8: parseBigInt,\n  bool: parseBool,\n  float4: parseNumber,\n  float8: parseNumber,\n  json: parseJson,\n  jsonb: parseJson,\n}\n\n// Taken from: https://github.com/electric-sql/pglite/blob/main/packages/pglite/src/types.ts#L233-L279\nexport function pgArrayParser(value: Token, parser?: ParseFunction): Value {\n  let i = 0\n  let char = null\n  let str = ``\n  let quoted = false\n  let last = 0\n  let p: string | undefined = undefined\n\n  function loop(x: string): Value[] {\n    const xs = []\n    for (; i < x.length; i++) {\n      char = x[i]\n      if (quoted) {\n        if (char === `\\\\`) {\n          str += x[++i]\n        } else if (char === `\"`) {\n          xs.push(parser ? parser(str) : str)\n          str = ``\n          quoted = x[i + 1] === `\"`\n          last = i + 2\n        } else {\n          str += char\n        }\n      } else if (char === `\"`) {\n        quoted = true\n      } else if (char === `{`) {\n        last = ++i\n        xs.push(loop(x))\n      } else if (char === `}`) {\n        quoted = false\n        last < i &&\n          xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))\n        last = i + 1\n        break\n      } else if (char === `,` && p !== `}` && p !== `\"`) {\n        xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))\n        last = i + 1\n      }\n      p = char\n    }\n    last < i &&\n      xs.push(parser ? parser(x.slice(last, i + 1)) : x.slice(last, i + 1))\n    return xs\n  }\n\n  return loop(value)[0]\n}\n\nexport class MessageParser<T extends Row> {\n  private parser: Parser\n  constructor(parser?: Parser) {\n    // Merge the provided parser with the default parser\n    // to use the provided parser whenever defined\n    // and otherwise fall back to the default parser\n    this.parser = { ...defaultParser, ...parser }\n  }\n\n  parse(messages: string, schema: Schema): Message<T>[] {\n    return JSON.parse(messages, (key, value) => {\n      // typeof value === `object` is needed because\n      // there could be a column named `value`\n      // and the value associated to that column will be a string\n      if (key === `value` && typeof value === `object`) {\n        // Parse the row values\n        const row = value as Record<string, Value>\n        Object.keys(row).forEach((key) => {\n          row[key] = this.parseRow(key, row[key] as NullableToken, schema)\n        })\n      }\n      return value\n    }) as Message<T>[]\n  }\n\n  // Parses the message values using the provided parser based on the schema information\n  private parseRow(key: string, value: NullableToken, schema: Schema): Value {\n    const columnInfo = schema[key]\n    if (!columnInfo) {\n      // We don't have information about the value\n      // so we just return it\n      return value\n    }\n\n    // Copy the object but don't include `dimensions` and `type`\n    const { type: typ, dims: dimensions, ...additionalInfo } = columnInfo\n\n    // Pick the right parser for the type\n    // and support parsing null values if needed\n    // if no parser is provided for the given type, just return the value as is\n    const typeParser = this.parser[typ] ?? identityParser\n    const parser = makeNullableParser(typeParser, columnInfo, key)\n\n    if (dimensions && dimensions > 0) {\n      // It's an array\n      const nullablePgArrayParser = makeNullableParser(\n        (value, _) => pgArrayParser(value, parser),\n        columnInfo,\n        key\n      )\n      return nullablePgArrayParser(value)\n    }\n\n    return parser(value, additionalInfo)\n  }\n}\n\nfunction makeNullableParser(\n  parser: ParseFunction,\n  columnInfo: ColumnInfo,\n  columnName?: string\n): NullableParseFunction {\n  const isNullable = !(columnInfo.not_null ?? false)\n  // The sync service contains `null` value for a column whose value is NULL\n  // but if the column value is an array that contains a NULL value\n  // then it will be included in the array string as `NULL`, e.g.: `\"{1,NULL,3}\"`\n  return (value: NullableToken) => {\n    if (isPgNull(value)) {\n      if (!isNullable) {\n        throw new Error(`Column ${columnName ?? `unknown`} is not nullable`)\n      }\n      return null\n    }\n    return parser(value, columnInfo)\n  }\n}\n\nfunction isPgNull(value: NullableToken): value is NullToken {\n  return value === null || value === `NULL`\n}\n","import { ChangeMessage, ControlMessage, Message, Row } from './types'\n\n/**\n * Type guard for checking {@link Message} is {@link ChangeMessage}.\n *\n * See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)\n * for information on how to use type guards.\n *\n * @param message - the message to check\n * @returns true if the message is a {@link ChangeMessage}\n *\n * @example\n * ```ts\n * if (isChangeMessage(message)) {\n *   const msgChng: ChangeMessage = message // Ok\n *   const msgCtrl: ControlMessage = message // Err, type mismatch\n * }\n * ```\n */\nexport function isChangeMessage<T extends Row = Row>(\n  message: Message<T>\n): message is ChangeMessage<T> {\n  return `key` in message\n}\n\n/**\n * Type guard for checking {@link Message} is {@link ControlMessage}.\n *\n * See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)\n * for information on how to use type guards.\n *\n * @param message - the message to check\n * @returns true if the message is a {@link ControlMessage}\n *\n *  * @example\n * ```ts\n * if (isControlMessage(message)) {\n *   const msgChng: ChangeMessage = message // Err, type mismatch\n *   const msgCtrl: ControlMessage = message // Ok\n * }\n * ```\n */\nexport function isControlMessage<T extends Row = Row>(\n  message: Message<T>\n): message is ControlMessage {\n  return !isChangeMessage(message)\n}\n","import { Message, Offset, Schema, Row } from './types'\nimport { MessageParser, Parser } from './parser'\nimport { isChangeMessage, isControlMessage } from './helpers'\n\nexport type ShapeData<T extends Row = Row> = Map<string, T>\nexport type ShapeChangedCallback<T extends Row = Row> = (\n  value: ShapeData<T>\n) => void\n\nexport interface BackoffOptions {\n  initialDelay: number\n  maxDelay: number\n  multiplier: number\n}\n\nexport const BackoffDefaults = {\n  initialDelay: 100,\n  maxDelay: 10_000,\n  multiplier: 1.3,\n}\n\n/**\n * Options for constructing a ShapeStream.\n */\nexport interface ShapeStreamOptions {\n  /**\n   * The full URL to where the Shape is hosted. This can either be the Electric server\n   * directly or a proxy. E.g. for a local Electric instance, you might set `http://localhost:3000/v1/shape/foo`\n   */\n  url: string\n  /**\n   * where clauses for the shape.\n   */\n  where?: string\n  /**\n   * The \"offset\" on the shape log. This is typically not set as the ShapeStream\n   * will handle this automatically. A common scenario where you might pass an offset\n   * is if you're maintaining a local cache of the log. If you've gone offline\n   * and are re-starting a ShapeStream to catch-up to the latest state of the Shape,\n   * you'd pass in the last offset and shapeId you'd seen from the Electric server\n   * so it knows at what point in the shape to catch you up from.\n   */\n  offset?: Offset\n  /**\n   * Similar to `offset`, this isn't typically used unless you're maintaining\n   * a cache of the shape log.\n   */\n  shapeId?: string\n  backoffOptions?: BackoffOptions\n  /**\n   * Automatically fetch updates to the Shape. If you just want to sync the current\n   * shape and stop, pass false.\n   */\n  subscribe?: boolean\n  signal?: AbortSignal\n  fetchClient?: typeof fetch\n  parser?: Parser\n}\n\n/**\n * Receives batches of `messages`, puts them on a queue and processes\n * them asynchronously by passing to a registered callback function.\n *\n * @constructor\n * @param {(messages: Message[]) => void} callback function\n */\nclass MessageProcessor<T extends Row = Row> {\n  private messageQueue: Message<T>[][] = []\n  private isProcessing = false\n  private callback: (messages: Message<T>[]) => void | Promise<void>\n\n  constructor(callback: (messages: Message<T>[]) => void | Promise<void>) {\n    this.callback = callback\n  }\n\n  process(messages: Message<T>[]) {\n    this.messageQueue.push(messages)\n\n    if (!this.isProcessing) {\n      this.processQueue()\n    }\n  }\n\n  private async processQueue() {\n    this.isProcessing = true\n\n    while (this.messageQueue.length > 0) {\n      const messages = this.messageQueue.shift()!\n\n      await this.callback(messages)\n    }\n\n    this.isProcessing = false\n  }\n}\n\nexport class FetchError extends Error {\n  status: number\n  text?: string\n  json?: object\n  headers: Record<string, string>\n\n  constructor(\n    status: number,\n    text: string | undefined,\n    json: object | undefined,\n    headers: Record<string, string>,\n    public url: string,\n    message?: string\n  ) {\n    super(\n      message ||\n        `HTTP Error ${status} at ${url}: ${text ?? JSON.stringify(json)}`\n    )\n    this.name = `FetchError`\n    this.status = status\n    this.text = text\n    this.json = json\n    this.headers = headers\n  }\n\n  static async fromResponse(\n    response: Response,\n    url: string\n  ): Promise<FetchError> {\n    const status = response.status\n    const headers = Object.fromEntries([...response.headers.entries()])\n    let text: string | undefined = undefined\n    let json: object | undefined = undefined\n\n    const contentType = response.headers.get(`content-type`)\n    if (contentType && contentType.includes(`application/json`)) {\n      json = (await response.json()) as object\n    } else {\n      text = await response.text()\n    }\n\n    return new FetchError(status, text, json, headers, url)\n  }\n}\n\n/**\n * Reads updates to a shape from Electric using HTTP requests and long polling. Notifies subscribers\n * when new messages come in. Doesn't maintain any history of the\n * log but does keep track of the offset position and is the best way\n * to consume the HTTP `GET /v1/shape` api.\n *\n * @constructor\n * @param {ShapeStreamOptions} options - configure the shape stream\n * @example\n * Register a callback function to subscribe to the messages.\n * ```\n * const stream = new ShapeStream(options)\n * stream.subscribe(messages => {\n *   // messages is 1 or more row updates\n * })\n * ```\n *\n * To abort the stream, abort the `signal`\n * passed in via the `ShapeStreamOptions`.\n * ```\n * const aborter = new AbortController()\n * const issueStream = new ShapeStream({\n *   url: `${BASE_URL}/${table}`\n *   subscribe: true,\n *   signal: aborter.signal,\n * })\n * // Later...\n * aborter.abort()\n * ```\n */\nexport class ShapeStream<T extends Row = Row> {\n  private options: ShapeStreamOptions\n  private backoffOptions: BackoffOptions\n  private fetchClient: typeof fetch\n  private schema?: Schema\n\n  private subscribers = new Map<\n    number,\n    [MessageProcessor<T>, ((error: Error) => void) | undefined]\n  >()\n  private upToDateSubscribers = new Map<\n    number,\n    [() => void, (error: FetchError | Error) => void]\n  >()\n\n  private lastOffset: Offset\n  private messageParser: MessageParser<T>\n  public isUpToDate: boolean = false\n\n  shapeId?: string\n\n  constructor(options: ShapeStreamOptions) {\n    this.validateOptions(options)\n    this.options = { subscribe: true, ...options }\n    this.lastOffset = this.options.offset ?? `-1`\n    this.shapeId = this.options.shapeId\n    this.messageParser = new MessageParser<T>(options.parser)\n\n    this.backoffOptions = options.backoffOptions ?? BackoffDefaults\n    this.fetchClient =\n      options.fetchClient ??\n      ((...args: Parameters<typeof fetch>) => fetch(...args))\n\n    this.start()\n  }\n\n  async start() {\n    this.isUpToDate = false\n\n    const { url, where, signal } = this.options\n\n    while ((!signal?.aborted && !this.isUpToDate) || this.options.subscribe) {\n      const fetchUrl = new URL(url)\n      if (where) fetchUrl.searchParams.set(`where`, where)\n      fetchUrl.searchParams.set(`offset`, this.lastOffset)\n\n      if (this.isUpToDate) {\n        fetchUrl.searchParams.set(`live`, `true`)\n      }\n\n      if (this.shapeId) {\n        // This should probably be a header for better cache breaking?\n        fetchUrl.searchParams.set(`shape_id`, this.shapeId!)\n      }\n\n      let response!: Response\n\n      try {\n        const maybeResponse = await this.fetchWithBackoff(fetchUrl)\n        if (maybeResponse) response = maybeResponse\n        else break\n      } catch (e) {\n        if (!(e instanceof FetchError)) throw e // should never happen\n        if (e.status == 409) {\n          // Upon receiving a 409, we should start from scratch\n          // with the newly provided shape ID\n          const newShapeId = e.headers[`x-electric-shape-id`]\n          this.reset(newShapeId)\n          this.publish(e.json as Message<T>[])\n          continue\n        } else if (e.status >= 400 && e.status < 500) {\n          // Notify subscribers\n          this.sendErrorToUpToDateSubscribers(e)\n          this.sendErrorToSubscribers(e)\n\n          // 400 errors are not actionable without additional user input, so we're throwing them.\n          throw e\n        }\n      }\n\n      const { headers, status } = response\n      const shapeId = headers.get(`X-Electric-Shape-Id`)\n      if (shapeId) {\n        this.shapeId = shapeId\n      }\n\n      const lastOffset = headers.get(`X-Electric-Chunk-Last-Offset`)\n      if (lastOffset) {\n        this.lastOffset = lastOffset as Offset\n      }\n\n      const getSchema = (): Schema => {\n        const schemaHeader = headers.get(`X-Electric-Schema`)\n        return schemaHeader ? JSON.parse(schemaHeader) : {}\n      }\n      this.schema = this.schema ?? getSchema()\n\n      const messages = status === 204 ? `[]` : await response.text()\n\n      const batch = this.messageParser.parse(messages, this.schema)\n\n      // Update isUpToDate\n      if (batch.length > 0) {\n        const lastMessage = batch[batch.length - 1]\n        if (\n          isControlMessage(lastMessage) &&\n          lastMessage.headers.control === `up-to-date` &&\n          !this.isUpToDate\n        ) {\n          this.isUpToDate = true\n          this.notifyUpToDateSubscribers()\n        }\n\n        this.publish(batch)\n      }\n    }\n  }\n\n  subscribe(\n    callback: (messages: Message<T>[]) => void | Promise<void>,\n    onError?: (error: FetchError | Error) => void\n  ) {\n    const subscriptionId = Math.random()\n    const subscriber = new MessageProcessor(callback)\n\n    this.subscribers.set(subscriptionId, [subscriber, onError])\n\n    return () => {\n      this.subscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAll(): void {\n    this.subscribers.clear()\n  }\n\n  private publish(messages: Message<T>[]) {\n    this.subscribers.forEach(([subscriber, _]) => {\n      subscriber.process(messages)\n    })\n  }\n\n  private sendErrorToSubscribers(error: Error) {\n    this.subscribers.forEach(([_, errorFn]) => {\n      errorFn?.(error)\n    })\n  }\n\n  subscribeOnceToUpToDate(\n    callback: () => void | Promise<void>,\n    error: (err: FetchError | Error) => void\n  ) {\n    const subscriptionId = Math.random()\n\n    this.upToDateSubscribers.set(subscriptionId, [callback, error])\n\n    return () => {\n      this.upToDateSubscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAllUpToDateSubscribers(): void {\n    this.upToDateSubscribers.clear()\n  }\n\n  private notifyUpToDateSubscribers() {\n    this.upToDateSubscribers.forEach(([callback]) => {\n      callback()\n    })\n  }\n\n  private sendErrorToUpToDateSubscribers(error: FetchError | Error) {\n    // eslint-disable-next-line\n    this.upToDateSubscribers.forEach(([_, errorCallback]) =>\n      errorCallback(error)\n    )\n  }\n\n  /**\n   * Resets the state of the stream, optionally with a provided\n   * shape ID\n   */\n  private reset(shapeId?: string) {\n    this.lastOffset = `-1`\n    this.shapeId = shapeId\n    this.isUpToDate = false\n    this.schema = undefined\n  }\n\n  private validateOptions(options: ShapeStreamOptions): void {\n    if (!options.url) {\n      throw new Error(`Invalid shape option. It must provide the url`)\n    }\n    if (options.signal && !(options.signal instanceof AbortSignal)) {\n      throw new Error(\n        `Invalid signal option. It must be an instance of AbortSignal.`\n      )\n    }\n\n    if (\n      options.offset !== undefined &&\n      options.offset !== `-1` &&\n      !options.shapeId\n    ) {\n      throw new Error(\n        `shapeId is required if this isn't an initial fetch (i.e. offset > -1)`\n      )\n    }\n  }\n\n  private async fetchWithBackoff(url: URL) {\n    const { initialDelay, maxDelay, multiplier } = this.backoffOptions\n    const signal = this.options.signal\n\n    let delay = initialDelay\n    let attempt = 0\n\n    // eslint-disable-next-line no-constant-condition -- we're retrying with a lag until we get a non-500 response or the abort signal is triggered\n    while (true) {\n      try {\n        const result = await this.fetchClient(url.toString(), { signal })\n        if (result.ok) return result\n        else throw await FetchError.fromResponse(result, url.toString())\n      } catch (e) {\n        if (signal?.aborted) {\n          return undefined\n        } else if (\n          e instanceof FetchError &&\n          e.status >= 400 &&\n          e.status < 500\n        ) {\n          // Any client errors cannot be backed off on, leave it to the caller to handle.\n          throw e\n        } else {\n          // Exponentially backoff on errors.\n          // Wait for the current delay duration\n          await new Promise((resolve) => setTimeout(resolve, delay))\n\n          // Increase the delay for the next attempt\n          delay = Math.min(delay * multiplier, maxDelay)\n\n          attempt++\n          console.log(`Retry attempt #${attempt} after ${delay}ms`)\n        }\n      }\n    }\n  }\n}\n\n/**\n * A Shape is an object that subscribes to a shape log,\n * keeps a materialised shape `.value` in memory and\n * notifies subscribers when the value has changed.\n *\n * It can be used without a framework and as a primitive\n * to simplify developing framework hooks.\n *\n * @constructor\n * @param {ShapeStream<T extends Row>} - the underlying shape stream\n * @example\n * ```\n * const shapeStream = new ShapeStream<{ foo: number }>(url: 'http://localhost:3000/v1/shape/foo'})\n * const shape = new Shape(shapeStream)\n * ```\n *\n * `value` returns a promise that resolves the Shape data once the Shape has been\n * fully loaded (and when resuming from being offline):\n *\n *     const value = await shape.value\n *\n * `valueSync` returns the current data synchronously:\n *\n *     const value = shape.valueSync\n *\n *  Subscribe to updates. Called whenever the shape updates in Postgres.\n *\n *     shape.subscribe(shapeData => {\n *       console.log(shapeData)\n *     })\n */\nexport class Shape<T extends Row = Row> {\n  private stream: ShapeStream<T>\n\n  private data: ShapeData<T> = new Map()\n  private subscribers = new Map<number, ShapeChangedCallback<T>>()\n  public error: FetchError | false = false\n  private hasNotifiedSubscribersUpToDate: boolean = false\n\n  constructor(stream: ShapeStream<T>) {\n    this.stream = stream\n    this.stream.subscribe(this.process.bind(this), this.handleError.bind(this))\n    const unsubscribe = this.stream.subscribeOnceToUpToDate(\n      () => {\n        unsubscribe()\n      },\n      (e) => {\n        this.handleError(e)\n        throw e\n      }\n    )\n  }\n\n  get isUpToDate(): boolean {\n    return this.stream.isUpToDate\n  }\n\n  get value(): Promise<ShapeData<T>> {\n    return new Promise((resolve) => {\n      if (this.stream.isUpToDate) {\n        resolve(this.valueSync)\n      } else {\n        const unsubscribe = this.stream.subscribeOnceToUpToDate(\n          () => {\n            unsubscribe()\n            resolve(this.valueSync)\n          },\n          (e) => {\n            throw e\n          }\n        )\n      }\n    })\n  }\n\n  get valueSync() {\n    return this.data\n  }\n\n  subscribe(callback: ShapeChangedCallback<T>): () => void {\n    const subscriptionId = Math.random()\n\n    this.subscribers.set(subscriptionId, callback)\n\n    return () => {\n      this.subscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAll(): void {\n    this.subscribers.clear()\n  }\n\n  get numSubscribers() {\n    return this.subscribers.size\n  }\n\n  private process(messages: Message<T>[]): void {\n    let dataMayHaveChanged = false\n    let isUpToDate = false\n    let newlyUpToDate = false\n\n    messages.forEach((message) => {\n      if (isChangeMessage(message)) {\n        dataMayHaveChanged = [`insert`, `update`, `delete`].includes(\n          message.headers.operation\n        )\n\n        switch (message.headers.operation) {\n          case `insert`:\n            this.data.set(message.key, message.value)\n            break\n          case `update`:\n            this.data.set(message.key, {\n              ...this.data.get(message.key)!,\n              ...message.value,\n            })\n            break\n          case `delete`:\n            this.data.delete(message.key)\n            break\n        }\n      }\n\n      if (isControlMessage(message)) {\n        switch (message.headers.control) {\n          case `up-to-date`:\n            isUpToDate = true\n            if (!this.hasNotifiedSubscribersUpToDate) {\n              newlyUpToDate = true\n            }\n            break\n          case `must-refetch`:\n            this.data.clear()\n            this.error = false\n            isUpToDate = false\n            newlyUpToDate = false\n            break\n        }\n      }\n    })\n\n    // Always notify subscribers when the Shape first is up to date.\n    // FIXME this would be cleaner with a simple state machine.\n    if (newlyUpToDate || (isUpToDate && dataMayHaveChanged)) {\n      this.hasNotifiedSubscribersUpToDate = true\n      this.notify()\n    }\n  }\n\n  private handleError(e: Error): void {\n    if (e instanceof FetchError) {\n      this.error = e\n      this.notify()\n    }\n  }\n\n  private notify(): void {\n    this.subscribers.forEach((callback) => {\n      callback(this.valueSync)\n    })\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,IAAM,cAAc,CAAC,UAAkB,OAAO,KAAK;AACnD,IAAM,YAAY,CAAC,UAAkB,UAAU,UAAU,UAAU;AACnE,IAAM,cAAc,CAAC,UAAkB,OAAO,KAAK;AACnD,IAAM,YAAY,CAAC,UAAkB,KAAK,MAAM,KAAK;AACrD,IAAM,iBAAgC,CAAC,MAAc;AAE9C,IAAM,gBAAwB;AAAA,EACnC,MAAM;AAAA,EACN,MAAM;AAAA,EACN,MAAM;AAAA,EACN,MAAM;AAAA,EACN,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AACT;AAGO,SAAS,cAAc,OAAc,QAA+B;AACzE,MAAI,IAAI;AACR,MAAI,OAAO;AACX,MAAI,MAAM;AACV,MAAI,SAAS;AACb,MAAI,OAAO;AACX,MAAI,IAAwB;AAE5B,WAAS,KAAK,GAAoB;AAChC,UAAM,KAAK,CAAC;AACZ,WAAO,IAAI,EAAE,QAAQ,KAAK;AACxB,aAAO,EAAE,CAAC;AACV,UAAI,QAAQ;AACV,YAAI,SAAS,MAAM;AACjB,iBAAO,EAAE,EAAE,CAAC;AAAA,QACd,WAAW,SAAS,KAAK;AACvB,aAAG,KAAK,SAAS,OAAO,GAAG,IAAI,GAAG;AAClC,gBAAM;AACN,mBAAS,EAAE,IAAI,CAAC,MAAM;AACtB,iBAAO,IAAI;AAAA,QACb,OAAO;AACL,iBAAO;AAAA,QACT;AAAA,MACF,WAAW,SAAS,KAAK;AACvB,iBAAS;AAAA,MACX,WAAW,SAAS,KAAK;AACvB,eAAO,EAAE;AACT,WAAG,KAAK,KAAK,CAAC,CAAC;AAAA,MACjB,WAAW,SAAS,KAAK;AACvB,iBAAS;AACT,eAAO,KACL,GAAG,KAAK,SAAS,OAAO,EAAE,MAAM,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,MAAM,CAAC,CAAC;AAC9D,eAAO,IAAI;AACX;AAAA,MACF,WAAW,SAAS,OAAO,MAAM,OAAO,MAAM,KAAK;AACjD,WAAG,KAAK,SAAS,OAAO,EAAE,MAAM,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,MAAM,CAAC,CAAC;AAC5D,eAAO,IAAI;AAAA,MACb;AACA,UAAI;AAAA,IACN;AACA,WAAO,KACL,GAAG,KAAK,SAAS,OAAO,EAAE,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,MAAM,IAAI,CAAC,CAAC;AACtE,WAAO;AAAA,EACT;AAEA,SAAO,KAAK,KAAK,EAAE,CAAC;AACtB;AAEO,IAAM,gBAAN,MAAmC;AAAA,EAExC,YAAY,QAAiB;AAI3B,SAAK,SAAS,kCAAK,gBAAkB;AAAA,EACvC;AAAA,EAEA,MAAM,UAAkB,QAA8B;AACpD,WAAO,KAAK,MAAM,UAAU,CAAC,KAAK,UAAU;AAI1C,UAAI,QAAQ,WAAW,OAAO,UAAU,UAAU;AAEhD,cAAM,MAAM;AACZ,eAAO,KAAK,GAAG,EAAE,QAAQ,CAACA,SAAQ;AAChC,cAAIA,IAAG,IAAI,KAAK,SAASA,MAAK,IAAIA,IAAG,GAAoB,MAAM;AAAA,QACjE,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA;AAAA,EAGQ,SAAS,KAAa,OAAsB,QAAuB;AA3G7E;AA4GI,UAAM,aAAa,OAAO,GAAG;AAC7B,QAAI,CAAC,YAAY;AAGf,aAAO;AAAA,IACT;AAGA,UAA2D,iBAAnD,QAAM,KAAK,MAAM,WApH7B,IAoH+D,IAAnB,2BAAmB,IAAnB,CAAhC,QAAW;AAKnB,UAAM,cAAa,UAAK,OAAO,GAAG,MAAf,YAAoB;AACvC,UAAM,SAAS,mBAAmB,YAAY,YAAY,GAAG;AAE7D,QAAI,cAAc,aAAa,GAAG;AAEhC,YAAM,wBAAwB;AAAA,QAC5B,CAACC,QAAO,MAAM,cAAcA,QAAO,MAAM;AAAA,QACzC;AAAA,QACA;AAAA,MACF;AACA,aAAO,sBAAsB,KAAK;AAAA,IACpC;AAEA,WAAO,OAAO,OAAO,cAAc;AAAA,EACrC;AACF;AAEA,SAAS,mBACP,QACA,YACA,YACuB;AA9IzB;AA+IE,QAAM,aAAa,GAAE,gBAAW,aAAX,YAAuB;AAI5C,SAAO,CAAC,UAAyB;AAC/B,QAAI,SAAS,KAAK,GAAG;AACnB,UAAI,CAAC,YAAY;AACf,cAAM,IAAI,MAAM,UAAU,kCAAc,SAAS,kBAAkB;AAAA,MACrE;AACA,aAAO;AAAA,IACT;AACA,WAAO,OAAO,OAAO,UAAU;AAAA,EACjC;AACF;AAEA,SAAS,SAAS,OAA0C;AAC1D,SAAO,UAAU,QAAQ,UAAU;AACrC;;;AC7IO,SAAS,gBACd,SAC6B;AAC7B,SAAO,SAAS;AAClB;AAmBO,SAAS,iBACd,SAC2B;AAC3B,SAAO,CAAC,gBAAgB,OAAO;AACjC;;;AC/BO,IAAM,kBAAkB;AAAA,EAC7B,cAAc;AAAA,EACd,UAAU;AAAA,EACV,YAAY;AACd;AA+CA,IAAM,mBAAN,MAA4C;AAAA,EAK1C,YAAY,UAA4D;AAJxE,SAAQ,eAA+B,CAAC;AACxC,SAAQ,eAAe;AAIrB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,QAAQ,UAAwB;AAC9B,SAAK,aAAa,KAAK,QAAQ;AAE/B,QAAI,CAAC,KAAK,cAAc;AACtB,WAAK,aAAa;AAAA,IACpB;AAAA,EACF;AAAA,EAEc,eAAe;AAAA;AAC3B,WAAK,eAAe;AAEpB,aAAO,KAAK,aAAa,SAAS,GAAG;AACnC,cAAM,WAAW,KAAK,aAAa,MAAM;AAEzC,cAAM,KAAK,SAAS,QAAQ;AAAA,MAC9B;AAEA,WAAK,eAAe;AAAA,IACtB;AAAA;AACF;AAEO,IAAM,aAAN,MAAM,oBAAmB,MAAM;AAAA,EAMpC,YACE,QACA,MACA,MACA,SACO,KACP,SACA;AACA;AAAA,MACE,WACE,cAAc,MAAM,OAAO,GAAG,KAAK,sBAAQ,KAAK,UAAU,IAAI,CAAC;AAAA,IACnE;AANO;AAOP,SAAK,OAAO;AACZ,SAAK,SAAS;AACd,SAAK,OAAO;AACZ,SAAK,OAAO;AACZ,SAAK,UAAU;AAAA,EACjB;AAAA,EAEA,OAAa,aACX,UACA,KACqB;AAAA;AACrB,YAAM,SAAS,SAAS;AACxB,YAAM,UAAU,OAAO,YAAY,CAAC,GAAG,SAAS,QAAQ,QAAQ,CAAC,CAAC;AAClE,UAAI,OAA2B;AAC/B,UAAI,OAA2B;AAE/B,YAAM,cAAc,SAAS,QAAQ,IAAI,cAAc;AACvD,UAAI,eAAe,YAAY,SAAS,kBAAkB,GAAG;AAC3D,eAAQ,MAAM,SAAS,KAAK;AAAA,MAC9B,OAAO;AACL,eAAO,MAAM,SAAS,KAAK;AAAA,MAC7B;AAEA,aAAO,IAAI,YAAW,QAAQ,MAAM,MAAM,SAAS,GAAG;AAAA,IACxD;AAAA;AACF;AAgCO,IAAM,cAAN,MAAuC;AAAA,EAqB5C,YAAY,SAA6B;AAfzC,SAAQ,cAAc,oBAAI,IAGxB;AACF,SAAQ,sBAAsB,oBAAI,IAGhC;AAIF,SAAO,aAAsB;AA5L/B;AAiMI,SAAK,gBAAgB,OAAO;AAC5B,SAAK,UAAU,iBAAE,WAAW,QAAS;AACrC,SAAK,cAAa,UAAK,QAAQ,WAAb,YAAuB;AACzC,SAAK,UAAU,KAAK,QAAQ;AAC5B,SAAK,gBAAgB,IAAI,cAAiB,QAAQ,MAAM;AAExD,SAAK,kBAAiB,aAAQ,mBAAR,YAA0B;AAChD,SAAK,eACH,aAAQ,gBAAR,YACC,IAAI,SAAmC,MAAM,GAAG,IAAI;AAEvD,SAAK,MAAM;AAAA,EACb;AAAA,EAEM,QAAQ;AAAA;AA/MhB;AAgNI,WAAK,aAAa;AAElB,YAAM,EAAE,KAAK,OAAO,OAAO,IAAI,KAAK;AAEpC,aAAQ,EAAC,iCAAQ,YAAW,CAAC,KAAK,cAAe,KAAK,QAAQ,WAAW;AACvE,cAAM,WAAW,IAAI,IAAI,GAAG;AAC5B,YAAI,MAAO,UAAS,aAAa,IAAI,SAAS,KAAK;AACnD,iBAAS,aAAa,IAAI,UAAU,KAAK,UAAU;AAEnD,YAAI,KAAK,YAAY;AACnB,mBAAS,aAAa,IAAI,QAAQ,MAAM;AAAA,QAC1C;AAEA,YAAI,KAAK,SAAS;AAEhB,mBAAS,aAAa,IAAI,YAAY,KAAK,OAAQ;AAAA,QACrD;AAEA,YAAI;AAEJ,YAAI;AACF,gBAAM,gBAAgB,MAAM,KAAK,iBAAiB,QAAQ;AAC1D,cAAI,cAAe,YAAW;AAAA,cACzB;AAAA,QACP,SAAS,GAAG;AACV,cAAI,EAAE,aAAa,YAAa,OAAM;AACtC,cAAI,EAAE,UAAU,KAAK;AAGnB,kBAAM,aAAa,EAAE,QAAQ,qBAAqB;AAClD,iBAAK,MAAM,UAAU;AACrB,iBAAK,QAAQ,EAAE,IAAoB;AACnC;AAAA,UACF,WAAW,EAAE,UAAU,OAAO,EAAE,SAAS,KAAK;AAE5C,iBAAK,+BAA+B,CAAC;AACrC,iBAAK,uBAAuB,CAAC;AAG7B,kBAAM;AAAA,UACR;AAAA,QACF;AAEA,cAAM,EAAE,SAAS,OAAO,IAAI;AAC5B,cAAM,UAAU,QAAQ,IAAI,qBAAqB;AACjD,YAAI,SAAS;AACX,eAAK,UAAU;AAAA,QACjB;AAEA,cAAM,aAAa,QAAQ,IAAI,8BAA8B;AAC7D,YAAI,YAAY;AACd,eAAK,aAAa;AAAA,QACpB;AAEA,cAAM,YAAY,MAAc;AAC9B,gBAAM,eAAe,QAAQ,IAAI,mBAAmB;AACpD,iBAAO,eAAe,KAAK,MAAM,YAAY,IAAI,CAAC;AAAA,QACpD;AACA,aAAK,UAAS,UAAK,WAAL,YAAe,UAAU;AAEvC,cAAM,WAAW,WAAW,MAAM,OAAO,MAAM,SAAS,KAAK;AAE7D,cAAM,QAAQ,KAAK,cAAc,MAAM,UAAU,KAAK,MAAM;AAG5D,YAAI,MAAM,SAAS,GAAG;AACpB,gBAAM,cAAc,MAAM,MAAM,SAAS,CAAC;AAC1C,cACE,iBAAiB,WAAW,KAC5B,YAAY,QAAQ,YAAY,gBAChC,CAAC,KAAK,YACN;AACA,iBAAK,aAAa;AAClB,iBAAK,0BAA0B;AAAA,UACjC;AAEA,eAAK,QAAQ,KAAK;AAAA,QACpB;AAAA,MACF;AAAA,IACF;AAAA;AAAA,EAEA,UACE,UACA,SACA;AACA,UAAM,iBAAiB,KAAK,OAAO;AACnC,UAAM,aAAa,IAAI,iBAAiB,QAAQ;AAEhD,SAAK,YAAY,IAAI,gBAAgB,CAAC,YAAY,OAAO,CAAC;AAE1D,WAAO,MAAM;AACX,WAAK,YAAY,OAAO,cAAc;AAAA,IACxC;AAAA,EACF;AAAA,EAEA,iBAAuB;AACrB,SAAK,YAAY,MAAM;AAAA,EACzB;AAAA,EAEQ,QAAQ,UAAwB;AACtC,SAAK,YAAY,QAAQ,CAAC,CAAC,YAAY,CAAC,MAAM;AAC5C,iBAAW,QAAQ,QAAQ;AAAA,IAC7B,CAAC;AAAA,EACH;AAAA,EAEQ,uBAAuB,OAAc;AAC3C,SAAK,YAAY,QAAQ,CAAC,CAAC,GAAG,OAAO,MAAM;AACzC,yCAAU;AAAA,IACZ,CAAC;AAAA,EACH;AAAA,EAEA,wBACE,UACA,OACA;AACA,UAAM,iBAAiB,KAAK,OAAO;AAEnC,SAAK,oBAAoB,IAAI,gBAAgB,CAAC,UAAU,KAAK,CAAC;AAE9D,WAAO,MAAM;AACX,WAAK,oBAAoB,OAAO,cAAc;AAAA,IAChD;AAAA,EACF;AAAA,EAEA,oCAA0C;AACxC,SAAK,oBAAoB,MAAM;AAAA,EACjC;AAAA,EAEQ,4BAA4B;AAClC,SAAK,oBAAoB,QAAQ,CAAC,CAAC,QAAQ,MAAM;AAC/C,eAAS;AAAA,IACX,CAAC;AAAA,EACH;AAAA,EAEQ,+BAA+B,OAA2B;AAEhE,SAAK,oBAAoB;AAAA,MAAQ,CAAC,CAAC,GAAG,aAAa,MACjD,cAAc,KAAK;AAAA,IACrB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,MAAM,SAAkB;AAC9B,SAAK,aAAa;AAClB,SAAK,UAAU;AACf,SAAK,aAAa;AAClB,SAAK,SAAS;AAAA,EAChB;AAAA,EAEQ,gBAAgB,SAAmC;AACzD,QAAI,CAAC,QAAQ,KAAK;AAChB,YAAM,IAAI,MAAM,+CAA+C;AAAA,IACjE;AACA,QAAI,QAAQ,UAAU,EAAE,QAAQ,kBAAkB,cAAc;AAC9D,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAEA,QACE,QAAQ,WAAW,UACnB,QAAQ,WAAW,QACnB,CAAC,QAAQ,SACT;AACA,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEc,iBAAiB,KAAU;AAAA;AACvC,YAAM,EAAE,cAAc,UAAU,WAAW,IAAI,KAAK;AACpD,YAAM,SAAS,KAAK,QAAQ;AAE5B,UAAI,QAAQ;AACZ,UAAI,UAAU;AAGd,aAAO,MAAM;AACX,YAAI;AACF,gBAAM,SAAS,MAAM,KAAK,YAAY,IAAI,SAAS,GAAG,EAAE,OAAO,CAAC;AAChE,cAAI,OAAO,GAAI,QAAO;AAAA,cACjB,OAAM,MAAM,WAAW,aAAa,QAAQ,IAAI,SAAS,CAAC;AAAA,QACjE,SAAS,GAAG;AACV,cAAI,iCAAQ,SAAS;AACnB,mBAAO;AAAA,UACT,WACE,aAAa,cACb,EAAE,UAAU,OACZ,EAAE,SAAS,KACX;AAEA,kBAAM;AAAA,UACR,OAAO;AAGL,kBAAM,IAAI,QAAQ,CAAC,YAAY,WAAW,SAAS,KAAK,CAAC;AAGzD,oBAAQ,KAAK,IAAI,QAAQ,YAAY,QAAQ;AAE7C;AACA,oBAAQ,IAAI,kBAAkB,OAAO,UAAU,KAAK,IAAI;AAAA,UAC1D;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA;AACF;AAiCO,IAAM,QAAN,MAAiC;AAAA,EAQtC,YAAY,QAAwB;AALpC,SAAQ,OAAqB,oBAAI,IAAI;AACrC,SAAQ,cAAc,oBAAI,IAAqC;AAC/D,SAAO,QAA4B;AACnC,SAAQ,iCAA0C;AAGhD,SAAK,SAAS;AACd,SAAK,OAAO,UAAU,KAAK,QAAQ,KAAK,IAAI,GAAG,KAAK,YAAY,KAAK,IAAI,CAAC;AAC1E,UAAM,cAAc,KAAK,OAAO;AAAA,MAC9B,MAAM;AACJ,oBAAY;AAAA,MACd;AAAA,MACA,CAAC,MAAM;AACL,aAAK,YAAY,CAAC;AAClB,cAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF;AAAA,EAEA,IAAI,aAAsB;AACxB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,IAAI,QAA+B;AACjC,WAAO,IAAI,QAAQ,CAAC,YAAY;AAC9B,UAAI,KAAK,OAAO,YAAY;AAC1B,gBAAQ,KAAK,SAAS;AAAA,MACxB,OAAO;AACL,cAAM,cAAc,KAAK,OAAO;AAAA,UAC9B,MAAM;AACJ,wBAAY;AACZ,oBAAQ,KAAK,SAAS;AAAA,UACxB;AAAA,UACA,CAAC,MAAM;AACL,kBAAM;AAAA,UACR;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,IAAI,YAAY;AACd,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,UAAU,UAA+C;AACvD,UAAM,iBAAiB,KAAK,OAAO;AAEnC,SAAK,YAAY,IAAI,gBAAgB,QAAQ;AAE7C,WAAO,MAAM;AACX,WAAK,YAAY,OAAO,cAAc;AAAA,IACxC;AAAA,EACF;AAAA,EAEA,iBAAuB;AACrB,SAAK,YAAY,MAAM;AAAA,EACzB;AAAA,EAEA,IAAI,iBAAiB;AACnB,WAAO,KAAK,YAAY;AAAA,EAC1B;AAAA,EAEQ,QAAQ,UAA8B;AAC5C,QAAI,qBAAqB;AACzB,QAAI,aAAa;AACjB,QAAI,gBAAgB;AAEpB,aAAS,QAAQ,CAAC,YAAY;AAC5B,UAAI,gBAAgB,OAAO,GAAG;AAC5B,6BAAqB,CAAC,UAAU,UAAU,QAAQ,EAAE;AAAA,UAClD,QAAQ,QAAQ;AAAA,QAClB;AAEA,gBAAQ,QAAQ,QAAQ,WAAW;AAAA,UACjC,KAAK;AACH,iBAAK,KAAK,IAAI,QAAQ,KAAK,QAAQ,KAAK;AACxC;AAAA,UACF,KAAK;AACH,iBAAK,KAAK,IAAI,QAAQ,KAAK,kCACtB,KAAK,KAAK,IAAI,QAAQ,GAAG,IACzB,QAAQ,MACZ;AACD;AAAA,UACF,KAAK;AACH,iBAAK,KAAK,OAAO,QAAQ,GAAG;AAC5B;AAAA,QACJ;AAAA,MACF;AAEA,UAAI,iBAAiB,OAAO,GAAG;AAC7B,gBAAQ,QAAQ,QAAQ,SAAS;AAAA,UAC/B,KAAK;AACH,yBAAa;AACb,gBAAI,CAAC,KAAK,gCAAgC;AACxC,8BAAgB;AAAA,YAClB;AACA;AAAA,UACF,KAAK;AACH,iBAAK,KAAK,MAAM;AAChB,iBAAK,QAAQ;AACb,yBAAa;AACb,4BAAgB;AAChB;AAAA,QACJ;AAAA,MACF;AAAA,IACF,CAAC;AAID,QAAI,iBAAkB,cAAc,oBAAqB;AACvD,WAAK,iCAAiC;AACtC,WAAK,OAAO;AAAA,IACd;AAAA,EACF;AAAA,EAEQ,YAAY,GAAgB;AAClC,QAAI,aAAa,YAAY;AAC3B,WAAK,QAAQ;AACb,WAAK,OAAO;AAAA,IACd;AAAA,EACF;AAAA,EAEQ,SAAe;AACrB,SAAK,YAAY,QAAQ,CAAC,aAAa;AACrC,eAAS,KAAK,SAAS;AAAA,IACzB,CAAC;AAAA,EACH;AACF;","names":["key","value"]}
+{"version":3,"sources":["../src/parser.ts","../src/helpers.ts","../src/client.ts"],"sourcesContent":["import { ColumnInfo, Message, Row, Schema, Value } from './types'\n\ntype NullToken = null | `NULL`\ntype Token = Exclude<string, NullToken>\ntype NullableToken = Token | NullToken\nexport type ParseFunction = (\n  value: Token,\n  additionalInfo?: Omit<ColumnInfo, `type` | `dims`>\n) => Value\ntype NullableParseFunction = (\n  value: NullableToken,\n  additionalInfo?: Omit<ColumnInfo, `type` | `dims`>\n) => Value\nexport type Parser = { [key: string]: ParseFunction }\n\nconst parseNumber = (value: string) => Number(value)\nconst parseBool = (value: string) => value === `true` || value === `t`\nconst parseBigInt = (value: string) => BigInt(value)\nconst parseJson = (value: string) => JSON.parse(value)\nconst identityParser: ParseFunction = (v: string) => v\n\nexport const defaultParser: Parser = {\n  int2: parseNumber,\n  int4: parseNumber,\n  int8: parseBigInt,\n  bool: parseBool,\n  float4: parseNumber,\n  float8: parseNumber,\n  json: parseJson,\n  jsonb: parseJson,\n}\n\n// Taken from: https://github.com/electric-sql/pglite/blob/main/packages/pglite/src/types.ts#L233-L279\nexport function pgArrayParser(value: Token, parser?: ParseFunction): Value {\n  let i = 0\n  let char = null\n  let str = ``\n  let quoted = false\n  let last = 0\n  let p: string | undefined = undefined\n\n  function loop(x: string): Value[] {\n    const xs = []\n    for (; i < x.length; i++) {\n      char = x[i]\n      if (quoted) {\n        if (char === `\\\\`) {\n          str += x[++i]\n        } else if (char === `\"`) {\n          xs.push(parser ? parser(str) : str)\n          str = ``\n          quoted = x[i + 1] === `\"`\n          last = i + 2\n        } else {\n          str += char\n        }\n      } else if (char === `\"`) {\n        quoted = true\n      } else if (char === `{`) {\n        last = ++i\n        xs.push(loop(x))\n      } else if (char === `}`) {\n        quoted = false\n        last < i &&\n          xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))\n        last = i + 1\n        break\n      } else if (char === `,` && p !== `}` && p !== `\"`) {\n        xs.push(parser ? parser(x.slice(last, i)) : x.slice(last, i))\n        last = i + 1\n      }\n      p = char\n    }\n    last < i &&\n      xs.push(parser ? parser(x.slice(last, i + 1)) : x.slice(last, i + 1))\n    return xs\n  }\n\n  return loop(value)[0]\n}\n\nexport class MessageParser<T extends Row> {\n  private parser: Parser\n  constructor(parser?: Parser) {\n    // Merge the provided parser with the default parser\n    // to use the provided parser whenever defined\n    // and otherwise fall back to the default parser\n    this.parser = { ...defaultParser, ...parser }\n  }\n\n  parse(messages: string, schema: Schema): Message<T>[] {\n    return JSON.parse(messages, (key, value) => {\n      // typeof value === `object` && value !== null\n      // is needed because there could be a column named `value`\n      // and the value associated to that column will be a string or null.\n      // But `typeof null === 'object'` so we need to make an explicit check.\n      if (key === `value` && typeof value === `object` && value !== null) {\n        // Parse the row values\n        const row = value as Record<string, Value>\n        Object.keys(row).forEach((key) => {\n          row[key] = this.parseRow(key, row[key] as NullableToken, schema)\n        })\n      }\n      return value\n    }) as Message<T>[]\n  }\n\n  // Parses the message values using the provided parser based on the schema information\n  private parseRow(key: string, value: NullableToken, schema: Schema): Value {\n    const columnInfo = schema[key]\n    if (!columnInfo) {\n      // We don't have information about the value\n      // so we just return it\n      return value\n    }\n\n    // Copy the object but don't include `dimensions` and `type`\n    const { type: typ, dims: dimensions, ...additionalInfo } = columnInfo\n\n    // Pick the right parser for the type\n    // and support parsing null values if needed\n    // if no parser is provided for the given type, just return the value as is\n    const typeParser = this.parser[typ] ?? identityParser\n    const parser = makeNullableParser(typeParser, columnInfo, key)\n\n    if (dimensions && dimensions > 0) {\n      // It's an array\n      const nullablePgArrayParser = makeNullableParser(\n        (value, _) => pgArrayParser(value, parser),\n        columnInfo,\n        key\n      )\n      return nullablePgArrayParser(value)\n    }\n\n    return parser(value, additionalInfo)\n  }\n}\n\nfunction makeNullableParser(\n  parser: ParseFunction,\n  columnInfo: ColumnInfo,\n  columnName?: string\n): NullableParseFunction {\n  const isNullable = !(columnInfo.not_null ?? false)\n  // The sync service contains `null` value for a column whose value is NULL\n  // but if the column value is an array that contains a NULL value\n  // then it will be included in the array string as `NULL`, e.g.: `\"{1,NULL,3}\"`\n  return (value: NullableToken) => {\n    if (isPgNull(value)) {\n      if (!isNullable) {\n        throw new Error(`Column ${columnName ?? `unknown`} is not nullable`)\n      }\n      return null\n    }\n    return parser(value, columnInfo)\n  }\n}\n\nfunction isPgNull(value: NullableToken): value is NullToken {\n  return value === null || value === `NULL`\n}\n","import { ChangeMessage, ControlMessage, Message, Row } from './types'\n\n/**\n * Type guard for checking {@link Message} is {@link ChangeMessage}.\n *\n * See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)\n * for information on how to use type guards.\n *\n * @param message - the message to check\n * @returns true if the message is a {@link ChangeMessage}\n *\n * @example\n * ```ts\n * if (isChangeMessage(message)) {\n *   const msgChng: ChangeMessage = message // Ok\n *   const msgCtrl: ControlMessage = message // Err, type mismatch\n * }\n * ```\n */\nexport function isChangeMessage<T extends Row = Row>(\n  message: Message<T>\n): message is ChangeMessage<T> {\n  return `key` in message\n}\n\n/**\n * Type guard for checking {@link Message} is {@link ControlMessage}.\n *\n * See [TS docs](https://www.typescriptlang.org/docs/handbook/advanced-types.html#user-defined-type-guards)\n * for information on how to use type guards.\n *\n * @param message - the message to check\n * @returns true if the message is a {@link ControlMessage}\n *\n *  * @example\n * ```ts\n * if (isControlMessage(message)) {\n *   const msgChng: ChangeMessage = message // Err, type mismatch\n *   const msgCtrl: ControlMessage = message // Ok\n * }\n * ```\n */\nexport function isControlMessage<T extends Row = Row>(\n  message: Message<T>\n): message is ControlMessage {\n  return !isChangeMessage(message)\n}\n","import { Message, Offset, Schema, Row } from './types'\nimport { MessageParser, Parser } from './parser'\nimport { isChangeMessage, isControlMessage } from './helpers'\n\nexport type ShapeData<T extends Row = Row> = Map<string, T>\nexport type ShapeChangedCallback<T extends Row = Row> = (\n  value: ShapeData<T>\n) => void\n\nexport interface BackoffOptions {\n  initialDelay: number\n  maxDelay: number\n  multiplier: number\n}\n\nexport const BackoffDefaults = {\n  initialDelay: 100,\n  maxDelay: 10_000,\n  multiplier: 1.3,\n}\n\n/**\n * Options for constructing a ShapeStream.\n */\nexport interface ShapeStreamOptions {\n  /**\n   * The full URL to where the Shape is hosted. This can either be the Electric server\n   * directly or a proxy. E.g. for a local Electric instance, you might set `http://localhost:3000/v1/shape/foo`\n   */\n  url: string\n  /**\n   * where clauses for the shape.\n   */\n  where?: string\n  /**\n   * The \"offset\" on the shape log. This is typically not set as the ShapeStream\n   * will handle this automatically. A common scenario where you might pass an offset\n   * is if you're maintaining a local cache of the log. If you've gone offline\n   * and are re-starting a ShapeStream to catch-up to the latest state of the Shape,\n   * you'd pass in the last offset and shapeId you'd seen from the Electric server\n   * so it knows at what point in the shape to catch you up from.\n   */\n  offset?: Offset\n  /**\n   * Similar to `offset`, this isn't typically used unless you're maintaining\n   * a cache of the shape log.\n   */\n  shapeId?: string\n  backoffOptions?: BackoffOptions\n  /**\n   * Automatically fetch updates to the Shape. If you just want to sync the current\n   * shape and stop, pass false.\n   */\n  subscribe?: boolean\n  signal?: AbortSignal\n  fetchClient?: typeof fetch\n  parser?: Parser\n}\n\n/**\n * Receives batches of `messages`, puts them on a queue and processes\n * them asynchronously by passing to a registered callback function.\n *\n * @constructor\n * @param {(messages: Message[]) => void} callback function\n */\nclass MessageProcessor<T extends Row = Row> {\n  private messageQueue: Message<T>[][] = []\n  private isProcessing = false\n  private callback: (messages: Message<T>[]) => void | Promise<void>\n\n  constructor(callback: (messages: Message<T>[]) => void | Promise<void>) {\n    this.callback = callback\n  }\n\n  process(messages: Message<T>[]) {\n    this.messageQueue.push(messages)\n\n    if (!this.isProcessing) {\n      this.processQueue()\n    }\n  }\n\n  private async processQueue() {\n    this.isProcessing = true\n\n    while (this.messageQueue.length > 0) {\n      const messages = this.messageQueue.shift()!\n\n      await this.callback(messages)\n    }\n\n    this.isProcessing = false\n  }\n}\n\nexport class FetchError extends Error {\n  status: number\n  text?: string\n  json?: object\n  headers: Record<string, string>\n\n  constructor(\n    status: number,\n    text: string | undefined,\n    json: object | undefined,\n    headers: Record<string, string>,\n    public url: string,\n    message?: string\n  ) {\n    super(\n      message ||\n        `HTTP Error ${status} at ${url}: ${text ?? JSON.stringify(json)}`\n    )\n    this.name = `FetchError`\n    this.status = status\n    this.text = text\n    this.json = json\n    this.headers = headers\n  }\n\n  static async fromResponse(\n    response: Response,\n    url: string\n  ): Promise<FetchError> {\n    const status = response.status\n    const headers = Object.fromEntries([...response.headers.entries()])\n    let text: string | undefined = undefined\n    let json: object | undefined = undefined\n\n    const contentType = response.headers.get(`content-type`)\n    if (contentType && contentType.includes(`application/json`)) {\n      json = (await response.json()) as object\n    } else {\n      text = await response.text()\n    }\n\n    return new FetchError(status, text, json, headers, url)\n  }\n}\n\n/**\n * Reads updates to a shape from Electric using HTTP requests and long polling. Notifies subscribers\n * when new messages come in. Doesn't maintain any history of the\n * log but does keep track of the offset position and is the best way\n * to consume the HTTP `GET /v1/shape` api.\n *\n * @constructor\n * @param {ShapeStreamOptions} options - configure the shape stream\n * @example\n * Register a callback function to subscribe to the messages.\n * ```\n * const stream = new ShapeStream(options)\n * stream.subscribe(messages => {\n *   // messages is 1 or more row updates\n * })\n * ```\n *\n * To abort the stream, abort the `signal`\n * passed in via the `ShapeStreamOptions`.\n * ```\n * const aborter = new AbortController()\n * const issueStream = new ShapeStream({\n *   url: `${BASE_URL}/${table}`\n *   subscribe: true,\n *   signal: aborter.signal,\n * })\n * // Later...\n * aborter.abort()\n * ```\n */\nexport class ShapeStream<T extends Row = Row> {\n  private options: ShapeStreamOptions\n  private backoffOptions: BackoffOptions\n  private fetchClient: typeof fetch\n  private schema?: Schema\n\n  private subscribers = new Map<\n    number,\n    [MessageProcessor<T>, ((error: Error) => void) | undefined]\n  >()\n  private upToDateSubscribers = new Map<\n    number,\n    [() => void, (error: FetchError | Error) => void]\n  >()\n\n  private lastOffset: Offset\n  private messageParser: MessageParser<T>\n  private lastSyncedAt?: number // unix time\n  public isUpToDate: boolean = false\n  private connected: boolean = false\n\n  shapeId?: string\n\n  constructor(options: ShapeStreamOptions) {\n    this.validateOptions(options)\n    this.options = { subscribe: true, ...options }\n    this.lastOffset = this.options.offset ?? `-1`\n    this.shapeId = this.options.shapeId\n    this.messageParser = new MessageParser<T>(options.parser)\n\n    this.backoffOptions = options.backoffOptions ?? BackoffDefaults\n    this.fetchClient =\n      options.fetchClient ??\n      ((...args: Parameters<typeof fetch>) => fetch(...args))\n\n    this.start()\n  }\n\n  async start() {\n    this.isUpToDate = false\n\n    const { url, where, signal } = this.options\n\n    try {\n      while ((!signal?.aborted && !this.isUpToDate) || this.options.subscribe) {\n        const fetchUrl = new URL(url)\n        if (where) fetchUrl.searchParams.set(`where`, where)\n        fetchUrl.searchParams.set(`offset`, this.lastOffset)\n\n        if (this.isUpToDate) {\n          fetchUrl.searchParams.set(`live`, `true`)\n        }\n\n        if (this.shapeId) {\n          // This should probably be a header for better cache breaking?\n          fetchUrl.searchParams.set(`shape_id`, this.shapeId!)\n        }\n\n        let response!: Response\n\n        try {\n          const maybeResponse = await this.fetchWithBackoff(fetchUrl)\n          if (maybeResponse) response = maybeResponse\n          else break\n        } catch (e) {\n          if (!(e instanceof FetchError)) throw e // should never happen\n          if (e.status == 400) {\n            // The request is invalid, most likely because the shape has been deleted.\n            // We should start from scratch, this will force the shape to be recreated.\n            this.reset()\n            this.publish(e.json as Message<T>[])\n            continue\n          } else if (e.status == 409) {\n            // Upon receiving a 409, we should start from scratch\n            // with the newly provided shape ID\n            const newShapeId = e.headers[`x-electric-shape-id`]\n            this.reset(newShapeId)\n            this.publish(e.json as Message<T>[])\n            continue\n          } else if (e.status >= 400 && e.status < 500) {\n            // Notify subscribers\n            this.sendErrorToUpToDateSubscribers(e)\n            this.sendErrorToSubscribers(e)\n\n            // 400 errors are not actionable without additional user input, so we're throwing them.\n            throw e\n          }\n        }\n\n        const { headers, status } = response\n        const shapeId = headers.get(`X-Electric-Shape-Id`)\n        if (shapeId) {\n          this.shapeId = shapeId\n        }\n\n        const lastOffset = headers.get(`X-Electric-Chunk-Last-Offset`)\n        if (lastOffset) {\n          this.lastOffset = lastOffset as Offset\n        }\n\n        const getSchema = (): Schema => {\n          const schemaHeader = headers.get(`X-Electric-Schema`)\n          return schemaHeader ? JSON.parse(schemaHeader) : {}\n        }\n        this.schema = this.schema ?? getSchema()\n\n        const messages = status === 204 ? `[]` : await response.text()\n\n        if (status === 204) {\n          // There's no content so we are live and up to date\n          this.lastSyncedAt = Date.now()\n        }\n\n        const batch = this.messageParser.parse(messages, this.schema)\n\n        // Update isUpToDate\n        if (batch.length > 0) {\n          const lastMessage = batch[batch.length - 1]\n          if (\n            isControlMessage(lastMessage) &&\n            lastMessage.headers.control === `up-to-date`\n          ) {\n            this.lastSyncedAt = Date.now()\n            if (!this.isUpToDate) {\n              this.isUpToDate = true\n              this.notifyUpToDateSubscribers()\n            }\n          }\n\n          this.publish(batch)\n        }\n      }\n    } finally {\n      this.connected = false\n    }\n  }\n\n  subscribe(\n    callback: (messages: Message<T>[]) => void | Promise<void>,\n    onError?: (error: FetchError | Error) => void\n  ) {\n    const subscriptionId = Math.random()\n    const subscriber = new MessageProcessor(callback)\n\n    this.subscribers.set(subscriptionId, [subscriber, onError])\n\n    return () => {\n      this.subscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAll(): void {\n    this.subscribers.clear()\n  }\n\n  private publish(messages: Message<T>[]) {\n    this.subscribers.forEach(([subscriber, _]) => {\n      subscriber.process(messages)\n    })\n  }\n\n  private sendErrorToSubscribers(error: Error) {\n    this.subscribers.forEach(([_, errorFn]) => {\n      errorFn?.(error)\n    })\n  }\n\n  subscribeOnceToUpToDate(\n    callback: () => void | Promise<void>,\n    error: (err: FetchError | Error) => void\n  ) {\n    const subscriptionId = Math.random()\n\n    this.upToDateSubscribers.set(subscriptionId, [callback, error])\n\n    return () => {\n      this.upToDateSubscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAllUpToDateSubscribers(): void {\n    this.upToDateSubscribers.clear()\n  }\n\n  /** Time elapsed since last sync (in ms). Infinity if we did not yet sync. */\n  lastSynced(): number {\n    if (this.lastSyncedAt === undefined) return Infinity\n    return Date.now() - this.lastSyncedAt\n  }\n\n  isConnected(): boolean {\n    return this.connected\n  }\n\n  private notifyUpToDateSubscribers() {\n    this.upToDateSubscribers.forEach(([callback]) => {\n      callback()\n    })\n  }\n\n  private sendErrorToUpToDateSubscribers(error: FetchError | Error) {\n    // eslint-disable-next-line\n    this.upToDateSubscribers.forEach(([_, errorCallback]) =>\n      errorCallback(error)\n    )\n  }\n\n  /**\n   * Resets the state of the stream, optionally with a provided\n   * shape ID\n   */\n  private reset(shapeId?: string) {\n    this.lastOffset = `-1`\n    this.shapeId = shapeId\n    this.isUpToDate = false\n    this.connected = false\n    this.schema = undefined\n  }\n\n  private validateOptions(options: ShapeStreamOptions): void {\n    if (!options.url) {\n      throw new Error(`Invalid shape option. It must provide the url`)\n    }\n    if (options.signal && !(options.signal instanceof AbortSignal)) {\n      throw new Error(\n        `Invalid signal option. It must be an instance of AbortSignal.`\n      )\n    }\n\n    if (\n      options.offset !== undefined &&\n      options.offset !== `-1` &&\n      !options.shapeId\n    ) {\n      throw new Error(\n        `shapeId is required if this isn't an initial fetch (i.e. offset > -1)`\n      )\n    }\n  }\n\n  private async fetchWithBackoff(url: URL) {\n    const { initialDelay, maxDelay, multiplier } = this.backoffOptions\n    const signal = this.options.signal\n\n    let delay = initialDelay\n    let attempt = 0\n\n    // eslint-disable-next-line no-constant-condition -- we're retrying with a lag until we get a non-500 response or the abort signal is triggered\n    while (true) {\n      try {\n        const result = await this.fetchClient(url.toString(), { signal })\n        if (result.ok) {\n          if (this.options.subscribe) {\n            this.connected = true\n          }\n          return result\n        } else throw await FetchError.fromResponse(result, url.toString())\n      } catch (e) {\n        this.connected = false\n        if (signal?.aborted) {\n          return undefined\n        } else if (\n          e instanceof FetchError &&\n          e.status >= 400 &&\n          e.status < 500\n        ) {\n          // Any client errors cannot be backed off on, leave it to the caller to handle.\n          throw e\n        } else {\n          // Exponentially backoff on errors.\n          // Wait for the current delay duration\n          await new Promise((resolve) => setTimeout(resolve, delay))\n\n          // Increase the delay for the next attempt\n          delay = Math.min(delay * multiplier, maxDelay)\n\n          attempt++\n          console.log(`Retry attempt #${attempt} after ${delay}ms`)\n        }\n      }\n    }\n  }\n}\n\n/**\n * A Shape is an object that subscribes to a shape log,\n * keeps a materialised shape `.value` in memory and\n * notifies subscribers when the value has changed.\n *\n * It can be used without a framework and as a primitive\n * to simplify developing framework hooks.\n *\n * @constructor\n * @param {ShapeStream<T extends Row>} - the underlying shape stream\n * @example\n * ```\n * const shapeStream = new ShapeStream<{ foo: number }>(url: 'http://localhost:3000/v1/shape/foo'})\n * const shape = new Shape(shapeStream)\n * ```\n *\n * `value` returns a promise that resolves the Shape data once the Shape has been\n * fully loaded (and when resuming from being offline):\n *\n *     const value = await shape.value\n *\n * `valueSync` returns the current data synchronously:\n *\n *     const value = shape.valueSync\n *\n *  Subscribe to updates. Called whenever the shape updates in Postgres.\n *\n *     shape.subscribe(shapeData => {\n *       console.log(shapeData)\n *     })\n */\nexport class Shape<T extends Row = Row> {\n  private stream: ShapeStream<T>\n\n  private data: ShapeData<T> = new Map()\n  private subscribers = new Map<number, ShapeChangedCallback<T>>()\n  public error: FetchError | false = false\n  private hasNotifiedSubscribersUpToDate: boolean = false\n\n  constructor(stream: ShapeStream<T>) {\n    this.stream = stream\n    this.stream.subscribe(this.process.bind(this), this.handleError.bind(this))\n    const unsubscribe = this.stream.subscribeOnceToUpToDate(\n      () => {\n        unsubscribe()\n      },\n      (e) => {\n        this.handleError(e)\n        throw e\n      }\n    )\n  }\n\n  lastSynced(): number {\n    return this.stream.lastSynced()\n  }\n\n  isConnected(): boolean {\n    return this.stream.isConnected()\n  }\n\n  get value(): Promise<ShapeData<T>> {\n    return new Promise((resolve) => {\n      if (this.stream.isUpToDate) {\n        resolve(this.valueSync)\n      } else {\n        const unsubscribe = this.stream.subscribeOnceToUpToDate(\n          () => {\n            unsubscribe()\n            resolve(this.valueSync)\n          },\n          (e) => {\n            throw e\n          }\n        )\n      }\n    })\n  }\n\n  get valueSync() {\n    return this.data\n  }\n\n  subscribe(callback: ShapeChangedCallback<T>): () => void {\n    const subscriptionId = Math.random()\n\n    this.subscribers.set(subscriptionId, callback)\n\n    return () => {\n      this.subscribers.delete(subscriptionId)\n    }\n  }\n\n  unsubscribeAll(): void {\n    this.subscribers.clear()\n  }\n\n  get numSubscribers() {\n    return this.subscribers.size\n  }\n\n  private process(messages: Message<T>[]): void {\n    let dataMayHaveChanged = false\n    let isUpToDate = false\n    let newlyUpToDate = false\n\n    messages.forEach((message) => {\n      if (isChangeMessage(message)) {\n        dataMayHaveChanged = [`insert`, `update`, `delete`].includes(\n          message.headers.operation\n        )\n\n        switch (message.headers.operation) {\n          case `insert`:\n            this.data.set(message.key, message.value)\n            break\n          case `update`:\n            this.data.set(message.key, {\n              ...this.data.get(message.key)!,\n              ...message.value,\n            })\n            break\n          case `delete`:\n            this.data.delete(message.key)\n            break\n        }\n      }\n\n      if (isControlMessage(message)) {\n        switch (message.headers.control) {\n          case `up-to-date`:\n            isUpToDate = true\n            if (!this.hasNotifiedSubscribersUpToDate) {\n              newlyUpToDate = true\n            }\n            break\n          case `must-refetch`:\n            this.data.clear()\n            this.error = false\n            isUpToDate = false\n            newlyUpToDate = false\n            break\n        }\n      }\n    })\n\n    // Always notify subscribers when the Shape first is up to date.\n    // FIXME this would be cleaner with a simple state machine.\n    if (newlyUpToDate || (isUpToDate && dataMayHaveChanged)) {\n      this.hasNotifiedSubscribersUpToDate = true\n      this.notify()\n    }\n  }\n\n  private handleError(e: Error): void {\n    if (e instanceof FetchError) {\n      this.error = e\n      this.notify()\n    }\n  }\n\n  private notify(): void {\n    this.subscribers.forEach((callback) => {\n      callback(this.valueSync)\n    })\n  }\n}\n"],"mappings":"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","names":["key","value"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electric-sql/client",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "description": "Postgres everywhere - your data, in sync, wherever you need it.",
   "type": "module",
   "main": "dist/cjs/index.cjs",
@@ -28,7 +28,7 @@
   "bugs": {
     "url": "https://github.com/electric-sql/electric/issues"
   },
-  "homepage": "https://next.electric-sql.com",
+  "homepage": "https://electric-sql.com",
   "dependencies": {},
   "devDependencies": {
     "@types/pg": "^8.11.6",

package/src/client.ts

@@ -186,7 +186,9 @@ export class ShapeStream<T extends Row = Row> {
 
   private lastOffset: Offset
   private messageParser: MessageParser<T>
+  private lastSyncedAt?: number // unix time
   public isUpToDate: boolean = false
+  private connected: boolean = false
 
   shapeId?: string
 
@@ -210,80 +212,97 @@ export class ShapeStream<T extends Row = Row> {
 
     const { url, where, signal } = this.options
 
-    while ((!signal?.aborted && !this.isUpToDate) || this.options.subscribe) {
-      const fetchUrl = new URL(url)
-      if (where) fetchUrl.searchParams.set(`where`, where)
-      fetchUrl.searchParams.set(`offset`, this.lastOffset)
+    try {
+      while ((!signal?.aborted && !this.isUpToDate) || this.options.subscribe) {
+        const fetchUrl = new URL(url)
+        if (where) fetchUrl.searchParams.set(`where`, where)
+        fetchUrl.searchParams.set(`offset`, this.lastOffset)
 
-      if (this.isUpToDate) {
-        fetchUrl.searchParams.set(`live`, `true`)
-      }
+        if (this.isUpToDate) {
+          fetchUrl.searchParams.set(`live`, `true`)
+        }
 
-      if (this.shapeId) {
-        // This should probably be a header for better cache breaking?
-        fetchUrl.searchParams.set(`shape_id`, this.shapeId!)
-      }
+        if (this.shapeId) {
+          // This should probably be a header for better cache breaking?
+          fetchUrl.searchParams.set(`shape_id`, this.shapeId!)
+        }
 
-      let response!: Response
+        let response!: Response
+
+        try {
+          const maybeResponse = await this.fetchWithBackoff(fetchUrl)
+          if (maybeResponse) response = maybeResponse
+          else break
+        } catch (e) {
+          if (!(e instanceof FetchError)) throw e // should never happen
+          if (e.status == 400) {
+            // The request is invalid, most likely because the shape has been deleted.
+            // We should start from scratch, this will force the shape to be recreated.
+            this.reset()
+            this.publish(e.json as Message<T>[])
+            continue
+          } else if (e.status == 409) {
+            // Upon receiving a 409, we should start from scratch
+            // with the newly provided shape ID
+            const newShapeId = e.headers[`x-electric-shape-id`]
+            this.reset(newShapeId)
+            this.publish(e.json as Message<T>[])
+            continue
+          } else if (e.status >= 400 && e.status < 500) {
+            // Notify subscribers
+            this.sendErrorToUpToDateSubscribers(e)
+            this.sendErrorToSubscribers(e)
+
+            // 400 errors are not actionable without additional user input, so we're throwing them.
+            throw e
+          }
+        }
 
-      try {
-        const maybeResponse = await this.fetchWithBackoff(fetchUrl)
-        if (maybeResponse) response = maybeResponse
-        else break
-      } catch (e) {
-        if (!(e instanceof FetchError)) throw e // should never happen
-        if (e.status == 409) {
-          // Upon receiving a 409, we should start from scratch
-          // with the newly provided shape ID
-          const newShapeId = e.headers[`x-electric-shape-id`]
-          this.reset(newShapeId)
-          this.publish(e.json as Message<T>[])
-          continue
-        } else if (e.status >= 400 && e.status < 500) {
-          // Notify subscribers
-          this.sendErrorToUpToDateSubscribers(e)
-          this.sendErrorToSubscribers(e)
-
-          // 400 errors are not actionable without additional user input, so we're throwing them.
-          throw e
+        const { headers, status } = response
+        const shapeId = headers.get(`X-Electric-Shape-Id`)
+        if (shapeId) {
+          this.shapeId = shapeId
         }
-      }
 
-      const { headers, status } = response
-      const shapeId = headers.get(`X-Electric-Shape-Id`)
-      if (shapeId) {
-        this.shapeId = shapeId
-      }
+        const lastOffset = headers.get(`X-Electric-Chunk-Last-Offset`)
+        if (lastOffset) {
+          this.lastOffset = lastOffset as Offset
+        }
 
-      const lastOffset = headers.get(`X-Electric-Chunk-Last-Offset`)
-      if (lastOffset) {
-        this.lastOffset = lastOffset as Offset
-      }
+        const getSchema = (): Schema => {
+          const schemaHeader = headers.get(`X-Electric-Schema`)
+          return schemaHeader ? JSON.parse(schemaHeader) : {}
+        }
+        this.schema = this.schema ?? getSchema()
 
-      const getSchema = (): Schema => {
-        const schemaHeader = headers.get(`X-Electric-Schema`)
-        return schemaHeader ? JSON.parse(schemaHeader) : {}
-      }
-      this.schema = this.schema ?? getSchema()
+        const messages = status === 204 ? `[]` : await response.text()
 
-      const messages = status === 204 ? `[]` : await response.text()
+        if (status === 204) {
+          // There's no content so we are live and up to date
+          this.lastSyncedAt = Date.now()
+        }
 
-      const batch = this.messageParser.parse(messages, this.schema)
+        const batch = this.messageParser.parse(messages, this.schema)
+
+        // Update isUpToDate
+        if (batch.length > 0) {
+          const lastMessage = batch[batch.length - 1]
+          if (
+            isControlMessage(lastMessage) &&
+            lastMessage.headers.control === `up-to-date`
+          ) {
+            this.lastSyncedAt = Date.now()
+            if (!this.isUpToDate) {
+              this.isUpToDate = true
+              this.notifyUpToDateSubscribers()
+            }
+          }
 
-      // Update isUpToDate
-      if (batch.length > 0) {
-        const lastMessage = batch[batch.length - 1]
-        if (
-          isControlMessage(lastMessage) &&
-          lastMessage.headers.control === `up-to-date` &&
-          !this.isUpToDate
-        ) {
-          this.isUpToDate = true
-          this.notifyUpToDateSubscribers()
+          this.publish(batch)
         }
-
-        this.publish(batch)
       }
+    } finally {
+      this.connected = false
     }
   }
 
@@ -334,6 +353,16 @@ export class ShapeStream<T extends Row = Row> {
     this.upToDateSubscribers.clear()
   }
 
+  /** Time elapsed since last sync (in ms). Infinity if we did not yet sync. */
+  lastSynced(): number {
+    if (this.lastSyncedAt === undefined) return Infinity
+    return Date.now() - this.lastSyncedAt
+  }
+
+  isConnected(): boolean {
+    return this.connected
+  }
+
   private notifyUpToDateSubscribers() {
     this.upToDateSubscribers.forEach(([callback]) => {
       callback()
@@ -355,6 +384,7 @@ export class ShapeStream<T extends Row = Row> {
     this.lastOffset = `-1`
     this.shapeId = shapeId
     this.isUpToDate = false
+    this.connected = false
     this.schema = undefined
   }
 
@@ -390,9 +420,14 @@ export class ShapeStream<T extends Row = Row> {
     while (true) {
       try {
         const result = await this.fetchClient(url.toString(), { signal })
-        if (result.ok) return result
-        else throw await FetchError.fromResponse(result, url.toString())
+        if (result.ok) {
+          if (this.options.subscribe) {
+            this.connected = true
+          }
+          return result
+        } else throw await FetchError.fromResponse(result, url.toString())
       } catch (e) {
+        this.connected = false
         if (signal?.aborted) {
           return undefined
         } else if (
@@ -471,8 +506,12 @@ export class Shape<T extends Row = Row> {
     )
   }
 
-  get isUpToDate(): boolean {
-    return this.stream.isUpToDate
+  lastSynced(): number {
+    return this.stream.lastSynced()
+  }
+
+  isConnected(): boolean {
+    return this.stream.isConnected()
   }
 
   get value(): Promise<ShapeData<T>> {

package/src/parser.ts

@@ -90,10 +90,11 @@ export class MessageParser<T extends Row> {
 
   parse(messages: string, schema: Schema): Message<T>[] {
     return JSON.parse(messages, (key, value) => {
-      // typeof value === `object` is needed because
-      // there could be a column named `value`
-      // and the value associated to that column will be a string
-      if (key === `value` && typeof value === `object`) {
+      // typeof value === `object` && value !== null
+      // is needed because there could be a column named `value`
+      // and the value associated to that column will be a string or null.
+      // But `typeof null === 'object'` so we need to make an explicit check.
+      if (key === `value` && typeof value === `object` && value !== null) {
         // Parse the row values
         const row = value as Record<string, Value>
         Object.keys(row).forEach((key) => {