firebird-wasm 0.8.0 → 0.9.0

package/dist/electric-server/capture.js

@@ -8,15 +8,20 @@
  * which is the order the stream follows.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KEY_COLUMNS = exports.META = exports.CHANGES = void 0;
+exports.KEY_COLUMNS = exports.CHANGE_EVENT = exports.STAMPS = exports.META = exports.CHANGES = void 0;
 exports.triggerName = triggerName;
 exports.installCapture = installCapture;
 exports.tableTrigger = tableTrigger;
 exports.stampCommitted = stampCommitted;
+exports.pruneLog = pruneLog;
 const node_firebird_driver_1 = require("node-firebird-driver");
 const catalog_1 = require("./catalog");
 exports.CHANGES = 'ELECTRIC_CHANGES';
 exports.META = 'ELECTRIC_META';
+/** When each commit number was given: what pruning goes by. */
+exports.STAMPS = 'ELECTRIC_STAMPS';
+/** The event each logged change posts, delivered when its transaction commits. */
+exports.CHANGE_EVENT = 'ELECTRIC_CHANGES';
 const CHANGE_SEQ = 'ELECTRIC_CHANGE_SEQ';
 const COMMIT_SEQ = 'ELECTRIC_COMMIT_SEQ';
 /** How many key columns the log has room for. */
@@ -81,12 +86,20 @@ async function installCapture(attachment, tables) {
         await ddl(`CREATE INDEX ${exports.CHANGES}_SEQ ON ${exports.CHANGES} (COMMIT_SEQ)`);
     }
     if (!(await has(relation, exports.META))) {
-        await ddl(`CREATE TABLE ${exports.META} (EPOCH VARCHAR(40) NOT NULL)`);
+        await ddl(`CREATE TABLE ${exports.META} (EPOCH VARCHAR(40) NOT NULL, PRUNED_THROUGH BIGINT DEFAULT 0 NOT NULL)`);
         const tx = await attachment.startTransaction();
         const epoch = `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 10)}`;
         await attachment.execute(tx, `INSERT INTO ${exports.META} (EPOCH) VALUES (?)`, [epoch]);
         await tx.commit();
     }
+    // Installed by an earlier version: without pruning.
+    const column = 'SELECT 1 FROM RDB$RELATION_FIELDS WHERE RDB$RELATION_NAME = \'' + exports.META + '\' AND RDB$FIELD_NAME = ?';
+    if (!(await has(column, 'PRUNED_THROUGH'))) {
+        await ddl(`ALTER TABLE ${exports.META} ADD PRUNED_THROUGH BIGINT DEFAULT 0 NOT NULL`);
+    }
+    if (!(await has(relation, exports.STAMPS))) {
+        await ddl(`CREATE TABLE ${exports.STAMPS} (COMMIT_SEQ BIGINT NOT NULL PRIMARY KEY, STAMPED_AT TIMESTAMP NOT NULL)`);
+    }
     for (const table of tables) {
         await ddl(tableTrigger(table));
     }
@@ -106,6 +119,9 @@ function tableTrigger(table) {
         `  IF (DELETING OR (UPDATING AND (${keyChanged}))) THEN ${log('D', 'OLD')}\n` +
         `  IF (INSERTING) THEN ${log('I', 'NEW')}\n` +
         `  IF (UPDATING) THEN ${log('U', 'NEW')}\n` +
+        // Wakes the servers' live requests when the transaction commits; Firebird
+        // delivers one per transaction however many rows posted it.
+        `  POST_EVENT '${exports.CHANGE_EVENT}';\n` +
         'END');
 }
 /**
@@ -116,33 +132,93 @@ function tableTrigger(table) {
  * is loaded when a connection attaches, so an application connected before
  * the capture was installed would never run it.  A change still being
  * written is invisible to this READ COMMITTED update and is numbered by a
- * later call, after its commit; so numbers follow commits, and one stamper
- * at a time (the server's queue) leaves no number to arrive late.
+ * later call, after its commit; so numbers follow commits.
+ *
+ * One numbering at a time, across every server on the database: each takes
+ * the ELECTRIC_META row first, and a number is taken only under it.  So
+ * numbers commit in order, and a snapshot that sees a number sees every
+ * number below it.  Two servers numbering at once used to fail on each
+ * other's rows, or commit a higher number before a lower one.
  */
 async function stampCommitted(attachment) {
-    const tx = await attachment.startTransaction({
-        isolation: node_firebird_driver_1.TransactionIsolation.READ_COMMITTED,
-        readCommittedMode: 'RECORD_VERSION',
-        waitMode: 'NO_WAIT',
-    });
-    try {
-        const pending = await attachment.executeQuery(tx, `SELECT FIRST 1 1 FROM ${exports.CHANGES} WHERE COMMIT_SEQ IS NULL`);
-        const any = (await pending.fetch({ fetchSize: 1 })).length > 0;
-        await pending.close();
-        if (!any) {
+    for (let attempt = 1;; attempt++) {
+        const tx = await attachment.startTransaction({
+            isolation: node_firebird_driver_1.TransactionIsolation.READ_COMMITTED,
+            readCommittedMode: 'RECORD_VERSION',
+            waitMode: 'NO_WAIT',
+        });
+        try {
+            const pending = await attachment.executeQuery(tx, `SELECT FIRST 1 1 FROM ${exports.CHANGES} WHERE COMMIT_SEQ IS NULL`);
+            const any = (await pending.fetch({ fetchSize: 1 })).length > 0;
+            await pending.close();
+            if (!any) {
+                await tx.commit();
+                return 0;
+            }
+            try {
+                await attachment.execute(tx, `UPDATE ${exports.META} SET EPOCH = EPOCH`);
+            }
+            catch (err) {
+                // Another server is numbering: try again once it has.
+                await tx.rollback().catch(() => undefined);
+                if (attempt >= 100)
+                    throw err;
+                await new Promise((r) => setTimeout(r, Math.min(5 * attempt, 50)));
+                continue;
+            }
+            const seq = await attachment.executeQuery(tx, `SELECT GEN_ID(${COMMIT_SEQ}, 1) FROM RDB$DATABASE`);
+            const n = Number((await seq.fetch())[0][0]);
+            await seq.close();
+            await attachment.execute(tx, `UPDATE ${exports.CHANGES} SET COMMIT_SEQ = ? WHERE COMMIT_SEQ IS NULL`, [n]);
+            await attachment.execute(tx, `INSERT INTO ${exports.STAMPS} (COMMIT_SEQ, STAMPED_AT) VALUES (?, CURRENT_TIMESTAMP)`, [n]);
             await tx.commit();
-            return 0;
+            return n;
+        }
+        catch (err) {
+            await tx.rollback().catch(() => undefined);
+            throw err;
         }
-        const seq = await attachment.executeQuery(tx, `SELECT GEN_ID(${COMMIT_SEQ}, 1) FROM RDB$DATABASE`);
-        const n = Number((await seq.fetch())[0][0]);
-        await seq.close();
-        await attachment.execute(tx, `UPDATE ${exports.CHANGES} SET COMMIT_SEQ = ? WHERE COMMIT_SEQ IS NULL`, [n]);
-        await tx.commit();
-        return n;
     }
-    catch (err) {
-        await tx.rollback().catch(() => undefined);
-        throw err;
+}
+/**
+ * Drop what was numbered before `before` from the log, and return the
+ * highest number dropped (0 when nothing was).  A client whose position is
+ * below it is sent back to a snapshot: what it would need is gone.
+ */
+async function pruneLog(attachment, before) {
+    for (let attempt = 1;; attempt++) {
+        const tx = await attachment.startTransaction({
+            isolation: node_firebird_driver_1.TransactionIsolation.READ_COMMITTED,
+            readCommittedMode: 'RECORD_VERSION',
+            waitMode: 'NO_WAIT',
+        });
+        try {
+            try {
+                // Not while a number is being given: the same lock as stampCommitted.
+                await attachment.execute(tx, `UPDATE ${exports.META} SET EPOCH = EPOCH`);
+            }
+            catch (err) {
+                await tx.rollback().catch(() => undefined);
+                if (attempt >= 100)
+                    throw err;
+                await new Promise((r) => setTimeout(r, Math.min(5 * attempt, 50)));
+                continue;
+            }
+            const rs = await attachment.executeQuery(tx, `SELECT MAX(COMMIT_SEQ) FROM ${exports.STAMPS} WHERE STAMPED_AT < ?`, [before]);
+            const through = Number((await rs.fetch())[0]?.[0] ?? 0);
+            await rs.close();
+            if (through > 0) {
+                await attachment.execute(tx, `DELETE FROM ${exports.CHANGES} WHERE COMMIT_SEQ <= ?`, [through]);
+                await attachment.execute(tx, `DELETE FROM ${exports.STAMPS} WHERE COMMIT_SEQ <= ?`, [through]);
+                await attachment.execute(tx, `UPDATE ${exports.META} SET PRUNED_THROUGH = ? WHERE PRUNED_THROUGH < ?`, [through, through]);
+            }
+            await tx.commit();
+            return through;
+        }
+        catch (err) {
+            await tx.rollback().catch(() => undefined);
+            throw err;
+        }
     }
 }
 //# sourceMappingURL=capture.js.map

package/dist/electric-server/capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/electric-server/capture.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/electric-server/capture.ts"],"names":[],"mappings":"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"}

package/dist/electric-server/catalog.d.ts

@@ -15,6 +15,8 @@ export interface FirebirdColumn {
     precision: number;
     charLength: number;
     notNull: boolean;
+    /** RDB$CHARACTER_SET_ID: 1 is OCTETS, the set of BINARY and VARBINARY. */
+    charSet?: number;
 }
 /** How one column is read and described. */
 export interface ColumnPlan {
@@ -25,7 +27,7 @@ export interface ColumnPlan {
     /** The SELECT expression that yields the value. */
     select: string;
     /** How the fetched value becomes text. */
-    render: 'text' | 'number' | 'boolean' | 'blob' | 'utc';
+    render: 'text' | 'number' | 'boolean' | 'blob' | 'bytes' | 'utc';
     /** The column in `electric-schema`. */
     schema: ElectricColumn;
 }

package/dist/electric-server/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/electric-server/catalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzE,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,4CAA4C;AAC5C,MAAM,WAAW,UAAU;IACzB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,KAAK,CAAC;IACvD,uCAAuC;IACvC,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,kEAAkE;AAClE,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAkD7D;AAED,uCAAuC;AACvC,MAAM,WAAW,SAAS;IACxB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,iDAAiD;IACjD,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,SAAS,CAW3F;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAc3E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIlD"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/electric-server/catalog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzE,iDAAiD;AACjD,MAAM,WAAW,cAAc;IAC7B,oEAAoE;IACpE,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,4CAA4C;AAC5C,MAAM,WAAW,UAAU;IACzB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;IACjE,uCAAuC;IACvC,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEtD;AAKD,kEAAkE;AAClE,wBAAgB,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CA0D7D;AAED,uCAAuC;AACvC,MAAM,WAAW,SAAS;IACxB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,iDAAiD;IACjD,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,SAAS,CAW3F;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAmB3E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIlD"}

package/dist/electric-server/catalog.js

@@ -22,6 +22,8 @@ function quote(name) {
 function shapeName(firebirdName) {
     return /^[A-Z][A-Z0-9_$]*$/.test(firebirdName) ? firebirdName.toLowerCase() : firebirdName;
 }
+/** RDB$CHARACTER_SET_ID of OCTETS. */
+const OCTETS = 1;
 /** The plan for one column, from its system-table description. */
 function planColumn(column) {
     const q = quote(column.name);
@@ -53,12 +55,20 @@ function planColumn(column) {
         case 10: return { ...base, select: q, render: 'number', schema: schema('float4') };
         case 27: return { ...base, select: q, render: 'number', schema: schema('float8') };
         case 23: return { ...base, select: q, render: 'boolean', schema: schema('bool') };
-        case 14: return { ...base, select: q, render: 'text', schema: schema('bpchar', { length: column.charLength }) };
-        case 37: return { ...base, select: q, render: 'text', schema: schema('varchar', { max_length: column.charLength }) };
+        // BINARY(n) and VARBINARY(n) are CHAR and VARCHAR in OCTETS: bytes. Read
+        // as a binary BLOB: the native driver decodes an OCTETS column as text.
+        case 14:
+            return column.charSet === OCTETS
+                ? { ...base, select: `CAST(${q} AS BLOB SUB_TYPE BINARY)`, render: 'bytes', schema: schema('bytea') }
+                : { ...base, select: q, render: 'text', schema: schema('bpchar', { length: column.charLength }) };
+        case 37:
+            return column.charSet === OCTETS
+                ? { ...base, select: `CAST(${q} AS BLOB SUB_TYPE BINARY)`, render: 'bytes', schema: schema('bytea') }
+                : { ...base, select: q, render: 'text', schema: schema('varchar', { max_length: column.charLength }) };
         case 261:
             return column.subType === 1
                 ? { ...base, select: q, render: 'blob', schema: schema('text') }
-                : { ...base, select: 'NULL', render: 'text', schema: schema('bytea') };
+                : { ...base, select: q, render: 'bytes', schema: schema('bytea') };
         case 12: return { ...base, select: `CAST(${q} AS VARCHAR(10))`, render: 'text', schema: schema('date') };
         case 13: return { ...base, select: `CAST(${q} AS VARCHAR(13))`, render: 'text', schema: schema('time') };
         case 35: return { ...base, select: `CAST(${q} AS VARCHAR(24))`, render: 'text', schema: schema('timestamp') };
@@ -102,6 +112,11 @@ function renderValue(plan, value) {
             return String(value);
         case 'boolean':
             return value ? 'true' : 'false';
+        case 'bytes': {
+            // Postgres's hex form, of the bytes of a BLOB read whole.
+            const bytes = Buffer.from(value);
+            return `\\x${bytes.toString('hex')}`;
+        }
         case 'utc':
             // '2024-05-01 10:00:00.0000 UTC' → '2024-05-01 10:00:00.0000+00'
             return String(value).replace(/ (UTC|GMT|\+00:00)$/, '+00');

package/dist/electric-server/catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/electric-server/catalog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/electric-server/catalog.ts"],"names":[],"mappings":"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"}

package/dist/electric-server/index.d.ts

@@ -18,13 +18,15 @@
  * Firebird source.  It installs triggers that log each changed row's key,
  * numbers the log in commit order itself (see
  * docs/plans/firebird-shape-server.md), and serves a snapshot and then the
- * changes after it.  One server per database: two would number the log
- * against each other.  Node only: it uses the native client (`node-firebird-driver-
+ * changes after it, in pages for a snapshot, and with a `where` if asked.
+ * Several servers can share a database: they number the log one at a time.
+ * Node only: it uses the native client (`node-firebird-driver-
  * native`, an optional dependency of this package).
  */
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { TablePlan } from './catalog';
 export { triggerName, tableTrigger } from './capture';
+export { translateWhere, WhereError } from './where';
 export { planTable, planColumn, shapeName } from './catalog';
 export type { TablePlan, ColumnPlan, FirebirdColumn } from './catalog';
 /** Options of {@link createShapeServer}. */
@@ -41,8 +43,21 @@ export interface ShapeServerOptions {
     install?: boolean;
     /** How long a live request waits for a change.  Default 20 000 ms, as Electric. */
     liveTimeoutMs?: number;
-    /** How often a waiting live request looks at the log.  Default 100 ms. */
+    /**
+     * How often a waiting live request looks at the log when no event woke it.
+     * Default 1000 ms: a commit that logged a change wakes it at once.
+     */
     pollIntervalMs?: number;
+    /** Wake live requests on Firebird events (`ELECTRIC_CHANGES`), on a connection of its own.  Default true. */
+    events?: boolean;
+    /** Rows per response while serving a snapshot.  Default 10 000. */
+    snapshotPageRows?: number;
+    /**
+     * How long the log keeps a change after numbering it, in ms; a client
+     * further behind starts again from a snapshot.  Default 7 days; `null` or
+     * 0 keeps everything (prune with {@link ShapeServer.prune}).
+     */
+    retainLogMs?: number | null;
 }
 /** A running shape server. */
 export interface ShapeServer {
@@ -50,6 +65,18 @@ export interface ShapeServer {
     handler: (req: IncomingMessage, res: ServerResponse) => void;
     /** The plans of the served tables, by Firebird name. */
     readonly tables: ReadonlyMap<string, TablePlan>;
+    /**
+     * Whether live requests are woken by Firebird events.  False when the
+     * event connection could not be made (the server's `RemoteAuxPort` must
+     * be reachable from here; a container usually needs it pinned and
+     * published): live requests then poll every `pollIntervalMs`.
+     */
+    readonly events: boolean;
+    /**
+     * Drop what the log numbered before `before` (default: now less
+     * `retainLogMs`), and return the highest number dropped, or 0.
+     */
+    prune(before?: Date): Promise<number>;
     /** Stop answering and close the connection. */
     close(): Promise<void>;
 }

package/dist/electric-server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/electric-server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIjE,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC7D,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEvE,4CAA4C;AAC5C,MAAM,WAAW,kBAAkB;IACjC,wEAAwE;IACxE,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+FAA+F;IAC/F,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,8BAA8B;AAC9B,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7D,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAChD,+CAA+C;IAC/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAYD,mFAAmF;AACnF,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAiOzF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/electric-server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIjE,OAAO,KAAK,EAAkB,SAAS,EAAE,MAAM,WAAW,CAAC;AAK3D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC7D,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEvE,4CAA4C;AAC5C,MAAM,WAAW,kBAAkB;IACjC,wEAAwE;IACxE,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+FAA+F;IAC/F,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mFAAmF;IACnF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6GAA6G;IAC7G,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,8BAA8B;AAC9B,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7D,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAChD;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,+CAA+C;IAC/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAYD,mFAAmF;AACnF,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAkWzF"}