@rocicorp/zero 1.1.0 → 1.2.0-canary.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/out/zero/package.js +1 -1
  2. package/out/zero/package.js.map +1 -1
  3. package/out/zero-cache/src/server/change-streamer.d.ts.map +1 -1
  4. package/out/zero-cache/src/server/change-streamer.js +2 -2
  5. package/out/zero-cache/src/server/change-streamer.js.map +1 -1
  6. package/out/zero-cache/src/server/replicator.d.ts.map +1 -1
  7. package/out/zero-cache/src/server/replicator.js +3 -3
  8. package/out/zero-cache/src/server/replicator.js.map +1 -1
  9. package/out/zero-cache/src/services/change-source/custom/change-source.js +1 -1
  10. package/out/zero-cache/src/services/change-source/custom/change-source.js.map +1 -1
  11. package/out/zero-cache/src/services/change-source/pg/initial-sync.d.ts.map +1 -1
  12. package/out/zero-cache/src/services/change-source/pg/initial-sync.js +1 -1
  13. package/out/zero-cache/src/services/change-source/pg/initial-sync.js.map +1 -1
  14. package/out/zero-cache/src/services/change-streamer/change-streamer-service.d.ts.map +1 -1
  15. package/out/zero-cache/src/services/change-streamer/change-streamer-service.js +3 -3
  16. package/out/zero-cache/src/services/change-streamer/change-streamer-service.js.map +1 -1
  17. package/out/zero-cache/src/services/replicator/incremental-sync.d.ts +2 -2
  18. package/out/zero-cache/src/services/replicator/incremental-sync.d.ts.map +1 -1
  19. package/out/zero-cache/src/services/replicator/incremental-sync.js +10 -14
  20. package/out/zero-cache/src/services/replicator/incremental-sync.js.map +1 -1
  21. package/out/zero-cache/src/services/replicator/replication-status.d.ts +4 -2
  22. package/out/zero-cache/src/services/replicator/replication-status.d.ts.map +1 -1
  23. package/out/zero-cache/src/services/replicator/replication-status.js +20 -7
  24. package/out/zero-cache/src/services/replicator/replication-status.js.map +1 -1
  25. package/out/zero-cache/src/services/replicator/replicator.d.ts +2 -2
  26. package/out/zero-cache/src/services/replicator/replicator.d.ts.map +1 -1
  27. package/out/zero-cache/src/services/replicator/replicator.js +2 -2
  28. package/out/zero-cache/src/services/replicator/replicator.js.map +1 -1
  29. package/out/zero-cache/src/services/running-state.d.ts +3 -1
  30. package/out/zero-cache/src/services/running-state.d.ts.map +1 -1
  31. package/out/zero-cache/src/services/running-state.js +4 -0
  32. package/out/zero-cache/src/services/running-state.js.map +1 -1
  33. package/out/zero-cache/src/workers/replicator.d.ts.map +1 -1
  34. package/out/zero-cache/src/workers/replicator.js +18 -4
  35. package/out/zero-cache/src/workers/replicator.js.map +1 -1
  36. package/out/zero-client/src/client/version.js +1 -1
  37. package/out/zqlite/src/db.d.ts.map +1 -1
  38. package/out/zqlite/src/db.js +1 -1
  39. package/out/zqlite/src/db.js.map +1 -1
  40. package/package.json +1 -1
@@ -1,3 +1,4 @@
1
+ import { sleep } from "../../../shared/src/sleep.js";
1
2
  import { literalUnion } from "../../../shared/src/valita.js";
2
3
  import { Database } from "../../../zqlite/src/db.js";
3
4
  import { getAscendingEvents, recordEvent } from "../services/replicator/schema/replication-state.js";
@@ -14,9 +15,8 @@ var MILLIS_PER_HOUR = 1e3 * 60 * 60;
14
15
  var MB = 1024 * 1024;
15
16
  async function connect(lc, { file, vacuumIntervalHours }, walMode, mode) {
16
17
  const replica = new Database(lc, file);
17
- replica.pragma("busy_timeout = 1000");
18
18
  await upgradeReplica(lc, `${mode}-replica`, file);
19
- replica.pragma("journal_mode = delete");
19
+ await setJournalMode(lc, replica, "delete");
20
20
  const [{ page_size: pageSize }] = replica.pragma("page_size");
21
21
  const [{ page_count: pageCount }] = replica.pragma("page_count");
22
22
  const [{ freelist_count: freelistCount }] = replica.pragma("freelist_count");
@@ -38,13 +38,27 @@ async function connect(lc, { file, vacuumIntervalHours }, walMode, mode) {
38
38
  lc.info?.(`VACUUM completed (${t1 - t0} ms)`);
39
39
  }
40
40
  }
41
- lc.info?.(`setting ${file} to ${walMode} mode`);
42
- replica.pragma(`journal_mode = ${walMode}`);
41
+ await setJournalMode(lc, replica, walMode);
43
42
  applyPragmas(replica, getPragmaConfig(mode));
44
43
  replica.pragma("optimize = 0x10002");
45
44
  lc.info?.(`optimized ${file}`);
46
45
  return replica;
47
46
  }
47
+ async function setJournalMode(lc, replica, mode) {
48
+ lc.info?.(`setting ${replica.name} to ${mode} mode`);
49
+ let err;
50
+ for (let i = 0; i < 5; i++) {
51
+ try {
52
+ replica.pragma(`journal_mode = ${mode}`);
53
+ return;
54
+ } catch (e) {
55
+ lc.warn?.(`error setting journal_mode to ${mode} (attempt ${i + 1})`, e);
56
+ err = e;
57
+ }
58
+ await sleep(500);
59
+ }
60
+ throw err;
61
+ }
48
62
  /**
49
63
  * Returns the PragmaConfig for a given replica file mode.
50
64
  * This is used by both the main thread (setupReplica) and
@@ -1 +1 @@
1
- {"version":3,"file":"replicator.js","names":[],"sources":["../../../../../zero-cache/src/workers/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport type {ReplicaOptions} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {Notifier} from '../services/replicator/notifier.ts';\nimport type {\n ReplicaState,\n ReplicaStateNotifier,\n Replicator,\n} from '../services/replicator/replicator.ts';\nimport {\n getAscendingEvents,\n recordEvent,\n} from '../services/replicator/schema/replication-state.ts';\nimport {\n applyPragmas,\n type PragmaConfig,\n} from '../services/replicator/write-worker-client.ts';\nimport type {Worker} from '../types/processes.ts';\n\nexport const replicaFileModeSchema = v.literalUnion(\n 'serving',\n 'serving-copy',\n 'backup',\n);\n\nexport type ReplicaFileMode = v.Infer<typeof replicaFileModeSchema>;\n\nexport function replicaFileName(replicaFile: string, mode: ReplicaFileMode) {\n return mode === 'serving-copy' ? `${replicaFile}-serving-copy` : replicaFile;\n}\n\nconst MILLIS_PER_HOUR = 1000 * 60 * 60;\nconst MB = 1024 * 1024;\n\nasync function connect(\n lc: LogContext,\n {file, vacuumIntervalHours}: ReplicaOptions,\n walMode: 'wal' | 'wal2',\n mode: ReplicaFileMode,\n): Promise<Database> {\n const replica = new Database(lc, file);\n\n // To allow other readers (e.g. the change-streamer) to access the replica\n // for stats / event publishing, allow a short busy_timeout for performing\n // locking operations.\n replica.pragma('busy_timeout = 1000');\n\n // Perform any upgrades to the replica in case the backup is an\n // earlier version.\n await upgradeReplica(lc, `${mode}-replica`, file);\n\n // Start by folding any (e.g. restored) WAL(2) files into the main db.\n replica.pragma('journal_mode = delete');\n\n const [{page_size: pageSize}] = replica.pragma<{page_size: number}>(\n 'page_size',\n );\n const [{page_count: pageCount}] = replica.pragma<{page_count: number}>(\n 'page_count',\n );\n const [{freelist_count: freelistCount}] = replica.pragma<{\n freelist_count: number;\n }>('freelist_count');\n\n const dbSize = ((pageCount * pageSize) / MB).toFixed(2);\n const freelistSize = ((freelistCount * pageSize) / MB).toFixed(2);\n\n // TODO: Consider adding a freelist size or ratio based vacuum trigger.\n lc.info?.(`Size of db ${file}: ${dbSize} MB (${freelistSize} MB freeable)`);\n\n // Check for the VACUUM threshold.\n const events = getAscendingEvents(replica);\n lc.debug?.(`Runtime events for db ${file}`, {events});\n if (vacuumIntervalHours !== undefined) {\n const millisSinceLastEvent =\n Date.now() - (events.at(-1)?.timestamp.getTime() ?? 0);\n if (millisSinceLastEvent / MILLIS_PER_HOUR > vacuumIntervalHours) {\n lc.info?.(`Performing maintenance cleanup on ${file}`);\n const t0 = performance.now();\n replica.unsafeMode(true);\n replica.pragma('journal_mode = OFF');\n replica.exec('VACUUM');\n recordEvent(replica, 'vacuum');\n replica.unsafeMode(false);\n const t1 = performance.now();\n lc.info?.(`VACUUM completed (${t1 - t0} ms)`);\n }\n }\n\n lc.info?.(`setting ${file} to ${walMode} mode`);\n replica.pragma(`journal_mode = ${walMode}`);\n\n const pragmas = getPragmaConfig(mode);\n applyPragmas(replica, pragmas);\n\n replica.pragma('optimize = 0x10002');\n lc.info?.(`optimized ${file}`);\n return replica;\n}\n\n/**\n * Returns the PragmaConfig for a given replica file mode.\n * This is used by both the main thread (setupReplica) and\n * the write worker thread to apply the same pragma settings.\n */\nexport function getPragmaConfig(mode: ReplicaFileMode): PragmaConfig {\n return {\n busyTimeout: 30000,\n analysisLimit: 1000,\n walAutocheckpoint: mode === 'backup' ? 0 : undefined,\n };\n}\n\nexport async function setupReplica(\n lc: LogContext,\n mode: ReplicaFileMode,\n replicaOptions: ReplicaOptions,\n): Promise<Database> {\n lc.info?.(`setting up ${mode} replica`);\n\n switch (mode) {\n case 'backup':\n return await connect(lc, replicaOptions, 'wal', mode);\n\n case 'serving-copy': {\n // In 'serving-copy' mode, the original file is being used for 'backup'\n // mode, so we make a copy for servicing sync requests.\n const {file} = replicaOptions;\n const copyLocation = replicaFileName(file, mode);\n deleteLiteDB(copyLocation);\n\n const start = Date.now();\n lc.info?.(`copying ${file} to ${copyLocation}`);\n const replica = new Database(lc, file);\n replica.prepare(`VACUUM INTO ?`).run(copyLocation);\n replica.close();\n lc.info?.(`finished copy (${Date.now() - start} ms)`);\n\n return connect(lc, {...replicaOptions, file: copyLocation}, 'wal2', mode);\n }\n\n case 'serving':\n return connect(lc, replicaOptions, 'wal2', mode);\n\n default:\n throw new Error(`Invalid ReplicaMode ${mode}`);\n }\n}\n\nexport function setUpMessageHandlers(\n lc: LogContext,\n replicator: Replicator,\n parent: Worker,\n) {\n handleSubscriptionsFrom(lc, parent, replicator);\n}\n\ntype Notification = ['notify', ReplicaState];\n\nexport function handleSubscriptionsFrom(\n lc: LogContext,\n subscriber: Worker,\n notifier: ReplicaStateNotifier,\n) {\n subscriber.onMessageType('subscribe', async () => {\n const subscription = notifier.subscribe();\n\n subscriber.on('close', () => {\n lc.debug?.(`closing replication subscription from ${subscriber.pid}`);\n subscription.cancel();\n });\n\n for await (const msg of subscription) {\n try {\n subscriber.send<Notification>(['notify', msg]);\n } catch (e) {\n const log =\n e instanceof Error &&\n 'code' in e &&\n // This can happen in a race condition if the subscribing process\n // is closed before the 'close' message is processed.\n e.code === 'ERR_IPC_CHANNEL_CLOSED'\n ? 'warn'\n : 'error';\n\n lc[log]?.(\n `error sending replicator notification to ${subscriber.pid}: ${String(e)}`,\n e,\n );\n }\n }\n });\n}\n\n/**\n * Creates a Notifier to relay notifications the notifier of another Worker.\n * This does not send the initial subscription message. Use {@link subscribeTo}\n * to initiate the subscription.\n */\nexport function createNotifierFrom(_lc: LogContext, source: Worker): Notifier {\n const notifier = new Notifier();\n source.onMessageType<Notification>('notify', msg =>\n notifier.notifySubscribers(msg),\n );\n return notifier;\n}\n\nexport function subscribeTo(_lc: LogContext, source: Worker) {\n source.send(['subscribe', {}]);\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"replicator.js","names":[],"sources":["../../../../../zero-cache/src/workers/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {sleep} from '../../../shared/src/sleep.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport type {ReplicaOptions} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {Notifier} from '../services/replicator/notifier.ts';\nimport type {\n ReplicaState,\n ReplicaStateNotifier,\n Replicator,\n} from '../services/replicator/replicator.ts';\nimport {\n getAscendingEvents,\n recordEvent,\n} from '../services/replicator/schema/replication-state.ts';\nimport {\n applyPragmas,\n type PragmaConfig,\n} from '../services/replicator/write-worker-client.ts';\nimport type {Worker} from '../types/processes.ts';\n\nexport const replicaFileModeSchema = v.literalUnion(\n 'serving',\n 'serving-copy',\n 'backup',\n);\n\nexport type ReplicaFileMode = v.Infer<typeof replicaFileModeSchema>;\n\nexport function replicaFileName(replicaFile: string, mode: ReplicaFileMode) {\n return mode === 'serving-copy' ? `${replicaFile}-serving-copy` : replicaFile;\n}\n\nconst MILLIS_PER_HOUR = 1000 * 60 * 60;\nconst MB = 1024 * 1024;\n\nasync function connect(\n lc: LogContext,\n {file, vacuumIntervalHours}: ReplicaOptions,\n walMode: 'wal' | 'wal2',\n mode: ReplicaFileMode,\n): Promise<Database> {\n const replica = new Database(lc, file);\n\n // Perform any upgrades to the replica in case the backup is an\n // earlier version.\n await upgradeReplica(lc, `${mode}-replica`, file);\n\n // Start by folding any (e.g. restored) WAL(2) files into the main db.\n await setJournalMode(lc, replica, 'delete');\n\n const [{page_size: pageSize}] = replica.pragma<{page_size: number}>(\n 'page_size',\n );\n const [{page_count: pageCount}] = replica.pragma<{page_count: number}>(\n 'page_count',\n );\n const [{freelist_count: freelistCount}] = replica.pragma<{\n freelist_count: number;\n }>('freelist_count');\n\n const dbSize = ((pageCount * pageSize) / MB).toFixed(2);\n const freelistSize = ((freelistCount * pageSize) / MB).toFixed(2);\n\n // TODO: Consider adding a freelist size or ratio based vacuum trigger.\n lc.info?.(`Size of db ${file}: ${dbSize} MB (${freelistSize} MB freeable)`);\n\n // Check for the VACUUM threshold.\n const events = getAscendingEvents(replica);\n lc.debug?.(`Runtime events for db ${file}`, {events});\n if (vacuumIntervalHours !== undefined) {\n const millisSinceLastEvent =\n Date.now() - (events.at(-1)?.timestamp.getTime() ?? 0);\n if (millisSinceLastEvent / MILLIS_PER_HOUR > vacuumIntervalHours) {\n lc.info?.(`Performing maintenance cleanup on ${file}`);\n const t0 = performance.now();\n replica.unsafeMode(true);\n replica.pragma('journal_mode = OFF');\n replica.exec('VACUUM');\n recordEvent(replica, 'vacuum');\n replica.unsafeMode(false);\n const t1 = performance.now();\n lc.info?.(`VACUUM completed (${t1 - t0} ms)`);\n }\n }\n\n await setJournalMode(lc, replica, walMode);\n\n const pragmas = getPragmaConfig(mode);\n applyPragmas(replica, pragmas);\n\n replica.pragma('optimize = 0x10002');\n lc.info?.(`optimized ${file}`);\n return replica;\n}\n\n// Setting the journal_mode requires an exclusive lock on the replica.\n// Add resilience against random replica reads (for stats, etc.) by\n// retrying if the database is locked. Note that the busy_timeout doesn't\n// work here.\nasync function setJournalMode(\n lc: LogContext,\n replica: Database,\n mode: 'delete' | 'wal' | 'wal2',\n) {\n lc.info?.(`setting ${replica.name} to ${mode} mode`);\n let err: unknown;\n for (let i = 0; i < 5; i++) {\n try {\n replica.pragma(`journal_mode = ${mode}`);\n return;\n } catch (e) {\n lc.warn?.(`error setting journal_mode to ${mode} (attempt ${i + 1})`, e);\n err = e;\n }\n await sleep(500);\n }\n throw err;\n}\n\n/**\n * Returns the PragmaConfig for a given replica file mode.\n * This is used by both the main thread (setupReplica) and\n * the write worker thread to apply the same pragma settings.\n */\nexport function getPragmaConfig(mode: ReplicaFileMode): PragmaConfig {\n return {\n busyTimeout: 30000,\n analysisLimit: 1000,\n walAutocheckpoint: mode === 'backup' ? 0 : undefined,\n };\n}\n\nexport async function setupReplica(\n lc: LogContext,\n mode: ReplicaFileMode,\n replicaOptions: ReplicaOptions,\n): Promise<Database> {\n lc.info?.(`setting up ${mode} replica`);\n\n switch (mode) {\n case 'backup':\n return await connect(lc, replicaOptions, 'wal', mode);\n\n case 'serving-copy': {\n // In 'serving-copy' mode, the original file is being used for 'backup'\n // mode, so we make a copy for servicing sync requests.\n const {file} = replicaOptions;\n const copyLocation = replicaFileName(file, mode);\n deleteLiteDB(copyLocation);\n\n const start = Date.now();\n lc.info?.(`copying ${file} to ${copyLocation}`);\n const replica = new Database(lc, file);\n replica.prepare(`VACUUM INTO ?`).run(copyLocation);\n replica.close();\n lc.info?.(`finished copy (${Date.now() - start} ms)`);\n\n return connect(lc, {...replicaOptions, file: copyLocation}, 'wal2', mode);\n }\n\n case 'serving':\n return connect(lc, replicaOptions, 'wal2', mode);\n\n default:\n throw new Error(`Invalid ReplicaMode ${mode}`);\n }\n}\n\nexport function setUpMessageHandlers(\n lc: LogContext,\n replicator: Replicator,\n parent: Worker,\n) {\n handleSubscriptionsFrom(lc, parent, replicator);\n}\n\ntype Notification = ['notify', ReplicaState];\n\nexport function handleSubscriptionsFrom(\n lc: LogContext,\n subscriber: Worker,\n notifier: ReplicaStateNotifier,\n) {\n subscriber.onMessageType('subscribe', async () => {\n const subscription = notifier.subscribe();\n\n subscriber.on('close', () => {\n lc.debug?.(`closing replication subscription from ${subscriber.pid}`);\n subscription.cancel();\n });\n\n for await (const msg of subscription) {\n try {\n subscriber.send<Notification>(['notify', msg]);\n } catch (e) {\n const log =\n e instanceof Error &&\n 'code' in e &&\n // This can happen in a race condition if the subscribing process\n // is closed before the 'close' message is processed.\n e.code === 'ERR_IPC_CHANNEL_CLOSED'\n ? 'warn'\n : 'error';\n\n lc[log]?.(\n `error sending replicator notification to ${subscriber.pid}: ${String(e)}`,\n e,\n );\n }\n }\n });\n}\n\n/**\n * Creates a Notifier to relay notifications the notifier of another Worker.\n * This does not send the initial subscription message. Use {@link subscribeTo}\n * to initiate the subscription.\n */\nexport function createNotifierFrom(_lc: LogContext, source: Worker): Notifier {\n const notifier = new Notifier();\n source.onMessageType<Notification>('notify', msg =>\n notifier.notifySubscribers(msg),\n );\n return notifier;\n}\n\nexport function subscribeTo(_lc: LogContext, source: Worker) {\n source.send(['subscribe', {}]);\n}\n"],"mappings":"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"}
@@ -2,7 +2,7 @@
2
2
  /**
3
3
  * The current version of Zero.
4
4
  */
5
- var version = "1.1.0";
5
+ var version = "1.2.0-canary.1";
6
6
  //#endregion
7
7
  export { version };
8
8
 
@@ -1 +1 @@
1
- {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,eAAe,EAAE,EAEtB,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,gBAAgB,EACnC,MAAM,wBAAwB,CAAC;AAehC,qBAAa,QAAS,YAAW,UAAU;;gBAOvC,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EACjC,kBAAkB,SAAM;IAgB1B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAc/B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIvB,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,EAAE;IAQrC,OAAO,CAAC,sBAAsB,EAAE,MAAM;IAyCtC,UAAU,CAAC,MAAM,EAAE,OAAO;IAuB1B,KAAK,IAAI,IAAI;IAcb,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,IAAI,IAAI,WAEP;IAED,IAAI,aAAa,YAEhB;IAED,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI;CAGzB;AAED,qBAAa,SAAS;;IAKpB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACtD,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;gBAG5D,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM;IAUnB,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAKtC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAYpC,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;IAY/B,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAYjC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;CAQtD;AAkFD;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;CAAG"}
1
+ {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,eAAe,EAAE,EAEtB,KAAK,SAAS,EACd,KAAK,SAAS,IAAI,gBAAgB,EACnC,MAAM,wBAAwB,CAAC;AAehC,qBAAa,QAAS,YAAW,UAAU;;gBAOvC,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EACjC,kBAAkB,SAAM;IAgB1B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAc/B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIvB,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,EAAE;IAQrC,OAAO,CAAC,sBAAsB,EAAE,MAAM;IAyCtC,UAAU,CAAC,MAAM,EAAE,OAAO;IAuB1B,KAAK,IAAI,IAAI;IAgBb,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,IAAI,IAAI,WAEP;IAED,IAAI,aAAa,YAEhB;IAED,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI;CAGzB;AAED,qBAAa,SAAS;;IAKpB,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACtD,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;gBAG5D,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,MAAM;IAUnB,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAKtC,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS;IAYpC,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC;IAY/B,GAAG,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAYjC,OAAO,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;CAQtD;AAkFD;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;CAAG"}
@@ -74,7 +74,7 @@ var Database = class {
74
74
  }
75
75
  close() {
76
76
  const start = Date.now();
77
- try {
77
+ if (!this.#db.readonly) try {
78
78
  this.#db.pragma("optimize");
79
79
  const elapsed = Date.now() - start;
80
80
  if (elapsed > 2) this.#lc.debug?.(`PRAGMA optimized (${elapsed} ms)`);
@@ -1 +1 @@
1
- {"version":3,"file":"db.js","names":["#db","#threshold","#lc","#pageSize","#run","#bytes","#stmt","#attrs","#it","#start","#sqliteRowTimeSum","#log"],"sources":["../../../../zqlite/src/db.ts"],"sourcesContent":["import {trace, type Attributes} from '@opentelemetry/api';\nimport type {LogContext} from '@rocicorp/logger';\nimport SQLite3Database, {\n SqliteError,\n type RunResult,\n type Statement as SQLite3Statement,\n} from '@rocicorp/zero-sqlite3';\nimport {manualSpan} from '../../otel/src/span.ts';\nimport {version} from '../../otel/src/version.ts';\n\nconst tracer = trace.getTracer('view-syncer', version);\n\n// https://www.sqlite.org/pragma.html#pragma_auto_vacuum\nconst AUTO_VACUUM_INCREMENTAL = 2;\n\nconst MB = 1024 * 1024;\n\nfunction mb(bytes: number): string {\n return (bytes / MB).toFixed(2);\n}\n\nexport class Database implements Disposable {\n readonly #db: SQLite3Database.Database;\n readonly #threshold: number;\n readonly #lc: LogContext;\n readonly #pageSize: number;\n\n constructor(\n lc: LogContext,\n path: string,\n options?: SQLite3Database.Options,\n slowQueryThreshold = 100,\n ) {\n try {\n this.#lc = lc.withContext('class', 'Database').withContext('path', path);\n this.#db = new SQLite3Database(path, options);\n this.#threshold = slowQueryThreshold;\n\n const [{page_size: pageSize}] = this.pragma<{page_size: number}>(\n 'page_size',\n );\n this.#pageSize = pageSize;\n } catch (cause) {\n throw new DatabaseInitError(String(cause), {cause});\n }\n }\n\n prepare(sql: string): Statement {\n return this.#run(\n 'prepare',\n sql,\n () =>\n new Statement(\n this.#lc.withContext('sql', sql),\n {class: 'Statement', sql},\n this.#db.prepare(sql),\n this.#threshold,\n ),\n );\n }\n\n exec(sql: string): void {\n this.#run('exec', sql, () => this.#db.exec(sql));\n }\n\n pragma<T = unknown>(sql: string): T[] {\n return this.#run<T[]>('pragma', sql, () => this.#db.pragma(sql) as T[]);\n }\n\n #bytes(pages: number) {\n return pages * this.#pageSize;\n }\n\n compact(freeableBytesThreshold: number) {\n const [{freelist_count: freelistCount}] = this.pragma<{\n freelist_count: number;\n }>('freelist_count');\n\n const freeable = this.#bytes(freelistCount);\n if (freeable < freeableBytesThreshold) {\n this.#lc.debug?.(\n `Not compacting ${this.#db.name}: ${mb(freeable)} freeable MB`,\n );\n return;\n }\n const [{auto_vacuum: autoVacuumMode}] = this.pragma<{auto_vacuum: number}>(\n 'auto_vacuum',\n );\n if (autoVacuumMode !== AUTO_VACUUM_INCREMENTAL) {\n this.#lc.warn?.(\n `Cannot compact ${mb(freeable)} MB of ` +\n `${this.#db.name} because AUTO_VACUUM mode is ${autoVacuumMode}.`,\n );\n return;\n }\n const start = Date.now();\n const [{page_count: pageCountBefore}] = this.pragma<{page_count: number}>(\n 'page_count',\n );\n\n this.pragma('incremental_vacuum');\n\n const [{page_count: pageCountAfter}] = this.pragma<{page_count: number}>(\n 'page_count',\n );\n\n this.#lc.info?.(\n `Compacted ${this.#db.name} from ` +\n `${mb(this.#bytes(pageCountBefore))} MB to ` +\n `${mb(this.#bytes(pageCountAfter))} MB ` +\n `(${Date.now() - start} ms)`,\n );\n }\n\n unsafeMode(unsafe: boolean) {\n this.#db.unsafeMode(unsafe);\n }\n\n #run<T>(method: string, sql: string, fn: () => T): T {\n const start = performance.now();\n try {\n return fn();\n } catch (e) {\n if (e instanceof SqliteError) {\n e.message += `: ${sql}`;\n }\n throw e;\n } finally {\n logIfSlow(\n this.#lc.withContext('method', method),\n performance.now() - start,\n {method},\n this.#threshold,\n );\n }\n }\n\n close(): void {\n const start = Date.now();\n try {\n this.#db.pragma('optimize');\n const elapsed = Date.now() - start;\n if (elapsed > 2) {\n this.#lc.debug?.(`PRAGMA optimized (${elapsed} ms)`);\n }\n } catch (e) {\n this.#lc.warn?.('error running PRAGMA optimize', e);\n }\n this.#db.close();\n }\n\n transaction<T>(fn: () => T): T {\n return this.#db.transaction(fn)();\n }\n\n get name() {\n return this.#db.name;\n }\n\n get inTransaction() {\n return this.#db.inTransaction;\n }\n\n [Symbol.dispose](): void {\n this.close();\n }\n}\n\nexport class Statement {\n readonly #stmt: SQLite3Statement;\n readonly #lc: LogContext;\n readonly #threshold: number;\n readonly #attrs: Attributes;\n readonly scanStatus: SQLite3Statement['scanStatusV2'];\n readonly scanStatusReset: SQLite3Statement['scanStatusReset'];\n\n constructor(\n lc: LogContext,\n attrs: Attributes,\n stmt: SQLite3Statement,\n threshold: number,\n ) {\n this.#lc = lc.withContext('class', 'Statement');\n this.#attrs = attrs;\n this.#stmt = stmt;\n this.#threshold = threshold;\n this.scanStatus = this.#stmt.scanStatusV2.bind(this.#stmt);\n this.scanStatusReset = this.#stmt.scanStatusReset.bind(this.#stmt);\n }\n\n safeIntegers(useBigInt: boolean): this {\n this.#stmt.safeIntegers(useBigInt);\n return this;\n }\n\n run(...params: unknown[]): RunResult {\n const start = performance.now();\n const ret = this.#stmt.run(...params);\n logIfSlow(\n this.#lc.withContext('method', 'run'),\n performance.now() - start,\n {...this.#attrs, method: 'run'},\n this.#threshold,\n );\n return ret;\n }\n\n get<T>(...params: unknown[]): T {\n const start = performance.now();\n const ret = this.#stmt.get(...params);\n logIfSlow(\n this.#lc.withContext('method', 'get'),\n performance.now() - start,\n {...this.#attrs, method: 'get'},\n this.#threshold,\n );\n return ret as T;\n }\n\n all<T>(...params: unknown[]): T[] {\n const start = performance.now();\n const ret = this.#stmt.all(...params);\n logIfSlow(\n this.#lc.withContext('method', 'all'),\n performance.now() - start,\n {...this.#attrs, method: 'all'},\n this.#threshold,\n );\n return ret as T[];\n }\n\n iterate<T>(...params: unknown[]): IterableIterator<T> {\n return new LoggingIterableIterator(\n this.#lc.withContext('method', 'iterate'),\n this.#attrs,\n this.#stmt.iterate(...params),\n this.#threshold,\n ) as IterableIterator<T>;\n }\n}\n\nclass LoggingIterableIterator<T> implements IterableIterator<T> {\n readonly #lc: LogContext;\n readonly #it: IterableIterator<T>;\n readonly #threshold: number;\n readonly #attrs: Attributes;\n #start: number;\n #sqliteRowTimeSum: number;\n\n constructor(\n lc: LogContext,\n attrs: Attributes,\n it: IterableIterator<T>,\n slowQueryThreshold: number,\n ) {\n this.#lc = lc;\n this.#attrs = attrs;\n this.#it = it;\n this.#start = performance.now();\n this.#threshold = slowQueryThreshold;\n this.#sqliteRowTimeSum = 0;\n }\n\n next(): IteratorResult<T> {\n const start = performance.now();\n const ret = this.#it.next();\n const elapsed = performance.now() - start;\n this.#sqliteRowTimeSum += elapsed;\n if (ret.done) {\n this.#log();\n }\n return ret;\n }\n\n #log() {\n logIfSlow(\n this.#lc.withContext('type', 'total'),\n performance.now() - this.#start,\n {...this.#attrs, type: 'total', method: 'iterate'},\n this.#threshold,\n );\n logIfSlow(\n this.#lc.withContext('type', 'sqlite'),\n this.#sqliteRowTimeSum,\n {...this.#attrs, type: 'sqlite', method: 'iterate'},\n this.#threshold,\n );\n }\n\n [Symbol.iterator](): IterableIterator<T> {\n return this;\n }\n\n return(): IteratorResult<T> {\n this.#log();\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n return this.#it.return?.() as any;\n }\n\n throw(e: unknown): IteratorResult<T> {\n this.#log();\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n return this.#it.throw?.(e) as any;\n }\n}\n\nfunction logIfSlow(\n lc: LogContext,\n elapsed: number,\n attrs: Attributes,\n threshold: number,\n): void {\n if (elapsed >= threshold) {\n for (const [key, value] of Object.entries(attrs)) {\n lc = lc.withContext(key, value);\n }\n lc.warn?.('Slow SQLite query', elapsed);\n manualSpan(tracer, 'db.slow-query', elapsed, attrs);\n }\n}\n\n/**\n * An error indicating that the Database failed to open. This essentially\n * wraps the TypeError thrown by the better-sqlite3 package with something\n * more specific.\n */\nexport class DatabaseInitError extends Error {}\n"],"mappings":"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"}
1
+ {"version":3,"file":"db.js","names":["#db","#threshold","#lc","#pageSize","#run","#bytes","#stmt","#attrs","#it","#start","#sqliteRowTimeSum","#log"],"sources":["../../../../zqlite/src/db.ts"],"sourcesContent":["import {trace, type Attributes} from '@opentelemetry/api';\nimport type {LogContext} from '@rocicorp/logger';\nimport SQLite3Database, {\n SqliteError,\n type RunResult,\n type Statement as SQLite3Statement,\n} from '@rocicorp/zero-sqlite3';\nimport {manualSpan} from '../../otel/src/span.ts';\nimport {version} from '../../otel/src/version.ts';\n\nconst tracer = trace.getTracer('view-syncer', version);\n\n// https://www.sqlite.org/pragma.html#pragma_auto_vacuum\nconst AUTO_VACUUM_INCREMENTAL = 2;\n\nconst MB = 1024 * 1024;\n\nfunction mb(bytes: number): string {\n return (bytes / MB).toFixed(2);\n}\n\nexport class Database implements Disposable {\n readonly #db: SQLite3Database.Database;\n readonly #threshold: number;\n readonly #lc: LogContext;\n readonly #pageSize: number;\n\n constructor(\n lc: LogContext,\n path: string,\n options?: SQLite3Database.Options,\n slowQueryThreshold = 100,\n ) {\n try {\n this.#lc = lc.withContext('class', 'Database').withContext('path', path);\n this.#db = new SQLite3Database(path, options);\n this.#threshold = slowQueryThreshold;\n\n const [{page_size: pageSize}] = this.pragma<{page_size: number}>(\n 'page_size',\n );\n this.#pageSize = pageSize;\n } catch (cause) {\n throw new DatabaseInitError(String(cause), {cause});\n }\n }\n\n prepare(sql: string): Statement {\n return this.#run(\n 'prepare',\n sql,\n () =>\n new Statement(\n this.#lc.withContext('sql', sql),\n {class: 'Statement', sql},\n this.#db.prepare(sql),\n this.#threshold,\n ),\n );\n }\n\n exec(sql: string): void {\n this.#run('exec', sql, () => this.#db.exec(sql));\n }\n\n pragma<T = unknown>(sql: string): T[] {\n return this.#run<T[]>('pragma', sql, () => this.#db.pragma(sql) as T[]);\n }\n\n #bytes(pages: number) {\n return pages * this.#pageSize;\n }\n\n compact(freeableBytesThreshold: number) {\n const [{freelist_count: freelistCount}] = this.pragma<{\n freelist_count: number;\n }>('freelist_count');\n\n const freeable = this.#bytes(freelistCount);\n if (freeable < freeableBytesThreshold) {\n this.#lc.debug?.(\n `Not compacting ${this.#db.name}: ${mb(freeable)} freeable MB`,\n );\n return;\n }\n const [{auto_vacuum: autoVacuumMode}] = this.pragma<{auto_vacuum: number}>(\n 'auto_vacuum',\n );\n if (autoVacuumMode !== AUTO_VACUUM_INCREMENTAL) {\n this.#lc.warn?.(\n `Cannot compact ${mb(freeable)} MB of ` +\n `${this.#db.name} because AUTO_VACUUM mode is ${autoVacuumMode}.`,\n );\n return;\n }\n const start = Date.now();\n const [{page_count: pageCountBefore}] = this.pragma<{page_count: number}>(\n 'page_count',\n );\n\n this.pragma('incremental_vacuum');\n\n const [{page_count: pageCountAfter}] = this.pragma<{page_count: number}>(\n 'page_count',\n );\n\n this.#lc.info?.(\n `Compacted ${this.#db.name} from ` +\n `${mb(this.#bytes(pageCountBefore))} MB to ` +\n `${mb(this.#bytes(pageCountAfter))} MB ` +\n `(${Date.now() - start} ms)`,\n );\n }\n\n unsafeMode(unsafe: boolean) {\n this.#db.unsafeMode(unsafe);\n }\n\n #run<T>(method: string, sql: string, fn: () => T): T {\n const start = performance.now();\n try {\n return fn();\n } catch (e) {\n if (e instanceof SqliteError) {\n e.message += `: ${sql}`;\n }\n throw e;\n } finally {\n logIfSlow(\n this.#lc.withContext('method', method),\n performance.now() - start,\n {method},\n this.#threshold,\n );\n }\n }\n\n close(): void {\n const start = Date.now();\n if (!this.#db.readonly) {\n try {\n this.#db.pragma('optimize');\n const elapsed = Date.now() - start;\n if (elapsed > 2) {\n this.#lc.debug?.(`PRAGMA optimized (${elapsed} ms)`);\n }\n } catch (e) {\n this.#lc.warn?.('error running PRAGMA optimize', e);\n }\n }\n this.#db.close();\n }\n\n transaction<T>(fn: () => T): T {\n return this.#db.transaction(fn)();\n }\n\n get name() {\n return this.#db.name;\n }\n\n get inTransaction() {\n return this.#db.inTransaction;\n }\n\n [Symbol.dispose](): void {\n this.close();\n }\n}\n\nexport class Statement {\n readonly #stmt: SQLite3Statement;\n readonly #lc: LogContext;\n readonly #threshold: number;\n readonly #attrs: Attributes;\n readonly scanStatus: SQLite3Statement['scanStatusV2'];\n readonly scanStatusReset: SQLite3Statement['scanStatusReset'];\n\n constructor(\n lc: LogContext,\n attrs: Attributes,\n stmt: SQLite3Statement,\n threshold: number,\n ) {\n this.#lc = lc.withContext('class', 'Statement');\n this.#attrs = attrs;\n this.#stmt = stmt;\n this.#threshold = threshold;\n this.scanStatus = this.#stmt.scanStatusV2.bind(this.#stmt);\n this.scanStatusReset = this.#stmt.scanStatusReset.bind(this.#stmt);\n }\n\n safeIntegers(useBigInt: boolean): this {\n this.#stmt.safeIntegers(useBigInt);\n return this;\n }\n\n run(...params: unknown[]): RunResult {\n const start = performance.now();\n const ret = this.#stmt.run(...params);\n logIfSlow(\n this.#lc.withContext('method', 'run'),\n performance.now() - start,\n {...this.#attrs, method: 'run'},\n this.#threshold,\n );\n return ret;\n }\n\n get<T>(...params: unknown[]): T {\n const start = performance.now();\n const ret = this.#stmt.get(...params);\n logIfSlow(\n this.#lc.withContext('method', 'get'),\n performance.now() - start,\n {...this.#attrs, method: 'get'},\n this.#threshold,\n );\n return ret as T;\n }\n\n all<T>(...params: unknown[]): T[] {\n const start = performance.now();\n const ret = this.#stmt.all(...params);\n logIfSlow(\n this.#lc.withContext('method', 'all'),\n performance.now() - start,\n {...this.#attrs, method: 'all'},\n this.#threshold,\n );\n return ret as T[];\n }\n\n iterate<T>(...params: unknown[]): IterableIterator<T> {\n return new LoggingIterableIterator(\n this.#lc.withContext('method', 'iterate'),\n this.#attrs,\n this.#stmt.iterate(...params),\n this.#threshold,\n ) as IterableIterator<T>;\n }\n}\n\nclass LoggingIterableIterator<T> implements IterableIterator<T> {\n readonly #lc: LogContext;\n readonly #it: IterableIterator<T>;\n readonly #threshold: number;\n readonly #attrs: Attributes;\n #start: number;\n #sqliteRowTimeSum: number;\n\n constructor(\n lc: LogContext,\n attrs: Attributes,\n it: IterableIterator<T>,\n slowQueryThreshold: number,\n ) {\n this.#lc = lc;\n this.#attrs = attrs;\n this.#it = it;\n this.#start = performance.now();\n this.#threshold = slowQueryThreshold;\n this.#sqliteRowTimeSum = 0;\n }\n\n next(): IteratorResult<T> {\n const start = performance.now();\n const ret = this.#it.next();\n const elapsed = performance.now() - start;\n this.#sqliteRowTimeSum += elapsed;\n if (ret.done) {\n this.#log();\n }\n return ret;\n }\n\n #log() {\n logIfSlow(\n this.#lc.withContext('type', 'total'),\n performance.now() - this.#start,\n {...this.#attrs, type: 'total', method: 'iterate'},\n this.#threshold,\n );\n logIfSlow(\n this.#lc.withContext('type', 'sqlite'),\n this.#sqliteRowTimeSum,\n {...this.#attrs, type: 'sqlite', method: 'iterate'},\n this.#threshold,\n );\n }\n\n [Symbol.iterator](): IterableIterator<T> {\n return this;\n }\n\n return(): IteratorResult<T> {\n this.#log();\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n return this.#it.return?.() as any;\n }\n\n throw(e: unknown): IteratorResult<T> {\n this.#log();\n // oxlint-disable-next-line @typescript-eslint/no-explicit-any\n return this.#it.throw?.(e) as any;\n }\n}\n\nfunction logIfSlow(\n lc: LogContext,\n elapsed: number,\n attrs: Attributes,\n threshold: number,\n): void {\n if (elapsed >= threshold) {\n for (const [key, value] of Object.entries(attrs)) {\n lc = lc.withContext(key, value);\n }\n lc.warn?.('Slow SQLite query', elapsed);\n manualSpan(tracer, 'db.slow-query', elapsed, attrs);\n }\n}\n\n/**\n * An error indicating that the Database failed to open. This essentially\n * wraps the TypeError thrown by the better-sqlite3 package with something\n * more specific.\n */\nexport class DatabaseInitError extends Error {}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocicorp/zero",
3
- "version": "1.1.0",
3
+ "version": "1.2.0-canary.1",
4
4
  "description": "Zero is a web framework for serverless web development.",
5
5
  "author": "Rocicorp, Inc.",
6
6
  "repository": {