@spfn/cli 0.0.7 → 0.0.8

package/lib/index.js

@@ -13,7 +13,7 @@ program
     .command("login")
     .description("Authenticate via browser login")
     .action(() => {
-        login();
+        (async () => { await login(); })();
     });
 
 program.parse();

package/lib/login.js

@@ -1,11 +1,10 @@
 import http from "http";
 import open from "open";
-import fs from "fs";
-import os from "os";
-import path from "path";
 import { execSync } from "child_process";
 
-const PORT = 5678;
+const isDev = process.env.NODE_ENV === "development" || process.env.SF_ENV === "local";
+const GIT_HOST = isDev ? "gitea:13000" : "git.superfunctions.ai";
+const GIT_PROTOCOL = isDev ? "http" : "https";
 
 /**
  * Git credential helper를 이용해 특정 레포에 대한 인증 정보를 저장합니다.
@@ -16,10 +15,14 @@ const PORT = 5678;
 function installGitCredentials(
     username,
     token,
-    repoPath
+    {
+        protocol = "https",
+        host,
+        path // optional
+    }
 )
 {
-    // credential helper 설정
+    // credential helper 설정 (글로벌, 1회면 충분)
     if (process.platform === "win32")
     {
         execSync("git config --global credential.helper manager-core");
@@ -31,73 +34,30 @@ function installGitCredentials(
 
     // git credential approve 입력 생성
     const cred = [
-        "protocol=https",
-        "host=git.superfunctions.ai",
-        `path=${repoPath}`,
+        `protocol=${protocol}`,
+        `host=${host}`,
+        path ? `path=${path}` : null,
         `username=${username}`,
         `password=${token}`,
         ""
-    ].join("\n");
+    ].filter(Boolean).join("\n");
 
     execSync("git credential approve", {
         input: cred,
         stdio: ["pipe", "ignore", "inherit"]
     });
 
-    console.log(`✔️ Stored credentials for git.superfunctions.ai/${repoPath}`);
-}
-
-/**
- * 시스템 전역에 SF_USERNAME, SF_ACCESS_TOKEN 환경변수를 등록합니다.
- * - Windows: setx 명령 사용
- * - macOS/Linux: 쉘 RC 파일(~/.zshrc or ~/.bash_profile)에 export 라인 추가
- */
-function persistEnvVars(username, token) {
-    try {
-        if (process.platform === "win32") {
-            // Windows 환경변수 등록(기존 값이 있으면 덮어쓰기)
-            execSync(`setx SF_USERNAME "${username}"`);
-            execSync(`setx SF_ACCESS_TOKEN "${token}"`);
-            console.log("✔️ Windows 환경변수에 SF_USERNAME, SF_ACCESS_TOKEN 등록/갱신 완료");
-        } else {
-            // macOS/Linux: 사용자 쉘 RC 파일 선택
-            const shell = process.env.SHELL || "";
-            const rcFile = shell.includes("zsh") ? ".zshrc" : ".bash_profile";
-            const rcPath = path.join(os.homedir(), rcFile);
-
-            // RC 파일 내용을 읽어서 기존 export 라인 제거
-            const existing = fs.existsSync(rcPath)
-                ? fs.readFileSync(rcPath, "utf8").split(/\r?\n/)
-                : [];
-
-            const filtered = existing.filter(
-                (line) =>
-                    !/^export\s+SF_USERNAME=/.test(line) &&
-                    !/^export\s+SF_ACCESS_TOKEN=/.test(line) &&
-                    !/^# Superfunctions CLI 로그인/.test(line)
-            );
-
-            // 새 export 라인 추가
-            const exportBlock = [
-                "",
-                "# Superfunctions CLI 로그인",
-                `export SF_USERNAME="${username}"`,
-                `export SF_ACCESS_TOKEN="${token}"`,
-                ""
-            ];
-
-            const updated = filtered.concat(exportBlock);
-            fs.writeFileSync(rcPath, updated.join(os.EOL), { encoding: "utf8" });
-
-            console.log(`✔️ ${rcFile}에 SF_USERNAME, SF_ACCESS_TOKEN export 추가/갱신 완료`);
-            console.log(`   적용하려면: source ~/${rcFile} 또는 터미널 재시작`);
-        }
-    } catch (e) {
-        console.error("❌ 전역 환경변수 등록/갱신 실패:", e);
+    if (path)
+    {
+        console.log(`✔️ Stored credentials for ${protocol}://${host}/${path}`);
+    }
+    else
+    {
+        console.log(`✔️ Stored credentials for ${protocol}://${host}`);
     }
 }
 
-export function login()
+export async function login()
 {
     try
     {
@@ -122,24 +82,22 @@ export function login()
                 {
                     try
                     {
-                        const { username, token, projectSlug } = JSON.parse(body);
+                        const { username, token } = JSON.parse(body);
                         if (!username || !token)
                         {
                             res.writeHead(400).end("Missing username or token");
                             return;
                         }
 
-                        persistEnvVars(username, token);
-
                         // npm registry 설정 (생략)
                         try
                         {
                             execSync(
-                                `npm config set @sf:registry https://git.superfunctions.ai/api/packages/sf/npm/`,
+                                `npm config set @sf:registry ${GIT_PROTOCOL}://${GIT_HOST}/api/packages/spfn/npm/`,
                                 { stdio: "inherit", env: process.env }
                             );
                             execSync(
-                                `npm config set //git.superfunctions.ai/api/packages/sf/npm/:_authToken \"${token}\"`,
+                                `npm config set //${GIT_HOST}/api/packages/spfn/npm/:_authToken \"${token}\"`,
                                 { stdio: "inherit", env: process.env }
                             );
                             console.log("✔️ npm registry and authToken set via npm config");
@@ -150,22 +108,14 @@ export function login()
                         }
 
                         // 2개 레포에 대해 각각 자격증명 저장
-                        installGitCredentials(username, token, `${projectSlug}/${projectSlug}-server`);
-                        installGitCredentials(username, token, `${projectSlug}/${projectSlug}-app`);
+                        installGitCredentials(username, token, {
+                            protocol: GIT_PROTOCOL,
+                            host: GIT_HOST
+                        });
 
                         res.writeHead(200, { "Content-Type": "text/plain" });
                         res.end("✅ Login successful! You can now close this window.");
 
-                        console.log();
-                        console.log("💡 Tips:");
-                        console.log(
-                            `  git clone https://git.superfunctions.ai/${projectSlug}/${projectSlug}-server`
-                        );
-                        console.log(
-                            `  git clone https://git.superfunctions.ai/${projectSlug}/${projectSlug}-app`
-                        );
-                        console.log();
-
                         server.close();
                     }
                     catch (err)
@@ -182,14 +132,36 @@ export function login()
             }
         });
 
-        server.listen(PORT, () =>
+        const port = await getAvailablePort();
+
+        // 로그인 UI 주소도 분기
+        const isDev = process.env.NODE_ENV === "development" || process.env.SF_ENV === "local";
+        const LOGIN_UI_URL = isDev
+            ? `http://localhost:3000/cli-login?port=${port}`
+            : `https://console.superfunctions.ai/cli-login?port=${port}`;
+
+        server.listen(port, () =>
         {
             console.log("🌐 Opening browser for login...");
-            open(`https://console.superfunctions.ai/cli-login?port=${PORT}`);
+            open(LOGIN_UI_URL);
         });
     }
     catch (err)
     {
         console.error(err);
     }
-}
+}
+
+function getAvailablePort(defaultPort = 5678) {
+    return new Promise((resolve) => {
+        const srv = http.createServer();
+        srv.listen(defaultPort, () => {
+            srv.close(() => resolve(defaultPort));
+        });
+        srv.on("error", () => {
+            // 사용 중이면 10000~20000 사이 랜덤 포트
+            const randomPort = Math.floor(Math.random() * 10000) + 10000;
+            resolve(randomPort);
+        });
+    });
+}

package/package.json

@@ -1,7 +1,12 @@
 {
     "name": "@spfn/cli",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "Superfunction CLI",
+    "scripts": {
+        "start": "node lib/index.js",
+        "start:dev": "NODE_ENV=development node lib/index.js",
+        "start:prod": "NODE_ENV=production node lib/index.js"
+    },
     "keywords": [
         "cli",
         "superfunction",
@@ -12,7 +17,7 @@
     "homepage": "https://console.superfunctions.ai",
     "repository": {
         "type": "git",
-        "url": "https://git.superfunctions.ai/sf/sf-cli.git"
+        "url": "https://git.superfunctions.ai/spfn/sf-cli.git"
     },
     "license": "MIT",
     "author": "Superfunction Ray <rayim@superfunctions.ai>",
@@ -27,9 +32,6 @@
     "files": [
         "lib/**/*"
     ],
-    "scripts": {
-        "start": "node lib/index.js"
-    },
     "dependencies": {
         "commander": "^13.1.0",
         "open": "^10.1.1"