fix: MCP server Docker deployment, healthchecks, and minor fixes
MCP server: - Fix Prisma imports from stale client-generated path to @prisma/client - Switch schema from SQLite to PostgreSQL for Docker compatibility - Add prisma generate step to Dockerfile with proper binaryTargets - Include index-sse.js in Docker build (was excluded by .dockerignore) - Install openssl and libc6-compat in Alpine image for Prisma runtime Docker: - Fix memento-note healthcheck (wget unavailable in bullseye-slim) Minor fixes: - scrape.service SSRF protection, middleware route coverage - canvas-board and note-input type fixes - next.config turbopack and devIndicators adjustments Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -46,7 +46,7 @@ services:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--spider", "-q", "http://localhost:3000"]
|
||||
test: ["CMD", "node", "-e", "fetch('http://localhost:3000').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
@@ -6,6 +6,5 @@ node_modules
|
||||
.env.*
|
||||
*.log
|
||||
.DS_Store
|
||||
index-sse.js
|
||||
README-SSE.md
|
||||
N8N-CONFIG.md
|
||||
|
||||
@@ -4,20 +4,24 @@ FROM node:20-alpine
|
||||
# Install dependencies
|
||||
WORKDIR /app
|
||||
|
||||
# Install curl and wget for healthchecks
|
||||
RUN apk add --no-cache curl wget
|
||||
# Install curl, wget, and openssl for healthchecks and Prisma runtime
|
||||
RUN apk add --no-cache curl wget openssl libc6-compat
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
|
||||
# Install dependencies
|
||||
RUN npm ci --only=production
|
||||
# Install all dependencies (including dev for prisma generate)
|
||||
RUN npm ci
|
||||
|
||||
# Copy application code
|
||||
COPY . .
|
||||
|
||||
# Copy Prisma schema and client
|
||||
# Copy Prisma schema and generate client
|
||||
COPY prisma ./prisma
|
||||
RUN npx prisma generate
|
||||
|
||||
# Prune devDependencies after generating Prisma client
|
||||
RUN npm prune --omit=dev
|
||||
|
||||
# Create non-root user
|
||||
RUN addgroup -g 1001 -S mcp && \
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Vérifier les propriétés des notes
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
const prisma = new PrismaClient({
|
||||
datasources: {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Supprimer toutes les notes créées
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
const prisma = new PrismaClient({
|
||||
datasources: {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Utilise Prisma pour créer les notes
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
const prisma = new PrismaClient({
|
||||
datasources: {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Importe le contenu intégral de chaque fichier .md
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { readFileSync } from 'fs';
|
||||
import { join, dirname } from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
||||
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { dirname, join } from 'path';
|
||||
import { randomUUID } from 'crypto';
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
||||
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { dirname, join } from 'path';
|
||||
import { registerTools } from './tools.js';
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
generator client {
|
||||
provider = "prisma-client-js"
|
||||
output = "../node_modules/.prisma/client"
|
||||
provider = "prisma-client-js"
|
||||
output = "../node_modules/.prisma/client"
|
||||
binaryTargets = ["linux-musl-openssl-3.0.x", "native"]
|
||||
}
|
||||
|
||||
datasource db {
|
||||
provider = "sqlite"
|
||||
url = "file:../../memento-note/prisma/dev.db"
|
||||
provider = "postgresql"
|
||||
url = env("DATABASE_URL")
|
||||
}
|
||||
|
||||
model Note {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* node test/performance-test.js
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
|
||||
const prisma = new PrismaClient({
|
||||
datasources: {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Les notes sont créées avec isMarkdown: true
|
||||
*/
|
||||
|
||||
import { PrismaClient } from '../memento-note/prisma/client-generated/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { readFileSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
import dynamic from 'next/dynamic'
|
||||
import { useState, useEffect, useRef } from 'react'
|
||||
import { toast } from 'sonner'
|
||||
import type { ExcalidrawElement } from '@excalidraw/excalidraw/types/element/types'
|
||||
import type { AppState, BinaryFiles } from '@excalidraw/excalidraw/types/types'
|
||||
import type { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'
|
||||
import type { AppState, BinaryFiles } from '@excalidraw/excalidraw/types'
|
||||
import '@excalidraw/excalidraw/index.css'
|
||||
|
||||
// Dynamic import with SSR disabled is REQUIRED for Excalidraw due to window dependencies
|
||||
|
||||
@@ -68,7 +68,7 @@ interface NoteInputProps {
|
||||
onNoteCreated?: (note: Note) => void
|
||||
defaultExpanded?: boolean
|
||||
forceExpanded?: boolean
|
||||
/** Mode onglets : occupe toute la largeur du contenu principal (plus de carte étroite centrée) */
|
||||
/** Tab mode: takes full width of main content (no narrow centered card) */
|
||||
fullWidth?: boolean
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ export function NoteInput({
|
||||
const [dismissedTitleSuggestions, setDismissedTitleSuggestions] = useState(false)
|
||||
|
||||
const handleSelectGhostTag = async (tag: string) => {
|
||||
// Vérification insensible à la casse
|
||||
// Case-insensitive check
|
||||
const tagExists = selectedLabels.some(l => l.toLowerCase() === tag.toLowerCase())
|
||||
|
||||
if (!tagExists) {
|
||||
@@ -145,7 +145,7 @@ export function NoteInput({
|
||||
try {
|
||||
await addLabel(tag)
|
||||
} catch (err) {
|
||||
console.error('Erreur création label auto:', err)
|
||||
console.error('Error creating auto-label:', err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,18 +29,18 @@ export interface OrganizationPlan {
|
||||
}
|
||||
|
||||
/**
|
||||
* Service for batch organizing notes from "Notes générales" into notebooks
|
||||
* Service for batch organizing notes from "General Notes" into notebooks
|
||||
* (Story 5.3 - IA3)
|
||||
*/
|
||||
export class BatchOrganizationService {
|
||||
/**
|
||||
* Analyze all notes in "Notes générales" and create an organization plan
|
||||
* Analyze all notes in "General Notes" and create an organization plan
|
||||
* @param userId - User ID
|
||||
* @param language - User's preferred language (default: 'en')
|
||||
* @returns Organization plan with notebook assignments
|
||||
*/
|
||||
async createOrganizationPlan(userId: string, language: string = 'en'): Promise<OrganizationPlan> {
|
||||
// 1. Get all notes without notebook (Inbox/Notes générales)
|
||||
// 1. Get all notes without notebook (Inbox/General Notes)
|
||||
const notesWithoutNotebook = await prisma.note.findMany({
|
||||
where: {
|
||||
userId,
|
||||
|
||||
@@ -50,12 +50,12 @@ export class ScrapeService {
|
||||
}
|
||||
|
||||
return {
|
||||
title: article.title,
|
||||
content: article.content, // HTML fragment from readability
|
||||
textContent: article.textContent, // Clean text
|
||||
excerpt: article.excerpt,
|
||||
byline: article.byline,
|
||||
siteName: article.siteName,
|
||||
title: article.title ?? '',
|
||||
content: article.content ?? '', // HTML fragment from readability
|
||||
textContent: article.textContent ?? '', // Clean text
|
||||
excerpt: article.excerpt ?? '',
|
||||
byline: article.byline ?? '',
|
||||
siteName: article.siteName ?? '',
|
||||
url: targetUrl
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import NextAuth from 'next-auth';
|
||||
import { authConfig } from './auth.config';
|
||||
|
||||
// NOTE: NextAuth middleware API may change in Next.js 16+.
|
||||
// See: https://nextjs.org/docs/app/building-your-application/routing/middleware
|
||||
export default NextAuth(authConfig).auth;
|
||||
|
||||
export const config = {
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
import type { NextConfig } from "next";
|
||||
|
||||
const withPWA = require("@ducanh2912/next-pwa").default({
|
||||
dest: "public",
|
||||
register: true,
|
||||
skipWaiting: true,
|
||||
disable: process.env.NODE_ENV === "development",
|
||||
});
|
||||
|
||||
const nextConfig: NextConfig = {
|
||||
// Enable standalone output for Docker
|
||||
output: 'standalone',
|
||||
@@ -22,8 +15,7 @@ const nextConfig: NextConfig = {
|
||||
// Hide the "compiling" indicator
|
||||
devIndicators: false,
|
||||
|
||||
// Silence warning from Next-PWA custom webpack injections
|
||||
turbopack: {},
|
||||
};
|
||||
|
||||
export default withPWA(nextConfig);
|
||||
export default nextConfig;
|
||||
|
||||
8605
memento-note/package-lock.json
generated
8605
memento-note/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user