presto-client - npm Package Compare versions

Comparing version 0.7.0 to 0.8.0

lib/presto-client/index.js

 const { URL } = require('url') ;
 
 var adapterFor = (function() {
-    adapters = {
-      'http:': require('http'),
-      'https:': require('https'),
+    var adapters = {
+        'http:': require('http'),
+        'https:': require('https'),
     };
 
-  return function(protocol) {
-    return adapters[protocol];
-  }
+    return function(protocol) {
+        return adapters[protocol];
+    };
 }());
@@ -21,47 +21,58 @@
 var Client = exports.Client = function(args){
-  if (!args)
-    args = {};
-  // exports.version set in index.js of project root
-  this.userAgent = 'presto-client-node ' + exports.version;
+    if (!args)
+        args = {};
+    // exports.version set in index.js of project root
+    this.userAgent = 'presto-client-node ' + exports.version;
 
-  this.host = args.host || 'localhost';
-  this.port = args.port || 8080;
-  this.user = args.user || process.env.USER;
-  this.basic_auth = args.basic_auth || null;
-  this.protocol = 'http:';
+    this.host = args.host || 'localhost';
+    this.port = args.port || 8080;
+    this.user = args.user || process.env.USER;
+    this.basic_auth = args.basic_auth || null;
+    this.protocol = 'http:';
 
-  this.catalog = args.catalog;
-  this.schema = args.schema;
+    this.catalog = args.catalog;
+    this.schema = args.schema;
     
-  this.source = args.source || 'nodejs-client';
+    this.source = args.source || 'nodejs-client';
 
-  this.checkInterval = args.checkInterval || QUERY_STATE_CHECK_INTERVAL;
-  this.enableVerboseStateCallback = args.enableVerboseStateCallback || false;
-  this.jsonParser = args.jsonParser || JSON;
+    this.checkInterval = args.checkInterval || QUERY_STATE_CHECK_INTERVAL;
+    this.enableVerboseStateCallback = args.enableVerboseStateCallback || false;
+    this.jsonParser = args.jsonParser || JSON;
 
-  if (args.ssl) {
-    this.protocol = 'https:';
-    this.ssl = args.ssl;
-  }
+    if (args.ssl) {
+        this.protocol = 'https:';
+        this.ssl = args.ssl;
+    }
 };
 
 Client.prototype.request = function(opts, callback) {
-  var client = this;
-  var adapter = adapterFor(client.protocol);
-  var contentBody = null;
+    var client = this;
+    var adapter = adapterFor(client.protocol);
+    var contentBody = null;
 
-  if (opts instanceof Object) {
-    opts.host = client.host;
-    opts.port = client.port;
+    if (opts instanceof Object) {
+        opts.host = client.host;
+        opts.port = client.port;
+        if (! opts.headers)
+            opts.headers = {};
+    } else {
+        // "opts" argument should be an URL, probably nextUri
+        var href = new URL(opts);
+        opts = {
+            method: 'GET',
+            host: href.hostname,
+            port: href.port,
+            path: href.pathname + href.search,
+            headers: {},
+        };
+    }
     opts.protocol = client.protocol;
+
     opts = Object.assign({}, opts, client.ssl);
 
-    if (! opts.headers)
-      opts.headers = {};
+    if (client.user)
+        opts.headers[Headers.USER] = client.user;
 
-    if (client.user)
-      opts.headers[Headers.USER] = client.user;
-      
     if (client.source)
-      opts.headers[Headers.SOURCE] = client.source;
+        opts.headers[Headers.SOURCE] = client.source;
 
@@ -73,285 +84,276 @@ opts.headers[Headers.USER_AGENT] = this.userAgent;
      * has specified a client.basic_auth object.
-     * client.basic_auth = { user: "<user", password : "<password>"}
+     * client.basic_auth = { user: "<user>", password : "<password>"}
      */
     if (client.basic_auth)
-      opts.headers[Headers.AUTHORIZATION] = 'Basic ' + new Buffer(client.basic_auth.user + ":" + client.basic_auth.password).toString("base64");
+        opts.headers[Headers.AUTHORIZATION] = 'Basic ' + new Buffer(client.basic_auth.user + ":" + client.basic_auth.password).toString("base64");
 
-
     if (opts.body)
-      contentBody = opts.body;
+        contentBody = opts.body;
 
     opts.agent = new adapter.Agent(opts); // Otherwise SSL params are ignored.
-  } else {
-    /**
-     * The request has not come through as an object,
-     * it is a nextUri string. Hence, if basic auth is to be applied
-     * to the request, we must parse the
-     * incoming string (opts) and form a new request object with
-     * appropriate basic auth headers
-     */
-    if (client.basic_auth){
-      var href = new URL(opts);
-      opts = {};
-      opts.host = href.hostname;
-      opts.port = href.port;
-      opts.protocol = client.protocol;
-      opts.path = href.pathname + href.search;
-      opts.headers = {};
-      opts.headers[Headers.AUTHORIZATION] = 'Basic ' + new Buffer(client.basic_auth.user + ":" + client.basic_auth.password).toString("base64");
-    }
-    /**
-     * Otherwise, if basic auth not required, continue
-     * with request as normal leaving the opts string
-     * unmodified for the below adapter.request() call
-     */
-  }
 
-  var parser = this.jsonParser;
+    var parser = this.jsonParser;
 
-  var req = adapter.request(opts, function(res){
-    var response_code = res.statusCode;
-    var response_data = '';
-    res.setEncoding('utf8');
-    res.on('data', function(chunk){
-      response_data += chunk;
+    var req = adapter.request(opts, function(res){
+        var response_code = res.statusCode;
+        var response_data = '';
+        res.setEncoding('utf8');
+        res.on('data', function(chunk){
+            response_data += chunk;
+        });
+        res.on('end', function(){
+            var data = response_data;
+            if (response_code < 300 && (data[0] === '{' || data[0] === '[')) {
+                try { data = parser.parse(data); }
+                catch (x) {
+                    /* ignore json parse error (and don't parse) for non-json content body */
+                }
+            }
+            callback(null, response_code, data);
+        });
     });
-    res.on('end', function(){
-      var data = response_data;
-      if (response_code < 300 && (data[0] === '{' || data[0] === '[')) {
-        try { data = parser.parse(data); }
-        catch (x) {
-          /* ignore json parse error (and don't parse) for non-json content body */
-        }
-      }
-      callback(null, response_code, data);
+
+    req.on('error', function(e){
+        callback(e);
     });
-  });
 
-  req.on('error', function(e){
-    callback(e);
-  });
+    if (contentBody)
+        req.write(contentBody);
 
-  if (contentBody)
-    req.write(contentBody);
-
-  req.end();
+    req.end();
 };
 
 Client.prototype.nodes = function(opts, callback) { // TODO: "failed" nodes not supported yet
-  if (! callback) {
-    callback = opts;
-    opts = {};
-  }
+    if (! callback) {
+        callback = opts;
+        opts = {};
+    }
 
-  this.request({ method: 'GET', path: '/v1/node' }, function(error, code, data){
-    if (error || code !== 200) {
-      var message = "node list api returns error" + (data && data.length > 0 ? ":" + data : "");
-      callback({message: message, error: error, code: code});
-      return;
-    }
-    callback(null, data);
-  });
+    this.request({ method: 'GET', path: '/v1/node' }, function(error, code, data){
+        if (error || code !== 200) {
+            var message = "node list api returns error" + (data && data.length > 0 ? ":" + data : "");
+            callback({message: message, error: error, code: code});
+            return;
+        }
+        callback(null, data);
+    });
 };
 
 Client.prototype.query = function(query_id, callback) {
-  this.request({ method: 'GET', path: '/v1/query/' + query_id }, function(error, code, data){
-    if (error || code !== 200) {
-      var message = "query info api returns error" + (data && data.length > 0 ? ":" + data : "");
-      callback({message: message, error: error, code: code});
-      return;
-    }
-    callback(null, data);
-  });
+    this.request({ method: 'GET', path: '/v1/query/' + query_id }, function(error, code, data){
+        if (error || code !== 200) {
+            var message = "query info api returns error" + (data && data.length > 0 ? ":" + data : "");
+            callback({message: message, error: error, code: code});
+            return;
+        }
+        callback(null, data);
+    });
 };
 
 Client.prototype.kill = function(query_id, callback) {
-  this.request({ method: 'DELETE', path: '/v1/query/' + query_id }, function(error, code, data){
-    if (error || code !== 204) {
-      var message = "query kill api returns error" + (data && data.length > 0 ? ":" + data : "");
-      callback({message: message, error: error, code: code});
-      return;
-    }
-    if (callback)
-      callback(null);
-  });
+    this.request({ method: 'DELETE', path: '/v1/query/' + query_id }, function(error, code, data){
+        if (error || code !== 204) {
+            var message = "query kill api returns error" + (data && data.length > 0 ? ":" + data : "");
+            callback({message: message, error: error, code: code});
+            return;
+        }
+        if (callback)
+            callback(null);
+    });
 };
 
 Client.prototype.execute = function(opts) {
-  this.statementResource(opts);
+    this.statementResource(opts);
 };
 
 Client.prototype.statementResource = function(opts) {
-  var client = this;
-  var columns = null;
+    var client = this;
+    var columns = null;
 
-  if (!opts.catalog && !this.catalog)
-    throw {message: "catalog not specified"};
-  if (!opts.schema && !this.schema)
-    throw {message: "schema not specified"};
-  if (!opts.success && !opts.callback)
-    throw {message: "callback function 'success' (or 'callback') not specified"};
+    if (!opts.catalog && !this.catalog)
+        throw {message: "catalog not specified"};
+    if (!opts.schema && !this.schema)
+        throw {message: "schema not specified"};
+    if (!opts.success && !opts.callback)
+        throw {message: "callback function 'success' (or 'callback') not specified"};
 
-  var header = {};
-  header[Headers.CATALOG] = opts.catalog || this.catalog;
-  header[Headers.SCHEMA] = opts.schema || this.schema;
+    var header = {};
+    header[Headers.CATALOG] = opts.catalog || this.catalog;
+    header[Headers.SCHEMA] = opts.schema || this.schema;
 
-  if (opts.session)
-    header[Headers.SESSION] = opts.session;
-  if (opts.timezone)
-    header[Headers.TIME_ZONE] = opts.timezone;
+    if (opts.session)
+        header[Headers.SESSION] = opts.session;
+    if (opts.timezone)
+        header[Headers.TIME_ZONE] = opts.timezone;
 
 
-  var fetch_info = opts.info || false;
+    var fetch_info = opts.info || false;
 
-  var cancel_checker = opts.cancel;
-  var state_callback = opts.state;
-  var columns_callback = opts.columns;
-  var data_callback = opts.data;
-  var success_callback = opts.success || opts.callback;
-  var error_callback = opts.error || opts.callback;
+    var cancel_checker = opts.cancel;
+    var state_callback = opts.state;
+    var columns_callback = opts.columns;
+    var data_callback = opts.data;
+    var success_callback = opts.success || opts.callback;
+    var error_callback = opts.error || opts.callback;
 
-  var enable_verbose_state_callback = this.enableVerboseStateCallback || false;
+    var enable_verbose_state_callback = this.enableVerboseStateCallback || false;
 
-  var req = { method: 'POST', path: '/v1/statement', headers: header, body: opts.query };
-  client.request(req, function(err, code, data){
-    if (err || code !== 200 || (data && data.error)) {
-      if (error_callback) {
-        var message = "execution error" + (data && data.length > 0 ? ":" + data : "");
-        if (data && data.error && data.error.message)
-          message = data.error.message;
-        error_callback({message:message, error: (err || data.error), code: code});
-      }
-      return;
-    }
-    /*
-    var data = {
-      "stats": {
-        "processedBytes": 0, "processedRows": 0,
-        "wallTimeMillis": 0, "cpuTimeMillis": 0, "userTimeMillis": 0,
-        "state": "QUEUED",
-        "scheduled": false,
-        "nodes": 0,
-        "totalSplits": 0, "queuedSplits": 0, "runningSplits": 0, "completedSplits": 0,
-      },
-      "nextUri": "http://localhost:8080/v1/statement/20140120_032523_00000_32v8g/1",
-      "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
-      "id": "20140120_032523_00000_32v8g"
-    };
-     */
-    if (!data.id || !data.nextUri || !data.infoUri) {
-      var error_message = null;
-      if (!data.id)
-        error_message = "query id missing in response for POST /v1/statement";
-      else if (!data.nextUri)
-        error_message = "nextUri missing in response for POST /v1/statement";
-      else if (!data.infoUri)
-        error_message = "infoUri missing in response for POST /v1/statement";
-      error_callback({message: error_message, data: data});
-      return;
-    }
-    var last_state = null;
-    var firstNextUri = data.nextUri; // TODO: check the cases without nextUri for /statement ?
-    var fetch_next = function(next_uri){
-      /*
-       * 1st time
-{
- "stats": {
-   "rootStage": {
-     "subStages": [
-       {
-         "subStages": [],
-         "processedBytes": 83103149, "processedRows": 2532704,
-         "wallTimeMillis": 20502, "cpuTimeMillis": 3431, "userTimeMillis": 3210,
-         "stageId": "1", "state": "FINISHED", "done": true,
-         "nodes": 3,
-         "totalSplits": 420, "queuedSplits": 0, "runningSplits": 0, "completedSplits": 420
-       }
-     ],
-     // same as substage
-   },
-   // same as substage
-   "state": "RUNNING",
- },
- "data": [ [ 1266352 ] ],
- "columns": [ { "type": "bigint", "name": "cnt" } ],
- "nextUri": "http://localhost:8080/v1/statement/20140120_032523_00000_32v8g/2",
- "partialCancelUri": "http://10.0.0.0:8080/v1/stage/20140120_032523_00000_32v8g.0",
- "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
- "id": "20140120_032523_00000_32v8g"
-}
-       */
-      /*
-       * 2nd time
-{
- "stats": {
-   // ....
-   "state": "FINISHED",
- },
- "columns": [ { "type": "bigint", "name": "cnt" } ],
- "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
- "id": "20140120_032523_00000_32v8g"
-}
-       */
-      if (cancel_checker && cancel_checker()) {
-        client.request({ method: 'DELETE', path: next_uri }, function(error, code, data){
-          if (error || code !== 204) {
-            error_callback({message: "query fetch canceled, but Presto query cancel may fail", error: error, code: code});
-          } else {
-            error_callback({message: "query fetch canceled by operation"});
-          }
-        });
-        return;
-      }
-      client.request(next_uri, function(error, code, response){
-        if (error || response.error) {
-          error_callback(error || response.error);
-          return;
+    var req = { method: 'POST', path: '/v1/statement', headers: header, body: opts.query };
+    client.request(req, function(err, code, data){
+        if (err || code !== 200 || (data && data.error)) {
+            if (error_callback) {
+                var message = "execution error" + (data && data.length > 0 ? ":" + data : "");
+                if (data && data.error && data.error.message)
+                    message = data.error.message;
+                error_callback({message:message, error: (err || data.error), code: code});
+            }
+            return;
         }
-
-        if (state_callback && (last_state !== response.stats.state || enable_verbose_state_callback)) {
-          state_callback(null, response.id, response.stats);
-          last_state = response.stats.state;
+        /*
+          var data = {
+              "stats": {
+                  "processedBytes": 0,
+                  "processedRows": 0,
+                  "wallTimeMillis": 0,
+                  "cpuTimeMillis": 0,
+                  "userTimeMillis": 0,
+                  "state": "QUEUED",
+                  "scheduled": false,
+                  "nodes": 0,
+                  "totalSplits": 0,
+                  "queuedSplits": 0,
+                  "runningSplits": 0,
+                  "completedSplits": 0,
+              },
+              "nextUri": "http://localhost:8080/v1/statement/20140120_032523_00000_32v8g/1",
+              "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
+              "id": "20140120_032523_00000_32v8g"
+          };
+        */
+        if (!data.id || !data.nextUri || !data.infoUri) {
+            var error_message = null;
+            if (!data.id)
+                error_message = "query id missing in response for POST /v1/statement";
+            else if (!data.nextUri)
+                error_message = "nextUri missing in response for POST /v1/statement";
+            else if (!data.infoUri)
+                error_message = "infoUri missing in response for POST /v1/statement";
+            error_callback({message: error_message, data: data});
+            return;
         }
+        var last_state = null;
+        var firstNextUri = data.nextUri; // TODO: check the cases without nextUri for /statement ?
+        var fetch_next = function(next_uri){
+            /*
+             * 1st time
+             {
+                 "stats": {
+                     "rootStage": {
+                         "subStages": [
+                             {
+                                 "subStages": [],
+                                 "processedBytes": 83103149,
+                                 "processedRows": 2532704,
+                                 "wallTimeMillis": 20502,
+                                 "cpuTimeMillis": 3431,
+                                 "userTimeMillis": 3210,
+                                 "stageId": "1",
+                                 "state": "FINISHED",
+                                 "done": true,
+                                 "nodes": 3,
+                                 "totalSplits": 420,
+                                 "queuedSplits": 0,
+                                 "runningSplits": 0,
+                                 "completedSplits": 420
+                             }
+                         ],
+                         // same as substage
+                     },
+                     // same as substage
+                     "state": "RUNNING",
+                 },
+                 "data": [ [ 1266352 ] ],
+                 "columns": [ { "type": "bigint", "name": "cnt" } ],
+                 "nextUri": "http://localhost:8080/v1/statement/20140120_032523_00000_32v8g/2",
+                 "partialCancelUri": "http://10.0.0.0:8080/v1/stage/20140120_032523_00000_32v8g.0",
+                 "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
+                 "id": "20140120_032523_00000_32v8g"
+             }
+            */
+            /*
+             * 2nd time
+             {
+                 "stats": {
+                     // ....
+                     "state": "FINISHED",
+                 },
+                 "columns": [ { "type": "bigint", "name": "cnt" } ],
+                 "infoUri": "http://localhost:8080/v1/query/20140120_032523_00000_32v8g",
+                 "id": "20140120_032523_00000_32v8g"
+             }
+            */
+            if (cancel_checker && cancel_checker()) {
+                client.request({ method: 'DELETE', path: next_uri }, function(error, code, data){
+                    if (error || code !== 204) {
+                        error_callback({message: "query fetch canceled, but Presto query cancel may fail", error: error, code: code});
+                    } else {
+                        error_callback({message: "query fetch canceled by operation"});
+                    }
+                });
+                return;
+            }
+            client.request(next_uri, function(error, code, response){
+                if (error || response.error) {
+                    error_callback(error || response.error);
+                    return;
+                }
 
-        if (columns_callback && response.columns && !columns) {
-          columns = response.columns;
-          columns_callback(null, columns);
-        }
+                if (state_callback && (last_state !== response.stats.state || enable_verbose_state_callback)) {
+                    state_callback(null, response.id, response.stats);
+                    last_state = response.stats.state;
+                }
 
-        /* presto-main/src/main/java/com/facebook/presto/execution/QueryState.java
-         * QUEUED, PLANNING, STARTING, RUNNING, FINISHED, CANCELED, FAILED
-         */
-        if (response.stats.state === 'QUEUED'
-          || response.stats.state === 'PLANNING'
-          || response.stats.state === 'STARTING'
-          || response.stats.state === 'RUNNING' && !response.data) {
-          var next = response.nextUri;
-          setTimeout(function(){ fetch_next(next); }, client.checkInterval);
-          return;
-        }
+                if (columns_callback && response.columns && !columns) {
+                    columns = response.columns;
+                    columns_callback(null, columns);
+                }
 
-        if (data_callback && response.data) {
-          data_callback(null, response.data, response.columns, response.stats);
-        }
+                var fetchNextWithTimeout = function(uri, checkInterval) {
+                    setTimeout(function(){ fetch_next(uri); }, checkInterval);
+                };
 
-        if (response.nextUri) {
-          var next = response.nextUri;
-          setTimeout(function(){ fetch_next(next); }, client.checkInterval);
-          return;
-        }
+                /* presto-main/src/main/java/com/facebook/presto/execution/QueryState.java
+                 * QUEUED, PLANNING, STARTING, RUNNING, FINISHED, CANCELED, FAILED
+                 */
+                if (response.stats.state === 'QUEUED'
+                    || response.stats.state === 'PLANNING'
+                    || response.stats.state === 'STARTING'
+                    || response.stats.state === 'RUNNING' && !response.data) {
+                    fetchNextWithTimeout(response.nextUri, client.checkInterval);
+                    return;
+                }
 
-        var finishedStats = response.stats;
+                if (data_callback && response.data) {
+                    data_callback(null, response.data, response.columns, response.stats);
+                }
 
-        if (fetch_info && response.infoUri) {
-          client.request(response.infoUri, function(error, code, response){
-            success_callback(null, finishedStats, response);
-          });
-        }
-        else {
-          success_callback(null, finishedStats);
-        }
-      });
-    };
-    fetch_next(firstNextUri);
-  });
+                if (response.nextUri) {
+                    fetchNextWithTimeout(response.nextUri, client.checkInterval);
+                    return;
+                }
+
+                var finishedStats = response.stats;
+
+                if (fetch_info && response.infoUri) {
+                    client.request(response.infoUri, function(error, code, response){
+                        success_callback(null, finishedStats, response);
+                    });
+                }
+                else {
+                    success_callback(null, finishedStats);
+                }
+            });
+        };
+        fetch_next(firstNextUri);
+    });
 };

package.json

 {
   "name": "presto-client",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Distributed query engine Presto client library for node.js",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -169,2 +169,4 @@ # presto-client-node
 
+* 0.8.0:
+  * fix the bug about SSL/TLS handling if redirections are required
 * 0.7.0:
@@ -171,0 +173,0 @@ * support the change of prestodb 0.226 (compatible with others)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

22938

increased by8.04%

Lines of code

327

increased by0.62%

Number of lines in readme file

215

increased by0.94%

No dependency changes