nqm-common-import - npm Package Compare versions

Comparing version 0.0.8 to 0.0.9

lib/commands.js

@@ -14,2 +14,17 @@ /**
 
+  var handleError = function(err, response, log, cb) {
+    if (err || response.statusCode !== 200 || (response.body && response.body.error)) {
+      if (!err) {
+        err = new Error("[status code " + response.statusCode + "] " + ((response.body && response.body.error) || "unknown error"));
+      }
+      log("failure [%s]", err.message);
+      cb(err);
+      // Error handled.
+      return true;    
+    } else {
+      // No error.
+      return false;
+    }
+  };
+
   exports.getAccessToken = (function() {
@@ -21,7 +36,3 @@ var log = require("debug")("getAccessToken");
       request({ url: url, method: "post", headers: { "authorization": "Basic " + credentials }, json: true, body: { grant_type: "client_credentials" } }, function(err, response, content) {
-        if (err || response.statusCode !== 200) {
-          err = err || new Error(response.body.error || "not found");
-          log("failure [%s]", err.message);
-          cb(err);
-        } else {
+        if (!handleError(err, response, log, cb)) {
           log("result from server: %j", response.body);
@@ -39,18 +50,2 @@ cb(null, response.body.access_token);
 
-    var buildSchema = function(schema, inp) {
-      _.forEach(inp, function(v,k) {
-        if (Array.isArray(v)) {
-          schema[k] = v;
-        } else if (typeof v === "object") {
-          schema[k] = {};
-          buildSchema(schema[k], v);
-        } else if (typeof v === "string" && k !== "__tdxType") {
-          schema[k] = { type: v };
-        } else {
-          schema[k] = v;
-        }
-      });
-      return schema;
-    };
- 
     function createTargetDataset(commandHost, accessToken, targetFolder, name, basedOn, schema, primaryKey, cb) {
@@ -64,10 +59,5 @@ var url = util.format("%s/commandSync/resource/create", commandHost);
       data.schema.uniqueIndex = _.map(primaryKey, function(key) { return { asc: key }} );
-      // buildSchema(data.schema.dataSchema, schema);
       log("sending create dataset [%j]",data);
       request({ url: url, method: "post", headers: { authorization: "Bearer " + accessToken }, json: true, body: data }, function(err, response, content) {
-        if (err || response.statusCode !== 200 || response.body.error) {
-          err = err || new Error(response.body.error || "not found");
-          log("failure upserting dataset data [%s]", err.message);
-          cb(err);
-        } else {
+        if (!handleError(err, response, log, cb)) {
           log("result from server: %j", response.body);
@@ -91,7 +81,3 @@ cb(null, response.body.response.id);
       request({ method: "get", url: url, json: true }, function(err, response, content) {
-        if (err || response.statusCode !== 200) {
-          err = err || new Error("not found");
-          log("failure getting dataset %s [%s]",datasetId, err.message);
-          cb(err);
-        } else {
+        if (!handleError(err, response, log, cb)) {
           cb(null, content);
@@ -119,7 +105,3 @@ }
       request(requestOptions, function(err, response, content) {
-        if (err || response.statusCode !== 200 || response.body.error) {
-          err = err || new Error(response.body.error || "not found");
-          log("failure adding dataset data [%s]", err.message);
-          cb(err);
-        } else {
+        if (!handleError(err, response, log, cb)) {
           log("result from server: %j", response.body);
@@ -147,7 +129,3 @@ cb(null);
       request({ url: url, timeout: 3600000, method: "post", headers: { authorization: "Bearer " + accessToken }, json: true, body: bulk }, function(err, response, content) {
-        if (err || response.statusCode !== 200 || response.body.error) {
-          err = err || new Error(response.body.error || "not found");
-          log("failure upserting dataset data [%s]", err.message);
-          cb(err);
-        } else {
+        if (!handleError(err, response, log, cb)) {
           log("result from server: %j", response.body);
@@ -154,0 +132,0 @@ cb(null);

package.json

@@ -7,3 +7,3 @@ {
   },
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "",
@@ -10,0 +10,0 @@ "main": "index.js",

No alert changes

Worsened metrics

Total package byte prevSize

9676

decreased by-8.56%

Lines of code

252

decreased by-8.03%

No dependency changes