auto-image-converter 2.0.1 → 2.1.1

package/README.md

@@ -26,11 +26,13 @@ Create a `image-converter.config.mjs` file in the root of your project:
 
 ```// Default configuration example
 export default {
-dir: "public", // Directory to scan for images
-format: "webp", // Output format: 'webp' or 'avif'
-quality: 80, // Quality (0–100)
-recursive: true, // Search subdirectories
-removeOriginal: true, // Remove original files after conversion
+  dir: "public",            // Directory to scan for images
+  converted: "*.{png,jpg,jpeg}", // Glob pattern for source image files to convert
+  format: "webp",           // Output image format: 'webp' or 'avif'
+  quality: 80,              // Quality of output images (0–100)
+  recursive: true,          // Whether to search subdirectories recursively
+  removeOriginal: true,     // Delete original files after successful conversion
+  ignoreOnStart: false,     // If true, ignore existing files on watcher startup
 };
 ```
 

package/bin/index.js

@@ -16,7 +16,8 @@ try {
 
   await convertImages({
     dir: absDir,
-    format: config.targetFormat || config.format || "webp",
+    converted: config.converted ?? "*.{png,jpg,jpeg}",
+    targetFormat: config.targetFormat ?? "webp",
     quality: config.quality ?? 80,
     recursive: config.recursive ?? true,
     removeOriginal: config.removeOriginal ?? false,

package/bin/watcher.mjs

@@ -9,35 +9,48 @@ const config = (await import(pathToFileURL(configPath).href)).default;
 
 const watchDir = config.dir || "public";
 const absWatchDir = path.resolve(process.cwd(), watchDir);
+const extensions = extractExtensions(config.converted ?? "*.{png,jpg,jpeg}");
 
-// Для chokidar лучше передать просто папку, а не glob
 const watchPath = absWatchDir;
 
 console.log(`👀 Watching for image changes on directory: ${watchPath}`);
 
+let debounceTimeout;
+
 chokidar
-  .watch(watchPath, {
-    ignored: /(^|[\/\\])\../, // игнор скрытых файлов и папок
+  .watch(absWatchDir, {
+    ignored: /(^|[\/\\])\../,
     persistent: true,
-    ignoreInitial: true,
+    ignoreInitial: config.ignoreOnStart ?? false,
     awaitWriteFinish: {
-      stabilityThreshold: 500, // ждем, пока запись в файл закончится
-      pollInterval: 100,
+      stabilityThreshold: 1500,
+      pollInterval: 500,
     },
   })
   .on("add", async (filePath) => {
-    if (/\.(png|jpe?g)$/i.test(filePath)) {
-      console.log(`➕ New image: ${filePath}`);
+    const ext = path.extname(filePath).slice(1).toLowerCase(); // без точки
+    if (!extensions.includes(ext)) return;
+    if (ext === (config.targetFormat ?? "webp").toLowerCase()) return;
+
+    console.log(`➕ New image: ${filePath}`);
+    clearTimeout(debounceTimeout);
+    debounceTimeout = setTimeout(async () => {
       try {
         await convertImages({
           dir: watchPath,
-          format: config.targetFormat || config.format || "webp",
+          converted: config.converted ?? "*.{png,jpg,jpeg}",
+          format: config.format ?? "webp",
           quality: config.quality ?? 80,
           recursive: config.recursive ?? true,
           removeOriginal: config.removeOriginal ?? false,
         });
       } catch (err) {
-        console.error("Ошибка при конвертации:", err.message);
+        console.error("Error covertation:", err.message);
       }
-    }
+    }, 1000);
   });
+
+function extractExtensions(pattern) {
+  const match = pattern.match(/\*\.\{(.+?)\}/);
+  return match ? match[1].split(",").map((s) => s.trim().toLowerCase()) : [];
+}

package/image-converter.config.mjs

@@ -1,7 +1,9 @@
 export default {
   dir: "./public",
+  converted: "*.{png,jpg,jpeg}",
   format: "webp",
   quality: 80,
   removeOriginal: true,
   recursive: true,
+  ignoreOnStart: true,
 };

package/lib/converter.js

@@ -3,34 +3,70 @@ import sharp from "sharp";
 import fs from "node:fs/promises";
 import path from "node:path";
 
+sharp.cache(false);
+
 const supportedExt = [".png", ".jpg", ".jpeg"];
 
+const processingFiles = new Set();
+
+async function safeUnlink(file, retries = 3, delayMs = 200) {
+  for (let i = 0; i < retries; i++) {
+    try {
+      await fs.unlink(file);
+      return;
+    } catch (err) {
+      if (i === retries - 1) throw err;
+      await new Promise((res) => setTimeout(res, delayMs));
+    }
+  }
+}
+
 export async function convertImages({
   dir,
+  converted,
   format,
   quality,
   recursive,
   removeOriginal,
 }) {
   const rawPattern = recursive
-    ? path.join(dir, "**", "*.{png,jpg,jpeg}")
-    : path.join(dir, "*.{png,jpg,jpeg}");
+    ? path.join(dir, "**", converted)
+    : path.join(dir, converted);
 
   const pattern = rawPattern.split(path.sep).join(path.posix.sep);
   const files = await fg(pattern, { caseSensitiveMatch: false });
 
   for (const file of files) {
-    const ext = path.extname(file);
-    const outFile = file.replace(ext, `.${format}`);
-
-    const image = sharp(file);
-    const buffer =
-      format === "webp"
-        ? await image.webp({ quality }).toBuffer()
-        : await image.avif({ quality }).toBuffer();
-
-    await fs.writeFile(outFile, buffer);
-    if (removeOriginal) await fs.unlink(file);
-    console.log(`✓ ${file} → ${outFile}`);
+    if (processingFiles.has(file)) continue;
+    processingFiles.add(file);
+
+    try {
+      const ext = path.extname(file);
+      const outFile = file.replace(ext, `.${format}`);
+
+      // Игнорируем файлы, которые уже в целевом формате
+      if (ext.toLowerCase() === `.${format.toLowerCase()}`) {
+        processingFiles.delete(file);
+        continue;
+      }
+
+      const image = sharp(file);
+      const buffer =
+        format === "webp"
+          ? await image.webp({ quality }).toBuffer()
+          : await image.avif({ quality }).toBuffer();
+
+      await fs.writeFile(outFile, buffer);
+
+      if (removeOriginal) {
+        await safeUnlink(file);
+      }
+
+      console.log(`✓ ${file} → ${outFile}`);
+    } catch (err) {
+      console.error("Error covertation:", err.message);
+    } finally {
+      processingFiles.delete(file);
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-image-converter",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "keywords": [
     "image",
     "converter",
@@ -12,7 +12,7 @@
     "png",
     "jpg",
     "jpeg",
-    "cli"
+    "for frontend"
   ],
   "type": "module",
   "bin": {