refactor to classes

lib/common/grpc-service-object.js

@@ -0,0 +1,97 @@
+/*!
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*!
+ * @module common/grpcServiceObject
+ */
+
+'use strict';
+
+var extend = require('extend');
+var nodeutil = require('util');
+
+/**
+ * @type {module:common/serviceObject}
+ * @private
+ */
+var ServiceObject = require('./service-object.js');
+
+/**
+ * @type {module:common/util}
+ * @private
+ */
+var util = require('./util.js');
+
+/**
+ * GrpcServiceObject is a base class, meant to be inherited from by a service
+ * object that uses the gRPC protobuf API.
+ *
+ * @private
+ *
+ * @param {object} config - Configuration object.
+ */
+function GrpcServiceObject(config) {
+  ServiceObject.call(this, config);
+}
+
+nodeutil.inherits(GrpcServiceObject, ServiceObject);
+
+/**
+ * Delete the object.
+ *
+ * @param {function=} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ */
+GrpcServiceObject.prototype.delete = function(callback) {
+  var protoOpts = this.methods.delete.protoOpts;
+  var reqOpts = this.methods.delete.reqOpts;
+
+  this.request(protoOpts, reqOpts, callback || util.noop);
+};
+
+/**
+ * Get the metadata of this object.
+ *
+ * @param {function} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ * @param {object} callback.metadata - The metadata for this object.
+ */
+GrpcServiceObject.prototype.getMetadata = function(callback) {
+  var protoOpts = this.methods.getMetadata.protoOpts;
+  var reqOpts = this.methods.getMetadata.reqOpts;
+
+  this.request(protoOpts, reqOpts, callback);
+};
+
+/**
+ * Set the metadata for this object.
+ *
+ * @param {object} metadata - The metadata to set on this object.
+ * @param {function=} callback - The callback function.
+ * @param {?error} callback.err - An error returned while making this request.
+ */
+GrpcServiceObject.prototype.setMetadata = function(metadata, callback) {
+  var protoOpts = this.methods.setMetadata.protoOpts;
+  var reqOpts = extend(true, {}, this.methods.setMetadata.reqOpts, metadata);
+
+  this.request(protoOpts, reqOpts, callback || util.noop);
+};
+
+GrpcServiceObject.prototype.request = function(protoOpts, reqOpts, callback) {
+  this.parent.request(protoOpts, reqOpts, callback);
+};
+
+module.exports = GrpcServiceObject;

lib/common/grpc-service.js

@@ -0,0 +1,230 @@
+/*!
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*!
+ * @module common/grpcService
+ */
+
+'use strict';
+
+var camelize = require('camelize');
+var googleProtoFiles = require('google-proto-files');
+var grpc = require('grpc');
+var is = require('is');
+var nodeutil = require('util');
+var path = require('path');
+var snakeize = require('snakeize');
+
+/**
+ * @type {module:common/service}
+ * @private
+ */
+var Service = require('./service.js');
+
+/**
+ * @const {object} - A map of protobuf codes to HTTP status codes.
+ * @private
+ */
+var HTTP_ERROR_CODE_MAP = {
+  0: {
+    code: 200,
+    message: 'OK'
+  },
+
+  1: {
+    code: 499,
+    message: 'Client Closed Request'
+  },
+
+  2: {
+    code: 500,
+    message: 'Internal Server Error'
+  },
+
+  3: {
+    code: 400,
+    message: 'Bad Request'
+  },
+
+  4: {
+    code: 504,
+    message: 'Gateway Timeout'
+  },
+
+  5: {
+    code: 404,
+    message: 'Not Found'
+  },
+
+  6: {
+    code: 409,
+    message: 'Conflict'
+  },
+
+  7: {
+    code: 403,
+    message: 'Forbidden'
+  },
+
+  8: {
+    code: 429,
+    message: 'Too Many Requests'
+  },
+
+  9: {
+    code: 412,
+    message: 'Precondition Failed'
+  },
+
+  10: {
+    code: 409,
+    message: 'Conflict'
+  },
+
+  11: {
+    code: 400,
+    message: 'Bad Request'
+  },
+
+  12: {
+    code: 501,
+    message: 'Not Implemented'
+  },
+
+  13: {
+    code: 500,
+    message: 'Internal Server Error'
+  },
+
+  14: {
+    code: 503,
+    message: 'Service Unavailable'
+  },
+
+  15: {
+    code: 500,
+    message: 'Internal Server Error'
+  },
+
+  16: {
+    code: 401,
+    message: 'Unauthorized'
+  }
+};
+
+/**
+ * Service is a base class, meant to be inherited from by a "service," like
+ * BigQuery or Storage.
+ *
+ * This handles making authenticated requests by exposing a `makeReq_` function.
+ *
+ * @param {object} config - Configuration object.
+ * @param {string} config.baseUrl - The base URL to make API requests to.
+ * @param {string[]} config.scopes - The scopes required for the request.
+ * @param {object} options - [Configuration object](#/docs/?method=gcloud).
+ */
+function GrpcService(config, options) {
+  Service.call(this, config, options);
+
+  var service = config.service;
+  var apiVersion = config.apiVersion;
+  var rootDir = googleProtoFiles('..');
+
+  this.protoOpts = config.proto;
+  this.proto = grpc.load({
+    root: rootDir,
+    file: path.relative(rootDir, googleProtoFiles[service][apiVersion])
+  }).google[service][apiVersion];
+}
+
+nodeutil.inherits(GrpcService, Service);
+
+/**
+ * Make an authenticated request with gRPC.
+ *
+ * @param {object} protoOpts - The proto options.
+ * @param {string} protoOpts.service - The service name.
+ * @param {string} protoOpts.method - The method name.
+ * @param {object} reqOpts - The request options.
+ * @param {function=} callback - The callback function.
+ */
+GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
+  var self = this;
+  var proto = this.proto;
+
+  if (!this.grpcCredentials) {
+    // We must establish an authClient to give to grpc.
+    this.authClient.getCredentials(function(err) {
+      if (err) {
+        callback(err);
+        return;
+      }
+
+      var authClient = self.authClient.authClient;
+
+      self.grpcCredentials = grpc.credentials.combineChannelCredentials(
+        grpc.credentials.createSsl(),
+        grpc.credentials.createFromGoogleCredential(authClient)
+      );
+
+      self.request.call(self, protoOpts, reqOpts, callback);
+    });
+    return;
+  }
+
+  var service = new proto[protoOpts.service](
+    this.baseUrl,
+    this.grpcCredentials
+  );
+
+  service[protoOpts.method](snakeize(reqOpts), function(err, resp) {
+    if (err) {
+      if (HTTP_ERROR_CODE_MAP[err.code]) {
+        var httpError = HTTP_ERROR_CODE_MAP[err.code];
+        err.code = httpError.code;
+      }
+
+      callback(err);
+      return;
+    }
+
+    function convertBuffers(data) {
+      if (is.array(data)) {
+        return data.map(convertBuffers);
+      }
+
+      if (is.object(data)) {
+        for (var prop in data) {
+          var value = data[prop];
+
+          // @todo - Set preference on gRPC deserializeCls method to not give
+          // raw buffers.
+          if (is.object(value) && value.length) {
+            data[prop] = new Buffer(value).toString('base64');
+          } else if (is.object(value)) {
+            data[prop] = convertBuffers(value);
+          }
+        }
+      }
+
+      return data;
+    }
+
+    callback(null, convertBuffers(camelize(resp)));
+  });
+};
+
+module.exports = GrpcService;

lib/common/service-object.js

@@ -76,9 +76,6 @@ function ServiceObject(config) {
           // All ServiceObjects need `request`.
           methodName !== 'request' &&
 
-          // If this is a proto-API, the `protoRequest` method is needed.
-          (config.parent.proto && methodName !== 'protoRequest') &&
-
           // The ServiceObject didn't redefine the method.
           self[methodName] === ServiceObject.prototype[methodName] &&
 
@@ -142,12 +139,6 @@ ServiceObject.prototype.delete = function(callback) {
   var methodConfig = this.methods.delete || {};
   callback = callback || util.noop;
 
-  if (methodConfig.proto) {
-    var proto = methodConfig.proto;
-    this.parent.protoRequest(proto.protoOpts, proto.reqOpts, callback);
-    return;
-  }
-
   var reqOpts = extend({
     method: 'DELETE',
     uri: ''
@@ -297,10 +288,6 @@ ServiceObject.prototype.setMetadata = function(metadata, callback) {
   });
 };
 
-ServiceObject.prototype.protoRequest = function() {
-  this.parent.protoRequest.apply(this.parent, arguments);
-};
-
 /**
  * Make an authenticated API request.
  *