fixed autoSync issue

cloudimpl · Apr 1, 2024 · fdd3701 · fdd3701
1 parent af685c1
commit fdd3701
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudimpl-inc/cpm",
-  "version": "2.33.3",
+  "version": "2.33.4",
   "description": "CloudImpl Project Manager",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

diff --git a/src/util.ts b/src/util.ts
@@ -93,6 +93,18 @@ export const createFile = (path: string, def: string | (() => string)) => {
     }
 }
 
+export const readFile = (path: string, def: string | (() => string)) => {
+    if (existsSync(path)) {
+        return readFileSync(path).toString();
+    } else {
+        if (typeof def === 'function') {
+            return def();
+        } else {
+            return def;
+        }
+    }
+}
+
 export const readJson = (path: string, def: any | (() => any)): any => {
     if (existsSync(path)) {
         const data = readFileSync(path);
@@ -423,7 +435,7 @@ export const calculateFilesMD5Sync = (filePaths: string[]): string => {
     try {
         const hash = crypto.createHash('md5');
         for (const filePath of filePaths) {
-            const fileData = fs.readFileSync(filePath);
+            const fileData = Buffer.from(readFile(filePath, ''));
             hash.update(fileData);
         }
         return hash.digest('hex');
@@ -444,9 +456,7 @@ export const autoSync = async (config: CPMConfig) => {
     if (isProjectRepo) {
         const files = [configFilePath, variablesFilePath, packageLockJsonFile];
         const fileHash = calculateFilesMD5Sync(files).trim();
-        const savedHash = (existsSync(hashFilePath))
-            ? readFileSync(hashFilePath).toString().trim()
-            : '';
+        const savedHash = readFile(hashFilePath, '');
 
         if (fileHash !== savedHash) {
             await syncProject(config);