fix: local development environment (#68)

getAlby · Jan 2, 2025 · 3db575b · 3db575b
1 parent 43df142
commit 3db575b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 154 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
-DATABASE_URL=postgres://user:password@localhost:5432/nwc-periodic-payments
+DATABASE_URL=postgres://user:password@localhost:5442/nwc-periodic-payments
 
 # default email config will use Mailhog
 EMAIL_SERVER_USER=username
@@ -8,7 +8,9 @@ EMAIL_SERVER_PORT=1025
 EMAIL_FROM=[email protected]
 
 INNGEST_EVENT_KEY="local"
+INNGEST_DEV=1
 INNGEST_SIGNING_KEY=
+INNGEST_SERVE_HOST=http://localhost:8081
 
 ORIGIN=http://localhost:8081
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   database:
     image: "postgres:latest"
     ports:
-      - 5432:5432
+      - 5442:5432
     environment:
       POSTGRES_USER: user
       POSTGRES_PASSWORD: password

diff --git a/package.json b/package.json
@@ -10,12 +10,12 @@
     "format:fix": "yarn prettier --write . --check '!.db'",
     "format:check": "yarn prettier --check . --check '!.db'",
     "inngest:local": "inngest-cli dev",
-    "docker:start": "docker-compose up",
-    "docker:stop": "docker-compose stop",
-    "docker:remove": "docker-compose down",
+    "docker:start": "docker compose up",
+    "docker:stop": "docker compose stop",
+    "docker:remove": "docker compose down",
     "db:migrate:local": "dotenv -e .env.local -- prisma migrate dev",
     "db:migrate:local:createonly": "dotenv -e .env.local -- prisma migrate dev --create-only",
-    "db:connect:local": "psql postgres://user:password@localhost:5432/nwc-periodic-payments",
+    "db:connect:local": "psql postgres://user:password@localhost:5442/nwc-periodic-payments",
     "db:connect:fly": "flyctl postgres connect -a nwc-periodic-payments-db -d nwc_periodic_payments",
     "db:studio:local": "dotenv -e .env.local -- prisma studio",
     "db:reset:local": "dotenv -e .env.local -- prisma migrate reset",
@@ -62,7 +62,7 @@
     "@types/nodemailer": "^6.4.10",
     "dotenv-cli": "^7.3.0",
     "husky": "^8.0.0",
-    "inngest-cli": "^0.11.0",
+    "inngest-cli": "^1.3.3",
     "prettier": "^3.0.3"
   }
 }
diff --git a/pages/api/inngest.ts b/pages/api/inngest.ts
@@ -13,7 +13,9 @@ import { isError } from "lib/utils";
 import { add } from "date-fns";
 import ms from "ms";
 
-global.crypto = crypto;
+if (!global.crypto) {
+  global.crypto = crypto;
+}
 
 type PeriodicZapEvent = {
   name: "zap";
@@ -288,6 +290,7 @@ const periodicZap = inngest.createFunction(
 );
 
 export default serve(inngest, [periodicZap], {
-  serveHost: "https://nwc-periodic-payments.fly.dev",
+  serveHost:
+    process.env.INNGEST_SERVE_HOST || "https://nwc-periodic-payments.fly.dev",
   servePath: "/api/inngest",
 });