@open-audio-stack/core 0.1.43 → 0.1.45

package/build/classes/ManagerLocal.js

@@ -178,10 +178,18 @@ export class ManagerLocal extends Manager {
         const excludedFormats = [];
         const system = getSystem();
         if (system === SystemType.Linux) {
-            if (!(await commandExists('dpkg')))
+            const hasDpkg = await commandExists('dpkg');
+            const hasRpm = await commandExists('rpm');
+            // If both exist, prefer DEB over RPM
+            if (hasDpkg && hasRpm) {
+                excludedFormats.push(FileFormat.RedHatPackage);
+            }
+            else if (!hasDpkg) {
                 excludedFormats.push(FileFormat.DebianPackage);
-            if (!(await commandExists('rpm')))
+            }
+            else if (!hasRpm) {
                 excludedFormats.push(FileFormat.RedHatPackage);
+            }
         }
         const files = packageCompatibleFiles(pkgVersion, [getArchitecture()], [getSystem()], excludedFormats);
         if (!files.length)

package/build/helpers/admin.js

@@ -42,15 +42,27 @@ export async function adminInit() {
     manager.log('adminInit', args);
     await manager.sync();
     manager.scan();
-    if (args.operation === 'install') {
-        await manager.install(args.id, args.version);
-    }
-    else if (args.operation === 'uninstall') {
-        await manager.uninstall(args.id, args.version);
+    try {
+        if (args.operation === 'install') {
+            await manager.install(args.id, args.version);
+        }
+        else if (args.operation === 'uninstall') {
+            await manager.uninstall(args.id, args.version);
+        }
+        else if (args.operation === 'installAll') {
+            await manager.installAll();
+        }
+        const result = { status: 'ok', code: 0 };
+        process.stdout.write('\n');
+        console.log(JSON.stringify(result));
+        process.exit(0);
     }
-    else if (args.operation === 'installAll') {
-        await manager.installAll();
+    catch (err) {
+        const message = err && err.message ? err.message : String(err);
+        const errorResult = { status: 'error', code: err && err.code ? err.code : 1, message };
+        process.stdout.write('\n');
+        console.log(JSON.stringify(errorResult));
+        process.exit(typeof errorResult.code === 'number' ? errorResult.code : 1);
     }
-    console.log('ADMIN_COMPLETE');
 }
 adminInit();

package/build/helpers/file.js

@@ -51,9 +51,12 @@ export async function archiveExtract(filePath, dirPath) {
         });
     }
     else if (ext === '.7z') {
-        return unpack(filePath, dirPath, err => {
-            if (err)
-                throw new Error(`7z extraction failed: ${err.message}`);
+        return new Promise((resolve, reject) => {
+            unpack(filePath, dirPath, (err2) => {
+                if (err2)
+                    return reject(new Error(`7z extraction failed: ${err2 && err2.message ? err2.message : String(err2)}`));
+                return resolve();
+            });
         });
     }
 }
@@ -247,10 +250,23 @@ export function fileMove(filePath, newPath) {
     return false;
 }
 export function filesMove(dirSource, dirTarget, dirSub, formatDir) {
-    // Read all files from source directory, ignoring Mac Contents files.
-    const allFiles = dirRead(`${dirSource}/**/*`);
-    const files = allFiles.filter(f => !dirIs(f));
+    const filesAndFolders = dirRead(`${dirSource}/**/*`);
+    log('filesAndFolders', filesAndFolders);
+    const files = filesAndFolders.filter(f => {
+        // Include files.
+        if (!dirIs(f))
+            return true;
+        // Include macOS application bundles (directory of files presented as a single file).
+        if (fileExists(path.join(f, 'Contents', 'Info.plist')))
+            return true;
+        // Include LV2 plugin folders.
+        if (fileExists(path.join(f, 'manifest.ttl')))
+            return true;
+        // Otherwise ignore.
+        return false;
+    });
     const filesMoved = [];
+    log('files', files);
     // For each file, move to correct folder based on type
     files.forEach((fileSource) => {
         const fileExt = path.extname(fileSource).slice(1).toLowerCase();
@@ -373,28 +389,46 @@ export function runCliAsAdmin(args) {
         const filename = fileURLToPath(import.meta.url).replace('src/', 'build/');
         const dirPathClean = dirname(filename).replace('app.asar', 'app.asar.unpacked');
         const script = path.join(dirPathClean, 'admin.js');
-        // Temp file for logging
-        const logFile = path.join(dirPathClean, 'admin.log');
-        writeFileSync(logFile, ''); // Clear previous logs
         log(`Running as admin: node "${script}" ${args}`);
-        // Monitor log file for completion
-        let completed = false;
-        const tail = spawn('tail', ['-f', logFile]);
-        tail.stdout.on('data', data => {
-            const output = data.toString();
-            log(output);
-            if (output.includes('ADMIN_COMPLETE')) {
-                completed = true;
-                tail.kill();
-                resolve();
+        const cmd = `node "${script}" ${args}`;
+        sudoPrompt.exec(cmd, { name: 'Open Audio Stack' }, (error, stdout, stderr) => {
+            // Prefer explicit error from sudo-prompt callback
+            if (error) {
+                const stderrStr = stderr ? (typeof stderr === 'string' ? stderr : stderr.toString()) : '';
+                const msg = `runCliAsAdmin: admin command failed: ${error && error.message ? error.message : String(error)}${stderrStr ? `\nstderr: ${stderrStr}` : ''}`;
+                const err = new Error(msg);
+                err.code = error && error.code ? error.code : undefined;
+                return reject(err);
             }
-        });
-        // Run the script with sudoPrompt
-        sudoPrompt.exec(`node "${script}" ${args} >> "${logFile}" 2>&1`, { name: 'Open Audio Stack' }, error => {
-            if (error && !completed) {
-                tail.kill();
-                reject(error);
+            // Convert stdout/stderr buffers to strings for inspection
+            const stdoutStr = stdout ? (typeof stdout === 'string' ? stdout : stdout.toString()) : '';
+            const stderrStr = stderr ? (typeof stderr === 'string' ? stderr : stderr.toString()) : '';
+            const out = stdoutStr + stderrStr;
+            log(out);
+            // Try to parse structured JSON output from the admin script first.
+            // Admin script outputs JSON on its own line after a newline, so look for the last JSON object.
+            const lines = out.split('\n');
+            let jsonPayload = null;
+            for (let i = lines.length - 1; i >= 0; i--) {
+                const line = lines[i].trim();
+                if (!line)
+                    continue; // Skip empty lines
+                try {
+                    jsonPayload = JSON.parse(line);
+                    break; // Found valid JSON, stop searching backwards
+                }
+                catch {
+                    // This line is not JSON, continue searching
+                }
+            }
+            if (jsonPayload) {
+                if (jsonPayload && (jsonPayload.status === 'ok' || jsonPayload.code === 0)) {
+                    return resolve();
+                }
+                const errMsg = jsonPayload && jsonPayload.message ? jsonPayload.message : JSON.stringify(jsonPayload);
+                return reject(new Error(`runCliAsAdmin: admin command reported error: ${errMsg}`));
             }
+            return reject(new Error(`runCliAsAdmin: admin command did not report completion. stdout: ${stdoutStr} stderr: ${stderrStr}`));
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-audio-stack/core",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "description": "Open-source audio plugin management software",
   "type": "module",
   "main": "./build/index.js",