hyperdb-wasm 0.0.26862-dev.wasm.g42f1012b → 0.0.26862-dev.wasm.g89537caa

package/dist/node.js

@@ -985,36 +985,12 @@ var init_client = __esm({
       disconnect(connection) {
         return this.request({ id: this.nextId++, type: "disconnect", connection });
       }
-      createDatabase(databaseName, persistent) {
-        return this.request({ id: this.nextId++, type: "createDatabase", databaseName, persistent });
-      }
-      openDatabase(databaseName) {
-        return this.request({ id: this.nextId++, type: "openDatabase", databaseName });
-      }
-      listDatabases() {
-        return this.request({ id: this.nextId++, type: "listDatabases" });
-      }
-      checkpointDatabase(databaseName) {
-        return this.request({ id: this.nextId++, type: "checkpointDatabase", databaseName });
-      }
-      dropDatabase(databaseName) {
-        return this.request({ id: this.nextId++, type: "dropDatabase", databaseName });
-      }
-      attachDatabase(connection, databaseName, alias) {
-        return this.request({ id: this.nextId++, type: "attachDatabase", connection, databaseName, alias });
-      }
-      detachDatabase(connection, alias) {
-        return this.request({ id: this.nextId++, type: "detachDatabase", connection, alias });
-      }
       shutdown() {
         return this.request({ id: this.nextId++, type: "shutdown" });
       }
       startQuery(connection, sql, sqlTestMode = false) {
         return this.request({ id: this.nextId++, type: "startQuery", connection, sql, ...sqlTestMode && { sqlTestMode } });
       }
-      startQueryWithInfo(connection, sql) {
-        return this.request({ id: this.nextId++, type: "startQueryWithInfo", connection, sql });
-      }
       insertArrowIPCFromPath(connection, path, name, schema, create, internal = false) {
         return this.request({ id: this.nextId++, type: "insertArrowIPCFromPath", connection, path, name, schema, create, internal });
       }
@@ -1040,11 +1016,8 @@ var init_client = __esm({
       cancelQuery(query) {
         return this.request({ id: this.nextId++, type: "cancelQuery", query });
       }
-      releaseQuery(query) {
-        return this.request({ id: this.nextId++, type: "releaseQuery", query });
-      }
-      releaseQueryWithInfo(query) {
-        return this.request({ id: this.nextId++, type: "releaseQueryWithInfo", query });
+      finishQuery(query) {
+        return this.request({ id: this.nextId++, type: "finishQuery", query });
       }
       async terminate() {
         await this.transport.terminate();
@@ -1137,10 +1110,11 @@ function assertBrowserSupport(environment = globalThis) {
     throw new Error("HyperDB cannot initialize because this browser does not support the origin-private file system");
   }
 }
-function resolveBrowserWorkerUrl(workerUrl, engineUrl, wasmUrl) {
+function resolveBrowserWorkerUrl(workerUrl, engineUrl, wasmUrl, storagePath) {
   const resolved = new URL(workerUrl);
   resolved.searchParams.set("engineUrl", new URL(engineUrl).href);
   if (wasmUrl != null) resolved.searchParams.set("wasmUrl", new URL(wasmUrl).href);
+  if (storagePath != null) resolved.searchParams.set("storagePath", storagePath);
   return resolved;
 }
 function createBrowserClient(options = {}) {
@@ -1148,7 +1122,7 @@ function createBrowserClient(options = {}) {
   const workerUrl = options.workerUrl ?? new URL("./browser_worker.js", import.meta.url);
   const engineUrl = options.engineUrl ?? new URL("./hyperdb-wasm.js", import.meta.url);
   return new HyperDBEngineClient(
-    new BrowserWorker(new Worker(resolveBrowserWorkerUrl(workerUrl, engineUrl, options.wasmUrl), { type: "classic" })),
+    new BrowserWorker(new Worker(resolveBrowserWorkerUrl(workerUrl, engineUrl, options.wasmUrl, options.storagePath), { type: "classic" })),
     options.onSetupProgress
   );
 }
@@ -12335,7 +12309,6 @@ var HyperDBError = class extends Error {
     this.hint = hint;
   }
 };
-var maxPersistentDatabaseNameLength = 200;
 function deferred() {
   let resolve;
   let reject;
@@ -12391,26 +12364,6 @@ function normalizeArrowInsertOptions(options) {
   if (!options.name) throw new Error("Arrow insert table name must not be empty");
   return { name: options.name, schema: options.schema ?? null, create: options.create ?? true };
 }
-function validateDatabaseName(databaseName) {
-  if (!databaseName) throw new Error("Database name must not be empty");
-  if (databaseName.includes("\0")) throw new Error("Database name must not contain NUL");
-}
-function validatePersistentDatabaseName(databaseName) {
-  validateDatabaseName(databaseName);
-  if (databaseName.length > maxPersistentDatabaseNameLength) {
-    throw new Error(`Persistent database name must be at most ${maxPersistentDatabaseNameLength} characters`);
-  }
-  if (!/^[a-z0-9][a-z0-9_-]*$/.test(databaseName)) {
-    throw new Error("Persistent database name must start with a lowercase ASCII letter or digit and contain only lowercase ASCII letters, digits, hyphens, and underscores");
-  }
-  if (/^(?:con|prn|aux|nul|com[1-9]|lpt[1-9])$/.test(databaseName)) {
-    throw new Error("Persistent database name is reserved by Windows");
-  }
-}
-function validateDatabaseAlias(alias) {
-  if (!alias) throw new Error("Database alias must not be empty");
-  if (alias.includes("\0")) throw new Error("Database alias must not contain NUL");
-}
 function materializeDictionaryColumns(table) {
   const dictionaryColumns = table.schema.fields.map((field, index) => DataType.isDictionary(field.type) ? index : -1).filter((index) => index !== -1);
   if (dictionaryColumns.length === 0) return table;
@@ -12451,34 +12404,6 @@ async function initializeHyperDB(client, settings) {
   if (serialized === void 0) throw new Error("HyperDB settings must be JSON-serializable");
   expectOk(await client.initialize(serialized), "initialize HyperDB settings");
 }
-function readDatabasesFromResult(result) {
-  expectOk(result, "list databases");
-  const invalidResult = () => new Error("list databases returned invalid metadata");
-  if (result.payload.byteLength < 4) throw invalidResult();
-  const view = new DataView(result.payload.buffer, result.payload.byteOffset, result.payload.byteLength);
-  const count = view.getUint32(0, true);
-  let offset = 4;
-  const databases = [];
-  const decoder2 = new TextDecoder("utf-8", { fatal: true });
-  for (let index = 0; index < count; ++index) {
-    if (offset + 8 > result.payload.byteLength) throw invalidResult();
-    const rawStorage = view.getUint32(offset, true);
-    const nameLength = view.getUint32(offset + 4, true);
-    offset += 8;
-    if (nameLength > result.payload.byteLength - offset) throw invalidResult();
-    let name;
-    try {
-      name = decoder2.decode(result.payload.subarray(offset, offset + nameLength));
-    } catch {
-      throw invalidResult();
-    }
-    if (!name || name.includes("\0") || rawStorage !== 0 && rawStorage !== 1) throw invalidResult();
-    databases.push({ name, storage: rawStorage === 0 ? "transient" : "persistent" });
-    offset += nameLength;
-  }
-  if (offset !== result.payload.byteLength) throw invalidResult();
-  return databases;
-}
 function yieldToEventLoop() {
   return new Promise((resolve) => setTimeout(resolve, 0));
 }
@@ -12518,25 +12443,6 @@ var HyperDB = class _HyperDB {
     this.connections.add(result);
     return result;
   }
-  async createDatabase(databaseName, options = {}) {
-    validateDatabaseName(databaseName);
-    if (options.storage !== void 0 && options.storage !== "transient" && options.storage !== "persistent") {
-      throw new Error(`Unsupported database storage: ${String(options.storage)}`);
-    }
-    if (options.storage === "persistent") validatePersistentDatabaseName(databaseName);
-    await this.runDatabaseOperation(async () => {
-      expectOk(await this.client.createDatabase(databaseName, options.storage === "persistent"), "create database");
-    });
-  }
-  async openDatabase(databaseName) {
-    validatePersistentDatabaseName(databaseName);
-    await this.runDatabaseOperation(async () => {
-      expectOk(await this.client.openDatabase(databaseName), "open database");
-    });
-  }
-  listDatabases() {
-    return this.runDatabaseOperation(async () => readDatabasesFromResult(await this.client.listDatabases()));
-  }
   async registerExternalFile(...args) {
     if (args.length === 1) {
       const [sourcePath] = args;
@@ -12588,18 +12494,6 @@ var HyperDB = class _HyperDB {
       return path;
     });
   }
-  async checkpointDatabase(databaseName) {
-    validateDatabaseName(databaseName);
-    await this.runDatabaseOperation(async () => {
-      expectOk(await this.client.checkpointDatabase(databaseName), "checkpoint database");
-    });
-  }
-  async dropDatabase(databaseName) {
-    validateDatabaseName(databaseName);
-    await this.runDatabaseOperation(async () => {
-      expectOk(await this.client.dropDatabase(databaseName), "drop database");
-    });
-  }
   async terminate() {
     if (this.terminated) return;
     if (this.activeDatabaseOperations !== 0) throw new Error("database has an active operation");
@@ -12671,25 +12565,6 @@ var HyperDBConnection = class {
     }
     await this.closing;
   }
-  async attachDatabase(databaseName, alias = databaseName) {
-    validateDatabaseName(databaseName);
-    validateDatabaseAlias(alias);
-    this.ensureAvailable();
-    try {
-      expectOk(await this.client.attachDatabase(this.connection, databaseName, alias), "attach database");
-    } finally {
-      this.active = false;
-    }
-  }
-  async detachDatabase(alias) {
-    validateDatabaseAlias(alias);
-    this.ensureAvailable();
-    try {
-      expectOk(await this.client.detachDatabase(this.connection, alias), "detach database");
-    } finally {
-      this.active = false;
-    }
-  }
   sendIPC(sql) {
     const connection = this;
     const queryInfo = deferred();
@@ -12701,7 +12576,7 @@ var HyperDBConnection = class {
       try {
         connection.ensureAvailable();
         acquired = true;
-        query = readHandleFromResult(await connection.client.startQueryWithInfo(connection.connection, sql), "start query");
+        query = readHandleFromResult(await connection.client.startQuery(connection.connection, sql), "start query");
         for (; ; ) {
           let result2 = prefetched ? await prefetched : await connection.client.pollQuery(query);
           prefetched = void 0;
@@ -12743,7 +12618,7 @@ var HyperDBConnection = class {
               }
             }
             try {
-              info = await connection.releaseWithInfo(query);
+              info = decodeQueryInfo(await connection.finishQuery(query));
             } catch (error) {
               cleanupError ??= error;
             }
@@ -12836,7 +12711,7 @@ var HyperDBConnection = class {
       }
     } finally {
       try {
-        if (query !== void 0) await this.release(query);
+        if (query !== void 0) await this.finishQuery(query);
       } finally {
         if (acquire) this.active = false;
       }
@@ -12850,22 +12725,12 @@ var HyperDBConnection = class {
     }
     this.active = true;
   }
-  async release(query) {
-    let delay = 1;
-    for (; ; ) {
-      const result = await this.client.releaseQuery(query);
-      if (result.state === "ok") return;
-      if (result.state !== "pending") throw readErrorFromResult(result, "release query");
-      await new Promise((resolve) => setTimeout(resolve, delay));
-      delay = Math.min(delay * 2, 32);
-    }
-  }
-  async releaseWithInfo(query) {
+  async finishQuery(query) {
     let delay = 1;
     for (; ; ) {
-      const result = await this.client.releaseQueryWithInfo(query);
-      if (result.state === "ok") return decodeQueryInfo(result.payload);
-      if (result.state !== "pending") throw readErrorFromResult(result, "release query");
+      const result = await this.client.finishQuery(query);
+      if (result.state === "ok") return result.payload;
+      if (result.state !== "pending") throw readErrorFromResult(result, "finish query");
       await new Promise((resolve) => setTimeout(resolve, delay));
       delay = Math.min(delay * 2, 32);
     }

package/dist/node_worker.js

@@ -57,51 +57,33 @@ var HyperDBBindings = class {
   initialize;
   connect;
   disconnect;
-  createDatabase;
-  openDatabase;
-  listDatabases;
-  checkpointDatabase;
-  dropDatabase;
   shutdown;
   registerExternalFile;
   registerExternalDirectory;
   removeExternalRegistration;
-  attachDatabase;
-  detachDatabase;
   startQuery;
-  startQueryWithInfo;
   insertArrowIPCFromPath;
   pollQuery;
   cancelQuery;
-  releaseQuery;
-  releaseQueryWithInfo;
+  finishQuery;
   resultState;
   resultPayloadLength;
   free;
   nextTemporaryFile = 1;
   constructor(module2) {
     this.module = module2;
-    this.initialize = module2.cwrap("hyperdb_wasm_initialize", "pointer", ["string"]);
+    this.initialize = module2.cwrap("hyperdb_wasm_initialize", "pointer", ["string", "string"]);
     this.connect = module2.cwrap("hyperdb_wasm_connect", "pointer", []);
     this.disconnect = module2.cwrap("hyperdb_wasm_disconnect", "pointer", ["number"]);
-    this.createDatabase = module2.cwrap("hyperdb_wasm_create_database", "pointer", ["string", "number"]);
-    this.openDatabase = module2.cwrap("hyperdb_wasm_open_database", "pointer", ["string"]);
-    this.listDatabases = module2.cwrap("hyperdb_wasm_list_databases", "pointer", []);
-    this.checkpointDatabase = module2.cwrap("hyperdb_wasm_checkpoint_database", "pointer", ["string"]);
-    this.dropDatabase = module2.cwrap("hyperdb_wasm_drop_database", "pointer", ["string"]);
     this.shutdown = module2.cwrap("hyperdb_wasm_shutdown", "pointer", []);
     this.registerExternalFile = module2.cwrap("hyperdb_wasm_register_external_file", "pointer", ["string", "string", "number"]);
     this.registerExternalDirectory = module2.cwrap("hyperdb_wasm_register_external_directory", "pointer", ["string", "string", "number"]);
     this.removeExternalRegistration = module2.cwrap("hyperdb_wasm_remove_external_registration", "pointer", ["string"]);
-    this.attachDatabase = module2.cwrap("hyperdb_wasm_attach_database", "pointer", ["number", "string", "string"]);
-    this.detachDatabase = module2.cwrap("hyperdb_wasm_detach_database", "pointer", ["number", "string"]);
     this.startQuery = module2.cwrap("hyperdb_wasm_query_start", "pointer", ["number", "string", "number"]);
-    this.startQueryWithInfo = module2.cwrap("hyperdb_wasm_query_start_with_info", "pointer", ["number", "string"]);
     this.insertArrowIPCFromPath = module2.cwrap("hyperdb_wasm_arrow_insert_from_path", "pointer", ["number", "string", "string", "string", "number"]);
     this.pollQuery = module2.cwrap("hyperdb_wasm_query_poll", "pointer", ["number"]);
     this.cancelQuery = module2.cwrap("hyperdb_wasm_query_cancel", "pointer", ["number"]);
-    this.releaseQuery = module2.cwrap("hyperdb_wasm_query_release", "pointer", ["number"]);
-    this.releaseQueryWithInfo = module2.cwrap("hyperdb_wasm_query_release_with_info", "pointer", ["number"]);
+    this.finishQuery = module2.cwrap("hyperdb_wasm_query_finish", "pointer", ["number"]);
     this.resultState = module2.cwrap("hyperdb_wasm_result_state", "number", ["number"]);
     this.resultPayloadLength = module2.cwrap("hyperdb_wasm_result_payload_len", "number", ["number"]);
     this.free = module2.cwrap("hyperdb_wasm_free", null, ["pointer"]);
@@ -210,32 +192,11 @@ var HyperDBBindings = class {
     switch (request.type) {
       case "initialize":
         validateCString(request.settings, "settings");
-        return this.initialize(request.settings);
+        return this.initialize(request.settings, this.module.hyperdbWasmStoragePath ?? "");
       case "connect":
         return this.connect();
       case "disconnect":
         return this.disconnect(request.connection);
-      case "createDatabase":
-        validateCString(request.databaseName, "database name");
-        return this.createDatabase(request.databaseName, Number(request.persistent));
-      case "openDatabase":
-        validateCString(request.databaseName, "database name");
-        return this.openDatabase(request.databaseName);
-      case "listDatabases":
-        return this.listDatabases();
-      case "checkpointDatabase":
-        validateCString(request.databaseName, "database name");
-        return this.checkpointDatabase(request.databaseName);
-      case "dropDatabase":
-        validateCString(request.databaseName, "database name");
-        return this.dropDatabase(request.databaseName);
-      case "attachDatabase":
-        validateCString(request.databaseName, "database name");
-        validateCString(request.alias, "database alias");
-        return this.attachDatabase(request.connection, request.databaseName, request.alias);
-      case "detachDatabase":
-        validateCString(request.alias, "database alias");
-        return this.detachDatabase(request.connection, request.alias);
       case "shutdown":
         return this.shutdown();
       case "registerExternalFile":
@@ -250,8 +211,6 @@ var HyperDBBindings = class {
         return this.removeExternalRegistration(request.path);
       case "startQuery":
         return this.startQuery(request.connection, request.sql, Number(request.sqlTestMode ?? false));
-      case "startQueryWithInfo":
-        return this.startQueryWithInfo(request.connection, request.sql);
       case "insertArrowIPCFromPath": {
         const path = request.internal ? request.path : this.module.resolveHyperDBPath?.(request.path) ?? request.path;
         return this.insertArrowIPCFromPath(request.connection, path, request.name, request.schema ?? "", Number(request.create));
@@ -260,10 +219,8 @@ var HyperDBBindings = class {
         return this.pollQuery(request.query);
       case "cancelQuery":
         return this.cancelQuery(request.query);
-      case "releaseQuery":
-        return this.releaseQuery(request.query);
-      case "releaseQueryWithInfo":
-        return this.releaseQueryWithInfo(request.query);
+      case "finishQuery":
+        return this.finishQuery(request.query);
     }
   }
   decodeResult(pointer) {
@@ -317,26 +274,13 @@ function isEngineRequest(value) {
     case "initialize":
       return hasKeys(value, ["id", "type", "settings"]) && typeof value.settings === "string";
     case "connect":
-    case "listDatabases":
       return hasKeys(value, ["id", "type"]);
     case "disconnect":
       return hasKeys(value, ["id", "type", "connection"]) && Number.isSafeInteger(value.connection);
-    case "createDatabase":
-      return hasKeys(value, ["id", "type", "databaseName", "persistent"]) && typeof value.databaseName === "string" && typeof value.persistent === "boolean";
-    case "openDatabase":
-    case "checkpointDatabase":
-    case "dropDatabase":
-      return hasKeys(value, ["id", "type", "databaseName"]) && typeof value.databaseName === "string";
     case "shutdown":
       return hasKeys(value, ["id", "type"]);
-    case "attachDatabase":
-      return hasKeys(value, ["id", "type", "connection", "databaseName", "alias"]) && Number.isSafeInteger(value.connection) && typeof value.databaseName === "string" && typeof value.alias === "string";
-    case "detachDatabase":
-      return hasKeys(value, ["id", "type", "connection", "alias"]) && Number.isSafeInteger(value.connection) && typeof value.alias === "string";
     case "startQuery":
       return (hasKeys(value, ["id", "type", "connection", "sql"]) || hasKeys(value, ["id", "type", "connection", "sql", "sqlTestMode"])) && Number.isSafeInteger(value.connection) && typeof value.sql === "string" && (value.sqlTestMode === void 0 || typeof value.sqlTestMode === "boolean");
-    case "startQueryWithInfo":
-      return hasKeys(value, ["id", "type", "connection", "sql"]) && Number.isSafeInteger(value.connection) && typeof value.sql === "string";
     case "insertArrowIPCFromPath":
       return hasKeys(value, ["id", "type", "connection", "path", "name", "schema", "create", "internal"]) && Number.isSafeInteger(value.connection) && typeof value.path === "string" && typeof value.name === "string" && (typeof value.schema === "string" || value.schema === null) && typeof value.create === "boolean" && typeof value.internal === "boolean";
     case "createTemporaryFile":
@@ -351,8 +295,7 @@ function isEngineRequest(value) {
       return hasKeys(value, ["id", "type", "path"]) && typeof value.path === "string";
     case "pollQuery":
     case "cancelQuery":
-    case "releaseQuery":
-    case "releaseQueryWithInfo":
+    case "finishQuery":
       return hasKeys(value, ["id", "type", "query"]) && Number.isSafeInteger(value.query);
     default:
       return false;
@@ -934,10 +877,9 @@ configureWorker(module, transport, (runtime) => {
   if (!runtime.NODEFS) throw new Error("Node filesystem backend is unavailable");
   const nodeFS = runtime.NODEFS;
   runtime.FS.mkdirTree("/host");
-  runtime.FS.mkdirTree("/hyperdb-persistent");
-  runtime.FS.mount(nodeFS, { root: storagePath }, "/hyperdb-persistent");
-  runtime.FS.mkdirTree("/hyperdb-persistent/hyperdb");
-  runtime.FS.mkdirTree("/hyperdb-persistent/logs");
+  runtime.FS.mkdirTree("/mnt/fs");
+  runtime.FS.mount(nodeFS, { root: storagePath }, "/mnt/fs");
+  runtime.FS.mkdirTree("/mnt/fs/logs");
   const nodeRuntimeFS = runtime.FS;
   const shouldAccessHostPath = (path) => isAbsolute2(path) && !nodeRuntimeFS.analyzePath(path).exists;
   runtime.hyperdbWasmShouldOpenHostFile = shouldAccessHostPath;
@@ -1047,7 +989,7 @@ configureWorker(module, transport, (runtime) => {
     const directory = dirname(absolute);
     let mount = hostDirectories.get(directory);
     if (mount === void 0) {
-      mount = `/host/${hostDirectories.size}`;
+      mount = `/mnt/host/${hostDirectories.size}`;
       runtime.FS.mkdirTree(mount);
       runtime.FS.mount(nodeFS, { root: directory }, mount);
       hostDirectories.set(directory, mount);

package/dist/protocol.d.ts

@@ -18,51 +18,15 @@ export type EngineRequest = {
     id: RequestId;
     type: 'disconnect';
     connection: number;
-} | {
-    id: RequestId;
-    type: 'createDatabase';
-    databaseName: string;
-    persistent: boolean;
-} | {
-    id: RequestId;
-    type: 'openDatabase';
-    databaseName: string;
-} | {
-    id: RequestId;
-    type: 'listDatabases';
-} | {
-    id: RequestId;
-    type: 'checkpointDatabase';
-    databaseName: string;
-} | {
-    id: RequestId;
-    type: 'dropDatabase';
-    databaseName: string;
 } | {
     id: RequestId;
     type: 'shutdown';
-} | {
-    id: RequestId;
-    type: 'attachDatabase';
-    connection: number;
-    databaseName: string;
-    alias: string;
-} | {
-    id: RequestId;
-    type: 'detachDatabase';
-    connection: number;
-    alias: string;
 } | {
     id: RequestId;
     type: 'startQuery';
     connection: number;
     sql: string;
     sqlTestMode?: boolean;
-} | {
-    id: RequestId;
-    type: 'startQueryWithInfo';
-    connection: number;
-    sql: string;
 } | {
     id: RequestId;
     type: 'insertArrowIPCFromPath';
@@ -114,11 +78,7 @@ export type EngineRequest = {
     query: number;
 } | {
     id: RequestId;
-    type: 'releaseQuery';
-    query: number;
-} | {
-    id: RequestId;
-    type: 'releaseQueryWithInfo';
+    type: 'finishQuery';
     query: number;
 };
 export type WasmResult = {