herdr-remote 0.2.23 → 0.2.24

package/dist/i18n/en.js

@@ -134,8 +134,8 @@ const en = {
     'keepalive.serviceNote': 'Runs as a Windows service under your account and starts at boot, before anyone signs in. Installing or removing it asks for administrator rights.',
     'keepalive.serviceWindowHint': 'Finish the installation in the administrator window that opens.',
     'keepalive.elevationCancelled': 'Administrator rights were not granted; nothing was installed.',
-    'keepalive.passwordPrompt': 'Windows password for {account} (the service signs in as you):',
-    'keepalive.passwordRejected': 'Windows did not accept that password. Try again.',
+    'keepalive.passwordPrompt': 'Windows account password for {account} (not a PIN; press Enter if there is no password):',
+    'keepalive.passwordRejected': 'Windows could not start the service with those credentials. Check the account password and service logon policy.',
     'keepalive.serviceInstalled': 'Service {id} is installed and running.',
     'keepalive.wrongAccount': 'Run this as the account that will use herdr-remote, not another administrator account.',
     'keepalive.pressEnter': 'Press Enter to close this window.',

package/dist/i18n/zh.js

@@ -133,8 +133,8 @@ const zh = {
     'keepalive.serviceNote': '以你的账户作为 Windows 服务运行，开机后、登录前自动启动。安装或移除需要管理员权限。',
     'keepalive.serviceWindowHint': '请在随后打开的管理员窗口中完成安装。',
     'keepalive.elevationCancelled': '未授予管理员权限，未安装服务。',
-    'keepalive.passwordPrompt': '请输入 {account} 的 Windows 密码（服务将以你的账户登录）：',
-    'keepalive.passwordRejected': 'Windows 不接受这个密码，请重试。',
+    'keepalive.passwordPrompt': '请输入 {account} 的 Windows 账户密码（不是 PIN；账户无密码时直接按 Enter）：',
+    'keepalive.passwordRejected': 'Windows 未能使用这些凭据启动服务。请检查账户密码和“作为服务登录”策略。',
     'keepalive.serviceInstalled': '服务 {id} 已安装并正在运行。',
     'keepalive.wrongAccount': '请使用将运行 herdr-remote 的账户执行此操作，不要换用其他管理员账户。',
     'keepalive.pressEnter': '按 Enter 关闭此窗口。',

package/dist/keepalive/windows-service-setup.js

@@ -59,6 +59,30 @@ function failure(label, result) {
     const output = String(result.stdout || result.stderr || '').trim();
     return new Error(`${label} failed (${String(result.status)}): ${output}`);
 }
+export async function configureAndStartServiceAccount(id, account, t, dependencies = {}) {
+    const setAccount = dependencies.setAccount || setServiceAccount;
+    const start = dependencies.start || startService;
+    const prompt = dependencies.prompt ||
+        ((name) => promptSecret(t('keepalive.passwordPrompt', { account: name })));
+    const write = dependencies.write || ((message) => process.stdout.write(message));
+    for (let attempt = 0; attempt <= MAX_PASSWORD_ATTEMPTS; attempt += 1) {
+        const password = attempt === 0 ? '' : await prompt(account);
+        if (password === null)
+            return false;
+        const changed = setAccount(id, account, password);
+        if (changed.error || changed.status !== 0)
+            throw failure('Setting the Windows service account', changed);
+        const started = classifyStartResult(start());
+        if (started === 'ok')
+            return true;
+        if (started !== 'logon-failed') {
+            write(`${started.message}\n`);
+            return false;
+        }
+        write(`${t('keepalive.passwordRejected')}\n`);
+    }
+    return false;
+}
 /** Complete service installation inside the elevated console. */
 export async function completeServiceInstall(t) {
     try {
@@ -87,24 +111,9 @@ export async function completeServiceInstall(t) {
             throw failure('WinSW install', installed);
         const { domain, user } = currentServiceAccount();
         const account = `${domain}\\${user}`;
-        for (let attempt = 0; attempt < MAX_PASSWORD_ATTEMPTS; attempt += 1) {
-            const password = await promptSecret(t('keepalive.passwordPrompt', { account }));
-            if (password === null)
-                return 1;
-            const changed = setServiceAccount(paths.id, account, password);
-            if (changed.error || changed.status !== 0)
-                throw failure('Setting the Windows service account', changed);
-            const started = classifyStartResult(startService());
-            if (started === 'ok') {
-                process.stdout.write(`${t('keepalive.serviceInstalled', { id: paths.id })}\n`);
-                return 0;
-            }
-            if (started === 'logon-failed') {
-                process.stdout.write(`${t('keepalive.passwordRejected')}\n`);
-                continue;
-            }
-            process.stdout.write(`${started.message}\n`);
-            return 1;
+        if (await configureAndStartServiceAccount(paths.id, account, t)) {
+            process.stdout.write(`${t('keepalive.serviceInstalled', { id: paths.id })}\n`);
+            return 0;
         }
         return 1;
     }

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "herdr.remote.web"
 name = "Herdr Remote Web"
-version = "0.2.23"
+version = "0.2.24"
 min_herdr_version = "0.9.1"
 description = "Browser access to Herdr workspaces via local or self-hosted relay"
 platforms = ["linux", "macos", "windows"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-remote",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Browser access to Herdr workspaces: plugin, host connector, and configuration TUI",
   "license": "MIT",
   "type": "module",