@timurproko/a1-install 0.2.1-dev.600 → 0.2.1-dev.603

package/bin/a1-install.js

@@ -231,6 +231,13 @@ function createDefaultProcessRunner(environment, platform) {
   }
 }
 
+export function consumeProcessLines(pending, chunk, callback) {
+  const lines = `${pending}${chunk}`.split(/\r?\n/u);
+  const trailing = lines.pop() ?? "";
+  for (const line of lines) callback?.(line);
+  return trailing.slice(-DIAGNOSTIC_LIMIT);
+}
+
 async function runChild(command, args, options) {
   return await new Promise((resolvePromise, rejectPromise) => {
     const child = spawn(command, args, {
@@ -243,22 +250,15 @@ async function runChild(command, args, options) {
     let stderr = "";
     let stdoutPending = "";
     let stderrPending = "";
-    const consume = (stream, chunk, callback) => {
-      const combined = `${stream}${chunk}`.slice(-DIAGNOSTIC_LIMIT);
-      const lines = combined.split(/\r?\n/u);
-      const pending = lines.pop() ?? "";
-      for (const line of lines) callback?.(line);
-      return pending;
-    };
     child.stdout?.setEncoding("utf8");
     child.stderr?.setEncoding("utf8");
     child.stdout?.on("data", chunk => {
       stdout = `${stdout}${chunk}`.slice(-DIAGNOSTIC_LIMIT);
-      stdoutPending = consume(stdoutPending, chunk, options.onStdoutLine);
+      stdoutPending = consumeProcessLines(stdoutPending, chunk, options.onStdoutLine);
     });
     child.stderr?.on("data", chunk => {
       stderr = `${stderr}${chunk}`.slice(-DIAGNOSTIC_LIMIT);
-      stderrPending = consume(stderrPending, chunk, options.onStderrLine);
+      stderrPending = consumeProcessLines(stderrPending, chunk, options.onStderrLine);
     });
     let settled = false;
     child.once("error", error => {
@@ -360,11 +360,13 @@ async function verifyLaunchers(globalRoot, platform) {
   const paths = launcherPaths(globalRoot, platform);
   const entry = resolve(packageRootFor(globalRoot), "bin", "cli.js");
   const expectedSuffix = `${APPLICATION_PACKAGE}/bin/cli.js`;
+  let canonicalEntry = null;
   for (const path of paths) {
     try {
       const metadata = await lstat(path);
       if (metadata.isSymbolicLink()) {
-        if (normalizePath(await realpath(path), platform) !== normalizePath(entry, platform)) throw new Error("launcher target differs");
+        if (canonicalEntry === null) canonicalEntry = normalizePath(await realpath(entry), platform);
+        if (normalizePath(await realpath(path), platform) !== canonicalEntry) throw new Error("launcher target differs");
       } else if (metadata.isFile()) {
         const content = await readFile(path, "utf8");
         if (content.length > 32_768 || !content.replaceAll("\\", "/").includes(expectedSuffix)) throw new Error("launcher content differs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timurproko/a1-install",
-  "version": "0.2.1-dev.600",
+  "version": "0.2.1-dev.603",
   "description": "Dependency-free installer for a1",
   "type": "module",
   "bin": {