@seams/wallet-server 0.6.2 → 0.7.3

package/dist/esm/core/NearPublicKeyStore.js

@@ -1,8 +1,10 @@
 import { parseWebAuthnRpId } from "../shared-ts/src/utils/domainIds.js";
 import { normalizeOptionalTrimmedString } from "../shared-ts/src/utils/normalize.js";
-import { isObject as isObject$1 } from "../shared-ts/src/utils/validation.js";
-import { formatD1ExecStatement, parseD1JsonColumn, resolveD1DatabaseFromConfig } from "../storage/d1Sql.js";
+import { isObject } from "../shared-ts/src/utils/validation.js";
+import { parseD1JsonColumn, resolveD1DatabaseFromConfig } from "../storage/d1Sql.js";
+import { D1TenantTable, d1TenantScopeFromConfig, ensureD1Schema } from "./d1TenantStore.js";
 //#region src/core/NearPublicKeyStore.ts
+const NEAR_PUBLIC_KEY_D1_STORE = "NEAR public key store";
 const NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL = Object.freeze([`
     CREATE TABLE IF NOT EXISTS near_public_keys (
       namespace TEXT NOT NULL,
@@ -40,10 +42,7 @@ const NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL = Object.freeze([`
       )
   `]);
 async function ensureNearPublicKeyStoreD1Schema(options) {
-	for (const statement of NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL) await options.database.exec(formatD1ExecStatement(statement));
-}
-function isObject(v) {
-	return isObject$1(v);
+	await ensureD1Schema(options.database, NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL);
 }
 function parseNearPublicKeyKind(input) {
 	const k = normalizeOptionalTrimmedString(input);
@@ -98,29 +97,6 @@ function parseNearPublicKeyRecord(raw) {
 		...Number.isFinite(removedAtMs) && removedAtMs > 0 ? { removedAtMs: Math.floor(removedAtMs) } : {}
 	};
 }
-function requireD1ScopeString(input, field) {
-	const normalized = normalizeOptionalTrimmedString(input);
-	if (!normalized) throw new Error(`${field} is required for D1 NEAR public key store`);
-	return normalized;
-}
-function normalizeD1NearPublicKeyStoreOptions(input) {
-	return {
-		database: input.database,
-		namespace: requireD1ScopeString(input.namespace, "namespace"),
-		orgId: requireD1ScopeString(input.orgId, "orgId"),
-		projectId: requireD1ScopeString(input.projectId, "projectId"),
-		envId: requireD1ScopeString(input.envId, "envId"),
-		ensureSchema: input.ensureSchema !== false
-	};
-}
-function d1ScopeFromConfig(input) {
-	return {
-		namespace: requireD1ScopeString(input.namespace, "namespace"),
-		orgId: requireD1ScopeString(input.config.orgId || input.config.ORG_ID, "orgId"),
-		projectId: requireD1ScopeString(input.config.projectId || input.config.PROJECT_ID, "projectId"),
-		envId: requireD1ScopeString(input.config.envId || input.config.ENV_ID, "envId")
-	};
-}
 var InMemoryNearPublicKeyStore = class {
 	constructor() {
 		this.byUser = /* @__PURE__ */ new Map();
@@ -143,33 +119,25 @@ var InMemoryNearPublicKeyStore = class {
 		return out;
 	}
 };
+/** A user's NEAR public keys, in signer-slot order; binds the scope, then the user. */
+const NEAR_PUBLIC_KEYS_BY_USER_SQL = `SELECT record_json
+         FROM near_public_keys
+        WHERE namespace = ?
+          AND org_id = ?
+          AND project_id = ?
+          AND env_id = ?
+          AND user_id = ?
+        ORDER BY COALESCE(signer_slot, 0) ASC, created_at_ms ASC, public_key ASC`;
 var D1NearPublicKeyStore = class {
 	constructor(input) {
 		this.adapterKind = "d1";
-		this.schemaReady = false;
-		const normalized = normalizeD1NearPublicKeyStoreOptions(input);
-		this.database = normalized.database;
-		this.scope = {
-			namespace: normalized.namespace,
-			orgId: normalized.orgId,
-			projectId: normalized.projectId,
-			envId: normalized.envId
-		};
-		this.ensureSchemaOnUse = normalized.ensureSchema;
-	}
-	async ensureSchema() {
-		if (!this.ensureSchemaOnUse || this.schemaReady) return;
-		await ensureNearPublicKeyStoreD1Schema({ database: this.database });
-		this.schemaReady = true;
-	}
-	bindScope(statement, values = []) {
-		return this.database.prepare(statement).bind(this.scope.namespace, this.scope.orgId, this.scope.projectId, this.scope.envId, ...values);
+		this.table = new D1TenantTable(input, NEAR_PUBLIC_KEY_D1_STORE, NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL);
 	}
 	async put(record) {
-		await this.ensureSchema();
+		await this.table.ensureSchema();
 		const parsed = parseNearPublicKeyRecord(record);
 		if (!parsed) throw new Error("Invalid near public key record");
-		await this.bindScope(`INSERT INTO near_public_keys (
+		await this.table.prepare(`INSERT INTO near_public_keys (
         namespace,
         org_id,
         project_id,
@@ -203,17 +171,10 @@ var D1NearPublicKeyStore = class {
 		]).run();
 	}
 	async listByUserId(userId) {
-		await this.ensureSchema();
+		await this.table.ensureSchema();
 		const uid = normalizeOptionalTrimmedString(userId);
 		if (!uid) return [];
-		return ((await this.bindScope(`SELECT record_json
-         FROM near_public_keys
-        WHERE namespace = ?
-          AND org_id = ?
-          AND project_id = ?
-          AND env_id = ?
-          AND user_id = ?
-        ORDER BY COALESCE(signer_slot, 0) ASC, created_at_ms ASC, public_key ASC`, [uid]).all()).results || []).map((row) => parseNearPublicKeyRecord(parseD1JsonColumn(row.record_json))).filter((record) => Boolean(record));
+		return ((await this.table.prepare(NEAR_PUBLIC_KEYS_BY_USER_SQL, [uid]).all()).results || []).map((row) => parseNearPublicKeyRecord(parseD1JsonColumn(row.record_json))).filter((record) => Boolean(record));
 	}
 };
 function createNearPublicKeyStore(input) {
@@ -226,10 +187,7 @@ function createNearPublicKeyStore(input) {
 		input.logger.info("[near-public-keys] Using D1 store for NEAR public key metadata");
 		return new D1NearPublicKeyStore({
 			database,
-			...d1ScopeFromConfig({
-				config,
-				namespace
-			})
+			...d1TenantScopeFromConfig(config, namespace, NEAR_PUBLIC_KEY_D1_STORE)
 		});
 	}
 	if (kind) throw new Error(`[near-public-keys] Unknown NEAR public key store kind: ${kind}`);
@@ -237,6 +195,6 @@ function createNearPublicKeyStore(input) {
 	return new InMemoryNearPublicKeyStore();
 }
 //#endregion
-export { D1NearPublicKeyStore, NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL, createNearPublicKeyStore, ensureNearPublicKeyStoreD1Schema };
+export { D1NearPublicKeyStore, NEAR_PUBLIC_KEYS_BY_USER_SQL, NEAR_PUBLIC_KEY_STORE_D1_SCHEMA_SQL, createNearPublicKeyStore, ensureNearPublicKeyStoreD1Schema };
 
 //# sourceMappingURL=NearPublicKeyStore.js.map