added changes
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
# ─── Prune: extract only @tower/api + its workspace deps ───
|
||||
FROM node:22-alpine AS pruner
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
COPY pnpm-lock.yaml pnpm-workspace.yaml package.json turbo.json tsconfig.base.json ./
|
||||
RUN pnpm install --frozen-lockfile
|
||||
COPY . .
|
||||
RUN pnpm exec turbo prune --scope=@tower/api --docker
|
||||
|
||||
# ─── Install ALL deps (layer cached by lockfile) ───
|
||||
FROM node:22-alpine AS installer
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
COPY --from=pruner /app/out/json/ .
|
||||
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=pruner /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
|
||||
RUN pnpm install --frozen-lockfile
|
||||
|
||||
# ─── Build ───
|
||||
FROM installer AS builder
|
||||
COPY --from=pruner /app/out/full/ .
|
||||
COPY tsconfig.base.json ./
|
||||
RUN pnpm exec prisma generate --schema=apps/api/prisma/schema.prisma
|
||||
RUN pnpm turbo build --filter=@tower/api
|
||||
|
||||
# ─── Production runner ───
|
||||
FROM node:22-alpine AS runner
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=pruner /app/out/full/ .
|
||||
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=builder /app/apps/api/dist ./apps/api/dist
|
||||
COPY --from=builder /app/packages/config/dist ./packages/config/dist
|
||||
COPY --from=builder /app/packages/logger/dist ./packages/logger/dist
|
||||
COPY --from=builder /app/packages/search/dist ./packages/search/dist
|
||||
COPY --from=builder /app/packages/types/dist ./packages/types/dist
|
||||
|
||||
RUN pnpm install --prod --frozen-lockfile
|
||||
RUN pnpm exec prisma generate --schema=apps/api/prisma/schema.prisma
|
||||
|
||||
COPY apps/api/docker-entrypoint.sh /usr/local/bin/
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
|
||||
EXPOSE 3001
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
CMD ["node", "apps/api/dist/main"]
|
||||
@@ -0,0 +1,8 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
echo "Running database migrations..."
|
||||
pnpm exec prisma migrate deploy --schema=apps/api/prisma/schema.prisma
|
||||
|
||||
echo "Starting TOWER API..."
|
||||
exec "$@"
|
||||
@@ -7,7 +7,7 @@
|
||||
"start": "node dist/main",
|
||||
"test": "jest",
|
||||
"test:e2e": "jest --config ./test/jest-e2e.json",
|
||||
"db:seed": "ts-node prisma/seed.ts"
|
||||
"db:seed": "DOTENV_CONFIG_PATH=.env ts-node -r dotenv/config prisma/seed.ts"
|
||||
},
|
||||
"prisma": {
|
||||
"seed": "ts-node prisma/seed.ts"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { useSuperAdmin } from '../../_lib/super-admin-context';
|
||||
import { useRouter } from 'next/navigation';
|
||||
|
||||
@@ -9,7 +9,10 @@ export default function BotsPage() {
|
||||
const router = useRouter();
|
||||
const [bots, setBots] = useState<any[]>([]);
|
||||
const [initiating, setInitiating] = useState(false);
|
||||
const [pairingInfo, setPairingInfo] = useState<{ token: string; expiresAt: string } | null>(null);
|
||||
const [pairingInfo, setPairingInfo] = useState<{ pairingToken: string; expiresAt: string } | null>(null);
|
||||
const [qrDataUrl, setQrDataUrl] = useState<string | null>(null);
|
||||
const [qrStatus, setQrStatus] = useState<string>('PAIRING');
|
||||
const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
|
||||
async function load() {
|
||||
const res = await fetch('/api/admin/bots');
|
||||
@@ -22,8 +25,30 @@ export default function BotsPage() {
|
||||
void load();
|
||||
}, [admin, loading, router]);
|
||||
|
||||
const pollQr = useCallback(async (token: string) => {
|
||||
const res = await fetch(`/api/admin/bots/qr/${token}`);
|
||||
if (!res.ok) { clearInterval(pollRef.current!); return; }
|
||||
const data = await res.json();
|
||||
setQrStatus(data.status);
|
||||
if (data.qrDataUrl) {
|
||||
setQrDataUrl(data.qrDataUrl);
|
||||
clearInterval(pollRef.current!);
|
||||
}
|
||||
if (data.status === 'ACTIVE') {
|
||||
clearInterval(pollRef.current!);
|
||||
setPairingInfo(null);
|
||||
void load();
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
return () => { if (pollRef.current) clearInterval(pollRef.current); };
|
||||
}, []);
|
||||
|
||||
async function initiateBot() {
|
||||
setInitiating(true);
|
||||
setQrDataUrl(null);
|
||||
setQrStatus('PAIRING');
|
||||
try {
|
||||
const res = await fetch('/api/admin/bots', {
|
||||
method: 'POST',
|
||||
@@ -33,6 +58,8 @@ export default function BotsPage() {
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
setPairingInfo(data);
|
||||
pollRef.current = setInterval(() => void pollQr(data.pairingToken), 2000);
|
||||
void pollQr(data.pairingToken);
|
||||
}
|
||||
} finally {
|
||||
setInitiating(false);
|
||||
@@ -51,11 +78,6 @@ export default function BotsPage() {
|
||||
}
|
||||
}
|
||||
|
||||
function getQrUrl() {
|
||||
if (!pairingInfo) return null;
|
||||
return `/api/admin/bots/qr/${pairingInfo.token}`;
|
||||
}
|
||||
|
||||
if (loading) return <p className="text-gray-500">Loading...</p>;
|
||||
if (!admin) return null;
|
||||
|
||||
@@ -73,17 +95,21 @@ export default function BotsPage() {
|
||||
</div>
|
||||
|
||||
{pairingInfo && (
|
||||
<div className="bg-yellow-50 border border-yellow-200 rounded-xl p-4 mb-6">
|
||||
<p className="text-sm font-medium mb-2">New bot created — scan QR to pair</p>
|
||||
<p className="text-xs text-gray-600 mb-2">Expires: {pairingInfo.expiresAt}</p>
|
||||
<a
|
||||
href={getQrUrl() ?? '#'}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-blue-600 text-sm underline"
|
||||
>
|
||||
View QR Code
|
||||
</a>
|
||||
<div className="bg-yellow-50 border border-yellow-200 rounded-xl p-4 mb-6 flex items-start gap-6">
|
||||
<div className="flex-1">
|
||||
<p className="text-sm font-medium mb-1">
|
||||
{qrStatus === 'ACTIVE' ? 'Bot connected!' : 'New bot created — waiting for QR scan...'}
|
||||
</p>
|
||||
<p className="text-xs text-gray-600">Status: {qrStatus}</p>
|
||||
<p className="text-xs text-gray-600">Expires: {pairingInfo.expiresAt}</p>
|
||||
</div>
|
||||
{qrDataUrl ? (
|
||||
<img src={qrDataUrl} alt="QR Code" className="w-40 h-40 border-2 border-gray-300 rounded-lg" />
|
||||
) : (
|
||||
<div className="w-40 h-40 bg-gray-100 border-2 border-dashed border-gray-300 rounded-lg flex items-center justify-center text-xs text-gray-400">
|
||||
{qrStatus === 'ACTIVE' ? 'Connected' : 'Waiting for QR...'}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
# ─── Prune: extract only @tower/worker + its workspace deps ───
|
||||
FROM node:22-alpine AS pruner
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
COPY pnpm-lock.yaml pnpm-workspace.yaml package.json turbo.json tsconfig.base.json ./
|
||||
RUN pnpm install --frozen-lockfile
|
||||
COPY . .
|
||||
RUN pnpm exec turbo prune --scope=@tower/worker --docker
|
||||
|
||||
# ─── Install ALL deps ───
|
||||
FROM node:22-alpine AS installer
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
COPY --from=pruner /app/out/json/ .
|
||||
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=pruner /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
|
||||
RUN pnpm install --frozen-lockfile
|
||||
|
||||
# ─── Build ───
|
||||
FROM installer AS builder
|
||||
COPY --from=pruner /app/out/full/ .
|
||||
COPY tsconfig.base.json ./
|
||||
RUN mkdir -p apps/worker/prisma
|
||||
COPY --from=pruner /app/apps/api/prisma/schema.prisma apps/worker/prisma/schema.prisma
|
||||
RUN pnpm exec prisma generate --schema=apps/worker/prisma/schema.prisma
|
||||
RUN cd apps/worker && pnpm exec tsc
|
||||
|
||||
# ─── Production runner ───
|
||||
FROM node:22-alpine AS runner
|
||||
RUN corepack enable && corepack prepare pnpm@10 --activate
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=pruner /app/out/full/ .
|
||||
COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
|
||||
COPY --from=builder /app/apps/worker/dist ./apps/worker/dist
|
||||
COPY --from=builder /app/packages/config/dist ./packages/config/dist
|
||||
COPY --from=builder /app/packages/logger/dist ./packages/logger/dist
|
||||
COPY --from=builder /app/packages/search/dist ./packages/search/dist
|
||||
COPY --from=builder /app/packages/types/dist ./packages/types/dist
|
||||
|
||||
RUN pnpm install --prod --frozen-lockfile
|
||||
RUN mkdir -p apps/worker/prisma
|
||||
COPY --from=pruner /app/apps/api/prisma/schema.prisma apps/worker/prisma/schema.prisma
|
||||
RUN pnpm exec prisma generate --schema=apps/worker/prisma/schema.prisma
|
||||
|
||||
CMD ["node", "apps/worker/dist/main.js"]
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@tower/worker",
|
||||
"version": "0.0.1",
|
||||
"scripts": {
|
||||
"generate": "prisma generate --schema=../api/prisma/schema.prisma",
|
||||
"generate": "prisma generate --schema=./prisma/schema.prisma",
|
||||
"build": "tsc",
|
||||
"dev": "DOTENV_CONFIG_PATH=../../.env ts-node -r dotenv/config src/main.ts",
|
||||
"start": "node dist/main.js",
|
||||
|
||||
Reference in New Issue
Block a user