@heroku/skynet 2.0.4 → 2.2.0

package/dist/commands/allowlists.js

@@ -1,6 +1,7 @@
 import SkynetAPI from '../lib/skynet.js';
 import { Command } from '@heroku-cli/command';
 import { hux } from '@heroku/heroku-cli-util';
+import { parseResponse } from '../lib/utils.js';
 export default class Allowlists extends Command {
     static id = 'skynet:allowlists';
     static aliases = ['skynet:allowlists'];
@@ -12,7 +13,7 @@ export default class Allowlists extends Command {
     async run() {
         const skynet = new SkynetAPI(this.heroku.auth);
         let response = await skynet.allowlists();
-        response = JSON.parse(response);
+        response = parseResponse(response);
         if (Object.keys(response).length > 0) {
             hux.table(response, {
                 Value: {},

package/dist/commands/categories/get.js

@@ -1,6 +1,7 @@
 import SkynetAPI from '../../lib/skynet.js';
 import { Command } from '@heroku-cli/command';
 import { hux } from '@heroku/heroku-cli-util';
+import { parseResponse } from '../../lib/utils.js';
 export default class GetCategories extends Command {
     static id = 'skynet:categories';
     static aliases = ['skynet:categories'];
@@ -12,7 +13,7 @@ export default class GetCategories extends Command {
     async run() {
         const skynet = new SkynetAPI(this.heroku.auth);
         let response = await skynet.categories();
-        response = JSON.parse(response);
+        response = parseResponse(response);
         hux.table(response, {
             Category: {},
             Description: {}

package/dist/commands/deprovision.js

@@ -3,6 +3,7 @@ import { requireSudo } from '../lib/sudo.js';
 import { Command } from '@heroku-cli/command';
 import { color } from '@heroku-cli/color';
 import { Flags, ux } from '@oclif/core';
+import { parseResponse } from '../lib/utils.js';
 export default class Deprovision extends Command {
     static id = 'skynet:deprovision';
     static aliases = ['skynet:deprovision'];
@@ -76,7 +77,7 @@ export default class Deprovision extends Command {
         ux.action.start(`Deprovisioning ${color.cyan(user)}`);
         let response = await skynet.deprovision(user, notes, category, notify, force);
         ux.action.stop();
-        response = JSON.parse(response);
+        response = parseResponse(response);
         ux.log(`${color.cyan(response.status)}. ${response.message}. Notification ${notificationStatus}`);
     }
 }

package/dist/commands/suspend/app-owner.js

@@ -1,10 +1,9 @@
 import SkynetAPI from '../../lib/skynet.js';
-import * as utils from '../../lib/utils.js';
 import { requireSudo } from '../../lib/sudo.js';
 import { Command } from '@heroku-cli/command';
 import { color } from '@heroku-cli/color';
 import { Flags, ux } from '@oclif/core';
-import { processSuspensionResult } from '../../lib/utils.js';
+import { processSuspensionResult, parseResponse, readlines, arrayChunks } from '../../lib/utils.js';
 const chunkSize = 5;
 export default class SuspendAppOwner extends Command {
     static id = 'skynet:suspend:app-owner';
@@ -71,8 +70,8 @@ export default class SuspendAppOwner extends Command {
             ux.error('Either --app or --infile must be passed, but not both');
         }
         if (file) {
-            const apps = await utils.readlines(file);
-            const chunks = utils.arrayChunks(apps, chunkSize);
+            const apps = await readlines(file);
+            const chunks = arrayChunks(apps, chunkSize);
             for (const chunk of chunks) {
                 ux.log('Suspending app owners: ' + chunk.join());
                 const response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category, deprovision);
@@ -82,7 +81,8 @@ export default class SuspendAppOwner extends Command {
         else {
             ux.action.start(`Suspending app owner of ${color.cyan(app)}`);
             let response = await skynet.suspendAppOwner(app, notes, category, force, deprovision, flags.async);
-            response = JSON.parse(response);
+            response = parseResponse(response);
+            ux.action.stop();
             processSuspensionResult(app, response);
         }
     }

package/dist/commands/suspend/apps.js

@@ -3,7 +3,7 @@ import { requireSudo } from '../../lib/sudo.js';
 import { Command } from '@heroku-cli/command';
 import { color } from '@heroku-cli/color';
 import { Flags, ux } from '@oclif/core';
-import { processSuspensionResult } from '../../lib/utils.js';
+import { processSuspensionResult, parseResponse } from '../../lib/utils.js';
 export default class SuspendApp extends Command {
     static id = 'skynet:suspend:app';
     static aliases = ['skynet:suspend:app'];
@@ -50,7 +50,8 @@ export default class SuspendApp extends Command {
         const skynet = new SkynetAPI(this.heroku.auth);
         ux.action.start(color.blue.bold(`Suspending the app ${color.cyan(flags.app)}...`));
         let response = await skynet.suspendApp(flags.app, flags.notes, flags.category, flags.bypass || process.env.HEROKU_FORCE === '1', flags.async);
-        response = JSON.parse(response);
+        response = parseResponse(response);
+        ux.action.stop();
         processSuspensionResult(flags.app, response);
     }
 }

package/dist/commands/suspend/user.js

@@ -2,7 +2,7 @@ import SkynetAPI from '../../lib/skynet.js';
 import { requireSudo } from '../../lib/sudo.js';
 import { Command } from '@heroku-cli/command';
 import { Flags, ux } from '@oclif/core';
-import { logError, processSuspensionResult } from '../../lib/utils.js';
+import { processSuspensionResult, parseResponse, handleApiError } from '../../lib/utils.js';
 import { color } from '@heroku-cli/color';
 export default class SuspendUser extends Command {
     static id = 'skynet:suspend:user';
@@ -92,21 +92,36 @@ export default class SuspendUser extends Command {
         }
         if (file) {
             ux.action.start(color.blue.bold('Starting bulk suspend...'));
-            let response = await skynet.bulkSuspendUsers(file, notes, category, notify, force, deprovision);
-            response = JSON.parse(response);
-            if (response.statusCode === 200) {
-                ux.action.stop(color.green(`Bulk suspended users from ${file}. Please check slack for update on processing.`));
+            try {
+                let response = await skynet.bulkSuspendUsers(file, notes, category, notify, force, deprovision);
+                response = parseResponse(response);
+                ux.action.stop();
+                // For bulk operations, use a custom message if no message is in response
+                if ((response?.status === 'OK' || response?.statusCode === 200) && !response?.message && !response?.Message) {
+                    response.message = `Bulk suspended users from ${file}. Please check slack for update on processing.`;
+                }
+                processSuspensionResult(file, response);
             }
-            else {
-                logError(response);
-                ux.action.stop(color.bgRed(`Failed to bulk suspend users from ${file}`));
+            catch (error) {
+                ux.action.stop();
+                handleApiError(error, `bulk suspend users from ${file}`);
             }
         }
         else {
             ux.action.start(color.blue.bold(`Suspending user ${color.cyan(user)}...`));
-            let response = await skynet.suspendUser(user, notes, category, notify, force, deprovision, flags.async);
-            response = JSON.parse(response);
-            processSuspensionResult(user, response);
+            try {
+                let response = await skynet.suspendUser(user, notes, category, notify, force, deprovision, flags.async);
+                response = parseResponse(response);
+                ux.action.stop();
+                processSuspensionResult(user, response);
+            }
+            catch (error) {
+                // got throws errors for non-2xx status codes (like 409)
+                ux.action.stop();
+                handleApiError(error, `suspend ${user}`, false);
+                // Don't re-throw - we've handled the error response
+                return;
+            }
         }
     }
 }

package/dist/commands/suspensions.js

@@ -1,6 +1,7 @@
 import SkynetAPI from '../lib/skynet.js';
 import { Command } from '@heroku-cli/command';
 import { Flags, ux } from '@oclif/core';
+import { parseResponse } from '../lib/utils.js';
 export default class Suspensions extends Command {
     static id = 'skynet:suspensions';
     static aliases = ['skynet:suspensions'];
@@ -21,7 +22,7 @@ export default class Suspensions extends Command {
         const { flags } = await this.parse(Suspensions);
         const skynet = new SkynetAPI(this.heroku.auth);
         let response = await skynet.suspensions(flags.account);
-        response = JSON.parse(response);
+        response = parseResponse(response);
         ux.log(response);
     }
 }

package/dist/commands/unsuspend/apps.js

@@ -2,7 +2,7 @@ import SkynetAPI from '../../lib/skynet.js';
 import { Command } from '@heroku-cli/command';
 import { color } from '@heroku-cli/color';
 import { Flags, ux } from '@oclif/core';
-import { processUnsuspendResult } from '../../lib/utils.js';
+import { processUnsuspendResult, parseResponse } from '../../lib/utils.js';
 export default class UnsuspendApp extends Command {
     static id = 'skynet:unsuspend:app';
     static aliases = ['skynet:unsuspend:app'];
@@ -44,7 +44,7 @@ export default class UnsuspendApp extends Command {
         }
         ux.action.start(`Unsuspending app ${color.cyan(app)}`);
         let response = await skynet.unsuspendApp(app, category, notes);
-        response = JSON.parse(response);
+        response = parseResponse(response);
         processUnsuspendResult(app, response);
     }
 }

package/dist/commands/unsuspend/user.js

@@ -3,7 +3,7 @@ import { requireSudo } from '../../lib/sudo.js';
 import { Command } from '@heroku-cli/command';
 import { color } from '@heroku-cli/color';
 import { Flags, ux } from '@oclif/core';
-import { processUnsuspendResult } from '../../lib/utils.js';
+import { processUnsuspendResult, parseResponse } from '../../lib/utils.js';
 export default class UnsuspendUser extends Command {
     static id = 'skynet:unsuspend:user';
     static aliases = ['skynet:unsuspend:user'];
@@ -45,7 +45,7 @@ export default class UnsuspendUser extends Command {
         }
         ux.action.start(`Unsuspending ${color.cyan(user)}`);
         let response = await skynet.unsuspendUser(user, category, notes);
-        response = JSON.parse(response);
+        response = parseResponse(response);
         processUnsuspendResult(user, response);
     }
 }

package/dist/lib/utils.d.ts

@@ -1,5 +1,17 @@
 export declare function readlines(file: string): Promise<string[]>;
 export declare function arrayChunks<T>(array: T[], chunkSize: number): T[][];
+/**
+ * Parses a response that may be a string (JSON) or already an object
+ */
+export declare function parseResponse(response: any): any;
+/**
+ * Extracts and normalizes error information from an API error
+ */
+export declare function extractErrorBody(error: any): any;
+/**
+ * Handles API errors consistently, logging them and optionally throwing
+ */
+export declare function handleApiError(error: any, operation: string, throwError?: boolean): void;
 export declare function processSuspensionResult(suspendObject: any, response: any): void;
 export declare function processUnsuspendResult(unsuspendObject: any, response: any): void;
 export declare function logError(response: any): void;

package/dist/lib/utils.js

@@ -32,18 +32,74 @@ export function arrayChunks(array, chunkSize) {
     }
     return chunks;
 }
+/**
+ * Parses a response that may be a string (JSON) or already an object
+ */
+export function parseResponse(response) {
+    return typeof response === 'string' ? JSON.parse(response) : response;
+}
+/**
+ * Extracts and normalizes error information from an API error
+ */
+export function extractErrorBody(error) {
+    if (!error?.response?.body) {
+        return null;
+    }
+    try {
+        const errorBody = typeof error.response.body === 'string'
+            ? JSON.parse(error.response.body)
+            : error.response.body;
+        // Add status code from the HTTP response if not in body
+        if (error.response.statusCode && !errorBody.statusCode) {
+            errorBody.statusCode = error.response.statusCode;
+        }
+        return errorBody;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Handles API errors consistently, logging them and optionally throwing
+ */
+export function handleApiError(error, operation, throwError = true) {
+    const errorBody = extractErrorBody(error);
+    if (errorBody) {
+        logError(errorBody);
+    }
+    else if (!error?.response?.body) {
+        // Only log error message if we don't have a response body (already logged by logError)
+        ux.log(color.red(`Error: ${error?.message || error}`));
+    }
+    ux.log(color.bgRed(`Failed to ${operation}`));
+    if (throwError) {
+        throw error;
+    }
+}
 export function processSuspensionResult(suspendObject, response) {
-    if (response.statusCode === 200) {
-        ux.action.stop(color.green(`Suspended ${suspendObject}`));
+    if (response?.success === 'ok' || response?.status === 'OK' || response?.statusCode === 200) {
+        const message = response?.message || response?.Message;
+        if (message) {
+            ux.log(color.green(message));
+        }
+        else {
+            ux.log(color.green(`Suspended ${suspendObject}`));
+        }
     }
     else {
         logError(response);
-        ux.action.stop(color.bgRed(`Failed to suspend ${suspendObject}`));
+        ux.log(color.bgRed(`Failed to suspend ${suspendObject}`));
     }
 }
 export function processUnsuspendResult(unsuspendObject, response) {
-    if (response.statusCode === 200) {
-        ux.action.stop(color.green(`Unsuspended ${unsuspendObject}`));
+    if (response?.success === 'ok' || response?.status === 'OK' || response?.statusCode === 200) {
+        const message = response?.message || response?.Message;
+        if (message) {
+            ux.action.stop(color.green(message));
+        }
+        else {
+            ux.action.stop(color.green(`Unsuspended ${unsuspendObject}`));
+        }
     }
     else {
         logError(response);
@@ -51,7 +107,32 @@ export function processUnsuspendResult(unsuspendObject, response) {
     }
 }
 export function logError(response) {
-    ux.log(`${color.red(response.status)} \'${response.statusCode}\'.`);
-    ux.log(color.red(response.message));
-    ux.log(color.red(`Error: ${response.error}`));
+    const parts = [];
+    // Handle API response format: { Status: "error", StatusCode: 409, Message: "...", Error: "..." }
+    if (response?.statusCode || response?.StatusCode) {
+        parts.push(`Status: ${response.statusCode || response.StatusCode}`);
+    }
+    if (response?.Status && response.Status !== 'OK') {
+        parts.push(response.Status);
+    }
+    if (response?.Message) {
+        parts.push(response.Message);
+    }
+    else if (response?.message) {
+        parts.push(response.message);
+    }
+    if (response?.Error) {
+        parts.push(response.Error);
+    }
+    else if (response?.error) {
+        parts.push(response.error);
+    }
+    // If we have parts, combine them into a single line
+    if (parts.length > 0) {
+        ux.log(color.red(parts.join(' - ')));
+    }
+    else {
+        // If response doesn't have expected error format, log the whole thing
+        ux.log(color.red(`Error: ${JSON.stringify(response)}`));
+    }
 }

package/oclif.manifest.json

@@ -756,5 +756,5 @@
       ]
     }
   },
-  "version": "2.0.4"
+  "version": "2.2.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "2.0.4",
+  "version": "2.2.0",
   "description": "use Skynet from Heroku CLI",
   "type": "module",
   "repository": "heroku/heroku-skynet-cli",
@@ -20,6 +20,7 @@
     "@heroku-cli/color": "^2.0.4",
     "@heroku-cli/command": "^11.8.0",
     "@heroku/heroku-cli-util": "^10.1.2",
+    "@oclif/core": "^2.16.0",
     "@oclif/plugin-help": "^6.2.32",
     "form-data": "^4.0.4",
     "got": "^14.6.0",
@@ -66,6 +67,7 @@
     "build:dev": "rm -rf dist && tsc -b --sourcemap",
     "build:full": "rm -rf dist && tsc -b && npm run manifest && npm run readme",
     "manifest": "oclif manifest",
+    "release:prepare": "np --no-yarn",
     "readme": "echo 'README generation skipped for legacy plugin format'",
     "release": "np --no-yarn --any-branch",
     "lint": "eslint . --ext .ts --config .eslintrc.json",