correct errors thrown everywhere

  also update README with examples
  and update version to 0.4.13

Author: DinoChiesa

README.md

@@ -33,8 +33,8 @@ apigeeEdge.connect(options)
     return org.developers.create(options)
       .then( (result) => console.log('ok. developer: ' + JSON.stringify(result)) )
   })
-  .catch ( reason => {
-    console.log('error: ' + reason.error.stack);
+  .catch ( error => {
+    console.log('error: ' + error);
   });
 ```
 
@@ -176,10 +176,10 @@ edgeOrg.proxies.export({name:'proxyname'})
     fs.writeFileSync(path.join('/Users/foo/export', result.filename), result.buffer);
     console.log('ok');
   })
-  .catch( reason => { console.log(reason.error);});
+  .catch( error => console.log(util.format(error)) );
 ```
 
-In the case of an error, the catch()  will get the reason. There will be 2 members to the reason object: error, and result. The result is the payload send back, if any. 
+In the case of an error, the catch()  will get the Error object. There will be an additional member on the reason object: result. The result is the payload send back, if any.
 
 using callbacks:
 ```js
@@ -234,8 +234,8 @@ apigeeEdge.connect(options)
     org.proxies.import({name:opt.options.name, source:'/tmp/path/dir'})
       .then ( result =>
         console.log('import ok. %s name: %s r%d', term, result.name, result.revision) ) )
-  .catch ( reason => {
-    console.log('error: ' + reason.error.stack);
+  .catch ( error => {
+    console.log(util.format(error));
   });
 ```
 
@@ -276,7 +276,7 @@ var options = {
 
 org.proxies.deploy(options)
   .then( result => console.log('deployment succeeded.') )
-  .catch reason => console.log('deployment failed.') );
+  .catch( error => console.log('deployment failed. ' + error) );
 ```
 
 
@@ -313,11 +313,11 @@ apigeeEdge.connect(options)
         items
             .reduce(reducer, Promise.resolve([]))
             .then( (arrayOfResults) => common.logWrite('all done...\n' + JSON.stringify(arrayOfResults)) )
-            .catch( (e) => console.error('error: ' + e.stack) );
+            .catch( e => console.error('error: ' + e) );
 
       });
   })
-  .catch( reason => console.error('error: ' + reason.error.stack) );
+  .catch( e => console.error(e) );
 ```
 
 
@@ -394,7 +394,7 @@ apigeeEdge.connect(options)
       .then( () => org.maskconfigs.add({ namespaces : { prefix:'apigee', value:'urn://apigee' } })
       .then( (result) => console.log(JSON.stringify(result)) )
     })
-  .catch ( reason => console.log('error: ' + reason.error.stack) );
+  .catch ( e => console.log(e) );
 ```
 
 ### Create a Target Server
@@ -417,7 +417,7 @@ apigeeEdge.connect(options)
       }
     });
   })
-  .catch ( reason => console.log('error: ' + reason.error.stack) );
+  .catch ( e => console.log(e) );
 
 ```
 
@@ -435,8 +435,8 @@ apigeeEdge.connect(connectOptions)
       .then( result => {
         ...
       })
-      .catch( reason => {
-        console.log('failed to create: ' + reason.error);
+      .catch( e => {
+        console.log('failed to create: ' + e);
       });
   });
 ```
@@ -454,8 +454,8 @@ apigeeEdge.connect(connectOptions)
       .then ( result => {
         console.log('attrs: ' + JSON.stringify(result.attributes));
       })
-      .catch( reason => {
-        console.log('failed to create: ' + reason.error);
+      .catch( e => {
+        console.log('failed to update: ' + e);
       });
   });
 ```

examples/deployTool.js

@@ -20,7 +20,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// last saved: <2019-February-11 12:49:12>
+// last saved: <2019-September-05 15:22:42>
 
 const edgejs     = require('apigee-edge-js'),
       common     = edgejs.utility,
@@ -105,4 +105,4 @@ apigeeEdge.connect(common.optToOptions(opt))
         .catch( (e) => console.error('error: ' + e.stack) );
     }
   })
-  .catch( (e) => { console.error('error: ' + e.error);} );
+  .catch( (e) => console.error('error: ' + e) );

examples/getToken.js

@@ -18,7 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// last saved: <2019-July-08 16:07:40>
+// last saved: <2019-September-05 15:24:02>
 
 const edgejs     = require('apigee-edge-js'),
       common     = edgejs.utility,
@@ -56,4 +56,4 @@ apigeeEdge.connect(common.optToOptions(opt))
         }
       });
   })
-  .catch( e => { console.error('error: ' + e);} );
+  .catch( e => console.error('error: ' + e) );

examples/importAndDeploy.js

@@ -18,14 +18,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// last saved: <2019-June-04 10:50:42>
+// last saved: <2019-August-27 14:16:40>
 
 const edgejs     = require('apigee-edge-js'),
       common     = edgejs.utility,
+      util       = require('util'),
       apigeeEdge = edgejs.edge,
       sprintf    = require('sprintf-js').sprintf,
       Getopt     = require('node-getopt'),
-      version    = '20190211-1248',
+      version    = '20190827-1405',
       defaults   = { basepath : '/' },
       getopt     = new Getopt(common.commonOptions.concat([
         ['d' , 'source=ARG', 'source directory for the proxy files. Should be parent of dir "apiproxy" or "sharedflowbundle"'],
@@ -41,6 +42,9 @@ console.log(
   'Apigee Edge Proxy/Sharedflow Import + Deploy tool, version: ' + version + '\n' +
     'Node.js ' + process.version + '\n');
 
+process.on('unhandledRejection',
+            r => console.log('\n*** unhandled promise rejection: ' + util.format(r)));
+
 common.logWrite('start');
 
 // process.argv array starts with 'node' and 'scriptname.js'
@@ -60,8 +64,9 @@ if (opt.options.basepath && opt.options.sharedflow) {
 
 common.verifyCommonRequiredParameters(opt.options, getopt);
 
-apigeeEdge.connect(common.optToOptions(opt))
-  .then( (org) => {
+apigeeEdge
+  .connect(common.optToOptions(opt))
+  .then( org => {
     common.logWrite('connected');
 
     const collection = (opt.options.sharedflow) ? org.sharedflows : org.proxies;
@@ -89,19 +94,22 @@ apigeeEdge.connect(common.optToOptions(opt))
           const reducer = (promise, env) =>
             promise .then( () =>
                            collection
-                             .deploy(Object.assign(options, { environment:env }))
-                             .then( (result) => common.logWrite('deployment ' + ((result.error) ? 'failed: ' + JSON.stringify(result) : 'ok.') ))
+                           .deploy(Object.assign(options, { environment:env }))
+                           .then( (result) => common.logWrite('deployment ' + ((result.error) ? 'failed: ' + JSON.stringify(result) : 'ok.') ))
                          );
 
           return envs.split(',')
             .reduce(reducer, Promise.resolve())
             .then( () => common.logWrite('all done...') );
-            //.catch( (e) => console.error('error: ' + e.stack) );
+          //.catch( (e) => console.error('error: ' + e.stack) );
         }
         else {
           common.logWrite('not deploying...');
           common.logWrite('finish');
         }
       });
+
   })
-  .catch( (e) => { console.error('error: ' + e);} );
+  .catch( e => {
+    console.log('while connecting, error: ' + e);
+  } );

examples/resourceTool.js

@@ -19,7 +19,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// last saved: <2019-March-06 08:51:51>
+// last saved: <2019-September-05 15:23:39>
 
 const edgejs       = require('apigee-edge-js'),
       common       = edgejs.utility,
@@ -122,4 +122,4 @@ apigeeEdge.connect(common.optToOptions(opt))
         });
     }
   })
-  .catch( (e) => { console.error('error: ' + e.error);} );
+  .catch( (e) => console.error('error: ' + e) );

lib/cache.js

@@ -32,7 +32,7 @@
     var name = options.name || options.cache || options.cacheName;
     var env = options.env || options.environment;
     if (!env) {
-      return cb({error:"missing environment name for cache"});
+      return cb(new Error('missing environment name for cache'));
     }
     common.insureFreshToken(conn, function(requestOptions) {
       requestOptions.url = (options.name) ?
@@ -55,10 +55,10 @@
     var name = options.name || options.cache || options.cacheName;
     var env = options.env || options.environment;
     if (!env) {
-      return cb({error:"missing environment name for cache"});
+      return cb(new Error('missing environment name for cache'));
     }
     if (!name) {
-      return cb({error:"missing name for cache"});
+      return cb(new Error("missing name for cache"));
     }
     if (conn.verbosity>0) {
       utility.logWrite(sprintf('Create Cache %s', name));
@@ -98,10 +98,10 @@
     var name = options.name || options.cache || options.cacheName;
     var env = options.env || options.environment;
     if (!env) {
-      return cb({error:"missing environment name for cache"});
+      return cb(new Error("missing environment name for cache"));
     }
     if (!name) {
-      return cb({error:"missing name for cache"});
+      return cb(new Error("missing name for cache"));
     }
     if (conn.verbosity>0) {
       utility.logWrite(sprintf('Delete Cache %s', name));

lib/common.js

@@ -57,6 +57,7 @@
   }
 
   function safeJsonParse(response, body) {
+    if ( ! response || !response.headers) return body;
     let isJson = jsonRe.test(response.headers["content-type"]);
     // this simple approach does not work because the
     // Edge API sometimes claims application/json erroneously.

lib/connection.js

@@ -35,6 +35,12 @@
     return obj;
   }
 
+  function shortString(s){
+    if (s.length > 32)
+      s = s.substring(0, 32) + '...';
+      return s.replace(new RegExp('\n', 'g'), ' ');
+  }
+
   function invokeTokenEndpoint(conn, formparams, cb) {
     var requestOptions = {
           headers: {
@@ -50,14 +56,20 @@
     request.post(requestOptions, common.callback(conn, [200], function(e, result) {
       if (conn.verbosity>0) {
         if (e) {
-          utility.logWrite('POST error: ' + JSON.stringify(e));
+          utility.logWrite('POST error: ' + e.message);
+        }
+        else if (typeof result == 'string') {
+          utility.logWrite('POST result (string): ' + shortString(result));
         }
         else {
           var masked = mask(result);
           utility.logWrite('POST result: ' + JSON.stringify(masked));
         }
       }
-      if ( ! e && result) {
+      if (e) {
+        return cb(e, result);
+      }
+      if (result && typeof result == 'object' && result.access_token) {
         result.issued_at = (new Date()).valueOf();
         if (formparams.username) {
           conn.user = formparams.username;
@@ -66,8 +78,10 @@
         conn.requestHeaders.authorization = 'Bearer ' + result.access_token;
         delete conn.org.passcode;
         delete conn.org.password;
+        return cb(null, result);
       }
-      cb(e, result);
+
+      return cb(new Error("invalid token response"), result);
     }));
   }
 

lib/developer.js

@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+/* global process */
 
 (function (){
   'use strict';
@@ -46,7 +47,7 @@
     var conn = this.conn;
     var email = options.developerEmail || options.email;
     if ( !email || !options.firstName || !options.lastName || !options.userName) {
-      return cb({error: "missing required inputs, one of {email, firstName, lastName, userName}"});
+      return cb(new Error("missing required inputs, one of {email, firstName, lastName, userName}"));
     }
     if (conn.verbosity>0) {
       utility.logWrite(sprintf('Create Developer %s', email));
@@ -77,7 +78,7 @@
     // Authorization: :edge-auth
     var conn = this.conn;
     if ( !options.developerEmail) {
-      return cb({error: "missing developerEmail"});
+      return cb(new Error("missing developerEmail"));
     }
     if (conn.verbosity>0) {
       utility.logWrite(sprintf('Delete Developer %s', options.developerEmail));
@@ -111,11 +112,11 @@
     // POST -H content-type:application/octet-stream
     //  /v1/o/ORGNAME/developers/DEVELOPERID?action=ACTION
     if(options.action != 'revoke' && options.action != 'approve') {
-      return cb({error:"missing or invalid action"});
+      return cb(new Error("missing or invalid action"));
     }
     var discriminator = options.developer || options.developerId || options.developerEmail || options.email ;
     if( ! discriminator) {
-      return cb({error:"missing developer ID or email"});
+      return cb(new Error("missing developer ID or email"));
     }
 
     let urlTail = sprintf('developers/%s', discriminator);

lib/developerApp.js

@@ -48,7 +48,7 @@
     var name = options.appName || options.name || options.app;
     var email = options.developer || options.developerEmail || options.email ;
     if ( !email || !name || !options.apiProduct) {
-      return cb({error: "missing required inputs, one of {developer, appName, apiProduct}"});
+      return cb(new Error("missing required inputs, one of {developer, appName, apiProduct}"));
     }
     if (conn.verbosity>0) {
       utility.logWrite(sprintf('Create App %s for %s', name, email));
@@ -76,8 +76,9 @@
       requestOptions.body = JSON.stringify({
         attributes : appAttributes,
         apiProducts: [options.apiProduct],
-        keyExpiresIn : keyExpiresIn,
-        name: name
+        keyExpiresIn,
+        name,
+        callbackUrl: options.callbackUrl
       });
       if (conn.verbosity>0) {
         utility.logWrite(sprintf('POST %s', requestOptions.url));