akkeris - npm Package Compare versions

Comparing version 2.8.1 to 2.8.5

aka.js

@@ -131,15 +131,47 @@ #!/usr/bin/env node
   console.log(`
-                              _
-                          .-'\` \`}
-                  _./)   /       }
-                .'o   \\ |       }
-                '.___.'\`.\\    {\`
-                /\`\\_/  , \`.    }
-                \\=' .-'   _\`\  {
-                 \`'\`;/      \`,  }
-                    _\\       ;  }
-                   /__\`;-...'--'
 
-                   SQUIRREL!
+                      ''              .
+                      +d/           -yd.
+                      +mdy-...--..-/hdm.
+                      'dmmdyhyyyyyhdmms
+                       /mhhhhhddddddyd.
+                       .dmyhhhhhhhdhhh
+                       .yddyhhyyyhhyds
+                      .ohhyyyssdysyhys-
+                     .+yhyyhooydyoohys+'
+                    -+syssys/:smh+/oso+-
+                   -oyyysooo++sdy++oooo/
+                  -oyyyoo+++++++//:+++so-
+                 :yhyyo::-::::::::--::+yo
+               '+hhyo/-...----:-------/yy.
+               .hhssso+:-.....-.....--:+s/
+               -dhshdys+-.'........-//ooo/
+               'hmhhhddy+:--------/+oyhyy.
+                ydmmddmddhy++:-:+ohhdddh+
+               'oddddhhdmmhhhsoyyhdmmdy:'
+               -sddmh++/ohdhdddhhhhdmm+
+               /ydddy//::oso+oossoohmm+
+               /yhdhy/:-:+/::::////hmd:
+               /ydmdo--://:---:/:/odmo
+              'syhds/o:::--.-::::/ymd+
+              /sydho:::::-..-::::/omho'
+             .syhdd+---::-..-::://sdhs.
+             .sydhh+-:-::--.-:::/ohhys-
+             :ohhss+///+/::-:+//++osyy/.'
+            .ooo/++oshy++///+hy///+ooyo:..''
+            :so+/:::+yyso+++sh+---/+ohys//-..'
+            +hss+:-::/++/++///---:+oyhhyo/:-..'
+            sdho+/:::://::/:::-:-/oshdmho++/-.'
+            yddyy/://:/+///://::-:+ydmmdy+/:-.'
+           'ymdhy+os+/+sysoohs////+sddNmh+::-'
+            .hddhssoo+osdmdmmhso+oshddNmh+:.'
+             .hddhhssssyhdmmdhhyyyhdddmds+.
+              .hmmNmddmmmNMNNNNNNmmmmmy:'
+         :/+oosshdmmddNNNNNmNNNmdhmdhyo:.
+         -+ooo+ooo+/:--.''   ''./yysyhhho
 
+
+
+                     SQUIRREL!
+
   `)
@@ -191,2 +223,10 @@ }
   }
+  process.env.AKKERIS_AUTH_HOST = process.env.AKKERIS_AUTH_HOST.toLowerCase().trim()
+  process.env.AKKERIS_API_HOST = process.env.AKKERIS_API_HOST.toLowerCase().trim()
+  if (process.env.AKKERIS_AUTH_HOST.startsWith('https://') || process.env.AKKERIS_AUTH_HOST.startsWith('http://')) {
+    process.env.AKKERIS_AUTH_HOST = (new url.URL(process.env.AKKERIS_AUTH_HOST)).hostname
+  }
+  if (process.env.AKKERIS_API_HOST.startsWith('https://') || process.env.AKKERIS_API_HOST.startsWith('http://')) {
+    process.env.AKKERIS_API_HOST = (new url.URL(process.env.AKKERIS_API_HOST)).hostname
+  }
 }
@@ -562,2 +602,5 @@
                     'https://' + module.exports.config.akkeris_api_host) + rurl);
+  if (process.env.DEBUG) {
+    console.log(` => [akkeris-debug-http] ${type} ${full_url} ${JSON.stringify(headers)} ${JSON.stringify(payload)} `)
+  }
   return request(type, payload, full_url, headers, callback);
@@ -564,0 +607,0 @@ }

lib/terminal.js

@@ -124,3 +124,3 @@ const util = require('util');
 
-function error(obj) {
+function error(obj, onLogin) {
   if(process.env.DEBUG && obj && obj.message && obj.stack) {
@@ -130,3 +130,3 @@ console.log(obj.message)
   }
-  if(obj && obj.code && obj.code === 401) {
+  if(obj && obj.code && obj.code === 401 && !onLogin) {
     process.stderr.write(' ' + error_color + '▸' + normalColor + ' You do not appear to be logged in, use "aka auth:login" and try again.\n' + normalColor);
@@ -137,3 +137,9 @@ return;
       var msg = JSON.parse(obj.body.toString());
-      console.error('☠  ' + error_color + 'Error ' + obj.code + normalColor + (msg.message ? (', ' + msg.message) : obj.body.toString() ));
+      if(msg.message) {
+        console.error('☠  ' + error_color + 'Error ' + obj.code + normalColor + (msg.message ? (', ' + msg.message) : obj.body.toString() ));
+      } else if (msg.error_description && msg.error) {
+        console.error('☠  ' + error_color + 'Error ' + normalColor + `${msg.error_description} (${msg.error})`);
+      } else {
+        console.error('☠  ' + error_color + 'Error ' + normalColor, obj.body);
+      }
     } catch (e) {
@@ -140,0 +146,0 @@ var msg = obj.body.toString();

package.json

 {
   "name": "akkeris",
-  "version": "2.8.1",
+  "version": "2.8.5",
   "description": "Akkeris CLI",
@@ -5,0 +5,0 @@ "main": "aka.js",

plugins/addons/index.js

@@ -351,3 +351,3 @@ "use strict"
     }
-    appkit.terminal.error(new Error('The addon may currently be unavailable or unable to process upgrades, try again later.'))
+    appkit.terminal.error(e)
   } finally {
@@ -387,3 +387,3 @@ if(maintenance_ran) {
     }
-    appkit.terminal.error(new Error('The addon may currently be unavailable or unable to process downgrades, try again later.'))
+    appkit.terminal.error(e)
   } finally {
@@ -390,0 +390,0 @@ if(maintenance_ran) {

plugins/auth/index.js

@@ -21,3 +21,9 @@ "use strict"
     appkit.http.post(
-      JSON.stringify({'notes':'Akkeris CLI Token (' + require('os').hostname() + ')', 'note':'Akkeris CLI Token', 'notes_url':'', 'fingerprint':''}), 
+      JSON.stringify({
+        'notes':'Akkeris CLI Token (' + require('os').hostname() + ')', 
+        'note':'Akkeris CLI Token (' + (new Date()).toISOString() + ')', 
+        'notes_url':'', 
+        'fingerprint':'',
+        'scopes':['read:user','read:org'],
+      }), 
       `https://${appkit.config.akkeris_auth_host}/authorizations`, 
@@ -30,7 +36,7 @@ headers,
         }
-        if(err.body && err.body.indexOf('2FA') > -1 || err.body && err.body.indexOf('OTP')) {
+        if(err.body && err.body.indexOf('2FA') > -1 || err.body && err.body.indexOf('OTP') > -1) {
           let otp_header = Object.keys(err.headers).filter((x) => { return x.toLowerCase().indexOf("-otp") !== -1 && x.toLowerCase().startsWith("x-") })
           if(otp_header.length !== 1) {
             loader.end('error')
-            return appkit.terminal.error("Unable to determine type of two factor OTP: " + err.body)
+            return appkit.terminal.error("Unable to determine type of two factor OTP: " + err.body, true)
           }
@@ -45,3 +51,3 @@ loader.end('ok');
           loader.end('error');
-          return appkit.terminal.error(err);
+          return appkit.terminal.error(err, true);
         }
@@ -48,0 +54,0 @@ } else {

No alert changes

Improved metrics

Total package byte prevSize

214920

increased by1.08%

Lines of code

5740

increased by0.91%

Worsened metrics

Number of low supply chain risk alerts

63

increased by26%

No dependency changes