@open-audio-stack/core 0.1.44 → 0.1.46

package/build/classes/ManagerLocal.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { Package } from './Package.js';
 import { Manager } from './Manager.js';
-import { archiveExtract, dirCreate, dirDelete, dirEmpty, dirMove, dirRead, fileCreate, fileCreateJson, fileCreateYaml, fileExists, fileHash, fileInstall, fileOpen, fileReadJson, fileReadYaml, filesMove, isAdmin, runCliAsAdmin, } from '../helpers/file.js';
+import { archiveExtract, dirCreate, dirDelete, dirEmpty, dirIs, dirMove, dirRead, fileCreate, fileCreateJson, fileCreateYaml, fileExists, fileHash, fileInstall, fileOpen, fileReadJson, fileReadYaml, filesMove, isAdmin, runCliAsAdmin, } from '../helpers/file.js';
 import { isValidVersion, pathGetSlug, pathGetVersion, toSlug } from '../helpers/utils.js';
 import { commandExists, getArchitecture, getSystem, isTests } from '../helpers/utilsLocal.js';
 import { apiBuffer } from '../helpers/api.js';
@@ -260,12 +260,43 @@ export class ManagerLocal extends Manager {
                     fileCreateJson(path.join(dirTarget, 'index.json'), pkgVersion);
                 }
                 else {
-                    // Move only supported file extensions into their respective installation directories.
-                    const filesMoved = filesMove(dirSource, this.typeDir, dirSub, formatDir);
-                    filesMoved.forEach((fileMoved) => {
-                        const fileJson = path.join(path.dirname(fileMoved), 'index.json');
-                        fileCreateJson(fileJson, pkgVersion);
+                    // Check if archive contains installer files (pkg, dmg) that should be run
+                    const allFiles = dirRead(`${dirSource}/**/*`).filter(f => !dirIs(f));
+                    const installerFiles = allFiles.filter(f => {
+                        const ext = path.extname(f).toLowerCase();
+                        return ext === '.pkg' || ext === '.dmg';
                     });
+                    if (installerFiles.length > 0) {
+                        // Run installer files found in archive
+                        for (const installerFile of installerFiles) {
+                            if (isTests())
+                                fileOpen(installerFile);
+                            else
+                                fileInstall(installerFile);
+                        }
+                        // Create directory and save package info for installer
+                        const dirTarget = path.join(this.typeDir, 'Installers', dirSub);
+                        dirCreate(dirTarget);
+                        fileCreateJson(path.join(dirTarget, 'index.json'), pkgVersion);
+                    }
+                    else if (this.type === RegistryType.Plugins) {
+                        // For plugins, move files into type-specific subdirectories
+                        const filesMoved = filesMove(dirSource, this.typeDir, dirSub, formatDir);
+                        if (filesMoved.length === 0) {
+                            throw new Error(`No compatible files found to install for ${slug}`);
+                        }
+                        filesMoved.forEach((fileMoved) => {
+                            const fileJson = path.join(path.dirname(fileMoved), 'index.json');
+                            fileCreateJson(fileJson, pkgVersion);
+                        });
+                    }
+                    else {
+                        // For apps/projects/presets, move entire directory without type subdirectories
+                        const dirTarget = path.join(this.typeDir, dirSub);
+                        dirCreate(dirTarget);
+                        dirMove(dirSource, dirTarget);
+                        fileCreateJson(path.join(dirTarget, 'index.json'), pkgVersion);
+                    }
                 }
             }
         }
@@ -282,9 +313,9 @@ export class ManagerLocal extends Manager {
             return this.listPackages();
         }
         // Loop through all packages and install each one.
-        for (const [slug, pkg] of this.packages) {
+        for (const pkg of this.listPackages()) {
             const versionNum = pkg.latestVersion();
-            await this.install(slug, versionNum);
+            await this.install(pkg.slug, versionNum);
         }
         return this.listPackages();
     }
@@ -295,15 +326,17 @@ export class ManagerLocal extends Manager {
         manager.scan();
         const pkg = manager.getPackage(slug);
         if (!pkg)
-            return this.log(`Package ${slug} not found in registry`);
+            throw new Error(`Package ${slug} not found in registry`);
         const versionNum = version || pkg.latestVersion();
         const pkgVersion = pkg?.getVersion(versionNum);
         if (!pkgVersion)
-            return this.log(`Package ${slug} version ${versionNum} not found in registry`);
+            throw new Error(`Package ${slug} version ${versionNum} not found in registry`);
         // Get local package file.
         const pkgFile = packageLoadFile(filePath);
         if (pkgFile[type] && pkgFile[type][slug] && pkgFile[type][slug] === versionNum) {
-            return this.log(`Package ${slug} version ${versionNum} is already a dependency`);
+            this.log(`Package ${slug} version ${versionNum} is already a dependency`);
+            pkgFile.installed = true;
+            return pkgFile;
         }
         // Install dependency.
         await manager.install(slug, version);
@@ -434,9 +467,9 @@ export class ManagerLocal extends Manager {
         // Get local package file.
         const pkgFile = packageLoadFile(filePath);
         if (!pkgFile[type])
-            return this.log(`Package ${type} is missing`);
+            throw new Error(`Package ${type} is missing`);
         if (!pkgFile[type][slug])
-            return this.log(`Package ${type} ${slug} is not a dependency`);
+            throw new Error(`Package ${type} ${slug} is not a dependency`);
         // Uninstall dependency.
         const manager = new ManagerLocal(type, this.config.config);
         await manager.sync();

package/build/classes/Package.js

@@ -28,7 +28,7 @@ export class Package extends Base {
         if (Object.keys(report).length > 0)
             this.reports.set(num, report);
         if (errors.length > 0)
-            return this.log(`Package ${version.name} version ${num} errors`, errors);
+            throw new Error(`Package ${version.name} version ${num} has validation errors: ${JSON.stringify(errors)}`);
         version.verified = packageIsVerified(this.slug, version);
         this.versions.set(num, version);
         this.version = this.latestVersion();

package/build/helpers/admin.js

@@ -35,22 +35,34 @@ export function adminArguments() {
     return args;
 }
 export async function adminInit() {
-    const args = adminArguments();
-    const manager = new ManagerLocal(args.type, { appDir: args.appDir });
-    if (args.log)
-        manager.logEnable();
-    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 {
+        const args = adminArguments();
+        const manager = new ManagerLocal(args.type, { appDir: args.appDir });
+        if (args.log)
+            manager.logEnable();
+        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);
+        }
+        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.error(JSON.stringify(errorResult));
+        process.exit(typeof errorResult.code === 'number' ? errorResult.code : 1);
     }
-    console.log('ADMIN_COMPLETE');
 }
 adminInit();

package/build/helpers/file.js

@@ -16,9 +16,14 @@ import { fileURLToPath } from 'url';
 import sudoPrompt from '@vscode/sudo-prompt';
 import { getSystem } from './utilsLocal.js';
 import { log } from './utils.js';
+import mime from 'mime-types';
 export async function archiveExtract(filePath, dirPath) {
     log('⎋', dirPath);
+    const fileName = path.basename(filePath).toLowerCase();
     const ext = path.extname(filePath).trim().toLowerCase();
+    const tarExtensions = ['.tar', '.gz', '.tgz', '.xz', '.bz2', '.tbz2'];
+    const tarCompoundExtensions = ['.tar.gz', '.tar.xz', '.tar.bz2'];
+    const isTarFile = tarExtensions.includes(ext) || tarCompoundExtensions.some(compoundExt => fileName.endsWith(compoundExt));
     if (ext === '.zip') {
         const zip = new AdmZip(filePath);
         try {
@@ -44,16 +49,19 @@ export async function archiveExtract(filePath, dirPath) {
             }
         }
     }
-    else if (ext === '.tar' || ext === '.gz' || ext === '.tgz') {
+    else if (isTarFile) {
         return await tar.extract({
             file: filePath,
             cwd: 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,14 +255,51 @@ 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);
+    // First pass: identify bundle directories (app, clap, vst3, lv2, etc.)
+    const bundleDirs = new Set();
+    filesAndFolders.forEach(f => {
+        if (dirIs(f)) {
+            // Check if this is a macOS application bundle or plugin bundle
+            if (fileExists(path.join(f, 'Contents', 'Info.plist'))) {
+                bundleDirs.add(f);
+            }
+            // Check if this is an LV2 plugin folder
+            if (fileExists(path.join(f, 'manifest.ttl'))) {
+                bundleDirs.add(f);
+            }
+        }
+    });
+    const files = filesAndFolders.filter(f => {
+        // Exclude files/folders that are inside bundle directories
+        for (const bundleDir of bundleDirs) {
+            if (f.startsWith(bundleDir + path.sep)) {
+                return false; // This path is inside a bundle, exclude it
+            }
+        }
+        // Include regular files (not directories).
+        if (!dirIs(f))
+            return true;
+        // Include bundle directories themselves (already identified above).
+        if (bundleDirs.has(f))
+            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();
-        const fileExtTarget = formatDir[fileExt];
+        let fileExtTarget = formatDir[fileExt];
+        // Use mime-type detection as fallback for unmapped extensions
+        if (!fileExtTarget) {
+            const mimeType = mime.lookup(fileSource) || '';
+            if (!mimeType || mimeType.startsWith('application/')) {
+                fileExtTarget = 'App';
+            }
+        }
         // If this is not a supported file format, then ignore.
         if (fileExtTarget === undefined)
             return log(`${fileSource} - ${fileExt || 'no extension'} not mapped to a installation folder, skipping.`);
@@ -373,28 +418,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) => {
+            // 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
+                }
             }
-        });
-        // 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);
+            // If we found JSON output from admin script, prioritize it over sudoPrompt error
+            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}`));
+            }
+            // If no JSON found, check for sudoPrompt error
+            if (error) {
+                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);
             }
+            return reject(new Error(`runCliAsAdmin: admin command did not report completion. stdout: ${stdoutStr} stderr: ${stderrStr}`));
         });
     });
 }

package/build/types/PluginFormat.d.ts

@@ -19,9 +19,7 @@ export declare enum PluginFormat {
 export type PluginFormatDir = {
     [format in PluginFormat]: string;
 };
-export declare const pluginFormatDir: PluginFormatDir & {
-    '': string;
-};
+export declare const pluginFormatDir: PluginFormatDir;
 export interface PluginFormatOption {
     description: string;
     value: PluginFormat;

package/build/types/PluginFormat.js

@@ -34,7 +34,6 @@ export const pluginFormatDir = {
     [PluginFormat.VSTMac]: 'VST',
     [PluginFormat.VSTWin]: 'VST',
     [PluginFormat.WinStandalone]: 'Exe',
-    '': 'App',
 };
 export const pluginFormats = [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-audio-stack/core",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "Open-source audio plugin management software",
   "type": "module",
   "main": "./build/index.js",
@@ -42,6 +42,7 @@
     "@types/adm-zip": "^0.5.5",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
+    "@types/mime-types": "^3.0.1",
     "@types/node": "^22.7.8",
     "@types/semver": "^7.5.8",
     "@vitest/coverage-v8": "^3.0.5",
@@ -62,6 +63,7 @@
     "glob": "^11.0.0",
     "inquirer": "^12.4.1",
     "js-yaml": "^4.1.0",
+    "mime-types": "^3.0.2",
     "semver": "^7.6.3",
     "slugify": "^1.6.6",
     "tar": "^7.4.3",