lyb-pixi-js 1.11.6 → 1.11.7

package/Utils/LibPixiIntervalTrigger.d.ts

@@ -1,6 +1,7 @@
 /** @description 间隔触发
  * @param callback 回调函数
  * @param interval 间隔毫秒，或随机范围
+ * @param immediately 是否立即执行一次
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiIntervalTrigger-间隔触发
  */
-export declare const libPixiIntervalTrigger: (callback: () => void, interval: number | [number, number]) => () => void;
+export declare const libPixiIntervalTrigger: (callback: () => void, interval: number | [number, number], immediately?: boolean) => () => void;

package/Utils/LibPixiIntervalTrigger.js

@@ -3,9 +3,10 @@ import { libJsRandom } from "lyb-js/Random/LibJsRandom.js";
 /** @description 间隔触发
  * @param callback 回调函数
  * @param interval 间隔毫秒，或随机范围
+ * @param immediately 是否立即执行一次
  * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiIntervalTrigger-间隔触发
  */
-export const libPixiIntervalTrigger = (callback, interval) => {
+export const libPixiIntervalTrigger = (callback, interval, immediately = true) => {
     let elapsedTime = 0;
     // 创建一个新的 Ticker 实例
     const ticker = new Ticker();
@@ -24,6 +25,7 @@ export const libPixiIntervalTrigger = (callback, interval) => {
             elapsedTime = 0;
         }
     };
+    immediately && callback();
     ticker.add(tickerCallback);
     ticker.start();
     return () => {

package/Utils/LibPixiViteAssetsHash.d.ts

@@ -0,0 +1,8 @@
+import { Plugin } from "vite";
+/**
+ * Vite插件：Pixi.js缓存清除
+ * @param srcDir - 源文件目录
+ * @param distDir - 目标输出目录
+ * @returns {Plugin} Vite插件实例
+ */
+export declare const LibPixiViteAssetsHash: (srcDir: string, distDir: string) => Plugin;

package/Utils/LibPixiViteAssetsHash.js

@@ -0,0 +1,343 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { readdir, readFile, copyFile, mkdir, writeFile, rm, rename } from "fs/promises";
+import { createHash } from "crypto";
+import { extname, basename, join, dirname, relative } from "path";
+/**
+ * .fnt文件处理工具类
+ */
+class FntView {
+    /**
+     * 构造函数
+     * @param {Buffer} buffer - .fnt文件内容缓冲区
+     */
+    constructor(buffer) {
+        this.rawAtlas = buffer.toString();
+    }
+    /**
+     * 获取.fnt文件中引用的所有贴图文件名
+     * @returns {string[]} 贴图文件名数组
+     */
+    getTextures() {
+        const regex = /file="([^"]+\.png)"/g;
+        return [...this.rawAtlas.matchAll(regex)].map((m) => m[1]);
+    }
+    /**
+     * 替换.fnt文件中的贴图引用
+     * @param filename - 原始贴图文件名
+     * @param newFilename - 新的贴图文件名
+     */
+    replaceTexture(filename, newFilename) {
+        const escaped = filename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        const regex = new RegExp(`(file=")${escaped}(")`, "g");
+        this.rawAtlas = this.rawAtlas.replace(regex, `$1${newFilename}$2`);
+    }
+    /**
+     * 获取处理后的.fnt文件内容缓冲区
+     * @returns {Buffer} 文件内容缓冲区
+     */
+    get buffer() {
+        return Buffer.from(this.rawAtlas);
+    }
+}
+/**
+ * Pixi.js 资源缓存清除工具
+ *
+ * 通过为静态资源文件名添加哈希值来实现缓存清除功能，
+ * 同时处理特殊文件格式（如.fnt、.atlas）的引用关系。
+ */
+class PixiCacheBuster {
+    /**
+     * 构造函数
+     * @param srcDir - 源文件目录路径
+     * @param distDir - 目标输出目录路径
+     */
+    constructor(srcDir, distDir) {
+        /** main 目录文件映射表（原始文件名 -> 哈希文件名） */
+        this.mapMain = {};
+        /** preload 目录文件映射表（原始文件名 -> 哈希文件名） */
+        this.mapPreload = {};
+        /** main 清单文件名 */
+        this.manifestMain = "mainManifest.json";
+        /** preload 清单文件名 */
+        this.manifestPreload = "preloadManifest.json";
+        this.srcDir = srcDir;
+        this.distDir = distDir;
+    }
+    /**
+     * 标准化路径（将反斜杠转换为正斜杠）
+     * @param p - 原始路径
+     * @returns 标准化后的路径
+     */
+    normalizePath(p) {
+        return p.replace(/\\/g, "/");
+    }
+    /**
+     * 检查文件是否为图片
+     * @param file - 文件路径
+     * @returns {boolean} 是否为图片文件
+     */
+    isImage(file) {
+        return /\.(png|jpe?g|gif|webp|svg)$/i.test(file);
+    }
+    /**
+     * 递归遍历目录获取所有文件路径
+     * @param dir - 要遍历的目录路径
+     * @returns {Promise<string[]>} 文件路径数组
+     */
+    walk(dir) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const entries = yield readdir(dir, { withFileTypes: true });
+            const files = yield Promise.all(entries.map((entry) => {
+                const fullPath = join(dir, entry.name);
+                return entry.isDirectory() ? this.walk(fullPath) : [fullPath];
+            }));
+            return files.flat();
+        });
+    }
+    /**
+     * 处理普通文件（添加哈希值到文件名）
+     * @param filePath - 文件路径
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     * @param {Record<string, string>} map - 文件映射表
+     */
+    processFile(filePath, srcBase, distBase, map) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buf = yield readFile(filePath);
+            const ext = extname(filePath);
+            const relPath = this.normalizePath(relative(srcBase, filePath));
+            const relDir = dirname(relPath);
+            const base = basename(filePath, ext);
+            //生成8位MD5哈希值
+            const hash = createHash("md5").update(buf).digest("hex").slice(0, 8);
+            const hashedName = ext === ".ttf" ? `${base}${ext}` : `${base}-${hash}${ext}`;
+            const distPath = join(distBase, relDir, hashedName);
+            //创建目录并写入文件
+            yield mkdir(dirname(distPath), { recursive: true });
+            yield writeFile(distPath, buf);
+            //更新映射表
+            map[relPath] = this.normalizePath(join(relDir, hashedName));
+        });
+    }
+    /**
+     * 复制原始文件（不添加哈希值）
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     */
+    copyOriginal(srcBase, distBase) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const files = yield this.walk(srcBase);
+            yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
+                const relPath = this.normalizePath(relative(srcBase, file));
+                const distPath = join(distBase, relPath);
+                yield mkdir(dirname(distPath), { recursive: true });
+                yield copyFile(file, distPath);
+            })));
+        });
+    }
+    /**
+     * 处理.fnt文件（位图字体文件）
+     * @param filePath - .fnt文件路径
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     * @param {Record<string, string>} map - 文件映射表
+     */
+    processFntFile(filePath, srcBase, distBase, map) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buf = yield readFile(filePath);
+            const fntView = new FntView(buf);
+            const textures = fntView.getTextures();
+            //获取.fnt文件所在目录的相对路径
+            const fntDir = dirname(this.normalizePath(relative(srcBase, filePath)));
+            //替换.fnt文件中引用的所有贴图文件名
+            for (const tex of textures) {
+                const fullTexPath = this.normalizePath(join(fntDir, tex));
+                const newName = map[fullTexPath];
+                fntView.replaceTexture(tex, basename(newName));
+            }
+            //写入处理后的.fnt文件
+            const relPath = this.normalizePath(relative(srcBase, filePath));
+            const hashedDistPath = join(distBase, dirname(relPath), basename(map[relPath]));
+            yield mkdir(dirname(hashedDistPath), { recursive: true });
+            yield writeFile(hashedDistPath, fntView.buffer);
+        });
+    }
+    /**
+     * 处理.atlas文件（纹理图集文件）
+     * @param filePath - .atlas文件路径
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     * @param {Record<string, string>} map - 文件映射表
+     * @param [overrideFileName] - 覆盖输出文件名（不带扩展名）
+     */
+    processAtlasFile(filePath, srcBase, distBase, map, overrideFileName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buf = yield readFile(filePath);
+            let content = buf.toString();
+            const atlasDir = dirname(this.normalizePath(relative(srcBase, filePath)));
+            //替换.atlas文件中引用的所有图片文件名
+            for (const [original, hashed] of Object.entries(map)) {
+                if (!this.isImage(original))
+                    continue;
+                const imageDir = dirname(original);
+                //如果图片目录和.atlas文件目录不一致，则跳过
+                if (imageDir !== atlasDir)
+                    continue;
+                const originalBase = basename(original);
+                const hashedBase = basename(hashed);
+                const regex = new RegExp(`^${originalBase}$`, "gm");
+                content = content.replace(regex, hashedBase);
+            }
+            //写入处理后的.atlas文件
+            const relPath = this.normalizePath(relative(srcBase, filePath));
+            const finalName = overrideFileName ? `${overrideFileName}.atlas` : basename(relPath);
+            const finalDistPath = join(distBase, atlasDir, finalName);
+            yield mkdir(dirname(finalDistPath), { recursive: true });
+            yield writeFile(finalDistPath, content);
+        });
+    }
+    /**
+     * 处理.json文件（通常是Spine动画文件）
+     * @param filePath - .json文件路径
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     * @param {Record<string, string>} map - 文件映射表
+     */
+    processJsonFile(filePath, srcBase, distBase, map) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const buf = yield readFile(filePath);
+            const relPath = this.normalizePath(relative(srcBase, filePath));
+            //生成哈希文件名
+            const hash = createHash("md5").update(buf).digest("hex").slice(0, 8);
+            const ext = extname(filePath);
+            const base = basename(filePath, ext);
+            const hashedName = `${base}.${hash}${ext}`;
+            const distDir = join(distBase, dirname(relPath));
+            const hashedDistPath = join(distDir, hashedName);
+            //写入哈希后的.json文件
+            yield mkdir(distDir, { recursive: true });
+            yield writeFile(hashedDistPath, buf);
+            //更新映射表
+            map[relPath] = this.normalizePath(join(dirname(relPath), hashedName));
+            //重命名关联的.atlas文件（如果有）
+            const atlasPath = join(distDir, `${base}.atlas`);
+            const newAtlasPath = join(distDir, `${base}.${hash}.atlas`);
+            try {
+                yield rename(atlasPath, newAtlasPath);
+            }
+            catch (_a) {
+                //如果.atlas文件不存在，则忽略错误
+            }
+        });
+    }
+    /**
+     * 处理目录中的所有文件
+     * @param srcBase - 源基础目录
+     * @param distBase - 目标基础目录
+     * @param {Record<string, string>} map - 文件映射表
+     */
+    processFiles(srcBase, distBase, map) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const files = yield this.walk(srcBase);
+            //分类文件类型
+            const atlasFiles = files.filter((f) => f.endsWith(".atlas"));
+            const jsonFiles = files.filter((f) => f.endsWith(".json"));
+            const fntFiles = files.filter((f) => f.endsWith(".fnt"));
+            const otherFiles = files.filter((f) => !f.endsWith(".atlas") && !f.endsWith(".json"));
+            //1. 先处理非.atlas/.json文件（包括图片和.fnt文件）
+            yield Promise.all(otherFiles.map((file) => this.processFile(file, srcBase, distBase, map)));
+            //2. 处理.fnt文件（替换其中引用的图片文件名）
+            yield Promise.all(fntFiles.map((f) => this.processFntFile(f, srcBase, distBase, map)));
+            //3. 处理.json文件，并记录哈希后的文件名
+            const jsonNameMap = {};
+            yield Promise.all(jsonFiles.map((file) => __awaiter(this, void 0, void 0, function* () {
+                const relPath = this.normalizePath(relative(srcBase, file));
+                const baseName = relPath.slice(0, -5); //去掉.json后缀
+                yield this.processJsonFile(file, srcBase, distBase, map);
+                jsonNameMap[baseName] = basename(map[relPath], ".json");
+            })));
+            //4. 处理.atlas文件，使用关联的.json文件的哈希名称
+            yield Promise.all(atlasFiles.map((file) => __awaiter(this, void 0, void 0, function* () {
+                const relPath = this.normalizePath(relative(srcBase, file));
+                const baseName = relPath.slice(0, -6); //去掉.atlas后缀
+                const hashedName = jsonNameMap[baseName];
+                yield this.processAtlasFile(file, srcBase, distBase, map, hashedName);
+                if (hashedName) {
+                    const distRelPath = join(dirname(relPath), hashedName);
+                    map[relPath] = this.normalizePath(distRelPath);
+                }
+            })));
+        });
+    }
+    /**
+     * 写入清单文件
+     * @param {Record<string, string>} map - 文件映射表
+     * @param manifestPath - 清单文件路径
+     * @param topLevelDir - 顶层目录名（main/preload）
+     */
+    writeManifest(map, manifestPath, topLevelDir) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const manifest = Object.entries(map)
+                .filter(([original]) => {
+                const ext = original.slice(original.lastIndexOf("."));
+                //排除spine目录下的.png和.atlas文件
+                if (original.startsWith("spine/") && (ext === ".png" || ext === ".atlas"))
+                    return false;
+                //排除.fnt文件引用的图片（通常与.fnt同目录）
+                if (ext === ".png") {
+                    const base = original.slice(0, -ext.length);
+                    const hasFnt = Object.keys(map).some((k) => k.endsWith(".fnt") && k.startsWith(base));
+                    if (hasFnt)
+                        return false;
+                }
+                return true;
+            })
+                .map(([original, hashed]) => ({
+                //生成资源别名（去掉扩展名）和实际路径
+                alias: `${topLevelDir}/${original.replace(/\.[^/.]+$/, "")}`,
+                src: [`gameAssetsPack/${topLevelDir}/${hashed}`],
+            }));
+            yield mkdir(dirname(manifestPath), { recursive: true });
+            yield writeFile(manifestPath, JSON.stringify(manifest, null, 2));
+        });
+    }
+    /**
+     * 构建处理流程
+     */
+    build() {
+        return __awaiter(this, void 0, void 0, function* () {
+            //清空目标目录
+            yield rm(this.distDir, { recursive: true, force: true });
+            yield mkdir(this.distDir, { recursive: true });
+            //处理main和preload目录（添加哈希）
+            yield this.processFiles(join(this.srcDir, "main"), join(this.distDir, "main"), this.mapMain);
+            yield this.processFiles(join(this.srcDir, "preload"), join(this.distDir, "preload"), this.mapPreload);
+            //复制original目录（不添加哈希）
+            yield this.copyOriginal(join(this.srcDir, "original"), join(this.distDir, "original"));
+            //写入清单文件
+            yield this.writeManifest(this.mapMain, join(this.distDir, this.manifestMain), "main");
+            yield this.writeManifest(this.mapPreload, join(this.distDir, this.manifestPreload), "preload");
+        });
+    }
+}
+/**
+ * Vite插件：Pixi.js缓存清除
+ * @param srcDir - 源文件目录
+ * @param distDir - 目标输出目录
+ * @returns {Plugin} Vite插件实例
+ */
+export const LibPixiViteAssetsHash = (srcDir, distDir) => {
+    const instance = new PixiCacheBuster(srcDir, distDir);
+    instance.build();
+    return {
+        name: "vite-assets-hash",
+    };
+};

package/libPixiJs.d.ts

@@ -158,7 +158,7 @@ export declare const Utils: {
      * @param interval 间隔毫秒，或随机范围
      * @link 使用方法：https://www.npmjs.com/package/lyb-pixi-js#LibPixiIntervalTrigger-间隔触发
      */
-    libPixiIntervalTrigger: (callback: () => void, interval: number | [number, number]) => () => void;
+    libPixiIntervalTrigger: (callback: () => void, interval: number | [number, number], immediately?: boolean) => () => void;
     /** @description 点击容器外或入口按钮时隐藏
      * @param container 容器
      * @param btn 按钮

package/lyb-pixi.js

@@ -54462,7 +54462,7 @@ void main(void)\r
   const libJsRandom = (min2, max2, num = 0) => {
     return parseFloat((Math.random() * (max2 - min2) + min2).toFixed(num));
   };
-  const libPixiIntervalTrigger = (callback, interval) => {
+  const libPixiIntervalTrigger = (callback, interval, immediately = true) => {
     let elapsedTime = 0;
     const ticker2 = new Ticker();
     const tickerCallback = (deltaTime) => {
@@ -54478,6 +54478,7 @@ void main(void)\r
         elapsedTime = 0;
       }
     };
+    immediately && callback();
     ticker2.add(tickerCallback);
     ticker2.start();
     return () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lyb-pixi-js",
-  "version": "1.11.6",
+  "version": "1.11.7",
   "description": "自用Pixi.JS方法库",
   "license": "ISC",
   "exports": {