From dea5aa7e786905a17bb7c05081d16c7699856c8c Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Fri, 28 Mar 2025 09:19:42 +0000
Subject: [PATCH] fix database path

---
 .env.example        | 2 +-
 package.json        | 4 ++--
 src/app/database.ts | 3 ++-
 src/app/index.ts    | 6 +++---
 src/env.ts          | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index 470a3dd..7fe1582 100644
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@
 DATA_PATH=./data
 
 # the port to use
-PORT=9272
+BAKERY_PORT=9272
 
 # the address to the tor SOCKS5 proxy to enable connections to .onion addresses
 # TOR_PROXY="127.0.0.1:9050"
diff --git a/package.json b/package.json
index db5efed..ab68bab 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
     "prepack": "tsc",
     "start": "node .",
     "dev": "DATA_PATH=./data nodemon --loader @swc-node/register/esm src/index.ts",
-    "mcp": "mcp-inspector node . --mcp --port 8080",
-    "mcp-debug": "mcp-inspector node --inspect-brk . --mcp --port 8080",
+    "mcp": "mcp-inspector node . --mcp",
+    "mcp-debug": "mcp-inspector node --inspect-brk . --mcp",
     "build": "tsc",
     "test": "vitest run",
     "format": "prettier -w .",
diff --git a/src/app/database.ts b/src/app/database.ts
index 17a71b4..dc2de82 100644
--- a/src/app/database.ts
+++ b/src/app/database.ts
@@ -2,6 +2,7 @@ import EventEmitter from "events";
 import Database, { type Database as SQLDatabase } from "better-sqlite3";
 import path from "path";
 import fs from "fs";
+import { DATA_PATH } from "../env.js";
 
 export type LocalDatabaseConfig = {
   directory: string;
@@ -19,7 +20,7 @@ export default class LocalDatabase extends EventEmitter {
     super();
 
     this.config = {
-      directory: "data",
+      directory: DATA_PATH,
       name: "events",
       wal: true,
       ...config,
diff --git a/src/app/index.ts b/src/app/index.ts
index ac26183..746b85d 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -12,7 +12,7 @@ import { logger } from "../logger.js";
 import Database from "./database.js";
 
 import { NIP_11_SOFTWARE_URL, SENSITIVE_KINDS } from "../const.js";
-import { OWNER_PUBKEY, PORT } from "../env.js";
+import { OWNER_PUBKEY, BAKERY_PORT } from "../env.js";
 
 import ControlApi from "../modules/control/control-api.js";
 import ConfigActions from "../modules/control/config-actions.js";
@@ -373,9 +373,9 @@ export default class App extends EventEmitter<EventMap> {
     this.tick();
 
     // start http server listening
-    await new Promise<void>((res) => this.server.listen(PORT, () => res()));
+    await new Promise<void>((res) => this.server.listen(BAKERY_PORT, () => res()));
 
-    logger(`Listening on`, PORT);
+    logger(`Listening on`, BAKERY_PORT);
 
     if (process.send) process.send({ type: "RELAY_READY" });
 
diff --git a/src/env.ts b/src/env.ts
index 7b2b0ee..42800da 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -13,7 +13,7 @@ export const PUBLIC_ADDRESS = process.env.PUBLIC_ADDRESS;
 export const DATA_PATH = process.env.DATA_PATH || join(homedir(), ".bakery");
 await mkdirp(DATA_PATH);
 
-export const PORT = parseInt(args.values.port ?? process.env.PORT ?? "") || DEFAULT_PORT;
+export const BAKERY_PORT = parseInt(args.values.port ?? process.env.BAKERY_PORT ?? "") || DEFAULT_PORT;
 
 // I2P config
 export const I2P_PROXY = process.env.I2P_PROXY;