@zsukim/ctv-run 1.0.11 → 1.0.13

package/README.md

@@ -90,6 +90,7 @@
 | `appId` | | Tizen 앱 고유 ID (없으면 자동 생성) |
 | `tizenPath` | | tizen CLI 실행 경로 (기본값: `tizen`) |
 | `sdbPath` | | sdb 실행 경로 (기본값: `sdb`) |
+| `configXmlPath` | | 사용할 config.xml 경로 (우선순위: dist > 지정경로 > 루트 > 기본 생성) |
 
 **WebOS**
 
@@ -99,6 +100,7 @@
 | `url` | | TV가 로드할 URL |
 | `port` | | TV가 로드할 URL의 포트 |
 | `appId` | | webOS 앱 ID (기본값: `com.ctvrun.app`) |
+| `appInfoPath` | | 사용할 appinfo.json 경로 (우선순위: dist > 지정경로 > 루트 > 기본 생성) |
 
 **Common**
 

package/dist/platforms/tizen.js

@@ -19,9 +19,13 @@ const path_1 = __importDefault(require("path"));
 const config_1 = require("../utils/config");
 const ip_1 = require("../utils/ip");
 const platform_1 = require("../utils/platform");
+const DEFAULT_APP_ID = 'A123456789.CtvRunApp';
+const DEFAULT_APP_NAME = 'CtvRunApp';
+const DEFAULT_CERT_FILE = 'ctv-run-cert';
+const DEFAULT_CERT_PROFILE = 'ctv-run-profile';
 function runTizen() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const config = (0, config_1.loadConfig)();
         const args = process.argv.slice(2);
         const getArg = (0, platform_1.makeArgParser)(args);
@@ -79,10 +83,11 @@ function runTizen() {
             const appId = getArg('appId') ||
                 (xmlInfo === null || xmlInfo === void 0 ? void 0 : xmlInfo.appId) ||
                 ((_g = config.tizen) === null || _g === void 0 ? void 0 : _g.appId) ||
-                'A123456789.CtvRunApp';
-            const safeAppName = ((xmlInfo === null || xmlInfo === void 0 ? void 0 : xmlInfo.appName) || 'CtvRunApp').replace(/\s+/g, '');
+                DEFAULT_APP_ID;
+            const safeAppName = ((xmlInfo === null || xmlInfo === void 0 ? void 0 : xmlInfo.appName) || DEFAULT_APP_NAME).replace(/\s+/g, '');
             // static mode는 dist의 config.xml 유지, live mode는 개발서버 URL로 새로 생성
-            yield ensureTizenFiles(appId, tempAppDir, safeAppName, !isLiveMode, isLiveMode ? appUrl : '');
+            const configXmlPath = getArg('configXmlPath') || ((_h = config.tizen) === null || _h === void 0 ? void 0 : _h.configXmlPath);
+            yield ensureTizenFiles(appId, tempAppDir, safeAppName, !isLiveMode, isLiveMode ? appUrl : '', configXmlPath);
             // Tizen 인증서 프로필 확인/생성/활성화
             console.log('\n🎫 Tizen 인증서 프로필 확인 중...');
             const profilesXmlPath = path_1.default.join(process.env.HOME || '', 'tizen-studio-data/profile/profiles.xml');
@@ -122,7 +127,7 @@ function runTizen() {
                     existingProfiles.forEach((p, i) => {
                         console.log(`  ${i + 1}. ${p}`);
                     });
-                    const answer = askQuestion('🔑 사용할 프로필 번호를 입력하세요 (새로운 ctv-run-cert 생성): ');
+                    const answer = askQuestion(`🔑 사용할 프로필 번호를 입력하세요 (새로운 앱 전용 인증서 ${DEFAULT_CERT_FILE} 생성): `);
                     const idx = parseInt(answer, 10) - 1;
                     if (!isNaN(idx) && idx >= 0 && idx < existingProfiles.length) {
                         const chosen = existingProfiles[idx];
@@ -132,8 +137,8 @@ function runTizen() {
                 }
                 if (!activeProfile) {
                     console.log('⚠️ 활성화된 프로필이 없습니다. 앱 전용 인증서를 세팅합니다.');
-                    const certFileName = 'ctv-run-cert';
-                    const profileName = 'ctv-run-profile';
+                    const certFileName = DEFAULT_CERT_FILE;
+                    const profileName = DEFAULT_CERT_PROFILE;
                     const homeDir = process.env.HOME || '';
                     const defaultCertDir = path_1.default.join(homeDir, 'tizen-studio-data/keystore/author');
                     const p12Path = path_1.default.join(defaultCertDir, `${certFileName}.p12`);
@@ -204,7 +209,8 @@ function runTizen() {
             console.error(`\n❌ 오류 발생: ${err.message}`);
         }
         finally {
-            // if (fs.existsSync(tempAppDir)) fs.removeSync(tempAppDir);
+            if (fs_extra_1.default.existsSync(tempAppDir))
+                fs_extra_1.default.removeSync(tempAppDir);
         }
     });
 }
@@ -231,21 +237,28 @@ function getInfoFromXml(dir) {
     return null;
 }
 function ensureTizenFiles(appId_1, tempDir_1, appName_1) {
-    return __awaiter(this, arguments, void 0, function* (appId, tempDir, appName, keepExistingConfig = false, liveUrl = '') {
-        const configXmlPath = path_1.default.join(tempDir, 'config.xml');
-        if (keepExistingConfig && fs_extra_1.default.existsSync(configXmlPath)) {
+    return __awaiter(this, arguments, void 0, function* (appId, tempDir, appName, keepExistingConfig = false, liveUrl = '', specifiedPath) {
+        const destConfigXml = path_1.default.join(tempDir, 'config.xml');
+        if (keepExistingConfig && fs_extra_1.default.existsSync(destConfigXml)) {
             // static mode: dist의 config.xml을 그대로 유지
             (0, platform_1.resolveIcon)(tempDir);
             return;
         }
-        // live mode: 기존 config.xml 삭제 후 새로 생성
-        if (fs_extra_1.default.existsSync(configXmlPath)) {
-            fs_extra_1.default.removeSync(configXmlPath);
-        }
-        console.log(`📝 config.xml 생성 중... (Name: ${appName}, ID: ${appId})`);
-        // appId 추출
-        const packageId = appId.split('.')[0] || 'TizenApp';
-        const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>
+        // config.xml 없으면 지정경로 → 루트 → 기본값 (우선순위: dist > 지정경로 > 루트 > 기본값)
+        if (!fs_extra_1.default.existsSync(destConfigXml)) {
+            const candidates = [
+                specifiedPath && path_1.default.resolve(process.cwd(), specifiedPath),
+                path_1.default.join(process.cwd(), 'config.xml'),
+            ].filter(Boolean);
+            const found = candidates.find((p) => fs_extra_1.default.existsSync(p));
+            if (found) {
+                fs_extra_1.default.copyFileSync(found, destConfigXml);
+                console.log(`📝 config.xml 복사: ${found}`);
+            }
+            else {
+                console.log(`📝 config.xml 생성 중... (Name: ${appName}, ID: ${appId})`);
+                const packageId = appId.split('.')[0] || 'TizenApp';
+                const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns:tizen="http://tizen.org/ns/widgets" xmlns="http://www.w3.org/ns/widgets" id="http://yourdomain/tizen/${appName}" version="1.0.0" viewmodes="maximized">
     <tizen:application id="${appId}" package="${packageId}" required_version="2.1"/>
     <content src="index.html"/>
@@ -259,7 +272,9 @@ function ensureTizenFiles(appId_1, tempDir_1, appName_1) {
     <tizen:privilege name="http://tizen.org/privilege/tv.inputdevice" />
     <tizen:setting screen-orientation="landscape" context-menu="enable" background-support="disable" encryption="disable" install-location="auto" hwkey-event="enable"/>
 </widget>`;
-        fs_extra_1.default.writeFileSync(configXmlPath, xmlContent, 'utf8');
+                fs_extra_1.default.writeFileSync(destConfigXml, xmlContent, 'utf8');
+            }
+        }
         if (liveUrl) {
             const redirectHtml = `<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><title>Loading...</title><meta http-equiv="refresh" content="0; url=${liveUrl}"></head><body style="background:#000;"></body></html>`;
             fs_extra_1.default.writeFileSync(path_1.default.join(tempDir, 'index.html'), redirectHtml);

package/dist/platforms/webos.js

@@ -19,20 +19,23 @@ const path_1 = __importDefault(require("path"));
 const config_1 = require("../utils/config");
 const ip_1 = require("../utils/ip");
 const platform_1 = require("../utils/platform");
+const DEFAULT_APP_ID = 'com.ctvrun.app';
 function runWebOS() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const config = (0, config_1.loadConfig)();
         const args = process.argv.slice(2);
         const getArg = (0, platform_1.makeArgParser)(args);
         // 기본 설정값 로드
         const deviceName = getArg('device') || ((_a = config.webos) === null || _a === void 0 ? void 0 : _a.deviceName);
-        const appId = getArg('appId') || ((_b = config.webos) === null || _b === void 0 ? void 0 : _b.appId) || 'com.ctvrun.app';
+        const appId = getArg('appId') || ((_b = config.webos) === null || _b === void 0 ? void 0 : _b.appId) || DEFAULT_APP_ID;
+        const appInfoPath = getArg('appInfoPath') || ((_c = config.webos) === null || _c === void 0 ? void 0 : _c.appInfoPath);
         const targetArg = getArg('target');
-        const port = getArg('port') || ((_c = config.webos) === null || _c === void 0 ? void 0 : _c.port) || ((_d = config.common) === null || _d === void 0 ? void 0 : _d.devServerPort) || 3000;
-        const appUrl = getArg('url') ||
-            ((_e = config.webos) === null || _e === void 0 ? void 0 : _e.url) ||
-            `http://${(0, ip_1.getLocalIp)()}:${port}`;
+        const port = getArg('port') ||
+            ((_d = config.webos) === null || _d === void 0 ? void 0 : _d.port) ||
+            ((_e = config.common) === null || _e === void 0 ? void 0 : _e.devServerPort) ||
+            3000;
+        const appUrl = getArg('url') || ((_f = config.webos) === null || _f === void 0 ? void 0 : _f.url) || `http://${(0, ip_1.getLocalIp)()}:${port}`;
         // 등록된 기기가 없는 경우
         if (!deviceName) {
             console.log('\n📺 연결된 WebOS TV 정보가 없습니다.');
@@ -70,8 +73,6 @@ function runWebOS() {
             if (fs_extra_1.default.existsSync(tempAppDir))
                 fs_extra_1.default.removeSync(tempAppDir);
             fs_extra_1.default.ensureDirSync(tempAppDir);
-            // appinfo.json 생성
-            yield ensureWebosAppInfo(appId, tempAppDir);
             // 콘텐츠 모드 설정
             if (targetArg) {
                 const distPath = path_1.default.resolve(process.cwd(), targetArg);
@@ -99,14 +100,21 @@ function runWebOS() {
 			`;
                 fs_extra_1.default.writeFileSync(path_1.default.join(tempAppDir, 'index.html'), redirectHtml);
             }
+            // appinfo.json 생성 (우선순위: dist > 지정경로 > 루트 > 기본값)
+            yield ensureWebosAppInfo(appId, tempAppDir, appInfoPath);
+            // 실제 appId를 appinfo.json에서 읽음 (dist에 있던 값 우선)
+            const resolvedAppInfoPath = path_1.default.join(tempAppDir, 'appinfo.json');
+            const resolvedAppId = fs_extra_1.default.existsSync(resolvedAppInfoPath)
+                ? fs_extra_1.default.readJsonSync(resolvedAppInfoPath).id || appId
+                : appId;
             // 아이콘
             (0, platform_1.resolveIcon)(tempAppDir);
             // 패키징
-            console.log(`🔨 Packaging [${appId}]...`);
+            console.log(`🔨 Packaging [${resolvedAppId}]...`);
             (0, child_process_1.execSync)(`ares-package ${tempAppDir} -o .`, { stdio: 'inherit' });
             const ipkFile = fs_extra_1.default
                 .readdirSync(process.cwd())
-                .find((f) => f.startsWith(appId) && f.endsWith('.ipk'));
+                .find((f) => f.startsWith(resolvedAppId) && f.endsWith('.ipk'));
             if (ipkFile) {
                 // 설치
                 console.log(`🚀 Installing to ${deviceName}...`);
@@ -115,7 +123,9 @@ function runWebOS() {
                 });
                 // 런치
                 console.log(`▶️  Launching App...`);
-                (0, child_process_1.execSync)(`ares-launch -d ${deviceName} ${appId}`, { stdio: 'inherit' });
+                (0, child_process_1.execSync)(`ares-launch -d ${deviceName} ${resolvedAppId}`, {
+                    stdio: 'inherit',
+                });
                 // 파일 정리
                 fs_extra_1.default.removeSync(path_1.default.resolve(process.cwd(), ipkFile));
                 fs_extra_1.default.removeSync(tempAppDir);
@@ -127,26 +137,31 @@ function runWebOS() {
         }
     });
 }
-// appinfo.json이 없으면 자동 생성
-function ensureWebosAppInfo(appId, tempDir) {
+// appinfo.json이 없으면 자동 생성 (우선순위: dist > 지정경로 > 루트 > 기본값)
+function ensureWebosAppInfo(appId, tempDir, specifiedPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appInfoPath = path_1.default.join(tempDir, 'appinfo.json');
-        const rootAppInfo = path_1.default.resolve(process.cwd(), 'appinfo.json');
-        if (fs_extra_1.default.existsSync(rootAppInfo)) {
-            fs_extra_1.default.copySync(rootAppInfo, appInfoPath);
-        }
-        else {
-            const defaultAppInfo = {
-                id: appId,
-                version: '1.0.0',
-                vendor: 'CtvRun',
-                type: 'web',
-                main: 'index.html',
-                title: 'CTV-Run-App',
-                icon: 'icon.png',
-                uiRevision: 2,
-            };
-            fs_extra_1.default.writeJsonSync(appInfoPath, defaultAppInfo, { spaces: 2 });
+        const destPath = path_1.default.join(tempDir, 'appinfo.json');
+        if (fs_extra_1.default.existsSync(destPath))
+            return;
+        const candidates = [
+            specifiedPath && path_1.default.resolve(process.cwd(), specifiedPath),
+            path_1.default.resolve(process.cwd(), 'appinfo.json'),
+        ].filter(Boolean);
+        for (const candidate of candidates) {
+            if (fs_extra_1.default.existsSync(candidate)) {
+                fs_extra_1.default.copySync(candidate, destPath);
+                return;
+            }
         }
+        fs_extra_1.default.writeJsonSync(destPath, {
+            id: appId,
+            version: '1.0.0',
+            vendor: 'CtvRun',
+            type: 'web',
+            main: 'index.html',
+            title: 'CTV-Run-App',
+            icon: 'icon.png',
+            uiRevision: 2,
+        }, { spaces: 2 });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zsukim/ctv-run",
-	"version": "1.0.11",
+	"version": "1.0.13",
 	"description": "Smart TV deployment CLI for Vizio, LG webOS, Fire TV, and Samsung Tizen",
 	"keywords": [
 		"ctv",