@1sat/cli 0.0.53 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./src/cli.ts",
@@ -27,7 +27,6 @@
   "dependencies": {
     "@1sat/actions": "0.0.117",
     "@1sat/client": "0.0.27",
-    "@1sat/knex-bun-sqlite": "0.0.1",
     "@1sat/types": "0.0.19",
     "@1sat/wallet-node": "0.0.43",
     "@1sat/wallet-server": "0.0.13",

package/src/commands/serve-messagebox.ts

@@ -2,18 +2,17 @@
  * `1sat serve messagebox` — launch the BSV message-box server using the
  * CLI's wallet identity.
  *
- * Storage mirrors the wallet's choice: SQLite via `@1sat/knex-bun-sqlite`
- * when wallet storage is `bun-sqlite`, Postgres when wallet storage is `pg`.
- *
  * messagebox-server boots itself as a side effect of `import` once env vars
  * are populated, so this handler:
  *   1. Reads CLI config + private key
  *   2. Composes env (SERVER_PRIVATE_KEY, PORT, KNEX_DB_*, WALLET_STORAGE_URL, …)
- *   3. Dynamically imports `messagebox-server`
- *   4. Awaits SIGINT/SIGTERM, then closes the HTTP and WebSocket servers
+ *   3. Switches cwd to the messagebox-server install dir so its knexfile's
+ *      relative `./out/src/migrations` path resolves correctly
+ *   4. Dynamically imports `@bopen-io/messagebox-server`
+ *   5. Awaits SIGINT/SIGTERM, then closes the HTTP and WebSocket servers
  */
 
-import { join } from 'node:path'
+import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import type { PrivateKey } from '@bsv/sdk'
 import type { GlobalFlags } from '../args'
@@ -65,33 +64,14 @@ export async function startMessagebox(
 		`[messagebox] websockets: ${resolved.websockets ? 'enabled' : 'disabled'}`,
 	)
 
-	// When the env-driven knexfile resolves to 'sqlite3', swap in our
-	// bun:sqlite-backed Knex dialect class and rewrite the migrations
-	// directory to an absolute path. ESM singleton semantics mean
-	// messagebox-server's app.ts gets the same (mutated) module instance
-	// when it imports the knexfile next.
-	if (resolved.knexClient === 'sqlite3') {
-		const knexfileUrl = import.meta.resolve(
-			'@bopen-io/messagebox-server/out/knexfile.js',
-		)
-		const migrationsDir = fileURLToPath(new URL('src/migrations/', knexfileUrl))
-		const [knexfile, dialect] = await Promise.all([
-			import('@bopen-io/messagebox-server/out/knexfile.js') as Promise<{
-				default: Record<
-					string,
-					{ client: unknown; migrations?: { directory: string } }
-				>
-			}>,
-			import('@1sat/knex-bun-sqlite'),
-		])
-		const Client = dialect.default
-		for (const env of ['development', 'staging', 'production']) {
-			const cfg = knexfile.default[env]
-			if (!cfg) continue
-			cfg.client = Client
-			if (cfg.migrations) cfg.migrations.directory = migrationsDir
-		}
-	}
+	// messagebox-server's knexfile uses `./out/src/migrations` relative to
+	// cwd. Switch cwd to its install dir so that path resolves correctly
+	// regardless of where the CLI was invoked from.
+	const packageJsonUrl = import.meta.resolve(
+		'@bopen-io/messagebox-server/package.json',
+	)
+	const messageboxDir = dirname(fileURLToPath(packageJsonUrl))
+	process.chdir(messageboxDir)
 
 	// messagebox-server boots itself when its index module is loaded.
 	const mbox = (await import(
@@ -187,9 +167,6 @@ function resolveStorage(
 		const dataDir = ensureDataDir()
 		const filename =
 			messagebox.dbPath ?? join(dataDir, `messagebox-${chain}.db`)
-		// We pass `sqlite3` to satisfy the env-driven knexfile's alias check;
-		// the actual Client class is swapped in via ESM module mutation
-		// just before messagebox-server is imported.
 		return {
 			knexClient: 'sqlite3',
 			knexConnection: { filename },
@@ -197,6 +174,17 @@ function resolveStorage(
 	}
 
 	if (storage.provider === 'pg') {
+		// Prefer a dedicated messagebox database when configured (recommended:
+		// avoids `knex_migrations` table collisions with wallet-toolbox).
+		// Fall back to schema isolation against the wallet's database — note
+		// the `messagebox` schema must exist in that database for table
+		// creation to land there instead of `public`.
+		if (messagebox.dbUrl) {
+			return {
+				knexClient: 'pg',
+				knexConnection: { connectionString: messagebox.dbUrl },
+			}
+		}
 		const schema = messagebox.pgSchema ?? DEFAULT_PG_SCHEMA
 		return {
 			knexClient: 'pg',

package/src/config.ts

@@ -52,9 +52,15 @@ export interface ServerMessageboxConfig {
 	dbPath?: string
 	/**
 	 * Postgres schema for messagebox tables. Used only when wallet storage
-	 * is `pg`. Defaults to `messagebox`.
+	 * is `pg` AND `dbUrl` is unset. Defaults to `messagebox`.
 	 */
 	pgSchema?: string
+	/**
+	 * Override Postgres connection URL for messagebox storage. Use this
+	 * to point messagebox at a separate Postgres database from the wallet
+	 * (recommended — avoids `knex_migrations` table collisions).
+	 */
+	dbUrl?: string
 	/**
 	 * Override the wallet storage URL messagebox calls for BRC-31/BRC-29
 	 * operations. Defaults to the local wallet server URL (`http://<host>:<port>/`).

package/src/types/messagebox-server.d.ts

@@ -8,8 +8,3 @@ declare module '@bopen-io/messagebox-server' {
 	export const ROUTING_PREFIX: string
 	export function start(): Promise<void>
 }
-
-declare module '@bopen-io/messagebox-server/out/knexfile.js' {
-	const knexfile: Record<string, { client: unknown; [k: string]: unknown }>
-	export default knexfile
-}