aptechka 0.11.0 → 0.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"
@@ -528,6 +528,7 @@
     "detect-gpu": "^5.0.38",
     "favicons": "^7.2.0",
     "fluent-ffmpeg": "^2.1.3",
+    "node-html-parser": "^6.1.13",
     "sharp": "^0.33.4",
     "three": "^0.166.1",
     "urlpattern-polyfill": "^10.0.0"

package/server-lib/optimizer/index.js

@@ -1,7 +1,7 @@
 import { mkdir, readFile, readdir } from "fs/promises";
 import { dirname, join, sep, extname } from "path";
 import Ffmpeg from "fluent-ffmpeg";
-import { getTmpPath, outputFile, getFolderFiles, removeExtension, clear, replaceExtension, outputFiles } from "../utils/index.js";
+import { getTmpPath, outputFile, getFolderFiles, removeExtension, clear, getBuffer, replaceExtension, outputFiles } from "../utils/index.js";
 import favicons from "favicons";
 import { parse } from "node-html-parser";
 import { statSync } from "fs";
@@ -55,7 +55,8 @@ async function FFmpeg({
 async function generateFavicon(source) {
   const output = [];
   const { settings } = source;
-  const response = await favicons(source.content, settings);
+  const buffer = await getBuffer(source.content);
+  const response = await favicons(buffer, settings);
   output.push(
     ...[...response.images, ...response.files].map((item) => {
       return {
@@ -72,10 +73,11 @@ async function generateFavicon(source) {
 }
 async function generateSequence(source) {
   const { settings } = source;
+  const buffer = await getBuffer(source.content);
   return FFmpeg({
     inputPath: settings.destinationPath,
     outputPath: `${removeExtension(settings.destinationPath)}/frame-%04d.${settings.frameExtension || "jpg"}`,
-    fileContent: source.content,
+    fileContent: buffer,
     instructions: (command) => {
       if (settings.fps) {
         command.addOutputOption([`-r ${Math.max(1, settings.fps | 0)}`]);
@@ -91,7 +93,8 @@ async function generateSprite(source) {
   const svgCloseTag = "</svg>";
   let spriteString = svgOpenTag;
   for await (const item of source.content) {
-    const svgString = item.buffer.toString();
+    const buffer = await getBuffer(item.data);
+    const svgString = buffer.toString();
     const root = parse(svgString);
     const icon = root.querySelector("svg");
     icon.removeAttribute("width");
@@ -163,7 +166,7 @@ async function inputFiles({
             if (file.ext === ".svg") {
               content.push({
                 name: file.name,
-                buffer: file.buffer
+                data: file.buffer
               });
             }
           });
@@ -210,8 +213,7 @@ async function inputFiles({
               })
             }
           });
-        }
-        if (destinationPath.includes("@sequence")) {
+        } else if (destinationPath.includes("@sequence")) {
           const path = specialPath(destinationPath, "@sequence");
           sources.push({
             content,
@@ -263,8 +265,9 @@ async function inputFiles({
 }
 async function optimizeImage(source) {
   const { settings } = source;
+  const content = await getBuffer(source.content);
   const ext = extname(settings.destinationPath).toLowerCase();
-  const image = sharp(source.content);
+  const image = sharp(content);
   const meta = await image.metadata();
   const width = meta.width;
   const height = meta.height;
@@ -319,9 +322,10 @@ async function optimizeImage(source) {
 }
 async function optimizeVideo(source) {
   const { settings } = source;
+  const buffer = await getBuffer(source.content);
   return FFmpeg({
     inputPath: settings.destinationPath,
-    fileContent: source.content,
+    fileContent: buffer,
     instructions: (command) => {
       command.addOutputOption(
         `-crf ${Math.round((100 - ((settings == null ? void 0 : settings.quality) || 80)) * 51 / 100)}`
@@ -350,7 +354,7 @@ async function optimize(sources, options) {
       output.push(...await generateSequence(source));
     } else {
       output.push({
-        data: source.content,
+        data: await getBuffer(source.content),
         destinationPath: source.settings.destinationPath
       });
     }

package/server-lib/optimizer/types.d.ts

@@ -3,41 +3,41 @@ import { FaviconOptions } from 'favicons';
 export type SourceSettings = {
     [key: string]: any;
 };
-export interface Source<B = Buffer, T extends string = string, S extends SourceSettings = {}> {
+export interface Source<B = Buffer | File, T extends string = string, S extends SourceSettings = {}> {
     content: B;
     type: T;
     settings: S;
 }
-export type SkipSource = Source<Buffer, 'skip', {
+export type SkipSource = Source<Buffer | File, 'skip', {
     destinationPath: string;
 }>;
-export type ImageSource = Source<Buffer, 'image', {
+export type ImageSource = Source<Buffer | File, 'image', {
     destinationPath: string;
     quality?: number;
     scale?: number;
     placeholder?: boolean;
     webp?: boolean;
 }>;
-export type VideoSource = Source<Buffer, 'video', {
+export type VideoSource = Source<Buffer | File, 'video', {
     destinationPath: string;
     quality?: number;
     scale?: number;
     fps?: number;
 }>;
-export type FaviconSource = Source<Buffer, 'favicon', {
+export type FaviconSource = Source<Buffer | File, 'favicon', {
     destinationPath: string;
     destinationHtmlPath: string;
 } & FaviconOptions>;
 export type SpriteSource = Source<Array<{
     name: string;
-    buffer: Buffer;
+    data: Buffer | File;
 }>, 'sprite', {
     destinationPath: string;
     name?: string;
     removeStroke?: boolean;
     removeFill?: boolean;
 }>;
-export type SequenceSource = Source<Buffer, 'sequence', {
+export type SequenceSource = Source<Buffer | File, 'sequence', {
     destinationPath: string;
     fps?: number;
     frameExtension?: 'png' | 'jpg';

package/server-lib/utils/buffer.d.ts

@@ -0,0 +1 @@
+export declare function getBuffer(data: Buffer | File): Promise<Buffer>;

package/server-lib/utils/index.d.ts

@@ -1,3 +1,4 @@
+export { getBuffer } from './buffer';
 export { removeExtension, replaceExtension, getTmpPath } from './path';
 export { outputFile, outputFiles, clear, getFolderFiles } from './fs';
 export type { WriteFileData, OutputItem, Output } from './types';

package/server-lib/utils/index.js

@@ -1,6 +1,12 @@
 import { randomUUID } from "crypto";
 import { extname, dirname, join } from "path";
 import { mkdir, writeFile, rm, readdir, readFile } from "fs/promises";
+async function getBuffer(data) {
+  if (data instanceof Buffer) {
+    return data;
+  }
+  return Buffer.from(await data.arrayBuffer());
+}
 function removeExtension(path) {
   return path.replace(/\.[^/.]+$/, "");
 }
@@ -45,6 +51,7 @@ async function getFolderFiles(folderPath) {
 }
 export {
   clear,
+  getBuffer,
   getFolderFiles,
   getTmpPath,
   outputFile,