openilink-app-runner 0.2.1 → 0.3.0

package/dist/src/daemon.d.ts

@@ -1,2 +1,2 @@
-export declare function install(configPath: string): void;
+export declare function install(configPath?: string): void;
 export declare function uninstall(): void;

package/dist/src/daemon.js

@@ -39,43 +39,27 @@ const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
+const config_1 = require("./config");
 const SERVICE_NAME = "openilink-app-runner";
 function getBinPath() {
     try {
         return (0, child_process_1.execSync)("which openilink-app-runner", { encoding: "utf-8" }).trim();
     }
     catch {
-        // Fallback: resolve from node_modules
         return path.resolve(__dirname, "../bin/runner.js");
     }
 }
-function getNodePath() {
-    return process.execPath;
-}
-// ========== Linux (systemd) ==========
-function getRealUser() {
-    const sudoUser = process.env.SUDO_USER;
-    if (sudoUser) {
-        try {
-            const home = (0, child_process_1.execSync)(`eval echo ~${sudoUser}`, { encoding: "utf-8", shell: "/bin/sh" }).trim();
-            return { name: sudoUser, home };
-        }
-        catch { }
-    }
-    return { name: os.userInfo().username, home: os.homedir() };
-}
+// ========== Linux (systemd --user) ==========
 function systemdUnit(configPath) {
     const absConfig = path.resolve(configPath);
     const binPath = getBinPath();
     const workDir = path.dirname(absConfig);
-    const user = getRealUser();
     return `[Unit]
 Description=OpeniLink App Runner
 After=network.target
 
 [Service]
 Type=simple
-User=${user.name}
 ExecStart=${binPath} start --config ${absConfig}
 WorkingDirectory=${workDir}
 Restart=always
@@ -83,37 +67,43 @@ RestartSec=5
 Environment=NODE_ENV=production
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
 `;
 }
 function installSystemd(configPath) {
-    const unitPath = `/etc/systemd/system/${SERVICE_NAME}.service`;
-    const unit = systemdUnit(configPath);
-    fs.writeFileSync(unitPath, unit);
-    (0, child_process_1.execSync)("systemctl daemon-reload");
-    (0, child_process_1.execSync)(`systemctl enable ${SERVICE_NAME}`);
-    (0, child_process_1.execSync)(`systemctl start ${SERVICE_NAME}`);
-    console.log(`✓ 已安装 systemd 服务`);
+    const userDir = path.join(os.homedir(), ".config/systemd/user");
+    fs.mkdirSync(userDir, { recursive: true });
+    const unitPath = path.join(userDir, `${SERVICE_NAME}.service`);
+    fs.writeFileSync(unitPath, systemdUnit(configPath));
+    (0, child_process_1.execSync)(`systemctl --user daemon-reload`);
+    (0, child_process_1.execSync)(`systemctl --user enable ${SERVICE_NAME}`);
+    (0, child_process_1.execSync)(`systemctl --user start ${SERVICE_NAME}`);
+    // Enable lingering so user services run without login
+    try {
+        (0, child_process_1.execSync)(`loginctl enable-linger ${os.userInfo().username}`, { stdio: "ignore" });
+    }
+    catch { }
+    console.log(`✓ 已安装 systemd 用户服务（无需 sudo）`);
     console.log(`  服务文件: ${unitPath}`);
     console.log(`  配置文件: ${path.resolve(configPath)}`);
-    console.log(`  查看状态: systemctl status ${SERVICE_NAME}`);
-    console.log(`  查看日志: journalctl -u ${SERVICE_NAME} -f`);
+    console.log(`  查看状态: systemctl --user status ${SERVICE_NAME}`);
+    console.log(`  查看日志: journalctl --user -u ${SERVICE_NAME} -f`);
 }
 function uninstallSystemd() {
     try {
-        (0, child_process_1.execSync)(`systemctl stop ${SERVICE_NAME}`, { stdio: "ignore" });
+        (0, child_process_1.execSync)(`systemctl --user stop ${SERVICE_NAME}`, { stdio: "ignore" });
     }
     catch { }
     try {
-        (0, child_process_1.execSync)(`systemctl disable ${SERVICE_NAME}`, { stdio: "ignore" });
+        (0, child_process_1.execSync)(`systemctl --user disable ${SERVICE_NAME}`, { stdio: "ignore" });
     }
     catch { }
-    const unitPath = `/etc/systemd/system/${SERVICE_NAME}.service`;
+    const unitPath = path.join(os.homedir(), `.config/systemd/user/${SERVICE_NAME}.service`);
     if (fs.existsSync(unitPath)) {
         fs.unlinkSync(unitPath);
-        (0, child_process_1.execSync)("systemctl daemon-reload");
+        (0, child_process_1.execSync)(`systemctl --user daemon-reload`);
     }
-    console.log(`✓ 已卸载 systemd 服务`);
+    console.log(`✓ 已卸载 systemd 用户服务`);
 }
 // ========== macOS (launchd) ==========
 function launchdPlist(configPath) {
@@ -146,55 +136,46 @@ function launchdPlist(configPath) {
 `;
 }
 function installLaunchd(configPath) {
-    const plistPath = path.join(os.homedir(), `Library/LaunchAgents/com.openilink.app-runner.plist`);
-    const plist = launchdPlist(configPath);
+    const plistPath = path.join(os.homedir(), "Library/LaunchAgents/com.openilink.app-runner.plist");
     fs.mkdirSync(path.dirname(plistPath), { recursive: true });
-    fs.writeFileSync(plistPath, plist);
+    fs.writeFileSync(plistPath, launchdPlist(configPath));
     try {
         (0, child_process_1.execSync)(`launchctl unload ${plistPath}`, { stdio: "ignore" });
     }
     catch { }
     (0, child_process_1.execSync)(`launchctl load ${plistPath}`);
-    console.log(`✓ 已安装 launchd 服务`);
+    console.log(`✓ 已安装 launchd 服务（无需 sudo）`);
     console.log(`  配置文件: ${plistPath}`);
     console.log(`  日志: ~/Library/Logs/openilink-app-runner.log`);
 }
 function uninstallLaunchd() {
-    const plistPath = path.join(os.homedir(), `Library/LaunchAgents/com.openilink.app-runner.plist`);
+    const plistPath = path.join(os.homedir(), "Library/LaunchAgents/com.openilink.app-runner.plist");
     try {
         (0, child_process_1.execSync)(`launchctl unload ${plistPath}`, { stdio: "ignore" });
     }
     catch { }
-    if (fs.existsSync(plistPath)) {
+    if (fs.existsSync(plistPath))
         fs.unlinkSync(plistPath);
-    }
     console.log(`✓ 已卸载 launchd 服务`);
 }
 // ========== Public API ==========
 function install(configPath) {
-    let absConfig = path.resolve(configPath);
-    // If running under sudo and config not found, try the real user's config path
-    if (!fs.existsSync(absConfig) && process.env.SUDO_USER) {
-        const user = getRealUser();
-        const userConfig = path.join(user.home, ".config/openilink-app-runner/runner.yaml");
-        if (fs.existsSync(userConfig)) {
-            absConfig = userConfig;
-        }
-    }
+    const resolved = configPath || (0, config_1.getConfigPath)();
+    const absConfig = path.resolve(resolved);
     if (!fs.existsSync(absConfig)) {
         console.error(`配置文件不存在: ${absConfig}`);
         console.error(`请先运行: openilink-app-runner init --hub-url <url> --token <token>`);
         process.exit(1);
     }
     if (os.platform() === "darwin") {
-        installLaunchd(configPath);
+        installLaunchd(absConfig);
     }
     else if (os.platform() === "linux") {
-        installSystemd(configPath);
+        installSystemd(absConfig);
     }
     else {
         console.error(`不支持的平台: ${os.platform()}`);
-        console.error(`请手动运行: openilink-app-runner start --config ${absConfig}`);
+        console.error(`请手动运行: openilink-app-runner start`);
         process.exit(1);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openilink-app-runner",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Run local commands as OpeniLink Hub App tools — bridge CLI to WeChat",
   "bin": {
     "openilink-app-runner": "dist/bin/runner.js"