Add bala extraction in PullCommand

Author: azinneera

cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PullCommand.java

@@ -150,7 +150,8 @@ public void execute() {
         }
 
         Path packagePathInBalaCache = ProjectUtils.createAndGetHomeReposPath()
-                .resolve(ProjectConstants.BALA_DIR_NAME).resolve(orgName).resolve(packageName);
+                .resolve(ProjectConstants.REPOSITORIES_DIR).resolve(ProjectConstants.CENTRAL_REPOSITORY_CACHE_NAME)
+                .resolve(orgName).resolve(packageName);
         // create directory path in bala cache
         try {
             createDirectories(packagePathInBalaCache);

cli/central-client/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     implementation 'com.google.code.gson:gson'
     implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.github.zafarkhaja:java-semver'
+    implementation 'commons-io:commons-io'
     testCompile 'org.testng:testng'
     testCompile 'org.awaitility:awaitility'
     testImplementation 'org.powermock:powermock-mockito-release-full'

cli/central-client/src/main/java/module-info.java

@@ -9,4 +9,5 @@
     requires jdk.httpserver;
     requires io.ballerina.runtime;
     requires java.semver;
+    requires org.apache.commons.io;
 }

cli/central-client/src/main/java/org/ballerinalang/central/client/CentralAPIClient.java

@@ -331,7 +331,7 @@ public void pullPackage(String org, String name, String version, Path packagePat
                 conn.setRequestProperty(CONTENT_DISPOSITION, contentDisposition);
 
                 boolean isNightlyBuild = ballerinaVersion.contains("SNAPSHOT");
-                createBalaInHomeRepo(conn, packagePathInBalaCache, org + "/" + name, isNightlyBuild, newUrl,
+                createBalaInHomeRepo(conn, packagePathInBalaCache, org, name, isNightlyBuild, newUrl,
                                      contentDisposition, outStream, logFormatter);
             } else {
                 try (BufferedReader reader = new BufferedReader(

cli/central-client/src/main/java/org/ballerinalang/central/client/Utils.java

@@ -25,6 +25,7 @@
 import com.google.gson.reflect.TypeToken;
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarStyle;
+import org.apache.commons.io.FileUtils;
 import org.ballerinalang.central.client.exceptions.CentralClientException;
 import org.ballerinalang.central.client.exceptions.ConnectionErrorException;
 import org.ballerinalang.central.client.exceptions.PackageAlreadyExistsException;
@@ -36,13 +37,20 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
+import java.net.URI;
 import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -86,14 +94,15 @@ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, Strin
      *
      * @param conn               http connection
      * @param pkgPathInBalaCache package path in bala cache, <user.home>.ballerina/bala_cache/<org-name>/<pkg-name>
-     * @param pkgNameWithOrg     package name with org, <org-name>/<pkg-name>
+     * @param pkgOrg             package org
+     * @param pkgName            package name
      * @param isNightlyBuild     is nightly build
      * @param newUrl             new redirect url
      * @param contentDisposition content disposition header
      * @param outStream          Output print stream
      * @param logFormatter       log formatter
      */
-    public static void createBalaInHomeRepo(HttpURLConnection conn, Path pkgPathInBalaCache, String pkgNameWithOrg,
+    public static void createBalaInHomeRepo(HttpURLConnection conn, Path pkgPathInBalaCache, String pkgOrg, String pkgName,
             boolean isNightlyBuild, String newUrl, String contentDisposition, PrintStream outStream,
             LogFormatter logFormatter) throws CentralClientException {
         long responseContentLength = conn.getContentLengthLong();
@@ -110,17 +119,22 @@ public static void createBalaInHomeRepo(HttpURLConnection conn, Path pkgPathInBa
 
         String validPkgVersion = validatePackageVersion(pkgVersion, logFormatter);
         String balaFile = getBalaFileName(contentDisposition, uriParts[uriParts.length - 1]);
-        Path balaCacheWithPkgPath = pkgPathInBalaCache.resolve(validPkgVersion);
+        String platform = getPlatformFromBala(balaFile, pkgName, validPkgVersion);
+        Path balaCacheWithPkgPath = pkgPathInBalaCache.resolve(validPkgVersion).resolve(platform);
         //<user.home>.ballerina/bala_cache/<org-name>/<pkg-name>/<pkg-version>
 
-        Path balaPath = Paths.get(balaCacheWithPkgPath.toString(), balaFile);
-        if (balaPath.toFile().exists()) {
+        try {
+            if (Files.isDirectory(balaCacheWithPkgPath) && Files.list(balaCacheWithPkgPath).findAny().isPresent()) {
+                throw new PackageAlreadyExistsException(
+                        logFormatter.formatLog("package already exists in the home repository: " + balaCacheWithPkgPath.toString()));
+            }
+        } catch (IOException e) {
             throw new PackageAlreadyExistsException(
-                    logFormatter.formatLog("package already exists in the home repository: " + balaPath.toString()));
+                    logFormatter.formatLog("error accessing bala : " + balaCacheWithPkgPath.toString()));
         }
 
         createBalaFileDirectory(balaCacheWithPkgPath, logFormatter);
-        writeBalaFile(conn, balaPath, pkgNameWithOrg + ":" + validPkgVersion, responseContentLength, outStream,
+        writeBalaFile(conn, balaCacheWithPkgPath.resolve(balaFile), pkgOrg + "/" + pkgName + ":" + validPkgVersion, responseContentLength, outStream,
                       logFormatter);
         handleNightlyBuild(isNightlyBuild, balaCacheWithPkgPath, logFormatter);
     }
@@ -194,6 +208,8 @@ static void writeBalaFile(HttpURLConnection conn, Path balaPath, String fullPkgN
                 FileOutputStream outputStream = new FileOutputStream(balaPath.toString())) {
             writeAndHandleProgress(inputStream, outputStream, resContentLength / 1024, fullPkgName, outStream,
                                    logFormatter);
+            extractBala(balaPath, Optional.of(balaPath.getParent()).get());
+            Files.delete(balaPath);
         } catch (IOException e) {
             throw new CentralClientException(
                     logFormatter.formatLog("error occurred copying the bala file: " + e.getMessage()));
@@ -343,4 +359,25 @@ static long getTotalFileSizeInKB(Path filePath) throws CentralClientException {
     static List<String> getAsList(String arrayString) {
         return new Gson().fromJson(arrayString, new TypeToken<List<String>>() { }.getType());
     }
+
+    private static String getPlatformFromBala(String balaName, String packageName, String version) {
+        return balaName.split(packageName + "-")[1].split("-" + version)[0];
+    }
+
+    private static void extractBala(Path balaFilePath, Path balaFileDestPath) throws IOException {
+        Files.createDirectories(balaFileDestPath);
+        URI zipURI = URI.create("jar:" + balaFilePath.toUri().toString());
+        try (FileSystem zipFileSystem = FileSystems.newFileSystem(zipURI, new HashMap<>())) {
+            Path packageRoot = zipFileSystem.getPath("/");
+            List<Path> paths = Files.walk(packageRoot).filter(path -> path != packageRoot).collect(Collectors.toList());
+            for (Path path : paths) {
+                Path destPath = balaFileDestPath.resolve(packageRoot.relativize(path).toString());
+                // Handle overwriting existing bala
+                if (destPath.toFile().isDirectory()) {
+                    FileUtils.deleteDirectory(destPath.toFile());
+                }
+                Files.copy(path, destPath, StandardCopyOption.REPLACE_EXISTING);
+            }
+        }
+    }
 }

compiler/ballerina-lang/src/main/java/io/ballerina/projects/util/ProjectConstants.java

@@ -107,4 +107,5 @@ public class ProjectConstants {
     public static final String REPOSITORIES_DIR = "repositories";
     public static final String CENTRAL_REPOSITORY_NAME = "central.ballerina.io";
     public static final String LOCAL_REPOSITORY_NAME = "local";
+    public static final String CENTRAL_REPOSITORY_CACHE_NAME = "central.ballerina.io";
 }