@simplysm/sd-cli 12.16.5 → 12.16.6

package/dist/entry/SdCliCapacitor.d.ts

@@ -21,7 +21,9 @@ export declare class SdCliCapacitor {
     private _managePluginsAsync;
     private _setupAndroidSignAsync;
     private _setupIconAndSplashScreenAsync;
+    private _createPaddedIconAsync;
     private _configureAndroidNativeAsync;
+    private _configureAndroidStylesAsync;
     private _configureAndroidGradlePropertiesAsync;
     private _findJava21;
     private _configureSdkPathAsync;

package/dist/entry/SdCliCapacitor.js

@@ -1,6 +1,7 @@
 import * as path from "path";
 import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
 import { StringUtils, typescript } from "@simplysm/sd-core-common";
+import sharp from "sharp";
 export class SdCliCapacitor {
     constructor(_opt) {
         this._opt = _opt;
@@ -41,7 +42,7 @@ export class SdCliCapacitor {
     }
     // 1. Capacitor 프로젝트 초기화
     async _initializeCapacitorProjectAsync(capacitorPath) {
-        if (FsUtils.exists(capacitorPath)) {
+        if (FsUtils.exists(path.resolve(capacitorPath, "www"))) {
             SdCliCapacitor._logger.log("이미 생성되어있는 '.capacitor'를 사용합니다.");
             // 버전 동기화
             await this._syncVersionAsync(capacitorPath);
@@ -88,7 +89,7 @@ export class SdCliCapacitor {
             if (pkgJson.version !== this._npmConfig.version) {
                 pkgJson.version = this._npmConfig.version;
                 await FsUtils.writeJsonAsync(pkgJsonPath, pkgJson, { space: 2 });
-                SdCliCapacitor._logger.log(`버전 동기화: ${this._npmConfig.version}`);
+                SdCliCapacitor._logger.debug(`버전 동기화: ${this._npmConfig.version}`);
             }
         }
     }
@@ -120,6 +121,7 @@ export class SdCliCapacitor {
         },
         android: {
           allowMixedContent: true,
+          statusBarOverlaysWebView: false,
         },
         plugins: ${pluginsConfigStr},
       };
@@ -153,25 +155,25 @@ export class SdCliCapacitor {
             if (!usePlugins.includes(dep)) {
                 // Capacitor 관련 플러그인만 제거
                 if (dep.startsWith("@capacitor/") || dep.includes("capacitor-plugin")) {
-                    try {
-                        await SdCliCapacitor._execAsync("yarn", ["remove", dep], capacitorPath);
-                        SdCliCapacitor._logger.log(`플러그인 제거: ${dep}`);
-                    }
-                    catch {
-                        SdCliCapacitor._logger.warn(`플러그인 제거 실패: ${dep}`);
-                    }
+                    await SdCliCapacitor._execAsync("yarn", ["remove", dep], capacitorPath);
+                    SdCliCapacitor._logger.debug(`플러그인 제거: ${dep}`);
                 }
             }
         }
         // 새 플러그인 설치
+        const mainPkgJson = this._npmConfig;
+        const mainDeps = {
+            ...mainPkgJson.dependencies,
+            ...mainPkgJson.devDependencies,
+            ...mainPkgJson.peerDependencies,
+        };
         for (const plugin of usePlugins) {
             if (!currentDeps.includes(plugin)) {
-                await SdCliCapacitor._execAsync("yarn", ["add", plugin], capacitorPath);
-                SdCliCapacitor._logger.log(`플러그인 설치: ${plugin}`);
-                /*try {
-                } catch {
-                  SdCliCapacitor._logger.warn(`플러그인 설치 실패: ${plugin}`);
-                }*/
+                // 메인 프로젝트에 버전이 있으면 그 버전으로 설치
+                const version = mainDeps[plugin];
+                const pluginWithVersion = version ? `${plugin}@${version}` : plugin;
+                await SdCliCapacitor._execAsync("yarn", ["add", pluginWithVersion], capacitorPath);
+                SdCliCapacitor._logger.debug(`플러그인 설치: ${pluginWithVersion}`);
             }
         }
     }
@@ -188,14 +190,16 @@ export class SdCliCapacitor {
     // 6. 아이콘 및 스플래시 스크린 설정
     async _setupIconAndSplashScreenAsync(capacitorPath) {
         const iconDirPath = path.resolve(capacitorPath, this._ICON_DIR_PATH);
-        // ICON 파일 복사
         if (this._opt.config.icon != null) {
             await FsUtils.mkdirsAsync(iconDirPath);
             const iconSource = path.resolve(this._opt.pkgPath, this._opt.config.icon);
-            // icon.png, splash.png 둘 다 같은 파일 사용
+            // Adaptive Icon용 여백 추가된 이미지 생성
+            // 1024x1024 중 680x680이 safe zone (약 66%)
+            const paddedIconPath = path.resolve(iconDirPath, "icon-only.png");
+            await this._createPaddedIconAsync(iconSource, paddedIconPath);
+            // splash, icon 복사
             await FsUtils.copyAsync(iconSource, path.resolve(iconDirPath, "icon.png"));
             await FsUtils.copyAsync(iconSource, path.resolve(iconDirPath, "splash.png"));
-            // @capacitor/assets로 아이콘/스플래시 리사이징
             try {
                 await SdCliCapacitor._execAsync("npx", ["@capacitor/assets", "generate", "--android"], capacitorPath);
             }
@@ -207,6 +211,21 @@ export class SdCliCapacitor {
             await FsUtils.removeAsync(iconDirPath);
         }
     }
+    async _createPaddedIconAsync(sourcePath, outputPath) {
+        const size = 1024;
+        const iconSize = 680; // safe zone
+        const padding = Math.floor((size - iconSize) / 2); // 172px
+        await sharp(sourcePath)
+            .resize(iconSize, iconSize, { 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);
+    }
     // 7. Android 네이티브 설정
     async _configureAndroidNativeAsync(capacitorPath) {
         const androidPath = path.resolve(capacitorPath, "android");
@@ -223,6 +242,20 @@ export class SdCliCapacitor {
         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[^>]*AppTheme[^>]*>)/, `$1\n        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>`);
+        }
+        await FsUtils.writeFileAsync(stylesPath, stylesContent);
     }
     async _configureAndroidGradlePropertiesAsync(androidPath) {
         const gradlePropsPath = path.resolve(androidPath, "gradle.properties");
@@ -300,6 +333,20 @@ export class SdCliCapacitor {
                 }
             }
         }
+        // intentFilters 설정
+        const intentFilters = this._opt.config.platform?.android?.intentFilters ?? [];
+        for (const filter of intentFilters) {
+            const filterKey = filter.action ?? filter.category ?? "";
+            if (filterKey && !manifestContent.includes(filterKey)) {
+                const actionLine = filter.action != null ? `<action android:name="${filter.action}"/>` : "";
+                const categoryLine = filter.category != null ? `<category android:name="${filter.category}"/>` : "";
+                manifestContent = manifestContent.replace(/(<activity[\s\S]*?android:name="\.MainActivity"[\s\S]*?>)/, `$1
+            <intent-filter>
+                ${actionLine}
+                ${categoryLine}
+            </intent-filter>`);
+            }
+        }
         await FsUtils.writeFileAsync(manifestPath, manifestContent);
     }
     async _configureAndroidBuildGradleAsync(androidPath) {

package/dist/types/config/ISdProjectConfig.d.ts

@@ -114,6 +114,10 @@ export interface ISdClientBuilderCapacitorConfig {
         android?: {
             config?: Record<string, string>;
             bundle?: boolean;
+            intentFilters?: {
+                action?: string;
+                category?: string;
+            }[];
             sign?: {
                 keystore: string;
                 storePassword: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.16.5",
+  "version": "12.16.6",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,10 +17,10 @@
     "@angular/compiler-cli": "^20.3.15",
     "@anthropic-ai/sdk": "^0.71.2",
     "@electron/rebuild": "^4.0.2",
-    "@simplysm/sd-core-common": "12.16.5",
-    "@simplysm/sd-core-node": "12.16.5",
-    "@simplysm/sd-service-server": "12.16.5",
-    "@simplysm/sd-storage": "12.16.5",
+    "@simplysm/sd-core-common": "12.16.6",
+    "@simplysm/sd-core-node": "12.16.6",
+    "@simplysm/sd-service-server": "12.16.6",
+    "@simplysm/sd-storage": "12.16.6",
     "browserslist": "^4.28.1",
     "cordova": "^13.0.0",
     "electron": "^33.4.11",
@@ -33,6 +33,7 @@
     "rxjs": "^7.8.2",
     "sass-embedded": "^1.96.0",
     "semver": "^7.7.3",
+    "sharp": "^0.34.5",
     "specifier-resolution-node": "^1.1.4",
     "ts-morph": "^27.0.2",
     "tslib": "^2.8.1",

package/src/entry/SdCliCapacitor.ts

@@ -3,6 +3,7 @@ import { FsUtils, PathUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node"
 import { ISdClientBuilderCapacitorConfig } from "../types/config/ISdProjectConfig";
 import { INpmConfig } from "../types/common-config/INpmConfig";
 import { StringUtils, typescript } from "@simplysm/sd-core-common";
+import sharp from "sharp";
 
 export class SdCliCapacitor {
   // 상수 정의
@@ -62,7 +63,7 @@ export class SdCliCapacitor {
 
   // 1. Capacitor 프로젝트 초기화
   private async _initializeCapacitorProjectAsync(capacitorPath: string): Promise<void> {
-    if (FsUtils.exists(capacitorPath)) {
+    if (FsUtils.exists(path.resolve(capacitorPath, "www"))) {
       SdCliCapacitor._logger.log("이미 생성되어있는 '.capacitor'를 사용합니다.");
 
       // 버전 동기화
@@ -133,7 +134,7 @@ export class SdCliCapacitor {
       if (pkgJson.version !== this._npmConfig.version) {
         pkgJson.version = this._npmConfig.version;
         await FsUtils.writeJsonAsync(pkgJsonPath, pkgJson, { space: 2 });
-        SdCliCapacitor._logger.log(`버전 동기화: ${this._npmConfig.version}`);
+        SdCliCapacitor._logger.debug(`버전 동기화: ${this._npmConfig.version}`);
       }
     }
   }
@@ -170,6 +171,7 @@ export class SdCliCapacitor {
         },
         android: {
           allowMixedContent: true,
+          statusBarOverlaysWebView: false,
         },
         plugins: ${pluginsConfigStr},
       };
@@ -211,25 +213,28 @@ export class SdCliCapacitor {
       if (!usePlugins.includes(dep)) {
         // Capacitor 관련 플러그인만 제거
         if (dep.startsWith("@capacitor/") || dep.includes("capacitor-plugin")) {
-          try {
-            await SdCliCapacitor._execAsync("yarn", ["remove", dep], capacitorPath);
-            SdCliCapacitor._logger.log(`플러그인 제거: ${dep}`);
-          } catch {
-            SdCliCapacitor._logger.warn(`플러그인 제거 실패: ${dep}`);
-          }
+          await SdCliCapacitor._execAsync("yarn", ["remove", dep], capacitorPath);
+          SdCliCapacitor._logger.debug(`플러그인 제거: ${dep}`);
         }
       }
     }
 
     // 새 플러그인 설치
+    const mainPkgJson = this._npmConfig;
+    const mainDeps = {
+      ...mainPkgJson.dependencies,
+      ...mainPkgJson.devDependencies,
+      ...mainPkgJson.peerDependencies,
+    };
+
     for (const plugin of usePlugins) {
       if (!currentDeps.includes(plugin)) {
-        await SdCliCapacitor._execAsync("yarn", ["add", plugin], capacitorPath);
-        SdCliCapacitor._logger.log(`플러그인 설치: ${plugin}`);
-        /*try {
-        } catch {
-          SdCliCapacitor._logger.warn(`플러그인 설치 실패: ${plugin}`);
-        }*/
+        // 메인 프로젝트에 버전이 있으면 그 버전으로 설치
+        const version = mainDeps[plugin];
+        const pluginWithVersion = version ? `${plugin}@${version}` : plugin;
+
+        await SdCliCapacitor._execAsync("yarn", ["add", pluginWithVersion], capacitorPath);
+        SdCliCapacitor._logger.debug(`플러그인 설치: ${pluginWithVersion}`);
       }
     }
   }
@@ -252,17 +257,20 @@ export class SdCliCapacitor {
   private async _setupIconAndSplashScreenAsync(capacitorPath: string): Promise<void> {
     const iconDirPath = path.resolve(capacitorPath, this._ICON_DIR_PATH);
 
-    // ICON 파일 복사
     if (this._opt.config.icon != null) {
       await FsUtils.mkdirsAsync(iconDirPath);
 
       const iconSource = path.resolve(this._opt.pkgPath, this._opt.config.icon);
 
-      // icon.png, splash.png 둘 다 같은 파일 사용
+      // Adaptive Icon용 여백 추가된 이미지 생성
+      // 1024x1024 중 680x680이 safe zone (약 66%)
+      const paddedIconPath = path.resolve(iconDirPath, "icon-only.png");
+      await this._createPaddedIconAsync(iconSource, paddedIconPath);
+
+      // splash, icon 복사
       await FsUtils.copyAsync(iconSource, path.resolve(iconDirPath, "icon.png"));
       await FsUtils.copyAsync(iconSource, path.resolve(iconDirPath, "splash.png"));
 
-      // @capacitor/assets로 아이콘/스플래시 리사이징
       try {
         await SdCliCapacitor._execAsync(
           "npx",
@@ -277,6 +285,23 @@ export class SdCliCapacitor {
     }
   }
 
+  private async _createPaddedIconAsync(sourcePath: string, outputPath: string): Promise<void> {
+    const size = 1024;
+    const iconSize = 680; // safe zone
+    const padding = Math.floor((size - iconSize) / 2); // 172px
+
+    await sharp(sourcePath)
+      .resize(iconSize, iconSize, { 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);
+  }
+
   // 7. Android 네이티브 설정
   private async _configureAndroidNativeAsync(capacitorPath: string) {
     const androidPath = path.resolve(capacitorPath, "android");
@@ -299,6 +324,29 @@ export class SdCliCapacitor {
 
     // strings.xml 앱 이름 수정
     await this._configureAndroidStringsAsync(androidPath);
+
+    // styles.xml 수정
+    await this._configureAndroidStylesAsync(androidPath);
+  }
+
+  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[^>]*AppTheme[^>]*>)/,
+        `$1\n        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>`,
+      );
+    }
+
+    await FsUtils.writeFileAsync(stylesPath, stylesContent);
   }
 
   private async _configureAndroidGradlePropertiesAsync(androidPath: string) {
@@ -402,6 +450,26 @@ export class SdCliCapacitor {
       }
     }
 
+    // intentFilters 설정
+    const intentFilters = this._opt.config.platform?.android?.intentFilters ?? [];
+    for (const filter of intentFilters) {
+      const filterKey = filter.action ?? filter.category ?? "";
+      if (filterKey && !manifestContent.includes(filterKey)) {
+        const actionLine = filter.action != null ? `<action android:name="${filter.action}"/>` : "";
+        const categoryLine =
+          filter.category != null ? `<category android:name="${filter.category}"/>` : "";
+
+        manifestContent = manifestContent.replace(
+          /(<activity[\s\S]*?android:name="\.MainActivity"[\s\S]*?>)/,
+          `$1
+            <intent-filter>
+                ${actionLine}
+                ${categoryLine}
+            </intent-filter>`,
+        );
+      }
+    }
+
     await FsUtils.writeFileAsync(manifestPath, manifestContent);
   }
 

package/src/types/config/ISdProjectConfig.ts

@@ -132,7 +132,6 @@ export interface ISdClientBuilderCordovaConfig {
   browserslist?: string[];
 }
 
-
 export interface ISdClientBuilderCapacitorConfig {
   appId: string;
   appName: string;
@@ -143,6 +142,10 @@ export interface ISdClientBuilderCapacitorConfig {
     android?: {
       config?: Record<string, string>;
       bundle?: boolean;
+      intentFilters?: {
+        action?: string;
+        category?: string;
+      }[];
       sign?: {
         keystore: string;
         storePassword: string;