@needle-tools/gltf-build-pipeline 2.2.1-alpha.5 → 2.2.1-alpha.6

package/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.1-alpha.6] - 2023-06-19
+- fix: WARN if image validation can not run
+
 ## [2.2.1-alpha.5] - 2023-06-18
 - add: `stats` now includes json and animation size info
 - change: VRM's are compressed with meshopt again

package/dist/cache/cache.js

@@ -41,8 +41,9 @@ export function limitCacheSize(maxSizeMB = cacheSizeLimit) {
     const dir = getCacheDirectory(true);
     console.log(`Limit cache size to ${maxSizeMB.toFixed(2)} MB at ${dir}...`);
     let totalSize = 0;
+    const files = new Array();
     function recurseDirectories(dir) {
-        const files = fs.readdirSync(dir).map(file => {
+        fs.readdirSync(dir).forEach(file => {
             const path = `${dir}/${file}`;
             const stats = statSync(path);
             if (stats.isDirectory()) {
@@ -50,12 +51,11 @@ export function limitCacheSize(maxSizeMB = cacheSizeLimit) {
             }
             else {
                 totalSize += stats.size;
+                files.push({ path, size: stats.size });
             }
-            return { path, size: stats.size };
         });
-        return files;
     }
-    const files = recurseDirectories(dir);
+    recurseDirectories(dir);
     const maxSizeInBytes = maxSizeMB * 1024 * 1024;
     console.log(`Current cache size is ${(totalSize / (1024 * 1024)).toFixed(1)} MB`);
     if (totalSize < maxSizeInBytes)
@@ -67,17 +67,19 @@ export function limitCacheSize(maxSizeMB = cacheSizeLimit) {
     });
     const targetSize = maxSizeInBytes * 0.9;
     // remove oldest files first
+    let filesRemoved = 0;
     while (totalSize > targetSize) {
         const file = files.shift();
         if (!file)
             break;
-        if (fs.statSync(file.path).isDirectory())
+        if (fs.statSync(file.path).isDirectory()) {
             continue;
-        console.log(`Removing cache file ${file.path}...`);
+        }
+        filesRemoved++;
         fs.rmSync(file.path);
         totalSize -= file.size;
     }
-    console.log(`Cache size reduced to ${(totalSize / (1024 * 1024)).toFixed(1)} MB`);
+    console.log(`Cache size reduced to ${(totalSize / (1024 * 1024)).toFixed(1)} MB (${filesRemoved} files removed)`);
 }
 /**
  * Add data to the cache.

package/dist/cli/index.js

@@ -5,7 +5,7 @@ import { printStats, writeFileStatsToFile } from '../utils/stats.js';
 import { getVersion } from '../utils/version.js';
 import { UsecaseOptions, createConfig, getConfig } from '../config/index.js';
 import { make_progressive } from '../transforms/needle_progressive.js';
-import { cacheSizeLimit, clearCache } from '../cache/cache.js';
+import { cacheSizeLimit, clearCache, limitCacheSize } from '../cache/cache.js';
 import { statSync } from 'fs';
 import { foreachGLTF, isDirectory } from '../utils/fileutils.js';
 import path, { dirname } from 'path';
@@ -135,6 +135,7 @@ Each version will be compressed and written to the output directory.
         }
     });
     printStats(stats, logger, config);
+    limitCacheSize();
 });
 program.run().catch(err => {
     // Since we still invoke this package with paths when running npm scripts we need to ignore this error

package/dist/transforms/needle_toktx.d.ts

@@ -11,6 +11,7 @@ export declare class NeedleToktxContext implements INeedleTextureTransformContex
     limit: any;
     basisuExtension: KHRTextureBasisu;
     version: string;
+    cacheDirectory: string;
     tmpPathBase: string;
     document: Document;
     env: undefined | {

package/dist/transforms/needle_toktx.js

@@ -2,7 +2,7 @@ import { BufferUtils, FileUtils, ImageUtils, uuid } from "@gltf-transform/core";
 import { listTextureSlots, getTextureChannelMask, fitPowerOfTwo, TextureResizeFilter } from "@gltf-transform/functions";
 import { KHRTextureBasisu } from "@gltf-transform/extensions";
 import { checkKTXSoftware, createParams, KTX_SOFTWARE_VERSION_MIN, Mode } from "./toktx.js";
-import { existsSync, mkdirSync } from "fs";
+import { existsSync, mkdirSync, rmdirSync } from "fs";
 import { formatBytes, spawn, waitExit } from './util.js';
 import { ETC1S_DEFAULTS, UASTC_DEFAULTS } from "./toktx_types.js";
 import fs from 'fs/promises';
@@ -18,6 +18,7 @@ export class NeedleToktxContext {
     limit;
     basisuExtension;
     version;
+    cacheDirectory;
     tmpPathBase;
     document;
     env;
@@ -76,6 +77,7 @@ export class NeedleToktxContext {
             }
             this.basisuExtension = document.createExtension(KHRTextureBasisu).setRequired(true);
             const tmpDir = `${tmp.tmpdir}/gltf-transform`;
+            this.cacheDirectory = tmpDir;
             if (!(existsSync(tmpDir)))
                 mkdirSync(tmpDir);
             this.tmpPathBase = tmpDir + "/" + uuid();
@@ -226,5 +228,8 @@ export class NeedleToktxContext {
         if (!usesKTX2) {
             this.basisuExtension?.dispose();
         }
+        if (this.cacheDirectory && existsSync(this.cacheDirectory)) {
+            rmdirSync(this.cacheDirectory, { recursive: true });
+        }
     }
 }

package/dist/utils/validate.js

@@ -10,7 +10,7 @@ export function validateImageMimeType(mimetype, image) {
         };
     }
     else if (actualMimeType === null) {
-        console.warn("Could not determine image type");
+        console.warn(`WARN: Could not validate image type for \"${mimetype}\"`);
     }
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/gltf-build-pipeline",
-  "version": "2.2.1-alpha.5",
+  "version": "2.2.1-alpha.6",
   "description": "Pipeline and tools for optimizing gltf files using gltf-transform and compression settings within glTF extensions",
   "main": "dist/index.js",
   "type": "module",