From 1e1d745e55b29a080d319112c7cf70c85af7a5b0 Mon Sep 17 00:00:00 2001 From: Madison Grubb Date: Thu, 4 Sep 2025 16:52:13 -0400 Subject: [PATCH] rework to allow for image gen --- .gitignore | 1 + assets/parchment.jpg | Bin 29209 -> 0 bytes dungeonGenerator.js | 112 ++++----------- dungeonTemplate.js | 19 +-- generateDungeon.js => generatePDF.js | 14 +- imageGenerator.js | 207 +++++++++++++++++++++++++++ index.js | 18 ++- ollamaClient.js | 78 ++++++++++ package-lock.json | 58 +++----- 9 files changed, 372 insertions(+), 135 deletions(-) delete mode 100644 assets/parchment.jpg rename generateDungeon.js => generatePDF.js (57%) create mode 100644 imageGenerator.js create mode 100644 ollamaClient.js diff --git a/.gitignore b/.gitignore index b661d49..34ff206 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pdf +*.png .env node_modules/** diff --git a/assets/parchment.jpg b/assets/parchment.jpg deleted file mode 100644 index 807aecd4855813fc749e57ee18888e1deaee9099..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29209 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 setTimeout(resolve, ms)); -} - -// --- Utility: strip markdown artifacts --- +// Utility: strip markdown artifacts function cleanText(str) { return str .replace(/^#+\s*/gm, "") // remove headers @@ -15,51 +10,6 @@ function cleanText(str) { .trim(); } -async function callOllama(prompt, model = "gemma3n:e4b", retries = 5, stepName = "unknown") { - for (let attempt = 1; attempt <= retries; attempt++) { - try { - const promptCharCount = prompt.length; - const promptWordCount = prompt.split(/\s+/).length; - - console.log(`\n๐Ÿ“ค [${stepName}] Sending prompt (attempt ${attempt}/${retries})`); - console.log(` Prompt: ${promptCharCount} chars, ~${promptWordCount} words`); - - const response = await fetch(OLLAMA_API_URL, { - method: "POST", - headers: { - "Authorization": `Bearer ${OLLAMA_API_KEY}`, - "Content-Type": "application/json", - }, - body: JSON.stringify({ - model, - messages: [{ role: "user", content: prompt }], - }), - }); - - if (!response.ok) throw new Error(`Ollama request failed: ${response.status} ${response.statusText}`); - - const data = await response.json(); - const rawText = data.choices?.[0]?.message?.content; - if (!rawText) throw new Error("No response from Ollama"); - - const cleaned = cleanText(rawText); - - console.log(`โœ… [${stepName}] Received: ${rawText.length} chars, ~${rawText.split(/\s+/).length} words`); - console.log(`--- Raw output ---\n${rawText}\n`); - console.log(`--- Cleaned output ---\n${cleaned}\n`); - - return cleaned; - - } catch (err) { - console.warn(`โš ๏ธ [${stepName}] Attempt ${attempt} failed: ${err.message}`); - if (attempt === retries) throw err; - const delay = 1000 * Math.pow(2, attempt) + Math.random() * 500; - console.log(` Retrying in ${Math.round(delay / 1000)}s...`); - await sleep(delay); - } - } -} - function parseList(raw) { return raw .split(/\n?\d+[).]\s+/) @@ -83,9 +33,9 @@ function parseObjects(raw, type = "rooms") { } export async function generateDungeon() { - console.log("๐Ÿ—๏ธ Starting compact dungeon generation with debug logs...\n"); + console.log("Starting compact dungeon generation with debug logs...\n"); - // --- Step 1: Titles --- + // Step 1: Titles const titles10Raw = await callOllama( `Generate 10 short, punchy dungeon titles (max 5 words each), numbered as a plain text list. Each title should come from a different style or theme. Make the set varied and evocative. For example: @@ -97,25 +47,25 @@ Each title should come from a different style or theme. Make the set varied and - Weird fantasy: uncanny, surreal, unsettling - Whimsical: fun, quirky, playful -Avoid repeating materials or adjectives. Avoid the words "obsidian" and "clockwork". Do not include explanations, markdown, or preambles. Only the 10 numbered titles.`, +Avoid repeating materials or adjectives. Do not include any titles with the words "Obsidian" or "Clockwork". Do not include explanations, markdown, or preambles. Do not include the style or theme in parenthesis. Only the 10 numbered titles.`, undefined, 5, "Step 1: Titles" ); const titles10 = parseList(titles10Raw, 30); - console.log("๐Ÿ”น Parsed titles10:", titles10); + console.log("Parsed titles10:", titles10); - // --- Step 2: Narrow to 5 --- + // Step 2: Narrow to 5 const titles5Raw = await callOllama( `Here are 10 dungeon titles: ${titles10.join("\n")} -Randomly select 3 of the titles from the above list and create 2 additional unique titles. Avoid the words "obsidian" and "clockwork". +Randomly select 3 of the titles from the above list and create 2 additional unique titles. Do not include any titles with the words "Obsidian" or "Clockwork". Output exactly 5 titles as a numbered list, plain text only. No explanations.`, undefined, 5, "Step 2: Narrow Titles" ); const titles5 = parseList(titles5Raw, 30); - console.log("๐Ÿ”น Parsed titles5:", titles5); + console.log("Parsed titles5:", titles5); - // --- Step 3: Final title --- + // Step 3: Final title const bestTitleRaw = await callOllama( `From the following 5 dungeon titles, randomly select only one of them. Output only the title, no explanation, no numbering, no extra text: @@ -124,20 +74,20 @@ ${titles5.join("\n")}`, undefined, 5, "Step 3: Final Title" ); const title = cleanText(bestTitleRaw.split("\n")[0]); - console.log("๐Ÿ”น Selected title:", title); + console.log("Selected title:", title); - // --- Step 4: Flavor text --- + // Step 4: Flavor text const flavorRaw = await callOllama( - `Write a single evocative paragraph describing the dungeon titled "${title}". -Do not include hooks, NPCs, treasure, or instructions. Output plain text only, one paragraph. Maximum 4 sentences.`, + `Write a single evocative paragraph describing the location titled "${title}". +Do not include hooks, NPCs, treasure, or instructions. do not use bullet points or em-dashes. Output plain text only, one paragraph. Maximum 4 sentences.`, undefined, 5, "Step 4: Flavor" ); const flavor = flavorRaw; - console.log("๐Ÿ”น Flavor text:", flavor); + console.log("Flavor text:", flavor); - // --- Step 5: Hooks & Rumors --- + // Step 5: Hooks & Rumors const hooksRumorsRaw = await callOllama( - `Based only on this dungeon flavor: + `Based only on this location's flavor: ${flavor} @@ -147,9 +97,9 @@ Maximum 2 sentences per item. No explanations or extra text.`, undefined, 5, "Step 5: Hooks & Rumors" ); const hooksRumors = parseList(hooksRumorsRaw, 120); - console.log("๐Ÿ”น Hooks & Rumors:", hooksRumors); + console.log("Hooks & Rumors:", hooksRumors); - // --- Step 6: Rooms & Encounters --- + // Step 6: Rooms & Encounters const roomsEncountersRaw = await callOllama( `Using the flavor and these hooks/rumors: @@ -166,28 +116,28 @@ Output two numbered lists, labeled "Rooms:" and "Encounters:". Plain text only. const [roomsSection, encountersSection] = roomsEncountersRaw.split(/Encounters[:\n]/i); const rooms = parseObjects(roomsSection.replace(/Rooms[:\n]*/i, ""), "rooms", 120); const encounters = parseObjects(encountersSection || "", "encounters", 120); - console.log("๐Ÿ”น Rooms:", rooms); - console.log("๐Ÿ”น Encounters:", encounters); + console.log("Rooms:", rooms); + console.log("Encounters:", encounters); - // --- Step 7: Treasure & NPCs --- + // Step 7: Treasure & NPCs const treasureNpcsRaw = await callOllama( `Based only on these rooms and encounters: ${JSON.stringify({ rooms, encounters }, null, 2)} -Generate 3 treasures and 3 NPCs (name + trait, max 2 sentences each). +Generate 3 treasures and 3 NPCs (name + trait, max 2 sentences each). Each NPC has a proper name, not just a title. Output numbered lists labeled "Treasure:" and "NPCs:". Plain text only, no extra text.`, undefined, 5, "Step 7: Treasure & NPCs" ); const [treasureSection, npcsSection] = treasureNpcsRaw.split(/NPCs[:\n]/i); const treasure = parseList(treasureSection.replace(/Treasures?[:\n]*/i, ""), 120); const npcs = parseObjects(npcsSection || "", "npcs", 120); - console.log("๐Ÿ”น Treasure:", treasure); - console.log("๐Ÿ”น NPCs:", npcs); + console.log("Treasure:", treasure); + console.log("NPCs:", npcs); - // --- Step 8: Plot Resolutions --- + // Step 8: Plot Resolutions const plotResolutionsRaw = await callOllama( - `Based on the following dungeon flavor and story hooks: + `Based on the following location's flavor and story hooks: Flavor: ${flavor} @@ -198,15 +148,15 @@ ${hooksRumors.join("\n")} Major NPCs / Encounters: ${[...npcs.map(n => n.name), ...encounters.map(e => e.name)].join(", ")} -Suggest 3 possible, non-conflicting story climaxes or plot resolutions for adventurers exploring this dungeon. -These are prompts and ideas for brainstorming the dungeon's ending, not fixed outcomes. +Suggest 3 possible, non-conflicting story climaxes or plot resolutions for adventurers exploring this location. +These are prompts and ideas for brainstorming the story's ending, not fixed outcomes. Start each item with phrases like "The adventurers could..." or "The PCs might..." to emphasize their hypothetical nature. Keep each item short (max 2 sentences). Output as a numbered list, plain text only.`, undefined, 5, "Step 8: Plot Resolutions" ); const plotResolutions = parseList(plotResolutionsRaw, 180); - console.log("๐Ÿ”น Plot Resolutions:", plotResolutions); + console.log("Plot Resolutions:", plotResolutions); - console.log("\n๐ŸŽ‰ Dungeon generation complete!"); + console.log("\nDungeon generation complete!"); return { title, flavor, map: "map.png", hooksRumors, rooms, encounters, treasure, npcs, plotResolutions }; } diff --git a/dungeonTemplate.js b/dungeonTemplate.js index f2135e9..3fa8e6a 100644 --- a/dungeonTemplate.js +++ b/dungeonTemplate.js @@ -11,9 +11,9 @@ export function dungeonTemplate(data) { ]; const headingFonts = [ - "'Cinzel Decorative', cursive", - "'MedievalSharp', cursive", - "'Metamorphous', cursive", + "'Cinzel', serif", + "'MedievalSharp', serif", + "'Cormorant Garamond', serif", "'Playfair Display', serif" ]; @@ -25,10 +25,10 @@ export function dungeonTemplate(data) { ]; const quoteFonts = [ - "'Walter Turncoat', cursive", + "'Playfair Display', serif", "'Uncial Antiqua', serif", - "'Beth Ellen', cursive", - "'Pinyon Script', cursive" + "'Libre Baskerville', serif", + "'Merriweather', serif" ]; const bodyFont = pickRandom(bodyFonts); @@ -100,6 +100,10 @@ export function dungeonTemplate(data) { table tr:hover { background: rgba(0, 0, 0, 0.05); } .map-page { page-break-before: always; + display: flex; + align-items: center; + justify-content: center; + height: calc(100vh - 3cm); text-align: center; } .map-page img { max-width: 100%; max-height: 27cm; border: 2px solid #1a1a1a; border-radius: 0.2cm; } @@ -141,8 +145,7 @@ export function dungeonTemplate(data) {
-

Dungeon Map

- Dungeon Map + Dungeon Map
diff --git a/generateDungeon.js b/generatePDF.js similarity index 57% rename from generateDungeon.js rename to generatePDF.js index 6098a6e..0de3035 100644 --- a/generateDungeon.js +++ b/generatePDF.js @@ -1,12 +1,20 @@ import puppeteer from "puppeteer"; import { dungeonTemplate } from "./dungeonTemplate.js"; -export async function generateDungeonPDF(data, outputPath = "dungeon.pdf") { +import fs from 'fs/promises'; + +export async function generatePDF(data, outputPath = "dungeon.pdf") { const browser = await puppeteer.launch({ - args: ['--no-sandbox', '--disable-setuid-sandbox'] - }); + args: ['--no-sandbox', '--disable-setuid-sandbox'] + }); + const page = await browser.newPage(); + // Convert image to base64 + const imageBuffer = await fs.readFile(data.map); + const base64Image = `data:image/png;base64,${imageBuffer.toString("base64")}`; + data.map = base64Image; + const html = dungeonTemplate(data); await page.setContent(html, { waitUntil: "networkidle0" }); diff --git a/imageGenerator.js b/imageGenerator.js new file mode 100644 index 0000000..e20e011 --- /dev/null +++ b/imageGenerator.js @@ -0,0 +1,207 @@ +import path from "path"; +import { mkdir, writeFile } from "fs/promises"; +import { fileURLToPath } from "url"; +import { callOllama } from "./ollamaClient.js"; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const COMFYUI_URL = process.env.COMFYUI_URL || "http://localhost:8188"; + +// Drawing style prefix +const STYLE_PREFIX = `a high-contrast, black and white pen and ink drawing, hand-drawn sketch aesthetic, very low detail, visible loose linework, expressive simple hatching for shadows, quick conceptual sketch, subtle color accent`; + +// 1. Generate engineered visual prompt +async function generateVisualPrompt(flavor) { + const rawPrompt = await callOllama( + `You are a prompt engineer specializing in visual prompts for AI image generation (e.g., Stable Diffusion, ComfyUI). Given a piece of fantasy flavor text, your job is to extract and translate the visual elements into a highly descriptive image prompt. + +Your output should be structured like a list of visual tags, not a story or paragraph. Focus on describing the environment, mood, architecture, lighting, materials, and color. Avoid abstract, emotional, and visual language. Be literal, specific, and visual only. + +Rules: +- Do NOT repeat phrases or wording from the input. +- Only include things that could be seen in a single, still image. +- Use visual keywords, rich adjectives, and clear scene descriptors. +- Keep the prompt concise, 40-80 words. +- Maintain simplicity in descriptions. The image must be a minimal, hand drawn sketch aesthetic with low detail. +- Avoid characters or creatures unless clearly described. +- Avoid referencing rendering style, color technique, camera effects, or drawing medium โ€” focus only on the visual content of the scene. +- Do NOT include phrases like โ€œan image ofโ€ or โ€œa scene showingโ€. + +Input: +${flavor} + +Output:`, + "gemma3n:e4b", 3, "Generate Visual Prompt" + ); + + return `${STYLE_PREFIX}, ${rawPrompt.trim().replace(/\n/g, " ")}`; +} + +// 2. Save image buffer +async function saveImage(buffer, filename) { + const filepath = path.join(__dirname, filename); + await mkdir(__dirname, { recursive: true }); + await writeFile(filepath, buffer); + console.log(`โœ… Saved image: ${filepath}`); + return filepath; +} + +// 3. Build workflow payload +function buildComfyWorkflow(promptText, negativeText = "") { + return { + "3": { + "inputs": { + "seed": Math.floor(Math.random() * 100000), + "steps": 4, + "cfg": 1, + "sampler_name": "euler", + "scheduler": "simple", + "denoise": 1, + "model": ["4", 0], + "positive": ["6", 0], + "negative": ["7", 0], + "latent_image": ["5", 0] + }, + "class_type": "KSampler" + }, + "4": { + "inputs": { + "unet_name": "flux1-schnell-fp8.safetensors", + "weight_dtype": "fp8_e4m3fn" + }, + "class_type": "UNETLoader" + }, + "5": { + "inputs": { + "width": 1000, + "height": 700, + "batch_size": 1 + }, + "class_type": "EmptyLatentImage" + }, + "6": { + "inputs": { + "text": promptText, + "clip": ["10", 0] + }, + "class_type": "CLIPTextEncode" + }, + "7": { + "inputs": { + "text": negativeText, + "clip": ["10", 0] + }, + "class_type": "CLIPTextEncode" + }, + "10": { + "inputs": { + "clip_name1": "clip_l.safetensors", + "clip_name2": "t5xxl_fp8_e4m3fn.safetensors", + "type": "flux" + }, + "class_type": "DualCLIPLoader" + }, + "11": { + "inputs": { + "vae_name": "ae.safetensors" + }, + "class_type": "VAELoader" + }, + "8": { + "inputs": { + "samples": ["3", 0], + "vae": ["11", 0] + }, + "class_type": "VAEDecode" + }, + "9": { + "inputs": { + "filename_prefix": "ComfyUI_Flux", + "images": ["8", 0] + }, + "class_type": "SaveImage" + } + }; +} + + +// 4a. Wait for ComfyUI to finish image generation +async function waitForImage(promptId, timeout = 900000) { + const start = Date.now(); + + while (Date.now() - start < timeout) { + const res = await fetch(`${COMFYUI_URL}/history`); + const data = await res.json(); + const historyEntry = data[promptId]; + + if (historyEntry?.outputs) { + const images = Object.values(historyEntry.outputs).flatMap(o => o.images || []); + if (images.length > 0) return images.map(i => i.filename); + } + + await new Promise(resolve => setTimeout(resolve, 1000)); + } + + throw new Error("Timed out waiting for ComfyUI image result."); +} + +// 4b. Download image from ComfyUI server +async function downloadImage(filename, localFilename) { + const url = `${COMFYUI_URL}/view?filename=${filename}`; + const res = await fetch(url); + + if (!res.ok) throw new Error(`Failed to fetch image: ${res.statusText}`); + const buffer = Buffer.from(await res.arrayBuffer()); + + return await saveImage(buffer, localFilename); +} + +// 4c. Submit prompt and handle full image pipeline +async function generateImageViaComfyUI(prompt, filename) { + const workflow = buildComfyWorkflow(prompt, "text, blurry, lowres, watermark"); + + try { + console.log("Submitting prompt to ComfyUI..."); + const res = await fetch(`${COMFYUI_URL}/prompt`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ prompt: workflow }) + }); + + if (!res.ok) { + throw new Error(`ComfyUI error: ${res.statusText}`); + } + + const { prompt_id } = await res.json(); + + console.log("Waiting for image result..."); + const filenames = await waitForImage(prompt_id); + if (filenames.length === 0) throw new Error("No image generated"); + + const comfyFilename = filenames[0]; + + console.log("Downloading image..."); + const filepath = await downloadImage(comfyFilename, filename); + return filepath; + + } catch (err) { + console.error("Error generating image:", err.message); + return null; + } +} + +// 5. Main export +export async function generateDungeonImages({ flavor }) { + console.log("Generating dungeon image..."); + + const finalPrompt = await generateVisualPrompt(flavor); + console.log("Engineered visual prompt:\n", finalPrompt); + + const filename = `dungeon.png`; + const filepath = await generateImageViaComfyUI(finalPrompt, filename); + + if (!filepath) { + throw new Error("Failed to generate dungeon image."); + } + + return filepath; +} diff --git a/index.js b/index.js index 6540672..2929e57 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,7 @@ import 'dotenv/config'; -import { generateDungeonPDF } from "./generateDungeon.js"; import { generateDungeon } from "./dungeonGenerator.js"; +import { generateDungeonImages } from "./imageGenerator.js"; +import { generatePDF } from "./generatePDF.js"; // Utility to create a filesystem-safe filename from the dungeon title function slugify(text) { @@ -12,17 +13,20 @@ function slugify(text) { (async () => { try { - // Generate dungeon JSON from Ollama + // Generate the dungeon data const dungeonData = await generateDungeon(); - // Optional: replace the map placeholder with your local map path - // dungeonData.map = "/absolute/path/to/dungeon-map.png"; + // Generate dungeon map image (uses dungeonData.flavor) + console.log("๐Ÿ–ผ๏ธ Generating dungeon map image..."); + const mapPath = await generateDungeonImages(dungeonData); - // Generate a safe filename based on the dungeon's title + dungeonData.map = mapPath; + + // Generate PDF filename based on the title const filename = `${slugify(dungeonData.title)}.pdf`; - // Generate PDF - await generateDungeonPDF(dungeonData, filename); + // Generate the PDF using full dungeon data (including map) + await generatePDF(dungeonData, filename); console.log(`Dungeon PDF successfully generated: ${filename}`); } catch (err) { diff --git a/ollamaClient.js b/ollamaClient.js new file mode 100644 index 0000000..6f79fd1 --- /dev/null +++ b/ollamaClient.js @@ -0,0 +1,78 @@ +const OLLAMA_API_URL = process.env.OLLAMA_API_URL; +const OLLAMA_API_KEY = process.env.OLLAMA_API_KEY; + +async function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} + +// Utility: strip markdown artifacts +function cleanText(str) { + return str + .replace(/^#+\s*/gm, "") // remove headers + .replace(/\*\*(.*?)\*\*/g, "$1") // remove bold + .replace(/[*_`]/g, "") // remove stray formatting + .replace(/\s+/g, " ") // normalize whitespace + .trim(); +} + +export async function callOllama(prompt, model = "gemma3n:e4b", retries = 5, stepName = "unknown") { + const isUsingOpenWebUI = !!OLLAMA_API_KEY; + + for (let attempt = 1; attempt <= retries; attempt++) { + try { + const promptCharCount = prompt.length; + const promptWordCount = prompt.split(/\s+/).length; + + console.log(`\n[${stepName}] Sending prompt (attempt ${attempt}/${retries})`); + console.log(`Prompt: ${promptCharCount} chars, ~${promptWordCount} words`); + + const headers = { "Content-Type": "application/json" }; + + if (isUsingOpenWebUI) { + headers["Authorization"] = `Bearer ${OLLAMA_API_KEY}`; + } + + const body = isUsingOpenWebUI + ? { + model, + messages: [{ role: "user", content: prompt }], + } + : { + model, + messages: [{ role: "user", content: prompt }], + stream: false, + }; + + const response = await fetch(OLLAMA_API_URL, { + method: "POST", + headers, + body: JSON.stringify(body), + }); + + if (!response.ok) throw new Error(`Ollama request failed: ${response.status} ${response.statusText}`); + + const data = await response.json(); + + const rawText = isUsingOpenWebUI + ? data.choices?.[0]?.message?.content + : data.message?.content; + + if (!rawText) throw new Error("No response from Ollama"); + + const cleaned = cleanText(rawText); + + console.log(`[${stepName}] Received: ${rawText.length} chars, ~${rawText.split(/\s+/).length} words`); + console.log(`Raw output:\n${rawText}\n`); + console.log(`Cleaned output:\n${cleaned}\n`); + + return cleaned; + + } catch (err) { + console.warn(`[${stepName}] Attempt ${attempt} failed: ${err.message}`); + if (attempt === retries) throw err; + const delay = 1000 * Math.pow(2, attempt) + Math.random() * 500; + console.log(`Retrying in ${Math.round(delay / 1000)}s...`); + await sleep(delay); + } + } +} diff --git a/package-lock.json b/package-lock.json index 804d520..e52ee48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "auto-dm", + "name": "scrollsmith", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "auto-dm", + "name": "scrollsmith", "version": "1.0.0", "license": "SEE LICENSE IN README.md", "dependencies": { @@ -42,9 +42,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.8.0.tgz", + "integrity": "sha512-MJQFqrZgcW0UNYLGOuQpey/oTN59vyWwplvCGZztn1cKz9agZPPYpJB7h2OMmuu7VLqkvEjN8feFZJmxNF9D+Q==", "dev": true, "license": "MIT", "dependencies": { @@ -206,33 +206,19 @@ } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -434,9 +420,9 @@ "optional": true }, "node_modules/bare-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.2.1.tgz", - "integrity": "sha512-mELROzV0IhqilFgsl1gyp48pnZsaV9xhQapHLDsvn4d4ZTfbFhcghQezl7FTEDNBcGqLUnNI3lUlm6ecrLWdFA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.2.3.tgz", + "integrity": "sha512-1aGs5pRVLToMQ79elP+7cc0u0s/wXAzfBv/7hDloT7WFggLqECCas5qqPky7WHCFdsBH5WDq6sD4fAoz5sJbtA==", "license": "Apache-2.0", "optional": true, "dependencies": { @@ -700,9 +686,9 @@ "license": "BSD-3-Clause" }, "node_modules/dotenv": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz", - "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==", + "version": "17.2.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.2.tgz", + "integrity": "sha512-Sf2LSQP+bOlhKWWyhFsn0UsfdK/kCWRv1iuA2gXAwt3dyNabr6QSj00I2V10pidqz69soatm9ZwZvpQMTIOd5Q==", "license": "BSD-2-Clause", "engines": { "node": ">=12" @@ -1616,9 +1602,9 @@ } }, "node_modules/puppeteer": { - "version": "24.17.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.17.1.tgz", - "integrity": "sha512-KIuX0w+0um4TUbm55yFl2WIsbgjya2BHIgW9ylTuhavtwjXCOM7lMo9oLR1jQnCxrFvm9h/Yeb+zfs4nlgntPg==", + "version": "24.18.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.18.0.tgz", + "integrity": "sha512-Ke8oL/87GhzKIM2Ag6Yj49t5xbGc4rspGIuSuFLFCQBtYzWqCSanvqoCu08WkI78rbqcwnHjxiTH6oDlYFrjrw==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -1626,7 +1612,7 @@ "chromium-bidi": "8.0.0", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1475386", - "puppeteer-core": "24.17.1", + "puppeteer-core": "24.18.0", "typed-query-selector": "^2.12.0" }, "bin": { @@ -1637,9 +1623,9 @@ } }, "node_modules/puppeteer-core": { - "version": "24.17.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.17.1.tgz", - "integrity": "sha512-Msh/kf9k1XFN0wuKiT4/npMmMWOT7kPBEUw01gWvRoKOOoz3It9TEmWjnt4Gl4eO+p73VMrvR+wfa0dm9rfxjw==", + "version": "24.18.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.18.0.tgz", + "integrity": "sha512-As0BvfXxek2MbV0m7iqBmQKFnfSrzSvTM4zGipjd4cL+9f2Ccgut6RvHlc8+qBieKHqCMFy9BSI4QyveoYXTug==", "license": "Apache-2.0", "dependencies": { "@puppeteer/browsers": "2.10.8",