@jetstart/cli 1.5.2 → 1.5.3

package/dist/utils/android-sdk.d.ts

@@ -26,7 +26,15 @@ export declare class AndroidSDKManager {
      */
     installCmdlineTools(): Promise<void>;
     /**
-     * Get path to sdkmanager executable
+     * Resolve sdkmanager path and tools root
+     * Checks multiple standard paths:
+     * 1. cmdline-tools/latest/bin (Standard)
+     * 2. cmdline-tools/bin (Alternative)
+     * 3. tools/bin (Legacy)
+     */
+    private resolveSDKToolsPath;
+    /**
+     * Get path to sdkmanager executable (Legacy method, kept for reference but unused internally now)
      */
     private getSDKManagerPath;
     /**

package/dist/utils/android-sdk.js

@@ -122,7 +122,38 @@ class AndroidSDKManager {
         (0, logger_1.success)('Android cmdline-tools installed');
     }
     /**
-     * Get path to sdkmanager executable
+     * Resolve sdkmanager path and tools root
+     * Checks multiple standard paths:
+     * 1. cmdline-tools/latest/bin (Standard)
+     * 2. cmdline-tools/bin (Alternative)
+     * 3. tools/bin (Legacy)
+     */
+    async resolveSDKToolsPath() {
+        const sdkmanagerName = os.platform() === 'win32' ? 'sdkmanager.bat' : 'sdkmanager';
+        // Potential paths to check (in order of preference)
+        const candidates = [
+            {
+                bin: path.join(this.sdkRoot, 'cmdline-tools', 'latest', 'bin', sdkmanagerName),
+                root: path.join(this.sdkRoot, 'cmdline-tools', 'latest')
+            },
+            {
+                bin: path.join(this.sdkRoot, 'cmdline-tools', 'bin', sdkmanagerName),
+                root: path.join(this.sdkRoot, 'cmdline-tools')
+            },
+            {
+                bin: path.join(this.sdkRoot, 'tools', 'bin', sdkmanagerName),
+                root: path.join(this.sdkRoot, 'tools')
+            }
+        ];
+        for (const candidate of candidates) {
+            if (await fs.pathExists(candidate.bin)) {
+                return { binPath: candidate.bin, toolsRoot: candidate.root };
+            }
+        }
+        return { binPath: null, toolsRoot: '' };
+    }
+    /**
+     * Get path to sdkmanager executable (Legacy method, kept for reference but unused internally now)
      */
     getSDKManagerPath() {
         const sdkmanagerName = os.platform() === 'win32' ? 'sdkmanager.bat' : 'sdkmanager';
@@ -139,19 +170,19 @@ class AndroidSDKManager {
      * Run sdkmanager command
      */
     async runSDKManager(args, onProgress) {
-        const sdkmanagerPath = this.getSDKManagerPath();
-        if (!(await fs.pathExists(sdkmanagerPath))) {
+        // Resolve proper sdkmanager path and tools root
+        const { binPath, toolsRoot } = await this.resolveSDKToolsPath();
+        if (!binPath) {
             throw new Error('sdkmanager not found. Install cmdline-tools first.');
         }
         return new Promise((resolve, reject) => {
-            const proc = (0, child_process_1.spawn)(sdkmanagerPath, args, {
+            const proc = (0, child_process_1.spawn)(binPath, args, {
                 env: {
                     ...process.env,
                     ANDROID_HOME: this.sdkRoot,
                     ANDROID_SDK_ROOT: this.sdkRoot,
                     // Accept licenses automatically
-                    JAVA_OPTS: '-Dcom.android.sdkmanager.toolsdir=' +
-                        path.join(this.sdkRoot, 'cmdline-tools', 'latest'),
+                    JAVA_OPTS: '-Dcom.android.sdkmanager.toolsdir=' + toolsRoot,
                 },
                 shell: true,
             });
@@ -198,20 +229,19 @@ class AndroidSDKManager {
     async acceptLicenses() {
         const spinner = (0, spinner_1.startSpinner)('Accepting SDK licenses...');
         try {
-            const sdkmanagerPath = this.getSDKManagerPath();
-            // Add path validation (like runSDKManager does)
-            if (!(await fs.pathExists(sdkmanagerPath))) {
+            // Resolve tools path
+            const { binPath, toolsRoot } = await this.resolveSDKToolsPath();
+            if (!binPath) {
                 throw new Error('sdkmanager not found. Install cmdline-tools first.');
             }
             await new Promise((resolve, reject) => {
-                const proc = (0, child_process_1.spawn)(sdkmanagerPath, ['--licenses'], {
+                const proc = (0, child_process_1.spawn)(binPath, ['--licenses'], {
                     env: {
                         ...process.env,
                         ANDROID_HOME: this.sdkRoot,
                         ANDROID_SDK_ROOT: this.sdkRoot,
                         // ADD MISSING JAVA_OPTS (critical fix)
-                        JAVA_OPTS: '-Dcom.android.sdkmanager.toolsdir=' +
-                            path.join(this.sdkRoot, 'cmdline-tools', 'latest'),
+                        JAVA_OPTS: '-Dcom.android.sdkmanager.toolsdir=' + toolsRoot,
                     },
                     // ADD explicit stdio configuration
                     stdio: ['pipe', 'pipe', 'pipe'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetstart/cli",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Command-line interface for JetStart",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,8 +36,8 @@
   },
   "homepage": "https://github.com/dev-phantom/jetstart#readme",
   "dependencies": {
-    "@jetstart/core": "^1.5.2",
-    "@jetstart/shared": "^1.5.2",
+    "@jetstart/core": "^1.5.3",
+    "@jetstart/shared": "^1.5.3",
     "axios": "^1.6.2",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",

package/src/utils/android-sdk.ts

@@ -111,7 +111,42 @@ export class AndroidSDKManager {
   }
 
   /**
-   * Get path to sdkmanager executable
+   * Resolve sdkmanager path and tools root
+   * Checks multiple standard paths:
+   * 1. cmdline-tools/latest/bin (Standard)
+   * 2. cmdline-tools/bin (Alternative)
+   * 3. tools/bin (Legacy)
+   */
+  private async resolveSDKToolsPath(): Promise<{ binPath: string | null; toolsRoot: string }> {
+    const sdkmanagerName = os.platform() === 'win32' ? 'sdkmanager.bat' : 'sdkmanager';
+    
+    // Potential paths to check (in order of preference)
+    const candidates = [
+      {
+        bin: path.join(this.sdkRoot, 'cmdline-tools', 'latest', 'bin', sdkmanagerName),
+        root: path.join(this.sdkRoot, 'cmdline-tools', 'latest')
+      },
+      {
+        bin: path.join(this.sdkRoot, 'cmdline-tools', 'bin', sdkmanagerName),
+        root: path.join(this.sdkRoot, 'cmdline-tools')
+      },
+      {
+        bin: path.join(this.sdkRoot, 'tools', 'bin', sdkmanagerName),
+        root: path.join(this.sdkRoot, 'tools')
+      }
+    ];
+
+    for (const candidate of candidates) {
+      if (await fs.pathExists(candidate.bin)) {
+        return { binPath: candidate.bin, toolsRoot: candidate.root };
+      }
+    }
+
+    return { binPath: null, toolsRoot: '' };
+  }
+
+  /**
+   * Get path to sdkmanager executable (Legacy method, kept for reference but unused internally now)
    */
   private getSDKManagerPath(): string {
     const sdkmanagerName = os.platform() === 'win32' ? 'sdkmanager.bat' : 'sdkmanager';
@@ -133,22 +168,22 @@ export class AndroidSDKManager {
     args: string[],
     onProgress?: (progress: number, message: string) => void
   ): Promise<string> {
-    const sdkmanagerPath = this.getSDKManagerPath();
+    // Resolve proper sdkmanager path and tools root
+    const { binPath, toolsRoot } = await this.resolveSDKToolsPath();
 
-    if (!(await fs.pathExists(sdkmanagerPath))) {
+    if (!binPath) {
       throw new Error('sdkmanager not found. Install cmdline-tools first.');
     }
 
     return new Promise((resolve, reject) => {
-      const proc = spawn(sdkmanagerPath, args, {
+      const proc = spawn(binPath, args, {
         env: {
           ...process.env,
           ANDROID_HOME: this.sdkRoot,
           ANDROID_SDK_ROOT: this.sdkRoot,
           // Accept licenses automatically
           JAVA_OPTS:
-            '-Dcom.android.sdkmanager.toolsdir=' +
-            path.join(this.sdkRoot, 'cmdline-tools', 'latest'),
+            '-Dcom.android.sdkmanager.toolsdir=' + toolsRoot,
         },
         shell: true,
       });
@@ -208,23 +243,22 @@ export class AndroidSDKManager {
     const spinner = startSpinner('Accepting SDK licenses...');
 
     try {
-      const sdkmanagerPath = this.getSDKManagerPath();
+      // Resolve tools path
+      const { binPath, toolsRoot } = await this.resolveSDKToolsPath();
 
-      // Add path validation (like runSDKManager does)
-      if (!(await fs.pathExists(sdkmanagerPath))) {
+      if (!binPath) {
         throw new Error('sdkmanager not found. Install cmdline-tools first.');
       }
 
       await new Promise<void>((resolve, reject) => {
-        const proc = spawn(sdkmanagerPath, ['--licenses'], {
+        const proc = spawn(binPath, ['--licenses'], {
           env: {
             ...process.env,
             ANDROID_HOME: this.sdkRoot,
             ANDROID_SDK_ROOT: this.sdkRoot,
             // ADD MISSING JAVA_OPTS (critical fix)
             JAVA_OPTS:
-              '-Dcom.android.sdkmanager.toolsdir=' +
-              path.join(this.sdkRoot, 'cmdline-tools', 'latest'),
+              '-Dcom.android.sdkmanager.toolsdir=' + toolsRoot,
           },
           // ADD explicit stdio configuration
           stdio: ['pipe', 'pipe', 'pipe'],