@aiot-toolkit/aiotpack 2.0.5-beta.19 → 2.0.5-beta.20

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -304,19 +304,16 @@ class UxAfterCompile {
     if (compalition.trigger === _FileLaneTriggerType.default.START) {
       return;
     }
-    const {
-      outputPath,
-      projectPath
-    } = compilerOption;
     // 读取临时项目build文件夹中所有文件路径
-    const tempBuildPath = _path.default.join(projectPath, outputPath);
+    const tempBuildDir = _path.default.join(compilerOption.projectPath, compilerOption.outputPath);
     // 待优化，map文件跟随源文件变化，与时间戳有关文件无需对比
-    const tempFileList = _sharedUtils.FileUtil.readAlldirSync(tempBuildPath).map(filePath => _path.default.relative(tempBuildPath, filePath));
-    const diffList = _UxFileUtils.default.getDiffJSON(compalition, tempFileList, tempBuildPath);
+    const tempFileList = _sharedUtils.FileUtil.readAlldirSync(tempBuildDir);
+    const buildDir = _path.default.join(context.projectPath, compilerOption.outputPath);
+    const diffList = _UxFileUtils.default.getDiffJSON(compalition.buildFileList, tempFileList, buildDir, tempBuildDir);
 
     // 所有差异文件，压缩到 .diff.rpk 中
     if (diffList?.length) {
-      const buildFold = _path.default.join(compilerOption.projectPath, compilerOption.outputPath);
+      const buildFold = tempBuildDir;
       const distFold = _path.default.join(compilerOption.projectPath, compilerOption.releasePath);
       const diffFileName = `.diff.rpk`;
       const diffPath = _path.default.join(distFold, diffFileName);

package/lib/compiler/tools/icu/ImageIcu.js

@@ -53,7 +53,7 @@ class ImageIcu {
           recursive: true
         });
       }
-      const command = `${binPath} convert ${resourcePath} -O ${folder} -F ${format} -C i8 -r`;
+      const command = `"${binPath}" convert "${resourcePath}" -O "${folder}" -F ${format} -C i8 -r`;
       const message = (0, _child_process.execSync)(command).toString('utf-8');
       if (message) {
         console.log(`convert error: path=${resourcePath} message=${message}`);

package/lib/utils/BeforeCompileUtils.js

@@ -98,14 +98,7 @@ class BeforeCompileUtils {
     if (compilerOption) {
       // 存储build中的文件列表
       const buildPath = _path.default.join(context.projectPath, compilerOption.outputPath);
-      const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => {
-        const relativePath = _path.default.relative(buildPath, filePath);
-        const fileContent = _fsExtra.default.readFileSync(filePath);
-        return {
-          path: relativePath,
-          content: fileContent
-        };
-      }) : [];
+      const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => _path.default.relative(buildPath, filePath)) : [];
       if (compalition) {
         compalition.buildFileList = buildFileList;
       }

package/lib/utils/ux/FileCompare.d.ts

@@ -0,0 +1,12 @@
+interface FileComparisonResult {
+    isEqual: boolean;
+    details: {
+        hash1: string;
+        hash2: string;
+        fileSize1: number;
+        fileSize2: number;
+        comparisonTime: number;
+    };
+}
+export declare function compareFiles(filePath1: string, filePath2: string): FileComparisonResult;
+export {};

package/lib/utils/ux/FileCompare.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compareFiles = compareFiles;
+var _crypto = require("crypto");
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function compareFiles(filePath1, filePath2) {
+  const startTime = Date.now();
+
+  // 快速检查：文件大小不同则内容必然不同
+  const size1 = _fs.default.statSync(filePath1).size;
+  const size2 = _fs.default.statSync(filePath2).size;
+  if (size1 !== size2) {
+    return {
+      isEqual: false,
+      details: {
+        hash1: '',
+        hash2: '',
+        fileSize1: size1,
+        fileSize2: size2,
+        comparisonTime: Date.now() - startTime
+      }
+    };
+  }
+
+  // 计算两个文件的哈希
+  const hash1 = computeFileHash(filePath1);
+  const hash2 = computeFileHash(filePath2);
+  return {
+    isEqual: hash1 === hash2,
+    details: {
+      hash1,
+      hash2,
+      fileSize1: size1,
+      fileSize2: size2,
+      comparisonTime: Date.now() - startTime
+    }
+  };
+}
+function computeFileHash(filePath) {
+  const fileData = _fs.default.readFileSync(filePath);
+  const hash = (0, _crypto.createHash)('sha-256').update(fileData);
+  return hash.digest('hex');
+}

package/lib/utils/ux/UxFileUtils.d.ts

@@ -1,4 +1,3 @@
-import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 import IManifest from '../../compiler/javascript/vela/interface/IManifest';
 export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
@@ -39,15 +38,18 @@ export declare class UxFileUtils {
      */
     static validateSitemap(projectPath: string, sourceRoot?: string): void;
     /**
+     * 比较新旧文件列表差异
      * 1. 遍历旧文件列表
-     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
-     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.1 若文件路径在新文件列表remainingNewFilest中，且内容一致时，从remainingNewFiles中移除该项
+     *  1.2 若文件路径在新文件列表remainingNewFiles中，且内容不一致时，添加到diffList中表示待更新，从remainingNewFiles中移除该项
      *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
-     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
-     * @param oldFileList 旧文件列表
-     * @param newFileList 新文件列表
-     * @returns
+     * 2. 若遍历完旧文件列表后，remainingNewFiles长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件路径列表(相对路径)
+     * @param newFileList 新文件路径列表(绝对路径)
+     * @param oldDir 旧文件所在目录(绝对路径)
+     * @param newDir 新文件所在目录(绝对路径)
+     * @returns 返回差异文件路径列表(相对路径)
      */
-    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
+    static getDiffJSON(oldFileList: string[], newFileList: string[], oldDir: string, newDir: string): string[];
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -8,6 +8,7 @@ var _CommonUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _ManifestSchema = _interopRequireDefault(require("./ManifestSchema"));
+var _FileCompare = require("./FileCompare");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
 * FileUtils
@@ -112,39 +113,48 @@ class UxFileUtils {
       }
     }
   }
+
   /**
+   * 比较新旧文件列表差异
    * 1. 遍历旧文件列表
-   *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
-   *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+   *  1.1 若文件路径在新文件列表remainingNewFilest中，且内容一致时，从remainingNewFiles中移除该项
+   *  1.2 若文件路径在新文件列表remainingNewFiles中，且内容不一致时，添加到diffList中表示待更新，从remainingNewFiles中移除该项
    *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
-   * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
-   * @param oldFileList 旧文件列表
-   * @param newFileList 新文件列表
-   * @returns
+   * 2. 若遍历完旧文件列表后，remainingNewFiles长度不为0，表示有文件待新增
+   * @param oldFileList 旧文件路径列表(相对路径)
+   * @param newFileList 新文件路径列表(绝对路径)
+   * @param oldDir 旧文件所在目录(绝对路径)
+   * @param newDir 新文件所在目录(绝对路径)
+   * @returns 返回差异文件路径列表(相对路径)
    */
-  static getDiffJSON(compilation, newFileList, buildPath) {
-    const oldFileList = compilation.buildFileList;
-    if (!oldFileList.length) {
+  static getDiffJSON(oldFileList, newFileList, oldDir, newDir) {
+    if (!oldFileList.length && !newFileList.length) {
       return [];
     }
     let diffList = [];
+    // 剩余待处理的新文件列表
+    const remainingNewFiles = [...newFileList];
     // 1.
-    for (let i = 0; i < oldFileList.length; i++) {
-      const index = newFileList.findIndex(file => file === oldFileList[i].path);
-      // 1.3
+    for (const oldFile of oldFileList) {
+      const index = remainingNewFiles.findIndex(newFile => {
+        const relativePath = _path.default.relative(newDir, newFile);
+        return relativePath === oldFile;
+      });
       if (index !== -1) {
-        // 1.2
-        const oldContent = oldFileList[i].content?.toString('utf-8');
-        const newContent = _fsExtra.default.readFileSync(_path.default.join(buildPath, newFileList[index]), 'utf-8');
-        if (oldContent !== newContent) {
-          diffList.push(newFileList[index]);
+        const oldFilePath = _path.default.join(oldDir, oldFile);
+        // 比较文件内容
+        const {
+          isEqual
+        } = (0, _FileCompare.compareFiles)(oldFilePath, newFileList[index]);
+        if (!isEqual) {
+          diffList.push(_path.default.relative(newDir, remainingNewFiles[index]));
         }
-        // 从newFileList中移除该项
-        newFileList.splice(index, 1);
+        // 从新文件列表中移除已比较过的文件
+        remainingNewFiles.splice(index, 1);
       }
     }
     // 2.
-    newFileList.length > 0 && newFileList.forEach(file => diffList.push(file));
+    diffList.push(...remainingNewFiles.map(file => _path.default.relative(newDir, file)));
     return diffList;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.19",
+  "version": "2.0.5-beta.20",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.19",
-    "@aiot-toolkit/parser": "2.0.5-beta.19",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.19",
+    "@aiot-toolkit/generator": "2.0.5-beta.20",
+    "@aiot-toolkit/parser": "2.0.5-beta.20",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.20",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.5-beta.19",
+    "file-lane": "2.0.5-beta.20",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "hap-toolkit": "^2.0.0",
@@ -43,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "a0db41174e2ccc9750a8422bed0bc3392965407d"
+  "gitHead": "e34506862fb5e24eb86b4a4aa67fa88bb76f6114"
 }