@signageos/cli 2.7.1 → 2.9.0

package/dist/Applet/Upload/appletUploadFacadeHelper.d.ts

@@ -2,5 +2,5 @@ import RestApi from '@signageos/sdk/dist/RestApi/RestApi';
 import IAppletVersionFile from '@signageos/sdk/dist/RestApi/Applet/Version/File/IAppletVersionFile';
 export declare function getAppletFileRelativePath(fileAbsolutePath: string, directoryAbsolutePath: string): string;
 export declare function getAppletFilesDictionary(restApi: RestApi, appletUid: string, appletVersion: string): Promise<{
-    [fileRelativePath: string]: IAppletVersionFile;
+    [path: string]: IAppletVersionFile;
 }>;

package/dist/Applet/Upload/appletUploadFacadeHelper.js

@@ -66,10 +66,10 @@ function getAppletFileRelativePath(fileAbsolutePath, directoryAbsolutePath) {
 function getAppletFilesDictionary(restApi, appletUid, appletVersion) {
     return __awaiter(this, void 0, void 0, function* () {
         const filesDictionary = {};
-        const currentAppletFiles = yield restApi.applet.version.file.list(appletUid, appletVersion);
-        currentAppletFiles.forEach((file) => {
+        const files = yield restApi.applet.version.file.list(appletUid, appletVersion);
+        for (const file of files) {
             filesDictionary[file.path] = file;
-        });
+        }
         return filesDictionary;
     });
 }

package/dist/Applet/appletErrors.d.ts

@@ -1,3 +1,6 @@
 export declare class AppletDoesNotExistError extends Error {
     constructor(message: string);
 }
+export declare class AppletSelectionCancelledError extends Error {
+    constructor(message?: string);
+}

package/dist/Applet/appletErrors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppletDoesNotExistError = void 0;
+exports.AppletSelectionCancelledError = exports.AppletDoesNotExistError = void 0;
 class AppletDoesNotExistError extends Error {
     constructor(message) {
         super(message);
@@ -8,3 +8,10 @@ class AppletDoesNotExistError extends Error {
     }
 }
 exports.AppletDoesNotExistError = AppletDoesNotExistError;
+class AppletSelectionCancelledError extends Error {
+    constructor(message = 'Applet selection was cancelled') {
+        super(message);
+        Object.setPrototypeOf(this, AppletSelectionCancelledError.prototype);
+    }
+}
+exports.AppletSelectionCancelledError = AppletSelectionCancelledError;

package/dist/Applet/appletFacade.js

@@ -56,6 +56,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const parameters_1 = require("../parameters");
 const packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
 const appletErrors_1 = require("./appletErrors");
+const helper_1 = require("../helper");
 exports.APPLET_UID_OPTION = { name: 'applet-uid', type: String, description: 'Applet UID' };
 function getApplet(directoryPath) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -114,7 +115,11 @@ function getAppletUid(restApi_1, options_1) {
                             title: `${applet.name} (${applet.uid})`,
                             value: applet.uid,
                         })),
+                        suggest: helper_1.autocompleteSuggest,
                     });
+                    if (!response.appletUid) {
+                        throw new appletErrors_1.AppletSelectionCancelledError();
+                    }
                     appletUid = response.appletUid;
                 }
             }
@@ -148,7 +153,11 @@ function getAppletVersionFromApi(restApi_1, appletUid_1) {
                     title: applet.version,
                     value: applet.version,
                 })),
+                suggest: helper_1.autocompleteSuggest,
             });
+            if (!response.appletVersion) {
+                throw new Error('Applet version selection was cancelled');
+            }
             appletVersion = response.appletVersion;
         }
         return appletVersion;

package/dist/Applet/appletValidation.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Checks if the given directory appears to be a valid signageOS applet directory.
+ *
+ * A valid applet has @signageos/front-applet as a dependency.
+ * This is the definitive marker that distinguishes applets from other projects.
+ *
+ * @param directoryPath - The directory path to validate
+ * @returns true if the directory appears to be a valid applet, false otherwise
+ */
+export declare function isValidAppletDirectory(directoryPath: string): Promise<boolean>;
+/**
+ * Validates that the directory is a valid applet directory and throws an error if not.
+ *
+ * @param directoryPath - The directory path to validate
+ * @throws {Error} If the directory is not a valid applet directory
+ */
+export declare function validateAppletDirectory(directoryPath: string): Promise<void>;

package/dist/Applet/appletValidation.js

@@ -0,0 +1,62 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidAppletDirectory = isValidAppletDirectory;
+exports.validateAppletDirectory = validateAppletDirectory;
+const packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
+const chalk_1 = __importDefault(require("chalk"));
+/**
+ * Checks if the given directory appears to be a valid signageOS applet directory.
+ *
+ * A valid applet has @signageos/front-applet as a dependency.
+ * This is the definitive marker that distinguishes applets from other projects.
+ *
+ * @param directoryPath - The directory path to validate
+ * @returns true if the directory appears to be a valid applet, false otherwise
+ */
+function isValidAppletDirectory(directoryPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        try {
+            const packageJSONObject = yield (0, packageConfig_1.loadPackage)(directoryPath);
+            if (!packageJSONObject) {
+                return false;
+            }
+            // Check for @signageos/front-applet dependency
+            // If package has it, it's an applet
+            const hasFrontApplet = !!(((_a = packageJSONObject.dependencies) === null || _a === void 0 ? void 0 : _a['@signageos/front-applet']) || ((_b = packageJSONObject.devDependencies) === null || _b === void 0 ? void 0 : _b['@signageos/front-applet']));
+            return hasFrontApplet;
+        }
+        catch (_c) {
+            // If we can't load package.json or it's malformed, it's not a valid applet
+            return false;
+        }
+    });
+}
+/**
+ * Validates that the directory is a valid applet directory and throws an error if not.
+ *
+ * @param directoryPath - The directory path to validate
+ * @throws {Error} If the directory is not a valid applet directory
+ */
+function validateAppletDirectory(directoryPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const isValid = yield isValidAppletDirectory(directoryPath);
+        if (!isValid) {
+            throw new Error(chalk_1.default.red(`\nThe directory does not appear to be a valid signageOS applet:\n`) +
+                chalk_1.default.white(`  ${directoryPath}\n\n`) +
+                chalk_1.default.yellow(`A valid applet must have ${chalk_1.default.green('@signageos/front-applet')} as a dependency.\n\n`));
+        }
+    });
+}

package/dist/Auth/loginCommand.js

@@ -50,12 +50,14 @@ const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
 const debug_1 = __importDefault(require("debug"));
 const os = __importStar(require("os"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
 const helper_1 = require("../helper");
 const runControlHelper_1 = require("../RunControl/runControlHelper");
 const parameters_1 = require("../parameters");
+const globalArgs_1 = require("../Command/globalArgs");
 const commandDefinition_1 = require("../Command/commandDefinition");
 const Debug = (0, debug_1.default)('@signageos/cli:Auth:login');
 const OPTION_LIST = [{ name: 'username', type: String, description: `Username or e-mail used for authentication` }];
@@ -100,11 +102,35 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
             let identification = options.username;
+            const profile = (0, globalArgs_1.getGlobalProfile)();
+            const configFilePath = (0, sosControlHelper_1.getConfigFilePath)();
+            // Detect a new (non-existent) named profile and prompt for the API URL
+            let promptedApiUrl;
+            if (profile) {
+                let profileExists = false;
+                if (yield fs_extra_1.default.pathExists(configFilePath)) {
+                    const content = (yield fs_extra_1.default.readFile(configFilePath)).toString();
+                    profileExists = content.includes(`[profile ${profile}]`);
+                }
+                if (!profileExists) {
+                    (0, log_1.log)('info', `Profile "${profile}" does not exist in ${configFilePath}. Please enter the server API URL to create it.`);
+                    const { inputApiUrl } = yield (0, prompts_1.default)({
+                        type: 'text',
+                        name: 'inputApiUrl',
+                        message: 'Server API URL',
+                        initial: 'https://api.signageos.io',
+                        validate: (v) => (v.startsWith('http') ? true : 'Must be a valid URL starting with http'),
+                    });
+                    if (!inputApiUrl) {
+                        throw new Error('API URL is required to log in.');
+                    }
+                    promptedApiUrl = inputApiUrl.replace(/\/+$/, '');
+                }
+            }
             const config = yield (0, runControlHelper_1.loadConfig)();
-            const apiUrl = (0, helper_1.getApiUrl)(config);
+            const apiUrl = promptedApiUrl !== null && promptedApiUrl !== void 0 ? promptedApiUrl : (0, helper_1.getApiUrl)(config);
             // Extract domain from API URL to show in prompts
-            const apiUrlObj = new URL(apiUrl);
-            const hostToDisplay = apiUrlObj.hostname;
+            const hostToDisplay = new URL(apiUrl).hostname;
             if (!identification) {
                 const response = yield (0, prompts_1.default)({
                     type: 'text',
@@ -126,7 +152,7 @@ exports.login = (0, commandDefinition_1.createCommandDefinition)({
                 password,
                 apiUrl }, authQueryParams));
             yield (0, runControlHelper_1.saveConfig)({
-                apiUrl: apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
+                apiUrl: profile || apiUrl !== parameters_1.parameters.apiUrl ? apiUrl : undefined,
                 identification: tokenId,
                 apiSecurityToken,
             });

package/dist/Command/commandProcessor.js

@@ -20,6 +20,7 @@ const command_line_usage_1 = __importDefault(require("command-line-usage"));
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const packageVersion_1 = require("../Cli/packageVersion");
 const log_1 = require("@signageos/sdk/dist/Console/log");
+const globalArgs_1 = require("./globalArgs");
 const Debug = (0, debug_1.default)('@signageos/cli:Command:processor');
 // Preprocess argv to detect and handle multi-character single-dash options
 function preprocessArgv(argv) {
@@ -40,6 +41,10 @@ function preprocessArgv(argv) {
 }
 function processCommand(currentCommand_1) {
     return __awaiter(this, arguments, void 0, function* (currentCommand, parentOptionList = [], commandIndex = 0) {
+        // Validate mutually exclusive global options once at the root invocation
+        if (commandIndex === 0) {
+            (0, globalArgs_1.validateProfileAndApiUrl)();
+        }
         const nestedOptionList = [...parentOptionList, ...currentCommand.optionList];
         // Preprocess argv to handle multi-character single-dash options that should be treated as unknown
         // rather than being split into individual characters

package/dist/Command/globalArgs.d.ts

@@ -31,3 +31,24 @@ export declare function getGlobalApiUrl(): string | undefined;
  * ```
  */
 export declare function getGlobalProfile(): string;
+/**
+ * Validate that --profile and --api-url are not used together.
+ * These options are mutually exclusive: --profile selects a fully pre-configured
+ * connection from ~/.sosrc (which already includes an api-url), while --api-url
+ * overrides the endpoint directly (implying the default profile).
+ *
+ * @throws {Error} When both --profile and --api-url are present on the command line
+ *
+ * @example
+ * ```bash
+ * # Valid: only --profile
+ * sos --profile staging login
+ *
+ * # Valid: only --api-url
+ * sos --api-url https://custom-api.com login
+ *
+ * # Invalid: both together
+ * sos --profile staging --api-url https://custom-api.com login
+ * ```
+ */
+export declare function validateProfileAndApiUrl(): void;

package/dist/Command/globalArgs.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalApiUrl = getGlobalApiUrl;
 exports.getGlobalProfile = getGlobalProfile;
+exports.validateProfileAndApiUrl = validateProfileAndApiUrl;
 const command_line_args_1 = __importDefault(require("command-line-args"));
 const generalCommand_1 = require("../generalCommand");
 /**
@@ -46,3 +47,32 @@ function getGlobalProfile() {
     const options = (0, command_line_args_1.default)([generalCommand_1.PROFILE_OPTION], { partial: true });
     return options[generalCommand_1.PROFILE_OPTION.name];
 }
+/**
+ * Validate that --profile and --api-url are not used together.
+ * These options are mutually exclusive: --profile selects a fully pre-configured
+ * connection from ~/.sosrc (which already includes an api-url), while --api-url
+ * overrides the endpoint directly (implying the default profile).
+ *
+ * @throws {Error} When both --profile and --api-url are present on the command line
+ *
+ * @example
+ * ```bash
+ * # Valid: only --profile
+ * sos --profile staging login
+ *
+ * # Valid: only --api-url
+ * sos --api-url https://custom-api.com login
+ *
+ * # Invalid: both together
+ * sos --profile staging --api-url https://custom-api.com login
+ * ```
+ */
+function validateProfileAndApiUrl() {
+    const profile = getGlobalProfile();
+    const apiUrl = getGlobalApiUrl();
+    if (profile !== undefined && apiUrl !== undefined) {
+        throw new Error(`Options --profile and --api-url are mutually exclusive. ` +
+            `--profile selects a pre-configured connection from ~/.sosrc (which already includes an API URL), ` +
+            `while --api-url overrides the API endpoint directly. Use one or the other, not both.`);
+    }
+}

package/dist/CommandLine/progressBarFactory.js

@@ -36,23 +36,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProgressBar = createProgressBar;
 const cliProgress = __importStar(require("cli-progress"));
 function createProgressBar() {
-    const progressBar = new cliProgress.Bar({
-        format: '[{bar}] {name} {percentage}% | ETA: {eta}s | {value}/{total}',
+    // Create a MultiBar instance to manage multiple progress bars
+    const multiBar = new cliProgress.MultiBar({
+        format: '[{bar}] {name} {percentage}% | ETA: {eta}s | {valueKB}/{totalKB} kB',
+        forceRedraw: true, // Force redraw to ensure the display updates correctly
+        linewrap: false, // Disable line wrapping to keep the output clean
+        autopadding: true, // Automatically adjust padding for better alignment
+        etaBuffer: 5, // Reduced buffer for faster ETA calculation on small files
+        etaAsynchronousUpdate: false, // Disable asynchronous ETA updates to avoid NULL/Infinite states
     }, cliProgress.Presets.rect);
-    let current = 0;
-    let currentName = 'preparing';
+    // Keep track of all bars to clean up properly
+    const bars = new Map();
+    const barValues = new Map();
     return {
         init({ size, name }) {
-            currentName = name;
-            progressBar.start(size, current, { name });
+            // If a bar already exists with this name, stop and remove it
+            if (bars.has(name)) {
+                const existingBar = bars.get(name);
+                if (existingBar) {
+                    existingBar.stop();
+                    bars.delete(name);
+                    barValues.delete(name);
+                }
+            }
+            // Create a new bar for this file
+            const totalKB = Math.round((size / 1024) * 100) / 100; // Round to 2 decimal places
+            const bar = multiBar.create(size, 0, {
+                name,
+                totalKB: totalKB,
+                valueKB: 0,
+            });
+            bars.set(name, bar);
+            barValues.set(name, { current: 0, total: size });
         },
         update({ add, name }) {
-            current += add;
-            currentName = name || currentName;
-            progressBar.update(current + add, { name: currentName });
+            if (name && bars.has(name)) {
+                const bar = bars.get(name);
+                const values = barValues.get(name);
+                if (bar && values) {
+                    // Update tracked values
+                    values.current += add;
+                    // Calculate kB values
+                    const valueKB = Math.round((values.current / 1024) * 100) / 100;
+                    const totalKB = Math.round((values.total / 1024) * 100) / 100;
+                    // Update bar with new values
+                    bar.update(values.current, {
+                        name,
+                        totalKB: totalKB,
+                        valueKB: valueKB,
+                    });
+                    // Force ETA update
+                    bar.updateETA();
+                }
+            }
         },
         end() {
-            progressBar.stop();
+            multiBar.stop();
+            bars.clear();
+            barValues.clear();
         },
     };
 }

package/dist/CustomScript/Upload/customScriptUploadCommand.js

@@ -68,11 +68,11 @@ exports.customScriptUpload = (0, commandDefinition_1.createCommandDefinition)({
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentDirectory = process.cwd();
-            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
+            const skipConfirmation = options.yes;
+            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options, skipConfirmation);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
             const config = yield (0, customScriptFacade_1.getConfig)(currentDirectory);
-            const skipConfirmation = options.yes;
             const customScriptVersion = yield (0, customScriptFacade_1.ensureCustomScriptVersion)(restApi, config, skipConfirmation);
             for (const platform of Object.keys(config.platforms)) {
                 const platformConfig = config.platforms[platform];

package/dist/Device/Content/setContentCommand.js

@@ -66,10 +66,10 @@ exports.setContent = (0, commandDefinition_1.createCommandDefinition)({
     commands: [],
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
+            const skipConfirmation = !!options.yes;
+            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options, skipConfirmation);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
-            const skipConfirmation = !!options.yes;
             const appletUid = yield (0, appletFacade_1.getAppletUid)(restApi, options, skipConfirmation);
             const appletVersion = yield (0, appletFacade_1.getAppletVersionFromApi)(restApi, appletUid, skipConfirmation);
             const deviceUid = yield (0, deviceFacade_1.getDeviceUid)(restApi, options, skipConfirmation);

package/dist/Device/deviceFacade.js

@@ -55,7 +55,11 @@ function getDeviceUid(restApi_1, options_1) {
                             value: dev.uid,
                         });
                     }),
+                    suggest: helper_1.autocompleteSuggest,
                 });
+                if (!response.deviceUid) {
+                    throw new Error('Device selection was cancelled');
+                }
                 Debug('Device selected', response.deviceUid);
                 deviceUid = response.deviceUid;
             }
@@ -78,7 +82,11 @@ function getActionType(options) {
                     title: item[1].name,
                     value: item[0],
                 })),
+                suggest: helper_1.autocompleteSuggest,
             });
+            if (!response.type) {
+                throw new Error('Power action selection was cancelled');
+            }
             action = response.type;
         }
         if (!action) {

package/dist/Emulator/emulatorFacade.js

@@ -37,7 +37,8 @@ const createRestApi = (config) => {
 function getListOfEmulators(restApi, organizationUid) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            return yield restApi.emulator.list({ organizationUid });
+            const emulators = yield restApi.emulator.list({ organizationUid });
+            return emulators;
         }
         catch (e) {
             if (e instanceof AuthenticationError_1.default) {
@@ -84,14 +85,18 @@ function loadEmulatorOrCreateNewAndReturnUid(organizationUid) {
         }
         else if (listOfEmulatorsResponse.length > 1) {
             const selectedEmulator = yield (0, prompts_1.default)({
-                type: 'select',
+                type: 'autocomplete',
                 name: 'duid',
                 message: 'Select emulator to use',
                 choices: listOfEmulatorsResponse.map((emu) => ({
                     title: `${emu.name} (${emu.duid})`,
                     value: emu.duid,
                 })),
+                suggest: helper_1.autocompleteSuggest,
             });
+            if (!selectedEmulator.duid) {
+                throw new Error('Emulator selection was cancelled');
+            }
             emulatorUid = selectedEmulator.duid;
         }
         else {

package/dist/Emulator/emulatorFactory.js

@@ -57,8 +57,10 @@ const fsExtra = __importStar(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const fileSystem_1 = require("../Lib/fileSystem");
+const helper_1 = require("../helper");
 const DUMMY_CHECKSUM = '0000000000ffffffffff';
 const APPLET_DIRECTORY_PATH = '/applet';
+const SOS_CONFIG_LOCAL_FILENAME = 'sos.config.local.json';
 function createEmulator(params, organizationUid, dev) {
     return __awaiter(this, void 0, void 0, function* () {
         const { appletUid, appletVersion, emulatorServerPort, appletPath, entryFileRelativePath } = params;
@@ -84,6 +86,7 @@ function createEmulator(params, organizationUid, dev) {
                 res.redirect(`${req.originalUrl}${req.originalUrl.includes('?') ? '&' : '?'}duid=${params.emulatorUid}`);
             }
             else {
+                const localConfig = loadSosLocalConfig(appletPath);
                 const page = fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString();
                 const script = `
 <script>
@@ -91,6 +94,7 @@ function createEmulator(params, organizationUid, dev) {
 	window.__SOS_BUNDLED_APPLET.binaryFile = location.origin + ${JSON.stringify(envVars.binaryFilePath)};
 	window.__SOS_BUNDLED_APPLET.uid = ${JSON.stringify(envVars.uid)};
 	window.__SOS_BUNDLED_APPLET.version = ${JSON.stringify(envVars.version)};
+	window.__SOS_BUNDLED_APPLET.config = ${JSON.stringify(localConfig)};
 	window.__SOS_BUNDLED_APPLET.checksum = ${JSON.stringify(envVars.checksum)};
 	window.__SOS_BUNDLED_APPLET.frontAppletVersion = ${JSON.stringify(envVars.frontAppletVersion)};
 	window.__SOS_BUNDLED_APPLET.frontAppletBinaryFile = ${JSON.stringify(envVars.frontAppletBinaryFile)};
@@ -139,3 +143,17 @@ function createEmulator(params, organizationUid, dev) {
         };
     });
 }
+function loadSosLocalConfig(appletPath) {
+    const sosConfigLocalPath = path.join(appletPath, SOS_CONFIG_LOCAL_FILENAME);
+    if (fsExtra.existsSync(sosConfigLocalPath)) {
+        try {
+            const configContent = fsExtra.readFileSync(sosConfigLocalPath, 'utf8');
+            (0, log_1.log)('info', `Loaded local config from ${SOS_CONFIG_LOCAL_FILENAME}`);
+            return JSON.parse(configContent);
+        }
+        catch (error) {
+            (0, log_1.log)('warning', `Failed to load ${SOS_CONFIG_LOCAL_FILENAME}: ${(0, helper_1.getErrorMessageFromUnknownError)(error)}`);
+        }
+    }
+    return {};
+}

package/dist/Firmware/Upload/firmwareUploadCommand.js

@@ -173,15 +173,12 @@ exports.firmwareUpload = (0, commandDefinition_1.createCommandDefinition)({
                     pathSet.add(path);
                 });
             }
-            try {
-                yield (0, firmwareUploadFacade_1.uploadFirmwareVersion)({
-                    restApi,
-                    firmware: data,
-                    pathArr: Array.from(pathSet),
-                    progressBar: (0, progressBarFactory_1.createProgressBar)(),
-                });
-            }
-            catch (error) {
+            yield (0, firmwareUploadFacade_1.uploadFirmwareVersion)({
+                restApi,
+                firmware: data,
+                pathArr: Array.from(pathSet),
+                progressBar: (0, progressBarFactory_1.createProgressBar)(),
+            }).catch((error) => __awaiter(this, void 0, void 0, function* () {
                 if (error instanceof RequestError_1.default && error.errorName === 'INVALID_TYPE_TO_FIRMWARE_VERSION_UPLOAD') {
                     const promptOverride = () => (0, prompts_1.default)({
                         type: 'confirm',
@@ -204,7 +201,7 @@ exports.firmwareUpload = (0, commandDefinition_1.createCommandDefinition)({
                 else {
                     throw error;
                 }
-            }
+            }));
         });
     },
 });

package/dist/Firmware/Upload/firmwareUploadFacade.js

@@ -41,11 +41,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFirmwareVersion = uploadFirmwareVersion;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs-extra"));
 const fileSystem_1 = require("../../Lib/fileSystem");
+const chalk_1 = __importDefault(require("chalk"));
 function uploadFirmwareVersion(parameters) {
     return __awaiter(this, void 0, void 0, function* () {
         const { restApi, firmware, pathArr, progressBar } = parameters;
@@ -53,17 +57,22 @@ function uploadFirmwareVersion(parameters) {
             const stat = yield fs.stat(filePath);
             return stat.size;
         })));
-        const totalSize = sizes.reduce((sum, size) => sum + size, 0);
-        if (progressBar) {
-            progressBar.init({ size: totalSize, name: pathArr.join(',') });
-        }
+        // Process each file sequentially for cleaner output
         for (const index in pathArr) {
             const filePath = pathArr[index];
             if (!filePath) {
                 continue;
             }
-            const fileSize = sizes[parseInt(index)];
+            const fileSize = sizes[Number.parseInt(index)];
+            if (fileSize === undefined) {
+                continue;
+            }
             const fileName = path.basename(filePath);
+            // Log with newline for cleaner output
+            console.info(chalk_1.default.yellow(`Uploading ${filePath}\n`));
+            if (progressBar) {
+                progressBar.init({ size: fileSize, name: fileName });
+            }
             const md5Hash = yield (0, fileSystem_1.getFileMD5Checksum)(filePath);
             const stream = fs.createReadStream(filePath);
             stream.pause();
@@ -75,7 +84,7 @@ function uploadFirmwareVersion(parameters) {
             firmware.files.push({
                 hash: md5Hash,
                 content: stream,
-                size: fileSize !== null && fileSize !== void 0 ? fileSize : 0,
+                size: fileSize,
             });
         }
         try {

package/dist/Organization/organizationFacade.d.ts

@@ -26,7 +26,7 @@ export declare const ORGANIZATION_OPTIONS: ({
     readonly type: BooleanConstructor;
     readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc";
 })[];
-export declare function getOrganizationUidOrDefaultOrSelect(options: CommandLineOptions<[typeof ORGANIZATION_UID_OPTION, typeof NO_DEFAULT_ORGANIZATION_OPTION]>): Promise<string>;
+export declare function getOrganizationUidOrDefaultOrSelect(options: CommandLineOptions<[typeof ORGANIZATION_UID_OPTION, typeof NO_DEFAULT_ORGANIZATION_OPTION]>, skipPrompts?: boolean): Promise<string>;
 export declare function selectOrganizationUid(options: CommandLineOptions<[typeof ORGANIZATION_UID_OPTION]>): Promise<string>;
 export declare function getOrganizations(): Promise<IOrganization[]>;
 export declare function getOrganization(organizationUid: string): Promise<IOrganization>;