@simplysm/sd-cli 12.16.14 → 12.16.16

package/dist/entry/SdCliCapacitor.js

@@ -1,116 +1,162 @@
 import * as path from "path";
 import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
-import { StringUtils, typescript } from "@simplysm/sd-core-common";
+import { NotImplementError, ObjectUtils, StringUtils, typescript } from "@simplysm/sd-core-common";
 import sharp from "sharp";
 export class SdCliCapacitor {
     constructor(_opt) {
         this._opt = _opt;
         // 상수 정의
-        this._CAPACITOR_DIR_NAME = ".capacitor";
-        this._CONFIG_FILE_NAME = "capacitor.config.ts";
-        this._KEYSTORE_FILE_NAME = "android.keystore";
-        this._ICON_DIR_NAME = "resources";
+        this._ANDROID_KEYSTORE_FILE_NAME = "android.keystore";
         this._platforms = Object.keys(this._opt.config.platform ?? {});
         this._npmConfig = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
+        this._capPath = path.resolve(this._opt.pkgPath, ".capacitor");
     }
     static { this._logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCapacitor"]); }
     static async _execAsync(cmd, args, cwd) {
         this._logger.debug(`실행 명령: ${cmd + " " + args.join(" ")}`);
-        const msg = await SdProcess.spawnAsync(cmd, args, { cwd });
+        const msg = await SdProcess.spawnAsync(cmd, args, {
+            cwd,
+            env: {
+                FORCE_COLOR: "1", // chalk, supports-color 계열
+                CLICOLOR_FORCE: "1", // 일부 Unix 도구
+                COLORTERM: "truecolor", // 추가 힌트
+            },
+        });
         this._logger.debug(`실행 결과: ${msg}`);
+        return msg;
     }
     async initializeAsync() {
-        const capacitorPath = path.resolve(this._opt.pkgPath, this._CAPACITOR_DIR_NAME);
         // 1. Capacitor 프로젝트 초기화
-        const isNewProject = await this._initializeCapacitorProjectAsync(capacitorPath);
+        const changed = await this._initCapAsync();
         // 2. Capacitor 설정 파일 생성
-        await this._createCapacitorConfigAsync(capacitorPath);
+        await this._writeCapConfAsync();
         // 3. 플랫폼 관리
-        await this._managePlatformsAsync(capacitorPath);
-        // 4. 플러그인 관리
-        const pluginsChanged = await this._managePluginsAsync(capacitorPath);
-        // 5. 안드로이드 서명 설정
-        await this._setupAndroidSignAsync(capacitorPath);
-        // 6. 아이콘 및 스플래시 스크린 설정
-        await this._setupIconAndSplashScreenAsync(capacitorPath);
-        // 7. Android 네이티브 설정 (AndroidManifest.xml, build.gradle 등)
+        await this._addPlatformsAsync();
+        // 4. 아이콘 설정
+        await this._setupIconAsync();
+        // 5. Android 네이티브 설정
         if (this._platforms.includes("android")) {
-            await this._configureAndroidNativeAsync(capacitorPath);
+            await this._configureAndroidAsync();
         }
-        // 8. 웹 자산 동기화
-        if (isNewProject || pluginsChanged) {
-            await SdCliCapacitor._execAsync("npx", ["cap", "sync"], capacitorPath);
+        // 6. 웹 자산 동기화
+        if (changed) {
+            await SdCliCapacitor._execAsync("npx", ["cap", "sync"], this._capPath);
         }
         else {
-            await SdCliCapacitor._execAsync("npx", ["cap", "copy"], capacitorPath);
+            await SdCliCapacitor._execAsync("npx", ["cap", "copy"], this._capPath);
         }
     }
     // 1. Capacitor 프로젝트 초기화
-    async _initializeCapacitorProjectAsync(capacitorPath) {
-        const wwwPath = path.resolve(capacitorPath, "www");
-        if (FsUtils.exists(wwwPath)) {
-            SdCliCapacitor._logger.log("이미 생성되어있는 '.capacitor'를 사용합니다.");
-            // 버전 동기화
-            const pkgJsonPath = path.resolve(capacitorPath, "package.json");
-            if (FsUtils.exists(pkgJsonPath)) {
-                const pkgJson = (await FsUtils.readJsonAsync(pkgJsonPath));
-                if (pkgJson.version !== this._npmConfig.version) {
-                    pkgJson.version = this._npmConfig.version;
-                    await FsUtils.writeJsonAsync(pkgJsonPath, pkgJson, { space: 2 });
-                    SdCliCapacitor._logger.debug(`버전 동기화: ${this._npmConfig.version}`);
-                }
-            }
+    async _initCapAsync() {
+        // package.json 파일 구성
+        const depChanged = await this._setupNpmConfAsync();
+        if (!depChanged)
             return false;
-        }
-        // www 폴더 생성
-        await FsUtils.mkdirsAsync(wwwPath);
-        // package.json 생성
-        const projNpmConfig = await FsUtils.readJsonAsync(path.resolve(this._opt.pkgPath, "../../package.json"));
-        const pkgJson = {
-            name: this._opt.config.appId,
-            version: this._npmConfig.version,
-            private: true,
-            volta: projNpmConfig.volta,
-            dependencies: {
-                "@capacitor/core": "^7.0.0",
-                "@capacitor/app": "^7.0.0",
-                ...this._platforms.toObject((item) => `@capacitor/${item}`, () => "^7.0.0"),
-            },
-            devDependencies: {
-                "@capacitor/cli": "^7.0.0",
-                "@capacitor/assets": "^3.0.0",
-            },
-        };
-        await FsUtils.writeJsonAsync(path.resolve(capacitorPath, "package.json"), pkgJson, {
-            space: 2,
-        });
         // .yarnrc.yml 작성
-        await FsUtils.writeFileAsync(path.resolve(capacitorPath, ".yarnrc.yml"), "nodeLinker: node-modules");
+        await FsUtils.writeFileAsync(path.resolve(this._capPath, ".yarnrc.yml"), "nodeLinker: node-modules");
         // 빈 yarn.lock 작성
-        await FsUtils.writeFileAsync(path.resolve(capacitorPath, "yarn.lock"), "");
+        await FsUtils.writeFileAsync(path.resolve(this._capPath, "yarn.lock"), "");
         // yarn install
-        await SdCliCapacitor._execAsync("yarn", ["dlx", "npm-check-updates", "-u", "--target", "semver"], capacitorPath);
-        await SdCliCapacitor._execAsync("yarn", ["install"], capacitorPath);
-        // capacitor init
-        await SdCliCapacitor._execAsync("npx", ["cap", "init", this._opt.config.appName, this._opt.config.appId], capacitorPath);
-        // www/index.html 생성
+        const installResult = await SdCliCapacitor._execAsync("yarn", ["install"], this._capPath);
+        const errorLines = installResult.split("\n").filter((item) => item.includes("YN0002"));
+        // peer dependency 경고 감지
+        if (errorLines.length > 0) {
+            throw new Error(errorLines.join("\n"));
+        }
+        // cap init
+        await SdCliCapacitor._execAsync("npx", ["cap", "init", this._opt.config.appName, this._opt.config.appId], this._capPath);
+        // 기본 www/index.html 생성
+        const wwwPath = path.resolve(this._capPath, "www");
         await FsUtils.writeFileAsync(path.resolve(wwwPath, "index.html"), "<!DOCTYPE html><html><head></head><body></body></html>");
         return true;
     }
+    async _setupNpmConfAsync() {
+        const projNpmConfig = await FsUtils.readJsonAsync(path.resolve(this._opt.pkgPath, "../../package.json"));
+        // -----------------------------
+        // 기본설정
+        // -----------------------------
+        const capNpmConfPath = path.resolve(this._capPath, "package.json");
+        const orgCapNpmConf = FsUtils.exists(capNpmConfPath)
+            ? await FsUtils.readJsonAsync(path.resolve(this._capPath, "package.json"))
+            : {};
+        const capNpmConf = ObjectUtils.clone(orgCapNpmConf);
+        capNpmConf.name = this._opt.config.appId;
+        capNpmConf.version = this._npmConfig.version;
+        capNpmConf.volta = projNpmConfig.volta;
+        capNpmConf.dependencies = capNpmConf.dependencies ?? {};
+        capNpmConf.dependencies["@capacitor/core"] = "^7.0.0";
+        capNpmConf.dependencies["@capacitor/app"] = "^7.0.0";
+        for (const platform of this._platforms) {
+            capNpmConf.dependencies[`@capacitor/${platform}`] = "^7.0.0";
+        }
+        capNpmConf.devDependencies = capNpmConf.devDependencies ?? {};
+        capNpmConf.devDependencies["@capacitor/cli"] = "^7.0.0";
+        capNpmConf.devDependencies["@capacitor/assets"] = "^3.0.0";
+        // -----------------------------
+        // 플러그인 패키지 설정
+        // -----------------------------
+        const mainDeps = {
+            ...this._npmConfig.dependencies,
+            ...this._npmConfig.devDependencies,
+            ...this._npmConfig.peerDependencies,
+        };
+        const usePlugins = Object.keys(this._opt.config.plugins ?? {});
+        const prevPlugins = Object.keys(capNpmConf.dependencies).filter((item) => !["@capacitor/core", "@capacitor/android", "@capacitor/ios", "@capacitor/app"].includes(item));
+        // 사용하지 않는 플러그인 제거
+        for (const prevPlugin of prevPlugins) {
+            if (!usePlugins.includes(prevPlugin)) {
+                delete capNpmConf.dependencies[prevPlugin];
+                SdCliCapacitor._logger.debug(`플러그인 제거: ${prevPlugin}`);
+            }
+        }
+        // 새 플러그인 추가
+        for (const plugin of usePlugins) {
+            if (!(plugin in capNpmConf.dependencies)) {
+                const version = mainDeps[plugin] ?? "*";
+                capNpmConf.dependencies[plugin] = version;
+                SdCliCapacitor._logger.debug(`플러그인 추가: ${plugin}@${version}`);
+            }
+        }
+        // -----------------------------
+        // 저장
+        // -----------------------------
+        await FsUtils.writeJsonAsync(capNpmConfPath, capNpmConf, { space: 2 });
+        return (!ObjectUtils.equal(orgCapNpmConf.volta, capNpmConf.volta) ||
+            !ObjectUtils.equal(orgCapNpmConf.dependencies, capNpmConf.dependencies) ||
+            !ObjectUtils.equal(orgCapNpmConf.devDependencies, capNpmConf.devDependencies));
+        /*// volta, dep, devDep 이 변한 경우에만, yarn install
+        if (
+          !ObjectUtils.equal(orgCapNpmConf.volta, capNpmConf.volta) ||
+          !ObjectUtils.equal(orgCapNpmConf.dependencies, capNpmConf.dependencies) ||
+          !ObjectUtils.equal(orgCapNpmConf.devDependencies, capNpmConf.devDependencies)
+        ) {
+          const installResult = await SdCliCapacitor._execAsync("yarn", ["install"], this._capPath);
+    
+          const errorLines = installResult.split("\n").filter((item) => item.includes("YN0002"));
+    
+          // peer dependency 경고 감지
+          if (errorLines.length > 0) {
+            throw new Error(errorLines.join("\n"));
+          }
+    
+          return true;
+        }
+        // 변경 없으면 아무것도 안 함 → 오프라인 OK
+        return false;*/
+    }
     // 2. Capacitor 설정 파일 생성
-    async _createCapacitorConfigAsync(capacitorPath) {
-        const configFilePath = path.resolve(capacitorPath, this._CONFIG_FILE_NAME);
+    async _writeCapConfAsync() {
+        const confPath = path.resolve(this._capPath, "capacitor.config.ts");
         // 플러그인 옵션 생성
         const pluginOptions = {};
         for (const [pluginName, options] of Object.entries(this._opt.config.plugins ?? {})) {
             if (options !== true) {
-                // @capacitor/splash-screen → SplashScreen 형태로 변환
                 const configKey = StringUtils.toPascalCase(pluginName.split("/").last());
                 pluginOptions[configKey] = options;
             }
         }
         const pluginsConfigStr = Object.keys(pluginOptions).length > 0
-            ? JSON.stringify(pluginOptions, null, 4).replace(/^/gm, "  ").trim()
+            ? JSON.stringify(pluginOptions, null, 2).replace(/^/gm, "  ").trim()
             : "{}";
         const configContent = typescript `
       import type { CapacitorConfig } from "@capacitor/cli";
@@ -120,201 +166,114 @@ export class SdCliCapacitor {
         appName: "${this._opt.config.appName}",
         server: {
           androidScheme: "http",
-          cleartext: true,
-          allowNavigation: ["*"],
-        },
-        android: {
-          allowMixedContent: true,
-          statusBarOverlaysWebView: false,
+          cleartext: true
         },
+        android: {},
         plugins: ${pluginsConfigStr},
       };
 
       export default config;
     `;
-        await FsUtils.writeFileAsync(configFilePath, configContent);
+        await FsUtils.writeFileAsync(confPath, configContent);
     }
-    // 3. 플랫폼 관리
-    async _managePlatformsAsync(capacitorPath) {
+    // 3. 플랫폼 추가
+    async _addPlatformsAsync() {
         for (const platform of this._platforms) {
-            if (FsUtils.exists(path.resolve(capacitorPath, platform)))
+            if (FsUtils.exists(path.resolve(this._capPath, platform)))
                 continue;
-            await SdCliCapacitor._execAsync("npx", ["cap", "add", platform], capacitorPath);
-        }
-    }
-    async _managePluginsAsync(capacitorPath) {
-        const pkgJsonPath = path.resolve(capacitorPath, "package.json");
-        const pkgJson = (await FsUtils.readJsonAsync(pkgJsonPath));
-        const mainDeps = {
-            ...this._npmConfig.dependencies,
-            ...this._npmConfig.devDependencies,
-            ...this._npmConfig.peerDependencies,
-        };
-        const usePlugins = Object.keys(this._opt.config.plugins ?? {});
-        const currentDeps = pkgJson.dependencies ?? {};
-        let changed = false;
-        const prevPlugins = Object.keys(currentDeps).filter(item => ![
-            "@capacitor/core",
-            "@capacitor/android",
-            "@capacitor/ios",
-            "@capacitor/app",
-        ].includes(item));
-        // 사용하지 않는 플러그인 제거
-        for (const prevPlugin of prevPlugins) {
-            if (!usePlugins.includes(prevPlugin)) {
-                delete currentDeps[prevPlugin];
-                changed = true;
-                SdCliCapacitor._logger.debug(`플러그인 제거: ${prevPlugin}`);
-            }
-        }
-        // 새 플러그인 추가
-        for (const plugin of usePlugins) {
-            if (!(plugin in currentDeps)) {
-                const version = mainDeps[plugin] ?? "*";
-                currentDeps[plugin] = version;
-                changed = true;
-                SdCliCapacitor._logger.debug(`플러그인 추가: ${plugin}@${version}`);
-            }
-        }
-        // 변경사항 있을 때만 저장 & install
-        if (changed) {
-            pkgJson.dependencies = currentDeps;
-            await FsUtils.writeJsonAsync(pkgJsonPath, pkgJson, { space: 2 });
-            await SdCliCapacitor._execAsync("yarn", ["install"], capacitorPath);
-            return true;
+            await SdCliCapacitor._execAsync("npx", ["cap", "add", platform], this._capPath);
         }
-        // 변경 없으면 아무것도 안 함 → 오프라인 OK
-        return false;
     }
-    // 5. 안드로이드 서명 설정
-    async _setupAndroidSignAsync(capacitorPath) {
-        const keystorePath = path.resolve(capacitorPath, this._KEYSTORE_FILE_NAME);
-        if (this._opt.config.platform?.android?.sign) {
-            await FsUtils.copyAsync(path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore), keystorePath);
-        }
-        else {
-            await FsUtils.removeAsync(keystorePath);
-        }
-    }
-    async _setupIconAndSplashScreenAsync(capacitorPath) {
-        const resourcesDirPath = path.resolve(capacitorPath, this._ICON_DIR_NAME);
+    // 4. 아이콘 설정
+    async _setupIconAsync() {
+        const assetsDirPath = path.resolve(this._capPath, "assets");
         if (this._opt.config.icon != null) {
-            await FsUtils.mkdirsAsync(resourcesDirPath);
+            await FsUtils.mkdirsAsync(assetsDirPath);
             const iconSource = path.resolve(this._opt.pkgPath, this._opt.config.icon);
-            // 아이콘만 생성
-            const logoPath = path.resolve(resourcesDirPath, "logo.png");
-            await this._createCenteredImageAsync(iconSource, logoPath, 1024, 0.6);
-            await this._cleanupExistingIconsAsync(capacitorPath);
-            try {
-                await SdCliCapacitor._execAsync("npx", [
-                    "@capacitor/assets",
-                    "generate",
-                    "--android",
-                    "--iconBackgroundColor",
-                    "#ffffff",
-                    "--splashBackgroundColor",
-                    "#ffffff",
-                ], capacitorPath);
-            }
-            catch (e) {
-                SdCliCapacitor._logger.warn("아이콘 생성 실패, 기본 아이콘 사용", e);
-            }
+            // 아이콘 생성
+            const logoPath = path.resolve(assetsDirPath, "logo.png");
+            const logoSize = Math.floor(1024 * 0.6);
+            const padding = Math.floor((1024 - logoSize) / 2);
+            await sharp(iconSource)
+                .resize(logoSize, logoSize, {
+                fit: "contain",
+                background: { r: 0, g: 0, b: 0, alpha: 0 },
+            })
+                .extend({
+                top: padding,
+                bottom: padding,
+                left: padding,
+                right: padding,
+                background: { r: 0, g: 0, b: 0, alpha: 0 },
+            })
+                .toFile(logoPath);
+            // await this._cleanupExistingIconsAsync();
+            await SdCliCapacitor._execAsync("npx", [
+                "@capacitor/assets",
+                "generate",
+                "--iconBackgroundColor",
+                "#ffffff",
+                "--splashBackgroundColor",
+                "#ffffff",
+            ], this._capPath);
         }
         else {
-            await FsUtils.removeAsync(resourcesDirPath);
+            await FsUtils.removeAsync(assetsDirPath);
         }
     }
-    // 중앙에 로고를 배치한 이미지 생성
-    async _createCenteredImageAsync(sourcePath, outputPath, outputSize, logoRatio) {
-        const logoSize = Math.floor(outputSize * logoRatio);
-        const padding = Math.floor((outputSize - logoSize) / 2);
-        await sharp(sourcePath)
-            .resize(logoSize, logoSize, {
-            fit: "contain",
-            background: { r: 0, g: 0, b: 0, alpha: 0 },
-        })
-            .extend({
-            top: padding,
-            bottom: padding,
-            left: padding,
-            right: padding,
-            background: { r: 0, g: 0, b: 0, alpha: 0 },
-        })
-            .toFile(outputPath);
-    }
     // 기존 아이콘 파일 삭제
-    async _cleanupExistingIconsAsync(capacitorPath) {
-        const androidResPath = path.resolve(capacitorPath, "android/app/src/main/res");
-        if (!FsUtils.exists(androidResPath))
-            return;
-        // mipmap 폴더의 모든 ic_launcher 관련 파일 삭제 (png + xml)
-        const mipmapDirs = await FsUtils.globAsync(path.resolve(androidResPath, "mipmap-*"));
-        for (const dir of mipmapDirs) {
-            const iconFiles = await FsUtils.globAsync(path.resolve(dir, "ic_launcher*")); // 확장자 제거
-            for (const file of iconFiles) {
-                await FsUtils.removeAsync(file);
-            }
-        }
-        // drawable 폴더의 splash/icon 관련 파일도 삭제
-        const drawableDirs = await FsUtils.globAsync(path.resolve(androidResPath, "drawable*"));
-        for (const dir of drawableDirs) {
-            const splashFiles = await FsUtils.globAsync(path.resolve(dir, "splash*"));
-            const iconFiles = await FsUtils.globAsync(path.resolve(dir, "ic_launcher*"));
-            for (const file of [...splashFiles, ...iconFiles]) {
-                await FsUtils.removeAsync(file);
-            }
-        }
-    }
-    // 7. Android 네이티브 설정
-    async _configureAndroidNativeAsync(capacitorPath) {
-        const androidPath = path.resolve(capacitorPath, "android");
-        if (!FsUtils.exists(androidPath)) {
-            return;
-        }
-        // JAVA_HOME 찾기
-        await this._configureAndroidGradlePropertiesAsync(androidPath);
-        // local.properties 생성
-        await this._configureSdkPathAsync(androidPath);
+    // private async _cleanupExistingIconsAsync(): Promise<void> {
+    //   const androidResPath = path.resolve(capacitorPath, "android/app/src/main/res");
+    //
+    //   if (!FsUtils.exists(androidResPath)) return;
+    //
+    //   // mipmap 폴더의 모든 ic_launcher 관련 파일 삭제 (png + xml)
+    //   const mipmapDirs = await FsUtils.globAsync(path.resolve(androidResPath, "mipmap-*"));
+    //   for (const dir of mipmapDirs) {
+    //     const iconFiles = await FsUtils.globAsync(path.resolve(dir, "ic_launcher*")); // 확장자 제거
+    //     for (const file of iconFiles) {
+    //       await FsUtils.removeAsync(file);
+    //     }
+    //   }
+    //
+    //   // drawable 폴더의 splash/icon 관련 파일도 삭제
+    //   const drawableDirs = await FsUtils.globAsync(path.resolve(androidResPath, "drawable*"));
+    //   for (const dir of drawableDirs) {
+    //     const splashFiles = await FsUtils.globAsync(path.resolve(dir, "splash*"));
+    //     const iconFiles = await FsUtils.globAsync(path.resolve(dir, "ic_launcher*"));
+    //     for (const file of [...splashFiles, ...iconFiles]) {
+    //       await FsUtils.removeAsync(file);
+    //     }
+    //   }
+    // }
+    // 5. Android 네이티브 설정
+    async _configureAndroidAsync() {
+        const androidPath = path.resolve(this._capPath, "android");
+        // JAVA_HOME 경로 설정
+        await this._configureAndroidJavaHomePathAsync(androidPath);
+        // SDK 경로 설정
+        await this._configureAndroidSdkPathAsync(androidPath);
         // AndroidManifest.xml 수정
         await this._configureAndroidManifestAsync(androidPath);
         // build.gradle 수정 (필요시)
         await this._configureAndroidBuildGradleAsync(androidPath);
-        // strings.xml 앱 이름 수정
-        await this._configureAndroidStringsAsync(androidPath);
-        // styles.xml 수정
-        await this._configureAndroidStylesAsync(androidPath);
-    }
-    async _configureAndroidStylesAsync(androidPath) {
-        const stylesPath = path.resolve(androidPath, "app/src/main/res/values/styles.xml");
-        if (!FsUtils.exists(stylesPath)) {
-            return;
-        }
-        let stylesContent = await FsUtils.readFileAsync(stylesPath);
-        // Edge-to-Edge 비활성화만
-        if (!stylesContent.includes("android:windowOptOutEdgeToEdgeEnforcement")) {
-            stylesContent = stylesContent.replace(/(<style[^>]*name="AppTheme"[^>]*>)/, `$1\n        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>`);
-        }
-        // NoActionBarLaunch를 단순 NoActionBar로
-        stylesContent = stylesContent.replace(/(<style\s+name="AppTheme\.NoActionBarLaunch"\s+parent=")[^"]+(")/, `$1Theme.AppCompat.Light.NoActionBar$2`);
-        // splash 관련 전부 제거
-        stylesContent = stylesContent.replace(/\s*<item name="android:background">@drawable\/splash<\/item>/g, "");
-        stylesContent = stylesContent.replace(/\s*<item name="android:windowSplashScreen[^"]*">[^<]*<\/item>/g, "");
-        await FsUtils.writeFileAsync(stylesPath, stylesContent);
+        // TODO: strings.xml 앱 이름 수정?? WHY?
+        // await this._configureAndroidStringsAsync(androidPath);
+        // TODO: styles.xml 수정?? WHY?
+        // await this._configureAndroidStylesAsync(androidPath);
     }
-    async _configureAndroidGradlePropertiesAsync(androidPath) {
+    // JAVA_HOME 경로 설정
+    async _configureAndroidJavaHomePathAsync(androidPath) {
         const gradlePropsPath = path.resolve(androidPath, "gradle.properties");
-        if (!FsUtils.exists(gradlePropsPath)) {
-            return;
-        }
         let content = await FsUtils.readFileAsync(gradlePropsPath);
         // Java 21 경로 자동 탐색
-        const java21Path = this._findJava21();
+        const java21Path = await this._findJava21Async();
         if (java21Path != null && !content.includes("org.gradle.java.home")) {
             content += `\norg.gradle.java.home=${java21Path.replace(/\\/g, "\\\\")}\n`;
             FsUtils.writeFile(gradlePropsPath, content);
         }
     }
-    _findJava21() {
+    async _findJava21Async() {
         const patterns = [
             "C:/Program Files/Amazon Corretto/jdk21*",
             "C:/Program Files/Eclipse Adoptium/jdk-21*",
@@ -322,7 +281,7 @@ export class SdCliCapacitor {
             "C:/Program Files/Microsoft/jdk-21*",
         ];
         for (const pattern of patterns) {
-            const matches = FsUtils.glob(pattern);
+            const matches = await FsUtils.globAsync(pattern);
             if (matches.length > 0) {
                 // 가장 최신 버전 선택 (정렬 후 마지막)
                 return matches.sort().at(-1);
@@ -330,23 +289,38 @@ export class SdCliCapacitor {
         }
         return undefined;
     }
-    async _configureSdkPathAsync(androidPath) {
-        // local.properties 생성
+    // SDK 경로 설정
+    async _configureAndroidSdkPathAsync(androidPath) {
         const localPropsPath = path.resolve(androidPath, "local.properties");
-        if (FsUtils.exists(localPropsPath)) {
-            return;
-        }
         // SDK 경로 탐색 (Cordova 방식과 유사)
         const sdkPath = this._findAndroidSdk();
         if (sdkPath != null) {
             await FsUtils.writeFileAsync(localPropsPath, `sdk.dir=${sdkPath.replace(/\\/g, "/")}\n`);
         }
     }
+    _findAndroidSdk() {
+        // 1. 환경변수 확인
+        const fromEnv = process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
+        if (fromEnv != null && FsUtils.exists(fromEnv)) {
+            return fromEnv;
+        }
+        // 2. 일반적인 설치 경로 탐색
+        const candidates = [
+            path.resolve(process.env["LOCALAPPDATA"] ?? "", "Android/Sdk"),
+            path.resolve(process.env["HOME"] ?? "", "Android/Sdk"),
+            "C:/Program Files/Android/Sdk",
+            "C:/Android/Sdk",
+        ];
+        for (const candidate of candidates) {
+            if (FsUtils.exists(candidate)) {
+                return candidate;
+            }
+        }
+        return undefined;
+    }
+    // AndroidManifest.xml 수정
     async _configureAndroidManifestAsync(androidPath) {
         const manifestPath = path.resolve(androidPath, "app/src/main/AndroidManifest.xml");
-        if (!FsUtils.exists(manifestPath)) {
-            return;
-        }
         let manifestContent = await FsUtils.readFileAsync(manifestPath);
         // usesCleartextTraffic 설정
         if (!manifestContent.includes("android:usesCleartextTraffic")) {
@@ -393,11 +367,9 @@ export class SdCliCapacitor {
         }
         await FsUtils.writeFileAsync(manifestPath, manifestContent);
     }
+    // build.gradle 수정 (필요시)
     async _configureAndroidBuildGradleAsync(androidPath) {
         const buildGradlePath = path.resolve(androidPath, "app/build.gradle");
-        if (!FsUtils.exists(buildGradlePath)) {
-            return;
-        }
         let gradleContent = await FsUtils.readFileAsync(buildGradlePath);
         // versionName, versionCode 설정
         const version = this._npmConfig.version;
@@ -410,13 +382,21 @@ export class SdCliCapacitor {
         // SDK 버전 설정
         if (this._opt.config.platform?.android?.sdkVersion != null) {
             const sdkVersion = this._opt.config.platform.android.sdkVersion;
-            gradleContent = gradleContent.replace(/minSdkVersion \d+/, `minSdkVersion ${sdkVersion}`);
-            gradleContent = gradleContent.replace(/targetSdkVersion \d+/, `targetSdkVersion ${sdkVersion}`);
+            gradleContent = gradleContent.replace(/minSdkVersion .+/, `minSdkVersion ${sdkVersion}`);
+            gradleContent = gradleContent.replace(/targetSdkVersion .+/, `targetSdkVersion ${sdkVersion}`);
+        }
+        else {
+            gradleContent = gradleContent.replace(/minSdkVersion .+/, `minSdkVersion rootProject.ext.minSdkVersion`);
+            gradleContent = gradleContent.replace(/targetSdkVersion .+/, `targetSdkVersion rootProject.ext.targetSdkVersion`);
         }
         // Signing 설정
+        const keystorePath = path.resolve(this._capPath, this._ANDROID_KEYSTORE_FILE_NAME);
         const signConfig = this._opt.config.platform?.android?.sign;
         if (signConfig) {
-            const keystoreRelativePath = `../../${this._KEYSTORE_FILE_NAME}`;
+            await FsUtils.copyAsync(path.resolve(this._opt.pkgPath, signConfig.keystore), keystorePath);
+            const keystoreRelativePath = path
+                .relative(path.dirname(buildGradlePath), keystorePath)
+                .replace(/\\/g, "/");
             const keystoreType = signConfig.keystoreType ?? "jks";
             // signingConfigs 블록 추가
             if (!gradleContent.includes("signingConfigs")) {
@@ -439,34 +419,90 @@ export class SdCliCapacitor {
                 gradleContent = gradleContent.replace(/(buildTypes\s*\{[\s\S]*?release\s*\{)/, `$1\n            signingConfig signingConfigs.release`);
             }
         }
-        await FsUtils.writeFileAsync(buildGradlePath, gradleContent);
-    }
-    async _configureAndroidStringsAsync(androidPath) {
-        const stringsPath = path.resolve(androidPath, "app/src/main/res/values/strings.xml");
-        if (!FsUtils.exists(stringsPath)) {
-            return;
+        else {
+            //TODO: gradleContent에서 signingConfigs 관련 부분 삭제
+            await FsUtils.removeAsync(keystorePath);
         }
-        let stringsContent = await FsUtils.readFileAsync(stringsPath);
-        stringsContent = stringsContent.replace(/<string name="app_name">[^<]+<\/string>/, `<string name="app_name">${this._opt.config.appName}</string>`);
-        stringsContent = stringsContent.replace(/<string name="title_activity_main">[^<]+<\/string>/, `<string name="title_activity_main">${this._opt.config.appName}</string>`);
-        stringsContent = stringsContent.replace(/<string name="package_name">[^<]+<\/string>/, `<string name="package_name">${this._opt.config.appId}</string>`);
-        stringsContent = stringsContent.replace(/<string name="custom_url_scheme">[^<]+<\/string>/, `<string name="custom_url_scheme">${this._opt.config.appId}</string>`);
-        await FsUtils.writeFileAsync(stringsPath, stringsContent);
+        await FsUtils.writeFileAsync(buildGradlePath, gradleContent);
     }
+    /*private async _configureAndroidStringsAsync(androidPath: string) {
+      const stringsPath = path.resolve(androidPath, "app/src/main/res/values/strings.xml");
+  
+      if (!FsUtils.exists(stringsPath)) {
+        return;
+      }
+  
+      let stringsContent = await FsUtils.readFileAsync(stringsPath);
+      stringsContent = stringsContent.replace(
+        /<string name="app_name">[^<]+<\/string>/,
+        `<string name="app_name">${this._opt.config.appName}</string>`,
+      );
+      stringsContent = stringsContent.replace(
+        /<string name="title_activity_main">[^<]+<\/string>/,
+        `<string name="title_activity_main">${this._opt.config.appName}</string>`,
+      );
+      stringsContent = stringsContent.replace(
+        /<string name="package_name">[^<]+<\/string>/,
+        `<string name="package_name">${this._opt.config.appId}</string>`,
+      );
+      stringsContent = stringsContent.replace(
+        /<string name="custom_url_scheme">[^<]+<\/string>/,
+        `<string name="custom_url_scheme">${this._opt.config.appId}</string>`,
+      );
+  
+      await FsUtils.writeFileAsync(stringsPath, stringsContent);
+    }*/
+    /*private async _configureAndroidStylesAsync(androidPath: string) {
+      const stylesPath = path.resolve(androidPath, "app/src/main/res/values/styles.xml");
+  
+      if (!FsUtils.exists(stylesPath)) {
+        return;
+      }
+  
+      let stylesContent = await FsUtils.readFileAsync(stylesPath);
+  
+      // Edge-to-Edge 비활성화만
+      if (!stylesContent.includes("android:windowOptOutEdgeToEdgeEnforcement")) {
+        stylesContent = stylesContent.replace(
+          /(<style[^>]*name="AppTheme"[^>]*>)/,
+          `$1\n        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>`,
+        );
+      }
+  
+      // NoActionBarLaunch를 단순 NoActionBar로
+      stylesContent = stylesContent.replace(
+        /(<style\s+name="AppTheme\.NoActionBarLaunch"\s+parent=")[^"]+(")/,
+        `$1Theme.AppCompat.Light.NoActionBar$2`,
+      );
+  
+      // splash 관련 전부 제거
+      stylesContent = stylesContent.replace(
+        /\s*<item name="android:background">@drawable\/splash<\/item>/g,
+        "",
+      );
+      stylesContent = stylesContent.replace(
+        /\s*<item name="android:windowSplashScreen[^"]*">[^<]*<\/item>/g,
+        "",
+      );
+  
+      await FsUtils.writeFileAsync(stylesPath, stylesContent);
+    }*/
     async buildAsync(outPath) {
-        const capacitorPath = path.resolve(this._opt.pkgPath, this._CAPACITOR_DIR_NAME);
         const buildType = this._opt.config.debug ? "debug" : "release";
         // 플랫폼별 빌드
-        await Promise.all(this._platforms.map(async (platform) => {
+        for (const platform of this._platforms) {
             // 해당 플랫폼만 copy
-            await SdCliCapacitor._execAsync("npx", ["cap", "copy", platform], capacitorPath);
+            await SdCliCapacitor._execAsync("npx", ["cap", "copy", platform], this._capPath);
             if (platform === "android") {
-                await this._buildAndroidAsync(capacitorPath, outPath, buildType);
+                await this._buildAndroidAsync(outPath, buildType);
+            }
+            else {
+                throw new NotImplementError();
             }
-        }));
+        }
     }
-    async _buildAndroidAsync(capacitorPath, outPath, buildType) {
-        const androidPath = path.resolve(capacitorPath, "android");
+    async _buildAndroidAsync(outPath, buildType) {
+        const androidPath = path.resolve(this._capPath, "android");
         const targetOutPath = path.resolve(outPath, "android");
         const isBundle = this._opt.config.platform?.android?.bundle;
         const gradleTask = buildType === "release" ? (isBundle ? "bundleRelease" : "assembleRelease") : "assembleDebug";
@@ -496,26 +532,6 @@ export class SdCliCapacitor {
         await FsUtils.mkdirsAsync(updatesPath);
         await FsUtils.copyAsync(actualPath, path.resolve(updatesPath, `${this._npmConfig.version}.${ext}`));
     }
-    _findAndroidSdk() {
-        // 1. 환경변수 확인
-        const fromEnv = process.env["ANDROID_HOME"] ?? process.env["ANDROID_SDK_ROOT"];
-        if (fromEnv != null && FsUtils.exists(fromEnv)) {
-            return fromEnv;
-        }
-        // 2. 일반적인 설치 경로 탐색
-        const candidates = [
-            path.resolve(process.env["LOCALAPPDATA"] ?? "", "Android/Sdk"),
-            path.resolve(process.env["HOME"] ?? "", "Android/Sdk"),
-            "C:/Program Files/Android/Sdk",
-            "C:/Android/Sdk",
-        ];
-        for (const candidate of candidates) {
-            if (FsUtils.exists(candidate)) {
-                return candidate;
-            }
-        }
-        return undefined;
-    }
     static async runWebviewOnDeviceAsync(opt) {
         const projNpmConf = (await FsUtils.readJsonAsync(path.resolve(process.cwd(), "package.json")));
         const allPkgPaths = await projNpmConf.workspaces.mapManyAsync(async (item) => await FsUtils.globAsync(PathUtils.posix(process.cwd(), item)));
@@ -542,7 +558,7 @@ export class SdCliCapacitor {
             await this._execAsync("npx", ["cap", "run", opt.platform], capacitorPath);
         }
         catch (err) {
-            await SdProcess.spawnAsync("adb", ["kill-server"]);
+            await this._execAsync("adb", ["kill-server"], capacitorPath);
             throw err;
         }
     }