@spfn/cli 0.0.2 → 0.0.3

package/lib/login.js

@@ -3,93 +3,154 @@ import open from "open";
 import fs from "fs";
 import os from "os";
 import path from "path";
+import { execSync } from "child_process";
 
 const PORT = 5678;
 
-/**
- * templates 폴더에서 templateName 파일을 읽고,
- * {{KEY}} 플레이스홀더를 vars[KEY]로 치환하여 outputPath에 씁니다.
- */
-function applyTemplate(
-    templateName,
-    outputPath,
-    vars
-) {
-    const src = path.join(process.cwd(), "templates", templateName);
-    if (!fs.existsSync(src)) {
-        throw new Error(`Template not found: ${src}`);
+function mergeNetrc(
+    username,
+    token
+)
+{
+    const name = process.platform === "win32" ? "_netrc" : ".netrc";
+    const file = path.join(os.homedir(), name);
+    let lines = [];
+
+    if (fs.existsSync(file))
+    {
+        lines = fs.readFileSync(file, "utf-8").split(/\r?\n/);
+        const filtered = [];
+        let skip = false;
+        for (const l of lines)
+        {
+            if (l.trim().startsWith("machine git.superfunctions.ai"))
+            {
+                skip = true;
+            }
+            if (!skip)
+            {
+                filtered.push(l);
+            }
+            if (skip && l.trim() === "")
+            {
+                skip = false;
+            }
+        }
+        lines = filtered;
     }
-    const template = fs.readFileSync(src, "utf-8");
-    const result = template.replace(/\{\{(\w+)\}\}/g, (_, key) =>
-        vars[key] ?? ""
+
+    lines.push(
+        "",
+        "machine git.superfunctions.ai",
+        `  login ${username}`,
+        `  password ${token}`,
+        ""
     );
 
-    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
-    fs.writeFileSync(outputPath, result, "utf-8");
-    console.log(`✔️ Applied template ${templateName} → ${outputPath}`);
+    fs.writeFileSync(file, lines.join("\n"), "utf-8");
+    if (process.platform !== "win32")
+    {
+        fs.chmodSync(file, 0o600);
+    }
+    console.log(`✔️ Merged netrc: ${file}`);
 }
 
-export function login() {
-    try {
-        const server = http.createServer((req, res) => {
-            // CORS headers
+function mergeGradleInit()
+{
+    const dir = path.join(os.homedir(), ".gradle");
+    const file = path.join(dir, "init.gradle");
+    const startMarker = "// sf-cli start";
+    const endMarker = "// sf-cli end";
+
+    let content = "";
+    if (fs.existsSync(file))
+    {
+        content = fs.readFileSync(file, "utf-8");
+        const regex = new RegExp(
+            `${startMarker}[\\s\\S]*?${endMarker}\n?`,
+            "m"
+        );
+        content = content.replace(regex, "");
+    }
+
+    const block = [
+        startMarker,
+        "allprojects {",
+        "    repositories {",
+        "        maven {",
+        "            name = 'Gitea'",
+        "            url  = uri('https://git.superfunctions.ai/api/packages/sf/maven')",
+        "            credentials {",
+        "                username = System.getenv('SF_USERNAME')",
+        "                password = System.getenv('SF_AUTH_TOKEN')'",
+        "            }",
+        "        }",
+        "        mavenCentral()",
+        "    }",
+        "}",
+        endMarker,
+        ""
+    ].join("\n");
+
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(file, content + "\n" + block, "utf-8");
+    console.log(`✔️ Merged Gradle init script: ${file}`);
+}
+
+export function login()
+{
+    try
+    {
+        const server = http.createServer((req, res) =>
+        {
             res.setHeader("Access-Control-Allow-Origin", "*");
             res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
             res.setHeader("Access-Control-Allow-Headers", "Content-Type");
 
-            if (req.method === "OPTIONS") {
+            if (req.method === "OPTIONS")
+            {
                 res.writeHead(200);
                 res.end();
                 return;
             }
 
-            if (req.url === "/callback" && req.method === "POST") {
+            if (req.url === "/callback" && req.method === "POST")
+            {
                 let body = "";
                 req.on("data", (chunk) => (body += chunk));
-                req.on("end", () => {
-                    try {
+                req.on("end", () =>
+                {
+                    try
+                    {
                         const { username, token, projectSlug } = JSON.parse(body);
-                        if (!username || !token) {
+                        if (!username || !token)
+                        {
                             res.writeHead(400).end("Missing username or token");
                             return;
                         }
 
-                        // 1) 템플릿 적용
-                        // 1-1) Gradle init
-                        const gradleDest = path.join(
-                            os.homedir(),
-                            ".gradle",
-                            "init.gradle"
-                        );
-                        applyTemplate("gradle.tmpl", gradleDest, {
-                            SF_USERNAME: username,
-                            SF_AUTH_TOKEN: token,
-                        });
-
-                        // 1-2) npmrc
-                        const npmDest = path.join(os.homedir(), ".npmrc");
-                        applyTemplate("npm.tmpl", npmDest, {
-                            SF_AUTH_TOKEN: token,
-                        });
-                        if (process.platform !== "win32") {
-                            try {
-                                fs.chmodSync(npmDest, 0o600);
-                            } catch {}
+                        mergeGradleInit();
+                        try
+                        {
+                            execSync(
+                                `npm config set @sf:registry https://git.superfunctions.ai/api/packages/sf/npm/`,
+                                { stdio: "inherit", env: process.env }
+                            );
+                            execSync(
+                                `npm config set //git.superfunctions.ai/api/packages/sf/npm/:_authToken "${token}"`,
+                                { stdio: "inherit", env: process.env }
+                            );
+                            console.log(
+                                "✔️ npm registry and authToken set via npm config"
+                            );
                         }
-
-                        // 1-3) netrc (_netrc on Windows)
-                        const netrcName =
-                            process.platform === "win32" ? "_netrc" : ".netrc";
-                        const netrcDest = path.join(os.homedir(), netrcName);
-                        applyTemplate("netrc.tmpl", netrcDest, {
-                            SF_USERNAME: username,
-                            SF_AUTH_TOKEN: token,
-                        });
-                        if (process.platform !== "win32") {
-                            fs.chmodSync(netrcDest, 0o600);
+                        catch (e)
+                        {
+                            console.error("❌ npm config set failed:", e);
                         }
 
-                        // 3) 응답 & 팁
+                        mergeNetrc(username, token);
+
                         res.writeHead(200, { "Content-Type": "text/plain" });
                         res.end("✅ Login successful! You can now close this window.");
 
@@ -104,22 +165,29 @@ export function login() {
                         console.log();
 
                         server.close();
-                    } catch (err) {
+                    }
+                    catch (err)
+                    {
                         console.error(err);
                         res.writeHead(500).end("Error during login callback");
                         server.close();
                     }
                 });
-            } else {
+            }
+            else
+            {
                 res.writeHead(404).end("Not Found");
             }
         });
 
-        server.listen(PORT, () => {
+        server.listen(PORT, () =>
+        {
             console.log("🌐 Opening browser for login...");
             open(`https://console.superfunctions.ai/cli-login?port=${PORT}`);
         });
-    } catch (err) {
+    }
+    catch (err)
+    {
         console.error(err);
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@spfn/cli",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "Superfunction CLI",
     "keywords": [
         "cli",