@powerhousedao/switchboard 2.4.6-dev.1 → 2.4.6-dev.3

package/.env

@@ -1,11 +1,15 @@
-DATABASE_URL="postgresql://postgres:postgres@localhost:5444/postgres"
-REDIS_URL="redis://localhost:6380"
-API_ORIGIN=http://localhost:3000
-JWT_SECRET="secret"
-PORT=4001
-ADMIN_USERS=""
-## Optional parameters
-# JWT_EXPIRATION_PERIOD="3600"
+# Switchboard Environment Variables
+
+## General Server Options
+PH_SWITCHBOARD_PORT=4001
+PH_SWITCHBOARD_API_ORIGIN=http://localhost:3000
+PH_SWITCHBOARD_JWT_SECRET="secret"
+
+## Cache & Storage Options
+PH_SWITCHBOARD_DATABASE_URL="postgresql://postgres:postgres@localhost:5444/postgres"
+PH_SWITCHBOARD_REDIS_URL="redis://localhost:6380"
+
+## Auth Options
 SWITCHBOARD_AUTH_ENABLED=true
 SWITCHBOARD_AUTH_GUESTS=""
 SWITCHBOARD_AUTH_USERS=""

package/CHANGELOG.md

@@ -1,19 +1,19 @@
-## 2.4.6-dev.1 (2025-05-21)
+## 2.4.6-dev.3 (2025-05-25)
 
-### 🩹 Fixes
+### 🚀 Features
 
-- docker build with PH_PACKAGES ([856ac1187](https://github.com/powerhouse-inc/powerhouse/commit/856ac1187))
+- **switchboard:** deploy with new dockerfile ([54f65af17](https://github.com/powerhouse-inc/powerhouse/commit/54f65af17))
+- **switchboard:** new dockerfile based on ph-cmd ([fafff7143](https://github.com/powerhouse-inc/powerhouse/commit/fafff7143))
 
 ### 🧱 Updated Dependencies
 
-- Updated document-drive to 1.29.12-dev.12
-- Updated document-model to 2.28.1-dev.16
-- Updated @powerhousedao/reactor-api to 1.29.27-dev.1
-- Updated @powerhousedao/config to 1.27.0-dev.15
+- Updated document-drive to 1.29.14-dev.0
+- Updated @powerhousedao/reactor-api to 1.29.28-dev.0
+- Updated @powerhousedao/config to 1.27.0-dev.17
 
 ### ❤️ Thank You
 
-- Guillermo Puente @gpuente
+- Frank
 
 ## 2.3.0 (2025-05-06)
 

package/Dockerfile

@@ -1,50 +1,46 @@
-# FROM node:22-alpine AS build
-
-# WORKDIR /app
-# RUN [ ! -e /lib/libssl.so.3 ] && ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3 || echo "Link already exists"
-# RUN npm install --global pnpm@9
-# COPY . .
-# RUN pnpm install
-# RUN pnpm run build
-# ENV API_ORIGIN=http://localhost:3000
-# ENV JWT_SECRET="secret"
-# ENV PORT=4001
-# ENV ADMIN_USERS="0x123,0x456"
-# ENV DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
-# ENV REDIS_URL=redis://localhost:6379
-# ENV REDIS_TLS_URL=rediss://localhost:6379
-# ARG PH_PACKAGES
-# ENV PH_PACKAGES=${PH_PACKAGES}
-# RUN node dist/src/install-packages.js
-# CMD pnpx prisma generate && pnpm start
-
 FROM node:22-alpine AS build
 RUN apk update && apk add git
 WORKDIR /app
-RUN [ ! -e /lib/libssl.so.3 ] && ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3 || echo "Link already exists"
-RUN npm install --global pnpm@10 husky
-COPY . .
-ARG PH_PACKAGES
-ENV PH_PACKAGES=${PH_PACKAGES}
-ARG NX_SOCKET_DIR="/tmp/nx"
-ENV NX_SOCKET_DIR=${NX_SOCKET_DIR}
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable && corepack install --global pnpm@9.8.0
+ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+
+ENV HUSKY=false
+
+# Packages
+ENV PH_PACKAGES=""
+
+# Nx
+ENV NX_SOCKET_DIR="/tmp/nx"
 ENV NX_DAEMON=false
-RUN pnpm install --filter @powerhousedao/switchboard... 
-RUN pnpm nx run @powerhousedao/switchboard:build
-RUN pnpm --filter "@powerhousedao/switchboard" deploy --prod pruned --legacy
-RUN rm -rf pruned/node_modules/.pnpm/@prisma+client@5.17.0_prisma@5.17.0 && cp -R ./node_modules/.pnpm/@prisma+client@5.17.0_prisma@5.17.0 pruned/node_modules/.pnpm
 
-# Final production image
-FROM node:22-alpine AS runner
+# Auth
+ENV PH_SWITCHBOARD_AUTH_ENABLED=false
+ENV PH_SWITCHBOARD_ADMINS_LIST="0x123,0x456"
+ENV PH_SWITCHBOARD_USERS_LIST="0x123,0x456"
+ENV PH_SWITCHBOARD_GUESTS_LIST="0x123,0x456"
 
-WORKDIR /app
-COPY --from=build /app/pruned/dist dist
-COPY --from=build /app/pruned/node_modules node_modules
-COPY --from=build /app/pruned/package.json package.json
-COPY --from=build /app/pruned/powerhouse.config.json powerhouse.config.json
-# COPY --from=build /app/package.json package.json
-RUN [ ! -e /lib/libssl.so.3 ] && ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3 || echo "Link already exists"
-ENV DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
-ARG PH_PACKAGES
-ENV PH_PACKAGES=${PH_PACKAGES}
-CMD node dist/src/index.js
+# Database
+ENV PH_SWITCHBOARD_DATABASE_URL="dev.db"
+ENV PH_SWITCHBOARD_REDIS_URL=""
+
+# Heroku Workaround
+ENV PORT=4001 
+
+# Switchboard
+ENV PH_SWITCHBOARD_PORT=$PORT
+
+# Other
+ARG PH_TAG=latest
+ENV PH_TAG=$PH_TAG
+
+RUN pnpm add -g ph-cmd@$PH_TAG && \
+    ph setup-globals && \
+    ph use $PH_TAG
+
+# Copy and set up entrypoint script
+COPY . .
+RUN chmod +x entrypoint.sh
+
+ENTRYPOINT ["/app/entrypoint.sh"]

package/dist/src/config.d.ts

@@ -5,6 +5,10 @@ interface Config {
         users: string[];
         admins: string[];
     };
+    database: {
+        url: string;
+    };
+    port: number;
 }
 export declare const config: Config;
 export {};

package/dist/src/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAGA,UAAU,MAAM;IACd,IAAI,EAAE;QACJ,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AACD,eAAO,MAAM,MAAM,EAAE,MAOpB,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAMA,UAAU,MAAM;IACd,IAAI,EAAE;QACJ,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;IACF,QAAQ,EAAE;QACR,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE,MA4BpB,CAAC"}

package/dist/src/config.js

@@ -1,11 +1,32 @@
 import dotenv from "dotenv";
 dotenv.config();
+import { getConfig } from "@powerhousedao/config/utils";
+const phConfig = getConfig();
+const { switchboard } = phConfig;
 export const config = {
     auth: {
-        enabled: Boolean(process.env.SWITCHBOARD_AUTH_ENABLED) || false,
-        guests: (process.env.SWITCHBOARD_AUTH_GUESTS || "").split(","),
-        users: (process.env.SWITCHBOARD_AUTH_USERS || "").split(","),
-        admins: (process.env.SWITCHBOARD_AUTH_ADMINS || "").split(","),
+        enabled: process.env.SWITCHBOARD_AUTH_ENABLED === "true"
+            ? true
+            : (switchboard?.auth?.enabled ?? false),
+        guests: process.env.SWITCHBOARD_AUTH_GUESTS
+            ? process.env.SWITCHBOARD_AUTH_GUESTS.split(",")
+            : (switchboard?.auth?.guests ?? []),
+        users: process.env.SWITCHBOARD_AUTH_USERS
+            ? process.env.SWITCHBOARD_AUTH_USERS.split(",")
+            : (switchboard?.auth?.users ?? []),
+        admins: process.env.SWITCHBOARD_AUTH_ADMINS
+            ? process.env.SWITCHBOARD_AUTH_ADMINS.split(",")
+            : (switchboard?.auth?.admins ?? []),
     },
+    database: {
+        // url: process.env.PH_SWITCHBOARD_DATABASE_URL ?? switchboard?.database?.url ?? "dev.db",
+        url: process.env.PH_SWITCHBOARD_DATABASE_URL ??
+            switchboard?.database?.url ??
+            "dev.db",
+    },
+    port: process.env.PH_SWITCHBOARD_PORT &&
+        !isNaN(Number(process.env.PH_SWITCHBOARD_PORT))
+        ? Number(process.env.PH_SWITCHBOARD_PORT)
+        : (switchboard?.port ?? 4001),
 };
 //# sourceMappingURL=config.js.map

package/dist/src/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,MAAM,CAAC,MAAM,EAAE,CAAC;AAUhB,MAAM,CAAC,MAAM,MAAM,GAAW;IAC5B,IAAI,EAAE;QACJ,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,IAAI,KAAK;QAC/D,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QAC9D,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QAC5D,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;KAC/D;CACF,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC;AAC7B,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;AAajC,MAAM,CAAC,MAAM,MAAM,GAAW;IAC5B,IAAI,EAAE;QACJ,OAAO,EACL,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,MAAM;YAC7C,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,IAAI,KAAK,CAAC;QAC3C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACzC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC;YAChD,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;QACrC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;YACvC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC;YAC/C,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QACpC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;YACzC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC;YAChD,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;KACtC;IACD,QAAQ,EAAE;QACR,0FAA0F;QAC1F,GAAG,EACD,OAAO,CAAC,GAAG,CAAC,2BAA2B;YACvC,WAAW,EAAE,QAAQ,EAAE,GAAG;YAC1B,QAAQ;KACX;IACD,IAAI,EACF,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC/B,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACzC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC;CAClC,CAAC"}