Socket
Socket
Sign inDemoInstall

@google-cloud/common

Package Overview
Dependencies
Maintainers
17
Versions
118
Alerts
File Explorer

Advanced tools

License
Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

@google-cloud/common - npm Package Compare versions

Comparing version 0.19.2 to 0.20.0

9

build/src/logger-compat.js

@@ -17,2 +17,9 @@ "use strict";

*/
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -22,3 +29,3 @@ /**

*/
var is = require("is");
var is = __importStar(require("is"));
var logger_1 = require("./logger");

@@ -25,0 +32,0 @@ // tslint:enable:no-any

4

build/src/operation.d.ts

@@ -16,3 +16,3 @@ /*!

*/
import { ServiceObject, ServiceObjectConfig } from './service-object';
import { GetMetadataCallback, ServiceObject, ServiceObjectConfig } from './service-object';
export declare class Operation extends ServiceObject {

@@ -55,3 +55,3 @@ completeListeners: number;

*/
private poll_;
protected poll_(callback: GetMetadataCallback): void;
/**

@@ -58,0 +58,0 @@ * Poll `getMetadata` to check the operation's status. This runs a loop to

27

build/src/operation.js

@@ -62,2 +62,5 @@ "use strict";

};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -67,4 +70,4 @@ /*!

*/
var extend = require("extend");
var pify = require("pify");
var extend_1 = __importDefault(require("extend"));
var pify_1 = __importDefault(require("pify"));
var service_object_1 = require("./service-object");

@@ -103,3 +106,3 @@ var Operation = /** @class */ (function (_super) {

};
config = extend({
config = extend_1.default({
baseUrl: '',

@@ -161,11 +164,13 @@ }, config);

*/
Operation.prototype.poll_ = function () {
return pify(this.getMetadata)().then(function (resp) {
if (resp && resp.error) {
throw resp.error;
Operation.prototype.poll_ = function (callback) {
this.getMetadata(function (err, body) {
if (err || body.error) {
callback(err || body.error);
return;
}
if (!resp.done) {
return null;
if (!body.done) {
callback(null);
return;
}
return resp;
callback(null, body);
});

@@ -194,3 +199,3 @@ };

_a.trys.push([1, 3, , 4]);
return [4 /*yield*/, this.poll_()];
return [4 /*yield*/, pify_1.default(this.poll_.bind(this))()];
case 2:

@@ -197,0 +202,0 @@ metadata = _a.sent();

25

build/src/paginator.js

@@ -17,2 +17,5 @@ "use strict";

*/
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -22,5 +25,5 @@ /*!

*/
var arrify = require("arrify");
var extend = require("extend");
var is = require("is");
var arrify_1 = __importDefault(require("arrify"));
var extend_1 = __importDefault(require("extend"));
var is_1 = __importDefault(require("is"));
var split_array_stream_1 = require("split-array-stream");

@@ -57,3 +60,3 @@ var util_1 = require("./util");

Paginator.prototype.extend = function (Class, methodNames) {
methodNames = arrify(methodNames);
methodNames = arrify_1.default(methodNames);
methodNames.forEach(function (methodName) {

@@ -114,3 +117,3 @@ var originalMethod = Class.prototype[methodName];

var lastArgument = args[args.length - 1];
if (is.fn(firstArgument)) {
if (is_1.default.fn(firstArgument)) {
callback = firstArgument;

@@ -121,17 +124,17 @@ }

}
if (is.fn(lastArgument)) {
if (is_1.default.fn(lastArgument)) {
callback = lastArgument;
}
if (typeof query === 'object') {
query = extend(true, {}, query);
query = extend_1.default(true, {}, query);
// Check if the user only asked for a certain amount of results.
if (query.maxResults && is.number(query.maxResults)) {
if (query.maxResults && is_1.default.number(query.maxResults)) {
// `maxResults` is used API-wide.
maxResults = query.maxResults;
}
else if (is.number(query.pageSize)) {
else if (is_1.default.number(query.pageSize)) {
// `pageSize` is Pub/Sub's `maxResults`.
maxResults = query.pageSize;
}
if (query.maxApiCalls && is.number(query.maxApiCalls)) {
if (query.maxApiCalls && is_1.default.number(query.maxApiCalls)) {
maxApiCalls = query.maxApiCalls;

@@ -152,3 +155,3 @@ delete query.maxApiCalls;

};
parsedArguments.streamOptions = extend(true, {}, parsedArguments.query);
parsedArguments.streamOptions = extend_1.default(true, {}, parsedArguments.query);
delete parsedArguments.streamOptions.autoPaginate;

@@ -155,0 +158,0 @@ delete parsedArguments.streamOptions.maxResults;

2

build/src/service-object.d.ts

@@ -18,3 +18,3 @@ /*!

import { EventEmitter } from 'events';
import * as r from 'request';
import r from 'request';
import { Service } from '.';

@@ -21,0 +21,0 @@ import { ApiError, BodyResponseCallback, DecorateRequestOptions } from './util';

27

build/src/service-object.js

@@ -27,2 +27,5 @@ "use strict";

})();
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -32,6 +35,6 @@ /*!

*/
var arrify = require("arrify");
var arrify_1 = __importDefault(require("arrify"));
var events_1 = require("events");
var extend = require("extend");
var is = require("is");
var extend_1 = __importDefault(require("extend"));
var is_1 = __importDefault(require("is"));
var util_1 = require("./util");

@@ -130,3 +133,3 @@ /**

callback = callback || util_1.util.noop;
var reqOpts = extend({
var reqOpts = extend_1.default({
method: 'DELETE',

@@ -173,3 +176,3 @@ uri: '',

}
var autoCreate = config.autoCreate && is.fn(this.create);
var autoCreate = config.autoCreate && is_1.default.fn(this.create);
delete config.autoCreate;

@@ -192,3 +195,3 @@ function onCreate(err, instance, apiResponse) {

var args = [];
if (!is.empty(config)) {
if (!is_1.default.empty(config)) {
args.push(config);

@@ -217,3 +220,3 @@ }

var methodConfig = this.methods.getMetadata || {};
var reqOpts = extend({
var reqOpts = extend_1.default({
uri: '',

@@ -224,3 +227,3 @@ }, methodConfig.reqOpts);

this.request(reqOpts).then(function (resp) {
_this.metadata = resp;
_this.metadata = resp.body;
callback(null, _this.metadata, resp);

@@ -244,3 +247,3 @@ }, function (err) {

var methodConfig = this.methods.setMetadata || {};
var reqOpts = extend(true, {
var reqOpts = extend_1.default(true, {
method: 'PATCH',

@@ -260,3 +263,3 @@ uri: '',

ServiceObject.prototype.request_ = function (reqOpts) {
reqOpts = extend(true, {}, reqOpts);
reqOpts = extend_1.default(true, {}, reqOpts);
var isAbsoluteUrl = reqOpts.uri.indexOf('http') === 0;

@@ -274,3 +277,3 @@ var uriComponents = [this.baseUrl, this.id || '', reqOpts.uri];

.join('/');
var childInterceptors = arrify(reqOpts.interceptors_);
var childInterceptors = arrify_1.default(reqOpts.interceptors_);
var localInterceptors = [].slice.call(this.interceptors);

@@ -298,3 +301,3 @@ reqOpts.interceptors_ = childInterceptors.concat(localInterceptors);

ServiceObject.prototype.requestStream = function (reqOpts) {
var opts = extend(true, reqOpts, { shouldReturnStream: true });
var opts = extend_1.default(true, reqOpts, { shouldReturnStream: true });
return this.request_(opts);

@@ -301,0 +304,0 @@ };

2

build/src/service.d.ts

@@ -17,3 +17,3 @@ /*!

import { GoogleAuth } from 'google-auth-library';
import * as r from 'request';
import r from 'request';
import { StreamRequestOptions } from './service-object';

@@ -20,0 +20,0 @@ import { BodyResponseCallback, DecorateRequestOptions, MakeAuthenticatedRequest, PackageJson } from './util';

27

build/src/service.js

@@ -52,2 +52,5 @@ "use strict";

};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -57,6 +60,6 @@ /*!

*/
var arrify = require("arrify");
var extend = require("extend");
var is = require("is");
var pify = require("pify");
var arrify_1 = __importDefault(require("arrify"));
var extend_1 = __importDefault(require("extend"));
var is_1 = __importDefault(require("is"));
var pify_1 = __importDefault(require("pify"));
var util_1 = require("./util");

@@ -83,3 +86,3 @@ var PROJECT_ID_TOKEN = '{{projectId}}';

this.baseUrl = config.baseUrl;
this.globalInterceptors = arrify(options.interceptors_);
this.globalInterceptors = arrify_1.default(options.interceptors_);
this.interceptors = [];

@@ -90,3 +93,3 @@ this.packageJson = config.packageJson;

this.Promise = options.promise || Promise;
var reqCfg = extend({}, config, {
var reqCfg = extend_1.default({}, config, {
projectIdRequired: this.projectIdRequired,

@@ -137,3 +140,3 @@ projectId: this.projectId,

// TODO: fix the tests so this can be private
reqOpts = extend(true, {}, reqOpts);
reqOpts = extend_1.default(true, {}, reqOpts);
var isAbsoluteUrl = reqOpts.uri.indexOf('http') === 0;

@@ -162,3 +165,3 @@ var uriComponents = [this.baseUrl];

.concat(this.interceptors)
.concat(arrify(reqOpts.interceptors_));
.concat(arrify_1.default(reqOpts.interceptors_));
var interceptor;

@@ -172,3 +175,3 @@ // tslint:disable-next-line:no-conditional-assignment

var pkg = this.packageJson;
reqOpts.headers = extend({}, reqOpts.headers, {
reqOpts.headers = extend_1.default({}, reqOpts.headers, {
'User-Agent': util_1.util.getUserAgentFromPackageJson(pkg),

@@ -182,3 +185,3 @@ 'x-goog-api-client': "gl-node/" + process.versions.node + " gccl/" + pkg.version,

else {
return pify(this.makeAuthenticatedRequest, { multiArgs: true })(reqOpts)
return pify_1.default(this.makeAuthenticatedRequest, { multiArgs: true })(reqOpts)
.then(function (args) {

@@ -192,3 +195,3 @@ /**

}, function (e) {
if (is.array(e) && e.length > 0) {
if (is_1.default.array(e) && e.length > 0) {
var err = e[0], body = e[1], res = e[2];

@@ -220,3 +223,3 @@ if (res) {

Service.prototype.requestStream = function (reqOpts) {
var opts = extend(true, reqOpts, { shouldReturnStream: true });
var opts = extend_1.default(true, reqOpts, { shouldReturnStream: true });
return this.request_(opts);

@@ -223,0 +226,0 @@ };

4

build/src/util.d.ts

@@ -20,6 +20,6 @@ /**

*/
import * as duplexify from 'duplexify';
import duplexify from 'duplexify';
import { GoogleAuth, GoogleAuthOptions } from 'google-auth-library';
import { CredentialBody } from 'google-auth-library/build/src/auth/credentials';
import * as r from 'request';
import r from 'request';
import { Transform, TransformOptions } from 'stream';

@@ -26,0 +26,0 @@ import { Interceptor } from './service-object';

67

build/src/util.js

@@ -27,2 +27,5 @@ "use strict";

})();
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });

@@ -32,13 +35,13 @@ /*!

*/
var duplexify = require("duplexify");
var ent = require("ent");
var extend = require("extend");
var duplexify_1 = __importDefault(require("duplexify"));
var ent_1 = __importDefault(require("ent"));
var extend_1 = __importDefault(require("extend"));
var google_auth_library_1 = require("google-auth-library");
var is = require("is");
var r = require("request");
var retryRequest = require("retry-request");
var is_1 = __importDefault(require("is"));
var request_1 = __importDefault(require("request"));
var retry_request_1 = __importDefault(require("retry-request"));
var stream_1 = require("stream");
var streamEvents = require("stream-events");
var through = require("through2");
var request = r.defaults({
var stream_events_1 = __importDefault(require("stream-events"));
var through2_1 = __importDefault(require("through2"));
var request = request_1.default.defaults({
timeout: 60000,

@@ -95,3 +98,3 @@ gzip: true,

else if (_this.response && _this.response.body) {
messages.push(ent.decode(errorBody.response.body.toString()));
messages.push(ent_1.default.decode(errorBody.response.body.toString()));
}

@@ -152,3 +155,3 @@ else if (!errorBody.message) {

callback = callback || util.noop;
var parsedResp = extend(true, { err: err || null }, resp && util.parseHttpRespMessage(resp), body && util.parseHttpRespBody(body));
var parsedResp = extend_1.default(true, { err: err || null }, resp && util.parseHttpRespMessage(resp), body && util.parseHttpRespBody(body));
// Assign the parsed body to resp.body, even if { json: false } was passed

@@ -199,3 +202,3 @@ // as a request option.

};
if (is.string(body)) {
if (is_1.default.string(body)) {
try {

@@ -230,3 +233,3 @@ parsedHttpRespBody.body = JSON.parse(body);

onComplete = onComplete || util.noop;
var writeStream = through();
var writeStream = through2_1.default();
dup.setWritable(writeStream);

@@ -240,3 +243,3 @@ var defaultReqOpts = {

var metadata = options.metadata || {};
var reqOpts = extend(true, defaultReqOpts, options.request, {
var reqOpts = extend_1.default(true, defaultReqOpts, options.request, {
multipart: [

@@ -320,3 +323,3 @@ {

if (config === void 0) { config = {}; }
var googleAutoAuthConfig = extend({}, config);
var googleAutoAuthConfig = extend_1.default({}, config);
if (googleAutoAuthConfig.projectId === '{{projectId}}') {

@@ -328,6 +331,6 @@ delete googleAutoAuthConfig.projectId;

var stream;
var reqConfig = extend({}, config);
var reqConfig = extend_1.default({}, config);
var activeRequest_;
if (!optionsOrCallback) {
stream = duplexify();
stream = duplexify_1.default();
reqConfig.stream = stream;

@@ -393,3 +396,3 @@ }

authClient.authorizeRequest(reqOpts).then(function (res) {
var opts = extend(true, {}, reqOpts, res);
var opts = extend_1.default(true, {}, reqOpts, res);
onAuthenticated(null, opts);

@@ -421,3 +424,3 @@ }, function (err) {

var config = {};
if (is.fn(configOrCallback)) {
if (is_1.default.fn(configOrCallback)) {
callback = configOrCallback;

@@ -438,3 +441,3 @@ }

if (!config.stream) {
return retryRequest(reqOpts, options, function (err, response, body) {
return retry_request_1.default(reqOpts, options, function (err, response, body) {
util.handleResp(err, response, body, callback);

@@ -448,3 +451,3 @@ });

if (isGetRequest) {
requestStream = retryRequest(reqOpts, options);
requestStream = retry_request_1.default(reqOpts, options);
dup.setReadable(requestStream);

@@ -475,3 +478,3 @@ }

delete reqOpts.objectMode;
if (is.object(reqOpts.qs)) {
if (is_1.default.object(reqOpts.qs)) {
delete reqOpts.qs.autoPaginate;

@@ -481,3 +484,3 @@ delete reqOpts.qs.autoPaginateVal;

}
if (is.object(reqOpts.json)) {
if (is_1.default.object(reqOpts.json)) {
delete reqOpts.json.autoPaginate;

@@ -501,3 +504,3 @@ delete reqOpts.json.autoPaginateVal;

Util.prototype.replaceProjectIdToken = function (value, projectId) {
if (is.array(value)) {
if (is_1.default.array(value)) {
value = value

@@ -507,3 +510,3 @@ .map(function (v) { return util.replaceProjectIdToken(v, projectId); });

if (value !== null && typeof value === 'object' &&
is.fn(value.hasOwnProperty)) {
is_1.default.fn(value.hasOwnProperty)) {
for (var opt in value) {

@@ -547,3 +550,3 @@ if (value.hasOwnProperty(opt)) {

}
var options = extend({}, globalConfig);
var options = extend_1.default({}, globalConfig);
var hasGlobalConnection = options.credentials || options.keyFilename;

@@ -555,3 +558,3 @@ var isOverridingConnection = overrides.credentials || overrides.keyFilename;

}
var extendedConfig = extend(true, defaultConfig, options, overrides);
var extendedConfig = extend_1.default(true, defaultConfig, options, overrides);
// Preserve the original (not cloned) interceptors.

@@ -585,6 +588,6 @@ extendedConfig.interceptors_ = globalConfig.interceptors_;

streamOptions.objectMode = true;
var stream = streamEvents(new stream_1.Transform(streamOptions));
var stream = stream_events_1.default(new stream_1.Transform(streamOptions));
var requestsMade = 0;
var requestsToMake = -1;
if (is.number(options.maxApiCalls)) {
if (is_1.default.number(options.maxApiCalls)) {
requestsToMake = options.maxApiCalls;

@@ -664,6 +667,6 @@ }

var arg = arguments[last];
if (is.undefined(arg)) {
if (is_1.default.undefined(arg)) {
continue; // skip trailing undefined.
}
if (!is.fn(arg)) {
if (!is_1.default.fn(arg)) {
break; // non-callback last argument found.

@@ -721,3 +724,3 @@ }

// clang-format off
return (is.fn(Class.prototype[methodName]) && // is it a function?
return (is_1.default.fn(Class.prototype[methodName]) && // is it a function?
!/(^_|(Stream|_)|promise$)|^constructor$/.test(methodName) && // is it promisable?

@@ -724,0 +727,0 @@ exclude.indexOf(methodName) === -1); // is it blacklisted?

45

package.json
{
"name": "@google-cloud/common",
"description": "Common components for Cloud APIs Node.js Client Libraries",
"version": "0.19.2",
"version": "0.20.0",
"license": "Apache-2.0",

@@ -40,3 +40,3 @@ "author": "Google Inc.",

"docs": "repo-tools exec -- jsdoc -c .jsdoc.js",
"lint": "repo-tools lint --cmd eslint -- src/ samples/ system-test/ test/",
"lint": "npm run check && repo-tools lint --cmd eslint -- samples/",
"prettier": "repo-tools exec -- prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js",

@@ -46,3 +46,4 @@ "cover": "nyc --reporter=lcov mocha --require source-map-support/register intelli-espower-loader build/test/*.js && nyc report",

"test-no-cover": "repo-tools test run --cmd mocha -- build/test/*.js --no-timeouts",
"test": "repo-tools test run --cmd npm -- run cover",
"test": "npm run test-only",
"test-only": "repo-tools test run --cmd npm -- run cover",
"posttest": "npm run check && npm run license-check",

@@ -59,9 +60,9 @@ "prepare": "npm run compile",

"axios": "^0.18.0",
"duplexify": "^3.5.4",
"duplexify": "^3.6.0",
"ent": "^2.2.0",
"extend": "^3.0.1",
"google-auth-library": "^1.4.0",
"google-auth-library": "^1.6.0",
"is": "^3.2.1",
"pify": "^3.0.0",
"request": "^2.85.0",
"request": "^2.87.0",
"retry-request": "^3.3.1",

@@ -75,18 +76,18 @@ "split-array-stream": "^2.0.0",

"devDependencies": {
"@google-cloud/nodejs-repo-tools": "^2.2.6",
"@types/arrify": "^1.0.3",
"@google-cloud/nodejs-repo-tools": "^2.3.0",
"@types/arrify": "^1.0.4",
"@types/ent": "^2.2.1",
"@types/extend": "^3.0.0",
"@types/is": "0.0.19",
"@types/mocha": "^5.0.0",
"@types/is": "0.0.20",
"@types/mocha": "^5.2.1",
"@types/nock": "^9.1.3",
"@types/node": "^9.4.7",
"@types/pify": "^3.0.1",
"@types/node": "^10.3.1",
"@types/pify": "^3.0.2",
"@types/proxyquire": "^1.3.28",
"@types/shimmer": "^1.0.1",
"@types/sinon": "^4.3.1",
"@types/sinon": "^5.0.1",
"@types/through2": "^2.0.33",
"@types/uuid": "^3.4.3",
"async": "^2.6.0",
"codecov": "^3.0.0",
"async": "^2.6.1",
"codecov": "^3.0.2",
"eslint": "^4.19.1",

@@ -96,3 +97,3 @@ "eslint-config-prettier": "^2.9.0",

"eslint-plugin-prettier": "^2.6.0",
"gts": "^0.5.4",
"gts": "^0.6.0",
"ink-docstrap": "^1.3.2",

@@ -102,11 +103,11 @@ "intelli-espower-loader": "^1.0.1",

"jsdoc": "^3.5.5",
"mocha": "^5.0.5",
"nock": "^9.2.5",
"nyc": "^11.6.0",
"mocha": "^5.2.0",
"nock": "^9.3.1",
"nyc": "^12.0.2",
"power-assert": "^1.5.0",
"prettier": "^1.11.1",
"prettier": "^1.13.4",
"proxyquire": "^2.0.1",
"shimmer": "^1.2.0",
"sinon": "^5.0.2",
"source-map-support": "^0.5.4",
"sinon": "^5.1.0",
"source-map-support": "^0.5.6",
"typescript": "~2.9.1",

@@ -113,0 +114,0 @@ "uuid": "^3.2.1"

build/src/logger-compat.js.map

Sorry, the diff of this file is not supported yet

build/src/operation.js.map

Sorry, the diff of this file is not supported yet

build/src/paginator.js.map

Sorry, the diff of this file is not supported yet

build/src/service-object.js.map

Sorry, the diff of this file is not supported yet

build/src/service.js.map

Sorry, the diff of this file is not supported yet

build/src/util.js.map

Sorry, the diff of this file is not supported yet

SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

About

Packages

npm

Go

Maven

PyPI

Rubygems

Stay in touch

Get open source security insights delivered straight into your inbox.

  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc