hcordova 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hcordova",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Cordova CLI with HarmonyOS support",
   "main": "src/base-cli.js",
   "bin": {

package/src/utils/PlatformProject.js

@@ -120,6 +120,9 @@ class PlatformProject {
 
     // 下载 cordova-openharmony HAR 工程源码
     async downloadHarSourceCode(platformUrl, platformTag) {
+        if(!platformUrl.startsWith("http")) {
+            return await this.downloadNpmHarSourceCode(platformUrl, platformTag);
+        }
         // 检查git是否可用
         try {
             execSync('git --version', { stdio: 'pipe' });
@@ -186,6 +189,55 @@ class PlatformProject {
         }
     }
 
+    // 下载 cordova-openharmony HAR 工程源码
+    async downloadNpmHarSourceCode(platformUrl, platformTag) {
+        const organization = "@cordova-ohos";
+        const tempDir = path.join(os.tmpdir(), 'cordova-openharmony-har-' + Date.now());
+        try {
+            // 创建临时目录
+            if (!fs.existsSync(tempDir)) {
+                fs.mkdirSync(tempDir, { recursive: true });
+            }
+           
+            const fetcher = new ReleaseFetcher({ verbose: true });
+            const latestTag = fetcher.getNpmVersion(`${organization}/${platformUrl}`, platformTag);
+ 
+            let commandNpm = `npm --prefix ${tempDir} install ${organization}/${platformUrl}`;
+            if(latestTag != null) {
+                commandNpm += `@${latestTag}`;
+            }
+            
+            console.log(commandNpm);
+            try {
+               execSync(commandNpm, { stdio: 'inherit' });
+            } catch(error) {
+                throw new Error(`${commandNpm} exec failed`);
+            }
+            
+            // 验证 HAR 工程结构
+            const requiredFiles = [
+            'src/main/ets/',
+            'src/main/module.json5',
+            'oh-package.json5'
+            ];
+            
+            const fullPath = path.join(tempDir, 'node_modules', organization, platformUrl);
+            for (const file of requiredFiles) {
+                if (!fs.existsSync(path.join(fullPath, file))) {
+                    throw new Error(`Invalid HAR project structure: ${file} not found`);
+                }
+            }
+            
+            console.log('HAR source code downloaded successfully');
+            return fullPath;
+            
+        } catch (error) {
+            // 清理临时文件
+            this.cleanupTempFiles(tempDir);
+            throw new Error(`Failed to download HAR source code: ${error.message}`);
+        }
+    }
+
     // 下载 openssl 源码
     async downloadOpensslSourceCode() {
         // 检查git是否可用

package/src/utils/PluginDownloader.js

@@ -132,18 +132,15 @@ class PluginDownloader {
         }
 
         try {
-            let lastestTag = null;
-            const fetcher = new ReleaseFetcher({ verbose: true });
-            const tagInfo = await fetcher.getLatestReleaseTag(gitUrl, options.gitRef);
-            if(tagInfo.found) {
-                lastestTag = tagInfo.latestTag;
-            } else if(tagInfo.allTags.length > 0) {
-                lastestTag = tagInfo.allTags[0];
-            }
-
-            let commandGit = `git clone ${gitUrl} ${pluginDir}`;
-            if(lastestTag != null) {
-                commandGit += ` --branch ${lastestTag} --single-branch`;
+            let lastestTag = "master";
+            if (options.gitRef != null && options.gitRef != "" && options.gitRef !== undefined) {
+                const fetcher = new ReleaseFetcher({ verbose: true });
+                const tagInfo = await fetcher.getLatestReleaseTag(gitUrl, options.gitRef);
+                if (tagInfo.found) {
+                    lastestTag = tagInfo.latestTag;
+                } else if (tagInfo.allTags.length > 0) {
+                    lastestTag = tagInfo.allTags[0];
+                }
             }
 
             let commandGit = `git clone ${gitUrl} ${pluginDir}`;

package/src/utils/ReleaseFetcher.js

@@ -49,7 +49,6 @@ class ReleaseFetcher {
                 stdio: 'pipe',
                 timeout: 5000 
             });
-            this.log('Git is available');
         } catch (error) {
             throw new Error(`Git is not installed: ${error.message}`);
         }
@@ -177,6 +176,8 @@ class ReleaseFetcher {
             throw new Error(`Failed to fetch branches: ${error.message}`);
         }
     }
+
+    
     
     /**
      * 获取所有发行版标签（按语义化版本排序）
@@ -266,6 +267,46 @@ class ReleaseFetcher {
             repoUrl:repoUrl
         };
     }
+
+    /**
+     * 获取NPM包版本 - 如果指定版本存在则返回该版本，否则返回最新版本
+     * @param {string} packageName - NPM包名
+     * @param {string} version - 期望的版本号
+     * @returns {string} 最终版本号
+     */
+    getNpmVersion(packageName, version) {
+        try {
+            // 如果是 latest，直接返回最新版本
+            if (version === 'latest') {
+                return execSync(`npm view ${packageName} dist-tags.latest`, {
+                    encoding: 'utf-8'
+                }).trim();
+            }
+            
+            // 检查指定版本是否存在
+            if (version != "" && version != null && version != undefined) {
+                try {
+                    const result = execSync(`npm view ${packageName}@${version} version`, {
+                        encoding: 'utf-8'
+                    }).trim();
+                    
+                    if (result === version) {
+                        return version;
+                    }
+                } catch (e) {
+                    this.log("Install the latest version");
+                }
+            }
+            
+            // 返回最新版本
+            return execSync(`npm view ${packageName} dist-tags.latest`, {
+                encoding: 'utf-8'
+            }).trim();
+            
+        } catch (error) {
+            throw new Error(`获取版本失败: ${error.message}`);
+        }
+    }
     
     /**
      * 根据版本范围过滤标签