@fireproof/core 0.19.8-dev-alldocs-export → 0.19.8-dev-getid

package/index.js

@@ -1,11 +1,6 @@
-import {
-  guardVersion
-} from "./chunk-5UFCF36O.js";
 import {
   NotFoundError,
-  isNotFoundError
-} from "./chunk-VZGT7ZYP.js";
-import {
+  Result,
   dataDir,
   decodeFile,
   encodeFile,
@@ -15,16 +10,17 @@ import {
   getKey,
   getName,
   getStore,
+  isNotFoundError,
   runtime_exports,
   toCryptoOpts
-} from "./chunk-DG6XSV44.js";
+} from "./chunk-BNL4PVBF.js";
 import {
   SysContainer,
   __export,
   falsyToUndef,
   isFalsy,
   throwFalsy
-} from "./chunk-OWQAHX2V.js";
+} from "./chunk-JW2QT6BF.js";
 
 // src/database.ts
 import { uuidv7 } from "uuidv7";
@@ -280,7 +276,7 @@ import { KeyedResolvOnce } from "@adviser/cement";
 // src/blockstore/store.ts
 import pLimit2 from "p-limit";
 import { format, parse } from "@ipld/dag-json";
-import { ResolveOnce as ResolveOnce2, Result } from "@adviser/cement";
+import { ResolveOnce as ResolveOnce2, Result as Result2 } from "@adviser/cement";
 
 // src/blockstore/loader.ts
 import pLimit from "p-limit";
@@ -1243,6 +1239,12 @@ var Loader = class {
 };
 
 // src/blockstore/store.ts
+function guardVersion(url) {
+  if (!url.searchParams.has("version")) {
+    return Result2.Err(`missing version: ${url.toString()}`);
+  }
+  return Result2.Ok(url);
+}
 var VersionedStore = class {
   constructor(name, url, logger) {
     this._onStarted = [];
@@ -1288,14 +1290,14 @@ var MetaStore = class extends VersionedStore {
     this.logger.Debug().Str("branch", branch || "").Msg("loading");
     const url = await this.gateway.buildUrl(this.url, branch || "main");
     if (url.isErr()) {
-      throw this.logger.Error().Err(url.Err()).Str("branch", branch || "").Str("url", this.url.toString()).Msg("got error from gateway.buildUrl").AsError();
+      throw this.logger.Error().Result("buidUrl", url).Str("branch", branch || "").Url(this.url).Msg("got error from gateway.buildUrl").AsError();
     }
     const bytes = await this.gateway.get(url.Ok());
     if (bytes.isErr()) {
       if (isNotFoundError(bytes)) {
         return void 0;
       }
-      throw this.logger.Error().Err(bytes.Err()).Msg("gateway get").AsError();
+      throw this.logger.Error().Url(url.Ok()).Result("bytes:", bytes).Msg("gateway get").AsError();
     }
     try {
       return [this.parseHeader(textDecoder.decode(bytes.Ok()))];
@@ -1319,7 +1321,7 @@ var MetaStore = class extends VersionedStore {
   async close() {
     await this.gateway.close(this.url);
     this._onClosed.forEach((fn) => fn());
-    return Result.Ok(void 0);
+    return Result2.Ok(void 0);
   }
   async destroy() {
     return this.gateway.destroy(this.url);
@@ -1341,13 +1343,13 @@ var DataStore = class extends VersionedStore {
     this.logger.Debug().Msg("starting-gateway");
     const res = await this.gateway.start(this.url);
     if (res.isErr()) {
-      this.logger.Error().Err(res.Err()).Msg("started-gateway");
+      this.logger.Error().Result("gw-start", res).Msg("started-gateway");
       return res;
     }
     this._onStarted.forEach((fn) => fn());
     const version = guardVersion(this.url);
     if (version.isErr()) {
-      this.logger.Error().Err(res.Err()).Msg("guardVersion");
+      this.logger.Error().Result("version", version).Msg("guardVersion");
       await this.close();
       return version;
     }
@@ -1389,7 +1391,7 @@ var DataStore = class extends VersionedStore {
   async close() {
     await this.gateway.close(this.url);
     this._onClosed.forEach((fn) => fn());
-    return Result.Ok(void 0);
+    return Result2.Ok(void 0);
   }
   destroy() {
     return this.gateway.destroy(this.url);
@@ -1574,7 +1576,7 @@ var RemoteWAL = class extends VersionedStore {
   async close() {
     await this.gateway.close(this.url);
     this._onClosed.forEach((fn) => fn());
-    return Result.Ok(void 0);
+    return Result2.Ok(void 0);
   }
   destroy() {
     return this.gateway.destroy(this.url);
@@ -1617,17 +1619,26 @@ function buildURL(optURL, loader) {
   return toURL(optURL || obuUrl || dataDir(loader.name, storeOpts.stores?.base), storeOpts.isIndex);
 }
 function registerStoreProtocol(item) {
-  if (storeFactory.has(item.protocol)) {
-    throw new Error(`protocol ${item.protocol} already registered`);
+  let protocol = item.protocol;
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
+  if (storeFactory.has(protocol)) {
+    if (!item.overrideBaseURL && storeFactory.get(protocol) !== item) {
+      const logger = ensureLogger({}, "registerStoreProtocol", { protocol });
+      logger.Warn().Msg(`protocol ${protocol} already registered`);
+      return () => {
+      };
+    }
   }
   if (item.overrideBaseURL) {
     Array.from(storeFactory.values()).forEach((items) => {
       items.overrideBaseURL = void 0;
     });
   }
-  storeFactory.set(item.protocol, item);
+  storeFactory.set(protocol, item);
   return () => {
-    storeFactory.delete(item.protocol);
+    storeFactory.delete(protocol);
   };
 }
 function runStoreFactory(url, logger, run) {
@@ -1653,7 +1664,10 @@ async function dataStoreFactory(loader) {
   return onceDataStoreFactory.get(url.toString()).once(async () => {
     const gateway = await loadDataGateway(url, logger);
     const store = new DataStore(loader.name, url, loader.logger, gateway);
-    await store.start();
+    const ret = await store.start();
+    if (ret.isErr()) {
+      throw logger.Error().Result("start", ret).Msg("start failed").AsError();
+    }
     logger.Debug().Str("prepared", store.url.toString()).Msg("produced");
     return store;
   });
@@ -1674,7 +1688,10 @@ async function metaStoreFactory(loader) {
     logger.Debug().Str("protocol", url.protocol).Msg("pre-protocol switch");
     const gateway = await loadMetaGateway(url, logger);
     const store = new MetaStore(loader.name, url, loader.logger, gateway);
-    await store.start();
+    const ret = await store.start();
+    if (ret.isErr()) {
+      throw logger.Error().Result("start", ret).Msg("start failed").AsError();
+    }
     return store;
   });
 }
@@ -1694,7 +1711,10 @@ async function remoteWalFactory(loader) {
     const gateway = await loadWalGateway(url, logger);
     logger.Debug().Str("prepared", url.toString()).Msg("produced");
     const store = new RemoteWAL(loader, url, loader.logger, gateway);
-    await store.start();
+    const ret = await store.start();
+    if (ret.isErr()) {
+      throw logger.Error().Result("start", ret).Msg("start failed").AsError();
+    }
     return store;
   });
 }
@@ -1729,60 +1749,41 @@ function toStoreRuntime(opts, ilogger) {
 registerStoreProtocol({
   protocol: "file:",
   data: async (logger) => {
-    const { FileDataGateway } = await import("./store-file-WD746RSY.js");
+    const { FileDataGateway } = await import("./store-file-VJ6BI4II.js");
     return new FileDataGateway(logger);
   },
   meta: async (logger) => {
-    const { FileMetaGateway } = await import("./store-file-WD746RSY.js");
+    const { FileMetaGateway } = await import("./store-file-VJ6BI4II.js");
     return new FileMetaGateway(logger);
   },
   wal: async (logger) => {
-    const { FileWALGateway } = await import("./store-file-WD746RSY.js");
+    const { FileWALGateway } = await import("./store-file-VJ6BI4II.js");
     return new FileWALGateway(logger);
   },
   test: async (logger) => {
-    const { FileTestStore } = await import("./store-file-WD746RSY.js");
+    const { FileTestStore } = await import("./store-file-VJ6BI4II.js");
     return new FileTestStore(logger);
   }
 });
 registerStoreProtocol({
   protocol: "indexdb:",
   data: async (logger) => {
-    const { IndexDBDataGateway } = await import("./store-indexdb-NG45BU3Q.js");
+    const { IndexDBDataGateway } = await import("./store-indexdb-WLRSICCB.js");
     return new IndexDBDataGateway(logger);
   },
   meta: async (logger) => {
-    const { IndexDBMetaGateway } = await import("./store-indexdb-NG45BU3Q.js");
+    const { IndexDBMetaGateway } = await import("./store-indexdb-WLRSICCB.js");
     return new IndexDBMetaGateway(logger);
   },
   wal: async (logger) => {
-    const { IndexDBMetaGateway } = await import("./store-indexdb-NG45BU3Q.js");
+    const { IndexDBMetaGateway } = await import("./store-indexdb-WLRSICCB.js");
     return new IndexDBMetaGateway(logger);
   },
   test: async (logger) => {
-    const { IndexDBTestStore } = await import("./store-indexdb-NG45BU3Q.js");
+    const { IndexDBTestStore } = await import("./store-indexdb-WLRSICCB.js");
     return new IndexDBTestStore(logger);
   }
 });
-registerStoreProtocol({
-  protocol: "sqlite:",
-  data: async (logger) => {
-    const { SQLDataGateway } = await import("./store-sql-QVFNIGND.js");
-    return new SQLDataGateway(logger);
-  },
-  meta: async (logger) => {
-    const { SQLMetaGateway } = await import("./store-sql-QVFNIGND.js");
-    return new SQLMetaGateway(logger);
-  },
-  wal: async (logger) => {
-    const { SQLWalGateway } = await import("./store-sql-QVFNIGND.js");
-    return new SQLWalGateway(logger);
-  },
-  test: async (logger) => {
-    const { SQLTestStore } = await import("./store-sql-QVFNIGND.js");
-    return new SQLTestStore(logger);
-  }
-});
 
 // src/crdt-helpers.ts
 function time(tag) {
@@ -2687,9 +2688,9 @@ var Database = class {
     });
   }
   async get(id) {
-    this.logger.Debug().Str("id", id).Msg("get-pre-ready");
+    if (!id) throw this.logger.Error().Str("db", this.name).Msg(`Doc id is required`).AsError();
     await this.ready();
-    this.logger.Debug().Str("id", id).Msg("get-post-ready");
+    this.logger.Debug().Str("id", id).Msg("get");
     const got = await this._crdt.get(id).catch((e) => {
       throw new NotFoundError(`Not found: ${id} - ${e.message}`);
     });
@@ -2698,9 +2699,8 @@ var Database = class {
     return { ...doc, _id: id };
   }
   async put(doc) {
-    this.logger.Debug().Str("id", doc._id).Msg("put-pre-ready");
     await this.ready();
-    this.logger.Debug().Str("id", doc._id).Msg("put-post-ready");
+    this.logger.Debug().Str("id", doc._id).Msg("put");
     const { _id, ...value } = doc;
     const docId = _id || uuidv7();
     const result = await this._writeQueue.push({
@@ -2710,36 +2710,40 @@ var Database = class {
         _id: docId
       }
     });
-    return { id: docId, clock: result?.head };
+    return { id: docId, clock: result?.head, name: this.name };
   }
   async del(id) {
     await this.ready();
+    this.logger.Debug().Str("id", id).Msg("del");
     const result = await this._writeQueue.push({ id, del: true });
-    return { id, clock: result?.head };
+    return { id, clock: result?.head, name: this.name };
   }
   async changes(since = [], opts = {}) {
     await this.ready();
+    this.logger.Debug().Any("since", since).Any("opts", opts).Msg("changes");
     const { result, head } = await this._crdt.changes(since, opts);
     const rows = result.map(({ id: key, value, del, clock }) => ({
       key,
       value: del ? { _id: key, _deleted: true } : { _id: key, ...value },
       clock
     }));
-    return { rows, clock: head };
+    return { rows, clock: head, name: this.name };
   }
   async allDocs(opts = {}) {
     await this.ready();
+    this.logger.Debug().Msg("allDocs");
     const { result, head } = await this._crdt.allDocs();
     const rows = result.map(({ id: key, value, del }) => ({
       key,
       value: del ? { _id: key, _deleted: true } : { _id: key, ...value }
     }));
-    return { rows, clock: head };
+    return { rows, clock: head, name: this.name };
   }
   async allDocuments() {
     return this.allDocs();
   }
   subscribe(listener, updates) {
+    this.logger.Debug().Bool("updates", updates).Msg("subscribe");
     if (updates) {
       if (!this._listening) {
         this._listening = true;
@@ -2761,6 +2765,7 @@ var Database = class {
   // todo if we add this onto dbs in fireproof.ts then we can make index.ts a separate package
   async query(field, opts = {}) {
     await this.ready();
+    this.logger.Debug().Any("field", field).Any("opts", opts).Msg("query");
     const _crdt = this._crdt;
     const idx = typeof field === "string" ? index({ _crdt }, field) : index({ _crdt }, makeName(field.toString()), field);
     return await idx.query(opts);
@@ -2830,13 +2835,14 @@ function makeName(fnString) {
 
 // src/version.ts
 var PACKAGE_VERSION = Object.keys({
-  "0.0.0-dev": "xxxx"
+  "0.19.8-dev-getid": "xxxx"
 })[0];
 export {
   CRDT,
   Database,
   Index,
   PACKAGE_VERSION,
+  Result,
   blockstore_exports as blockstore,
   blockstore_exports as bs,
   ensureLogger,