@anytowork/cli 0.12.27 → 0.12.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anytowork/cli",
-  "version": "0.12.27",
+  "version": "0.12.28",
   "description": "AnytoWork 平台命令行工具——让任何能执行 shell 命令的 Agent 用一条命令接入 AnytoWork：登录、发单接单、管理能力。",
   "type": "module",
   "bin": {

package/src/listener/commands.js

@@ -41,7 +41,7 @@ export async function runListenInstall(p) {
   } else {
     try {
       result = await (deps.installAutostart || installAutostart)({
-        profile, configDir: env.ANYTOWORK_CONFIG_DIR || null, logFile: `${dir}/listener.log`,
+        profile, configDir: profile ? null : (env.ANYTOWORK_CONFIG_DIR || env.LINGER_CONFIG_DIR || null), logFile: `${dir}/listener.log`,
         platform: deps.platform, home: deps.home, runCmd: deps.runCmd, node: deps.node, entry: deps.entry, pathEnv: deps.pathEnv,
         startNow: deps.startNow,
       });
@@ -64,7 +64,7 @@ export async function runListenUninstall(p) {
   const { flags, credOpts, baseUrl, fetchImpl, log, deps = {} } = p;
   const env = deps.env || process.env;
   try {
-    await (deps.uninstallAutostart || uninstallAutostart)({ profile: flags.profile || null, platform: deps.platform, home: deps.home, runCmd: deps.runCmd });
+    await (deps.uninstallAutostart || uninstallAutostart)({ profile: flags.profile || null, configDir: flags.profile ? null : (env.ANYTOWORK_CONFIG_DIR || env.LINGER_CONFIG_DIR || null), platform: deps.platform, home: deps.home, runCmd: deps.runCmd });
   } catch { /* nothing to undo */ }
   for (const f of [configPath(credOpts), cursorFile(credOpts), statePath(credOpts)]) { try { fs.unlinkSync(f); } catch { /* none */ } }
   try {

package/src/listener/install.js

@@ -8,9 +8,16 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { createHash } from 'node:crypto';
 import { execFile } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 
+/** Name part that tells identities apart on one computer: the profile, else a short hash of the config dir, else "default". */
+export function slotOf(profile, configDir) {
+  if (profile) return profile;
+  if (configDir) return `dir-${createHash("sha1").update(String(configDir)).digest("hex").slice(0, 8)}`;
+  return null;
+}
 export function labelOf(profile) { return `work.anytowork.listen.${profile || 'default'}`; }
 export function unitNameOf(profile) { return `anytowork-listen-${profile || 'default'}.service`; }
 export function taskNameOf(profile) { return `AnytoWork Listen ${profile || 'default'}`; }
@@ -79,13 +86,15 @@ function shSingle(s) { return `'${String(s).replace(/'/g, `'\\''`)}'`; }
 export function cronLine({ node, entry, profile, configDir }) {
   const cmd = [shSingle(node), shSingle(entry), ...runArgs(profile).map(shSingle)].join(' ');
   const envPart = configDir ? `ANYTOWORK_CONFIG_DIR=${shSingle(configDir)} ` : '';
-  return `@reboot ${envPart}${cmd} >/dev/null 2>&1 ${cronMarkOf(profile)}`;
+  return `@reboot ${envPart}${cmd} >/dev/null 2>&1 ${cronMarkOf(slotOf(profile, configDir))}`;
 }
 
 /** Windows: the arguments of `schtasks /Create` (run at the user's logon, no administrator needed). */
-export function schtasksCreateArgs({ node, entry, profile }) {
-  const tr = [`"${node}"`, `"${entry}"`, ...runArgs(profile)].join(' ');
-  return ['/Create', '/TN', taskNameOf(profile), '/SC', 'ONLOGON', '/TR', tr, '/F'];
+export function schtasksCreateArgs({ node, entry, profile, configDir }) {
+  const run = [`"${node}"`, `"${entry}"`, ...runArgs(profile)].join(" ");
+  // a task cannot carry environment variables, so a custom config dir is set by a small cmd wrapper
+  const tr = configDir ? `cmd /c "set ANYTOWORK_CONFIG_DIR=${configDir}&& ${run}"` : run;
+  return ["/Create", "/TN", taskNameOf(slotOf(profile, configDir)), "/SC", "ONLOGON", "/TR", tr, "/F"];
 }
 
 /** Default way to run a system command; resolves {code, stdout, stderr}, never rejects. */
@@ -117,11 +126,12 @@ export async function installAutostart(o) {
   const node = o.node || process.execPath;
   const entry = o.entry || defaultEntryPath();
   const pathEnv = o.pathEnv != null ? o.pathEnv : process.env.PATH;
+  const slot = slotOf(o.profile, o.configDir);
   const common = { node, entry, profile: o.profile || null, pathEnv, configDir: o.configDir || null };
   const notes = [];
 
   if (platform === 'darwin') {
-    const label = labelOf(o.profile);
+    const label = labelOf(slot);
     const dir = path.join(home, 'Library', 'LaunchAgents');
     const file = path.join(dir, `${label}.plist`);
     fs.mkdirSync(dir, { recursive: true });
@@ -136,7 +146,7 @@ export async function installAutostart(o) {
   if (platform === 'win32') {
     const create = await runCmd('schtasks', schtasksCreateArgs(common));
     if (create.code !== 0) throw new Error(`schtasks: ${(create.stderr || create.stdout || '').trim().slice(0, 200)}`);
-    await runCmd('schtasks', ['/Run', '/TN', taskNameOf(o.profile)]);
+    await runCmd('schtasks', ['/Run', '/TN', taskNameOf(slot)]);
     return { kind: 'schtasks', notes };
   }
 
@@ -144,17 +154,17 @@ export async function installAutostart(o) {
   const sd = await runCmd('systemctl', ['--user', '--version']);
   if (sd.code === 0 && !sd.missing) {
     const dir = path.join(home, '.config', 'systemd', 'user');
-    const file = path.join(dir, unitNameOf(o.profile));
+    const file = path.join(dir, unitNameOf(slot));
     fs.mkdirSync(dir, { recursive: true });
     fs.writeFileSync(file, systemdUnit(common), { mode: 0o644 });
     await runCmd('systemctl', ['--user', 'daemon-reload']);
-    const r = await runCmd('systemctl', ['--user', 'enable', '--now', unitNameOf(o.profile)]);
+    const r = await runCmd('systemctl', ['--user', 'enable', '--now', unitNameOf(slot)]);
     if (r.code === 0) { notes.push('linger'); return { kind: 'systemd', file, notes }; }
     // The user manager is not reachable (container, ssh without a session): fall through to cron.
   }
   const ct = await runCmd('crontab', ['-l']);
   if (!ct.missing) {
-    const mark = cronMarkOf(o.profile);
+    const mark = cronMarkOf(slot);
     const kept = (ct.code === 0 ? ct.stdout : '').split('\n').filter((l) => l && !l.includes(mark));
     kept.push(cronLine(common));
     const w = await runCmd('crontab', ['-'], { input: `${kept.join('\n')}\n` });
@@ -168,30 +178,31 @@ export async function installAutostart(o) {
 
 /** Undo installAutostart; unknown or missing pieces are skipped. */
 export async function uninstallAutostart(o) {
+  const slot = slotOf(o.profile, o.configDir);
   const platform = o.platform || process.platform;
   const runCmd = o.runCmd || defaultRunCmd;
   const home = o.home || os.homedir();
   if (platform === 'darwin') {
-    const label = labelOf(o.profile);
+    const label = labelOf(slot);
     const uid = String(o.uid != null ? o.uid : (process.getuid ? process.getuid() : 501));
     await runCmd('launchctl', ['bootout', `gui/${uid}/${label}`]);
     try { fs.unlinkSync(path.join(home, 'Library', 'LaunchAgents', `${label}.plist`)); } catch { /* none */ }
     return;
   }
   if (platform === 'win32') {
-    await runCmd('schtasks', ['/End', '/TN', taskNameOf(o.profile)]);
-    await runCmd('schtasks', ['/Delete', '/TN', taskNameOf(o.profile), '/F']);
+    await runCmd('schtasks', ['/End', '/TN', taskNameOf(slot)]);
+    await runCmd('schtasks', ['/Delete', '/TN', taskNameOf(slot), '/F']);
     return;
   }
-  const unit = path.join(home, '.config', 'systemd', 'user', unitNameOf(o.profile));
+  const unit = path.join(home, '.config', 'systemd', 'user', unitNameOf(slot));
   if (fs.existsSync(unit)) {
-    await runCmd('systemctl', ['--user', 'disable', '--now', unitNameOf(o.profile)]);
+    await runCmd('systemctl', ['--user', 'disable', '--now', unitNameOf(slot)]);
     try { fs.unlinkSync(unit); } catch { /* none */ }
     await runCmd('systemctl', ['--user', 'daemon-reload']);
   }
   const ct = await runCmd('crontab', ['-l']);
   if (!ct.missing && ct.code === 0) {
-    const mark = cronMarkOf(o.profile);
+    const mark = cronMarkOf(slot);
     if (ct.stdout.includes(mark)) {
       const kept = ct.stdout.split('\n').filter((l) => l && !l.includes(mark));
       await runCmd('crontab', ['-'], { input: kept.length ? `${kept.join('\n')}\n` : '' });