grok-telegram-bot 2.6.0 → 2.7.0

package/src/service/platform.ts

@@ -4,6 +4,7 @@
  */
 import { execFileSync, spawn } from "node:child_process";
 import { join } from "node:path";
+import { parseInstanceFlags, serviceIdentity } from "../app/instance.js";
 import { PROJECT_ROOT, INSTANCE_DIR } from "../config.js";
 
 export type Platform = "windows" | "linux" | "macos" | "unknown";
@@ -31,9 +32,14 @@ export function buildLaunchSpec(): LaunchSpec {
   // the bot where its .env/logs/data live. Only appended for a global install
   // (instance dir differs) so in-place checkouts keep identical launch args.
   if (INSTANCE_DIR !== PROJECT_ROOT) args.push("--instance", INSTANCE_DIR);
+  const flags = parseInstanceFlags(process.argv);
+  const ident = serviceIdentity(INSTANCE_DIR, flags.name || process.env.GROK_TG_NAME);
   return {
-    id: "grok-telegram-bot",
-    displayName: "Grok Telegram Bot",
+    id: ident.id,
+    displayName: ident.displayName,
+    windowsTaskName: ident.windowsTaskName,
+    macosLabel: ident.macosLabel,
+    slug: ident.slug,
     nodePath: process.execPath,
     args,
     cwd: PROJECT_ROOT,
@@ -41,7 +47,10 @@ export function buildLaunchSpec(): LaunchSpec {
     // relaunches on exit — so its auto-updater exits cleanly instead of
     // re-exec'ing (which would double-run). Windows applies no env, so its
     // Scheduled Task (no auto-restart) takes the re-exec path instead.
-    env: { GROK_TG_SUPERVISED: "1" },
+    env: {
+      GROK_TG_SUPERVISED: "1",
+      ...(ident.slug ? { GROK_TG_NAME: ident.slug } : {}),
+    },
     logsDir,
     logFile: join(logsDir, "grok-telegram-bot.log"),
   };

package/src/service/types.ts

@@ -7,6 +7,12 @@ export interface LaunchSpec {
   id: string;
   /** Human-readable name. */
   displayName: string;
+  /** Windows Scheduled Task name (unique per named instance). */
+  windowsTaskName?: string;
+  /** launchd label (unique per named instance). */
+  macosLabel?: string;
+  /** Named instance slug when using `--name`. */
+  slug?: string;
   /** Absolute path to the node binary that should run the bot. */
   nodePath: string;
   /** Arguments after the node binary (tsx loader + entry file). */

package/src/service/windows.ts

@@ -15,6 +15,14 @@ const TASK = "GrokTelegramBot";
 /** Launcher dropped in the per-user Startup folder when no admin is available. */
 const STARTUP_VBS = "GrokTelegramBot.vbs";
 
+function taskName(spec?: { windowsTaskName?: string }): string {
+  return spec?.windowsTaskName || TASK;
+}
+
+function startupVbsFile(spec?: { slug?: string }): string {
+  return spec?.slug ? `GrokTelegramBot-${spec.slug}.vbs` : STARTUP_VBS;
+}
+
 /** The per-user Startup folder (runs at logon for the current user, no admin).
  *  Undefined only if APPDATA is unset (e.g. running with no roaming profile). */
 function startupDir(): string | undefined {
@@ -22,9 +30,9 @@ function startupDir(): string | undefined {
   return appData ? join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup") : undefined;
 }
 
-function startupVbsPath(): string | undefined {
+function startupVbsPath(spec?: { slug?: string }): string | undefined {
   const dir = startupDir();
-  return dir ? join(dir, STARTUP_VBS) : undefined;
+  return dir ? join(dir, startupVbsFile(spec)) : undefined;
 }
 
 /** Remove a leftover Startup-folder launcher (e.g. from an earlier non-elevated
@@ -40,8 +48,8 @@ function vbsPath(spec: LaunchSpec): string {
 }
 
 /** True when our hidden Scheduled Task is registered. */
-function taskInstalled(): boolean {
-  return runSafe("schtasks", ["/Query", "/TN", TASK]).ok;
+function taskInstalled(spec?: { windowsTaskName?: string }): boolean {
+  return runSafe("schtasks", ["/Query", "/TN", taskName(spec)]).ok;
 }
 
 /** True when a bot process matching this spec is currently running. Launch
@@ -63,35 +71,36 @@ export const windowsController: ServiceController = {
     // Preferred: a hidden ONLOGON Scheduled Task. Registering a *logon-triggered*
     // task is a privileged operation, so /Create succeeds only from an elevated
     // (admin) terminal. From a normal terminal it returns "Access is denied".
-    runSafe("schtasks", ["/Delete", "/F", "/TN", TASK]); // replace if present
+    const tn = taskName(spec);
+    runSafe("schtasks", ["/Delete", "/F", "/TN", tn]); // replace if present
     const res = runSafe("schtasks", [
       "/Create",
       "/F",
       "/SC",
       "ONLOGON",
       "/TN",
-      TASK,
+      tn,
       "/TR",
       `wscript.exe "${vbs}"`,
     ]);
     if (res.ok) {
       removeStartupLauncher(); // avoid a leftover launcher double-starting the bot
-      if (!isRunning(spec)) runSafe("schtasks", ["/Run", "/TN", TASK]);
-      return ok(`Installed scheduled task "${TASK}" (starts at logon) and launched it.`);
+      if (!isRunning(spec)) runSafe("schtasks", ["/Run", "/TN", tn]);
+      return ok(`Installed scheduled task "${tn}" (starts at logon) and launched it.`);
     }
 
     // A task may still exist that we just couldn't overwrite (e.g. created by an
     // earlier elevated install). Reuse it rather than ALSO adding a Startup
     // launcher, which would double-launch the bot at logon (409 Conflict).
-    if (taskInstalled()) {
+    if (taskInstalled(spec)) {
       removeStartupLauncher();
-      if (!isRunning(spec)) runSafe("schtasks", ["/Run", "/TN", TASK]);
-      return ok(`Scheduled task "${TASK}" already exists; launched it. (Re-run elevated to recreate it.)`);
+      if (!isRunning(spec)) runSafe("schtasks", ["/Run", "/TN", tn]);
+      return ok(`Scheduled task "${tn}" already exists; launched it. (Re-run elevated to recreate it.)`);
     }
 
     // Fallback (no admin — the common case): drop the launcher in the per-user
     // Startup folder. It runs hidden at every logon with no elevation.
-    const startupVbs = startupVbsPath();
+    const startupVbs = startupVbsPath(spec);
     const dir = startupDir();
     if (!startupVbs || !dir) {
       return fail(
@@ -118,21 +127,21 @@ export const windowsController: ServiceController = {
 
   async uninstall(spec) {
     await this.stop(spec);
-    runSafe("schtasks", ["/Delete", "/F", "/TN", TASK]); // best-effort (may not exist)
+    runSafe("schtasks", ["/Delete", "/F", "/TN", taskName(spec)]); // best-effort (may not exist)
     rmSync(vbsPath(spec), { force: true });
-    const startupVbs = startupVbsPath();
+    const startupVbs = startupVbsPath(spec);
     if (startupVbs) rmSync(startupVbs, { force: true });
-    return ok(`Removed "${TASK}" (scheduled task and/or Startup launcher).`);
+    return ok(`Removed "${taskName(spec)}" (scheduled task and/or Startup launcher).`);
   },
 
   async start(spec) {
     if (isRunning(spec)) return ok("Already running.");
-    if (taskInstalled()) {
+    if (taskInstalled(spec)) {
       // schtasks /Run returns once the task is queued (does not wait for the bot).
-      const res = runSafe("schtasks", ["/Run", "/TN", TASK]);
+      const res = runSafe("schtasks", ["/Run", "/TN", taskName(spec)]);
       return res.ok ? ok("Started.") : fail(res.out);
     }
-    const startupVbs = startupVbsPath();
+    const startupVbs = startupVbsPath(spec);
     if (startupVbs && existsSync(startupVbs)) {
       // Forever-restart VBS — must be detached or this CLI never returns.
       const launched = launchDetached("wscript.exe", [startupVbs]);
@@ -148,20 +157,20 @@ export const windowsController: ServiceController = {
   },
 
   async stop(spec) {
-    runSafe("schtasks", ["/End", "/TN", TASK]); // best-effort if task-based
+    runSafe("schtasks", ["/End", "/TN", taskName(spec)]); // best-effort if task-based
     const res = runSafe("powershell", ["-NoProfile", "-Command", killScript(entryOf(spec))]);
     return ok(`Stopped. ${res.out.trim()}`);
   },
 
   async status(spec) {
-    const installedTask = taskInstalled();
-    const startupVbs = startupVbsPath();
+    const installedTask = taskInstalled(spec);
+    const startupVbs = startupVbsPath(spec);
     const installedStartup = !!startupVbs && existsSync(startupVbs);
     const installed = installedTask || installedStartup;
     const running = isRunning(spec);
     const how = installedTask ? "scheduled task" : installedStartup ? "Startup folder" : "—";
     const detail = installedTask
-      ? `\n${runSafe("schtasks", ["/Query", "/TN", TASK, "/FO", "LIST"]).out.trim()}`
+      ? `\n${runSafe("schtasks", ["/Query", "/TN", taskName(spec), "/FO", "LIST"]).out.trim()}`
       : installedStartup
         ? `\nLauncher: ${startupVbs}`
         : "";