Public-API, mehrseitige Schriftstücke, manuelle Aufträge & Mailer
Public-API (neu, directus-extension-skrift-api): - Versionierter /v1-Namespace: POST /v1/orders, GET /v1/orders/:nr (Status pending/processing/shipped/cancelled), POST /v1/files (nur PDF, ≤80 MB). - Auth über X-Api-Key (Authorization ist von Directus reserviert), SHA-256-Hash. - Produkt-gebunden; Kuvert-only-Produkttyp; Kuvertformat automatisch (A4→DIN Lang, sonst C6); kein Platzhalter, kein Kunden-multipage/font_scale; Versandart englisch (single/bulk). - Selbst gehostete Swagger-UI-Doku (/docs) + OpenAPI (/v1/openapi.json), englisch/technisch. - Key-Hook (directus-extension-skrift-apikey): erzeugt Key automatisch, zeigt ihn einmalig in key_plain. Mehrseitige Schriftstücke: - generateLetterPages (Auto-Fluss, [[seitenumbruch]], Leerseiten-Filter). - Preview/Order-Generierung schreiben letter_NNN_pM.svg; Seiten-Übersicht im Neuauftrag. - Agent (skrift-agent): Seiten je Brief absteigend an den Plotter (Stapel-Reihenfolge). - countLetterPages + /api/order/pagecount für die Seiten-Vorschau. Manuelle Aufträge: - Schriftgröße (Brief/Kuvert), Signatur auf dem Brief mit X/Y/Größe-Feinjustierung, realistische Handschrift bis in den finalen Druck durchgereicht. - Spalten-Einfügen in der Empfängertabelle (Excel-Spalte je Zelle). Mailer: Text-Alternative + Reply-To (Zustellbarkeit). App: Freitext in Musteranfrage, Konfigurator-Reset, Lightbox-Seitenverhältnis + Bild-Download, Sticky-Vorschau-Fix, Tab-Eingabe + Rechtsbündigkeit, Leerzeilen-Trim. Bootstrap: neue Felder (font_scale_*, signatures_manual, multi_page, page_count, realistic, shipping_day, api_client) + Collections api_clients, Produkttyp envelope. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
|
||||
const { runGeneration } = require('./order-controller');
|
||||
const directus = require('../../services/directus-service');
|
||||
const { countLetterPages } = require('../../lib/svg-generator');
|
||||
const { replacePlaceholders } = require('../../services/placeholder-service');
|
||||
|
||||
// Directus-Formatschlüssel → Backend-Formate
|
||||
const LETTER_FORMAT = { a4: 'a4', a6_hoch: 'a6p', a6_quer: 'a6l' };
|
||||
@@ -53,6 +55,20 @@ function buildDocuments(order, entries) {
|
||||
// Datei-Produkte (z. B. Unterschriftenservice): das „Schriftstück" ist das vom
|
||||
// Kunden hochgeladene Dokument – es wird NICHT generiert. Kuverts hingegen schon.
|
||||
const istDatei = order.product?.input_mode === 'datei';
|
||||
// Kuvert-only-Produkt: es wird KEIN Schriftstück generiert, nur die (adressierten)
|
||||
// Kuverts. Etwaige hochgeladene PDF-Briefe liegen als source_files am Auftrag.
|
||||
const istKuvertOnly = order.product?.type === 'envelope';
|
||||
// Natürliche Handschrift-Variation (Default an), am Auftrag gespeichert.
|
||||
const realistisch = order.realistic !== false;
|
||||
// Relative Schriftgröße (getrennt Brief/Kuvert), aus dem Auftrag. 1 = Standard.
|
||||
const fontScaleLetter = Number(order.font_scale_letter) || 1;
|
||||
const fontScaleEnv = Number(order.font_scale_envelope) || 1;
|
||||
// Signatur(en) auf dem Brief (manuelle Aufträge): SVG je [[signaturN]] + Feinjustierung.
|
||||
const sigManual = order.signatures_manual && typeof order.signatures_manual === 'object' ? order.signatures_manual : null;
|
||||
const sigMap = sigManual?.signatures || {};
|
||||
const sigOff = sigManual?.offsets || {};
|
||||
// Mehrseitiges Schriftstück (Auto-Fluss über N Seiten) – nur wenn am Auftrag gesetzt.
|
||||
const istMehrseitig = !!order.multi_page;
|
||||
|
||||
const documents = [];
|
||||
|
||||
@@ -62,7 +78,7 @@ function buildDocuments(order, entries) {
|
||||
// Briefnummer 1 gehört. Vorschau nummeriert identisch (siehe skrift-orders).
|
||||
const nr = Number(entry.letter_number) || (i + 1);
|
||||
|
||||
if (!istDatei) {
|
||||
if (!istDatei && !istKuvertOnly) {
|
||||
// Abweichender Text je Schriftstück (#5) hat Vorrang; sonst Standardtext.
|
||||
const briefText = (entry.text && String(entry.text).trim()) ? entry.text : (order.text_template || '');
|
||||
documents.push({
|
||||
@@ -72,6 +88,11 @@ function buildDocuments(order, entries) {
|
||||
format: letterFormat,
|
||||
font,
|
||||
placeholders,
|
||||
fontScale: fontScaleLetter,
|
||||
signatures: sigMap,
|
||||
signatureOffsets: sigOff,
|
||||
multiPage: istMehrseitig,
|
||||
realisticHandwriting: realistisch,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -84,6 +105,8 @@ function buildDocuments(order, entries) {
|
||||
format: envFormat,
|
||||
font,
|
||||
placeholders,
|
||||
fontScale: fontScaleEnv,
|
||||
realisticHandwriting: realistisch,
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -176,4 +199,27 @@ async function generateFromDirectus(req, res, next) {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { generateFromDirectus };
|
||||
/**
|
||||
* POST /api/order/pagecount
|
||||
* Body: { text, format, fontScale, entries: [{ placeholders }] }
|
||||
* Liefert je Dokument die Seitenzahl (nur Umbruch-Zählung, kein Scriptalizer/SVG).
|
||||
*/
|
||||
function pageCounts(req, res) {
|
||||
const { text, format, fontScale, entries } = req.body || {};
|
||||
if (!text || !String(text).trim()) {
|
||||
return res.status(400).json({ error: 'Invalid request', message: 'text is required' });
|
||||
}
|
||||
const fmt = format || 'a4';
|
||||
const scale = Number(fontScale) || 1;
|
||||
const list = Array.isArray(entries) && entries.length ? entries : [{}];
|
||||
const counts = list.map((e, i) => {
|
||||
const ph = { ...(e && typeof e.placeholders === 'object' ? e.placeholders : {}), Briefnummer: String(i + 1) };
|
||||
let pages = 1;
|
||||
try { pages = countLetterPages(replacePlaceholders(String(text), ph), fmt, { fontScale: scale }); }
|
||||
catch { pages = 1; }
|
||||
return { index: i + 1, pages };
|
||||
});
|
||||
return res.json({ counts });
|
||||
}
|
||||
|
||||
module.exports = { generateFromDirectus, pageCounts };
|
||||
|
||||
@@ -3,7 +3,7 @@ const fsSync = require('fs');
|
||||
const path = require('path');
|
||||
const config = require('../../config');
|
||||
const { scriptalizeBatch } = require('../../services/scriptalizer-service');
|
||||
const { generateLetterSVG, generateEnvelopeSVG } = require('../../lib/svg-generator');
|
||||
const { generateLetterSVG, generateEnvelopeSVG, generateLetterPages } = require('../../lib/svg-generator');
|
||||
const { replacePlaceholders, generateAllCSVs } = require('../../services/placeholder-service');
|
||||
const { TAB_MARKER } = require('../../lib/svg-font-engine');
|
||||
|
||||
@@ -188,7 +188,8 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
||||
index: letter.index !== undefined ? letter.index : loopIndex,
|
||||
loopIndex,
|
||||
processedText: text,
|
||||
signatures: sigPlaceholders,
|
||||
// Signaturen aus Platzhaltern UND direkt übergebene (manuelle Aufträge).
|
||||
signatures: { ...(letter.signatures || {}), ...sigPlaceholders },
|
||||
format: letter.format || 'a4',
|
||||
font: letter.font || 'tilda',
|
||||
type: letter.type || 'letter',
|
||||
@@ -219,7 +220,7 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
||||
|
||||
for (const letter of fontLetters) {
|
||||
const raw = letter.processedText;
|
||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|[&|])/gi);
|
||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|[&|])/gi);
|
||||
const segments = [], markers = [];
|
||||
for (let i = 0; i < parts.length; i++) {
|
||||
if (i % 2 === 0) segments.push(parts[i]);
|
||||
@@ -271,7 +272,42 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
||||
const letter = processedLetters[i];
|
||||
const absoluteIndex = letter.index !== undefined ? letter.index : i;
|
||||
const isEnv = letter.type === 'envelope';
|
||||
const filename = `${isEnv ? 'envelope' : 'letter'}_${String(absoluteIndex).padStart(3, '0')}.svg`;
|
||||
const pad = String(absoluteIndex).padStart(3, '0');
|
||||
|
||||
// Mehrseitiger Brief → N Seiten-Dateien letter_NNN_pM.svg (Seite 1..N).
|
||||
if (!isEnv && letter.multiPage) {
|
||||
const scriptalizedText = scriptalizedMap.get(letter.loopIndex) || letter.processedText;
|
||||
let pages;
|
||||
try {
|
||||
({ pages } = generateLetterPages(scriptalizedText, letter.format, {
|
||||
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale,
|
||||
}));
|
||||
} catch (err) {
|
||||
const e = new Error(`Failed to generate SVG for letter ${i}: ${err.message}`);
|
||||
e.status = 500; e.label = 'SVG generation failed'; throw e;
|
||||
}
|
||||
// Entweder ALLE Seiten aus der Vorschau übernehmen oder ALLE neu rendern –
|
||||
// nicht mischen, sonst unterschiedliche Handschrift-Variation je Seite.
|
||||
let alleInVorschau = false;
|
||||
if (previewSession) {
|
||||
alleInVorschau = true;
|
||||
for (let p = 0; p < pages.length; p++) {
|
||||
try { await fs.access(path.join(previewsRoot, previewSession, `letter_${pad}_p${p + 1}.svg`)); }
|
||||
catch { alleInVorschau = false; break; }
|
||||
}
|
||||
}
|
||||
for (let p = 0; p < pages.length; p++) {
|
||||
const fn = `letter_${pad}_p${p + 1}.svg`;
|
||||
const fp = path.join(outputDir, fn);
|
||||
if (alleInVorschau) await fs.copyFile(path.join(previewsRoot, previewSession, fn), fp);
|
||||
else await fs.writeFile(fp, pages[p], 'utf8');
|
||||
generatedLetters.push(fn);
|
||||
}
|
||||
console.log(`[Order] letter_${pad}: ${pages.length} Seiten${alleInVorschau ? ' (aus Vorschau)' : ''}.`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const filename = `${isEnv ? 'envelope' : 'letter'}_${pad}.svg`;
|
||||
const filepath = isEnv ? path.join(envelopesDir, filename) : path.join(outputDir, filename);
|
||||
|
||||
// 1:1 aus der Vorschau übernehmen, wenn für dieses Dokument eine
|
||||
@@ -293,12 +329,12 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
||||
if (isEnv) {
|
||||
svgResult = generateEnvelopeSVG(
|
||||
scriptalizedText, letter.format, letter.envelopeType,
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false }
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale }
|
||||
);
|
||||
} else {
|
||||
svgResult = generateLetterSVG(
|
||||
scriptalizedText, letter.format,
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, signatures: letter.signatures || {} }
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, signatures: letter.signatures || {}, signatureOffsets: letter.signatureOffsets || {}, fontScale: letter.fontScale }
|
||||
);
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
@@ -7,6 +7,7 @@ const { scriptalizeBatch } = require("../../services/scriptalizer-service");
|
||||
const {
|
||||
generateLetterSVG,
|
||||
generateEnvelopeSVG,
|
||||
generateLetterPages,
|
||||
} = require("../../lib/svg-generator");
|
||||
const {
|
||||
replacePlaceholders,
|
||||
@@ -75,7 +76,8 @@ async function generateBatch(req, res, next) {
|
||||
...letter,
|
||||
index: letter.index !== undefined ? letter.index : loopIndex,
|
||||
processedText: text,
|
||||
signatures: sigPlaceholders,
|
||||
// Signaturen aus Platzhaltern UND direkt mitgeschickte (manuelle Aufträge).
|
||||
signatures: { ...(letter.signatures || {}), ...sigPlaceholders },
|
||||
format: letter.format || "a4",
|
||||
font: letter.font || "tilda",
|
||||
type: letter.type || "letter",
|
||||
@@ -99,7 +101,7 @@ async function generateBatch(req, res, next) {
|
||||
for (const letter of processedLetters) {
|
||||
const raw = letter.processedText;
|
||||
// Splitten an \t UND [[signaturN]] (mit capture-Gruppe → Marker bleiben erhalten)
|
||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|[&|])/gi);
|
||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|[&|])/gi);
|
||||
const segments = [], markers = [];
|
||||
for (let i = 0; i < parts.length; i++) {
|
||||
if (i % 2 === 0) segments.push(parts[i]);
|
||||
@@ -157,63 +159,62 @@ async function generateBatch(req, res, next) {
|
||||
for (let i = 0; i < processedLetters.length; i++) {
|
||||
const letter = processedLetters[i];
|
||||
const scriptalizedText = scriptalizedTexts[i] || letter.processedText;
|
||||
|
||||
let svgResult;
|
||||
const absoluteIndex = letter.index !== undefined ? letter.index : i;
|
||||
const pad = String(absoluteIndex).padStart(3, "0");
|
||||
const recipientName = letter.placeholders?.name || letter.placeholders?.vorname || `Brief ${absoluteIndex + 1}`;
|
||||
|
||||
try {
|
||||
if (letter.type === "envelope") {
|
||||
svgResult = generateEnvelopeSVG(
|
||||
scriptalizedText,
|
||||
letter.format,
|
||||
letter.envelopeType,
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false }
|
||||
const svgResult = generateEnvelopeSVG(
|
||||
scriptalizedText, letter.format, letter.envelopeType,
|
||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale }
|
||||
);
|
||||
if (svgResult.overflow) hasOverflow = true;
|
||||
const filename = `envelope_${pad}.svg`;
|
||||
await fs.writeFile(path.join(sessionDir, filename), svgResult.svg, "utf8");
|
||||
files.push({
|
||||
index: absoluteIndex, filename, url: `/api/preview/${finalSessionId}/${filename}`,
|
||||
lineCount: svgResult.lineCount, lineLimit: svgResult.lineLimit, overflow: svgResult.overflow,
|
||||
recipientName: null,
|
||||
});
|
||||
} else if (letter.multiPage) {
|
||||
// Mehrseitiger Brief: Text fließt über N Seiten – kein Überlauf-Fehler.
|
||||
const { pages } = generateLetterPages(scriptalizedText, letter.format, {
|
||||
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale,
|
||||
});
|
||||
for (let p = 0; p < pages.length; p++) {
|
||||
const filename = `letter_${pad}_p${p + 1}.svg`;
|
||||
await fs.writeFile(path.join(sessionDir, filename), pages[p], "utf8");
|
||||
files.push({
|
||||
index: absoluteIndex, page: p + 1, pageCount: pages.length, filename,
|
||||
url: `/api/preview/${finalSessionId}/${filename}`, recipientName,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// Briefe: Zeileninfo mit zurückgeben
|
||||
svgResult = generateLetterSVG(scriptalizedText, letter.format, {
|
||||
font: letter.font,
|
||||
realisticHandwriting: letter.realisticHandwriting ?? false,
|
||||
signatures: letter.signatures || {},
|
||||
const svgResult = generateLetterSVG(scriptalizedText, letter.format, {
|
||||
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false,
|
||||
signatures: letter.signatures || {}, signatureOffsets: letter.signatureOffsets || {},
|
||||
fontScale: letter.fontScale,
|
||||
});
|
||||
if (svgResult.overflow) {
|
||||
hasOverflow = true;
|
||||
console.log(`[Preview] Letter ${i} has overflow: ${svgResult.lineCount}/${svgResult.lineLimit} lines`);
|
||||
}
|
||||
const filename = `letter_${pad}.svg`;
|
||||
await fs.writeFile(path.join(sessionDir, filename), svgResult.svg, "utf8");
|
||||
files.push({
|
||||
index: absoluteIndex, filename, url: `/api/preview/${finalSessionId}/${filename}`,
|
||||
lineCount: svgResult.lineCount, lineLimit: svgResult.lineLimit, overflow: svgResult.overflow,
|
||||
recipientName,
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(
|
||||
`[Preview] SVG generation failed for letter ${i}:`,
|
||||
err.message
|
||||
);
|
||||
console.error(`[Preview] SVG generation failed for letter ${i}:`, err.message);
|
||||
return res.status(500).json({
|
||||
error: "SVG generation failed",
|
||||
message: `Failed to generate SVG for letter ${i}: ${err.message}`,
|
||||
});
|
||||
}
|
||||
|
||||
// Track overflow
|
||||
if (svgResult.overflow) {
|
||||
hasOverflow = true;
|
||||
console.log(`[Preview] Letter ${i} has overflow: ${svgResult.lineCount}/${svgResult.lineLimit} lines`);
|
||||
}
|
||||
|
||||
// Save SVG file - verwende den absoluten Index aus letter
|
||||
// Unterscheide zwischen Briefen und Umschlägen im Dateinamen
|
||||
const absoluteIndex = letter.index !== undefined ? letter.index : i;
|
||||
const prefix = letter.type === 'envelope' ? 'envelope' : 'letter';
|
||||
const filename = `${prefix}_${String(absoluteIndex).padStart(3, "0")}.svg`;
|
||||
const filepath = path.join(sessionDir, filename);
|
||||
|
||||
await fs.writeFile(filepath, svgResult.svg, "utf8");
|
||||
|
||||
// Empfänger-Info für bessere Fehlermeldung
|
||||
const recipientName = letter.placeholders?.name || letter.placeholders?.vorname || `Brief ${absoluteIndex + 1}`;
|
||||
|
||||
files.push({
|
||||
index: absoluteIndex,
|
||||
filename,
|
||||
url: `/api/preview/${finalSessionId}/${filename}`,
|
||||
lineCount: svgResult.lineCount,
|
||||
lineLimit: svgResult.lineLimit,
|
||||
overflow: svgResult.overflow,
|
||||
recipientName: letter.type !== 'envelope' ? recipientName : null,
|
||||
});
|
||||
}
|
||||
|
||||
console.log(`[Preview] Generated ${files.length} SVG files`);
|
||||
|
||||
@@ -144,4 +144,11 @@ router.post('/register', authenticateApiToken, orderController.registerOrder);
|
||||
*/
|
||||
router.post('/from-directus', authenticateApiToken, directusController.generateFromDirectus);
|
||||
|
||||
/**
|
||||
* POST /api/order/pagecount
|
||||
* Seitenzahl je Dokument (mehrseitig) – ohne Scriptalizer/SVG, nur Umbruch-Zählung.
|
||||
* Body: { text, format, fontScale, entries: [{ placeholders }] }
|
||||
*/
|
||||
router.post('/pagecount', authenticateApiToken, directusController.pageCounts);
|
||||
|
||||
module.exports = router;
|
||||
|
||||
Reference in New Issue
Block a user