@google-cloud/storage
Advanced tools
Comparing version 7.3.0 to 7.3.1
@@ -126,3 +126,3 @@ "use strict"; | ||
const pkg = this.packageJson; | ||
let userAgent = util_1.util.getUserAgentFromPackageJson(pkg); | ||
let userAgent = (0, util_2.getUserAgentString)(); | ||
if (this.providedUserAgent) { | ||
@@ -129,0 +129,0 @@ userAgent = `${this.providedUserAgent} ${userAgent}`; |
@@ -321,9 +321,2 @@ /*! | ||
/** | ||
* Create a properly-formatted User-Agent string from a package.json file. | ||
* | ||
* @param {object} packageJson - A module's package.json file. | ||
* @return {string} userAgent - The formatted User-Agent string. | ||
*/ | ||
getUserAgentFromPackageJson(packageJson: PackageJson): string; | ||
/** | ||
* Given two parameters, figure out if this is either: | ||
@@ -330,0 +323,0 @@ * - Just a callback function |
@@ -632,14 +632,2 @@ "use strict"; | ||
/** | ||
* Create a properly-formatted User-Agent string from a package.json file. | ||
* | ||
* @param {object} packageJson - A module's package.json file. | ||
* @return {string} userAgent - The formatted User-Agent string. | ||
*/ | ||
getUserAgentFromPackageJson(packageJson) { | ||
const hyphenatedPackageName = packageJson.name | ||
.replace('@google-cloud', 'gcloud-node') // For legacy purposes. | ||
.replace('/', '-'); // For UA spec-compliance purposes. | ||
return hyphenatedPackageName + '/' + packageJson.version; | ||
} | ||
/** | ||
* Given two parameters, figure out if this is either: | ||
@@ -658,3 +646,3 @@ * - Just a callback function | ||
const headers = { | ||
'User-Agent': util.getUserAgentFromPackageJson(packageJson), | ||
'User-Agent': (0, util_1.getUserAgentString)(), | ||
'x-goog-api-client': `${(0, util_1.getRuntimeTrackingString)()} gccl/${packageJson.version} gccl-invocation-id/${uuid.v4()}`, | ||
@@ -661,0 +649,0 @@ }; |
@@ -330,2 +330,3 @@ "use strict"; | ||
headers: { | ||
'User-Agent': (0, util_1.getUserAgentString)(), | ||
'x-goog-api-client': googAPIClient, | ||
@@ -474,2 +475,3 @@ ...headers, | ||
const headers = { | ||
'User-Agent': (0, util_1.getUserAgentString)(), | ||
'x-goog-api-client': googAPIClient, | ||
@@ -600,2 +602,3 @@ }; | ||
'Content-Range': 'bytes */*', | ||
'User-Agent': (0, util_1.getUserAgentString)(), | ||
'x-goog-api-client': googAPIClient, | ||
@@ -602,0 +605,0 @@ }, |
@@ -240,2 +240,3 @@ "use strict"; | ||
let headerFound = false; | ||
let userAgentFound = false; | ||
for (const [key, value] of Object.entries(headers)) { | ||
@@ -248,4 +249,6 @@ if (key.toLocaleLowerCase().trim() === 'x-goog-api-client') { | ||
} | ||
break; | ||
} | ||
else if (key.toLocaleLowerCase().trim() === 'user-agent') { | ||
userAgentFound = true; | ||
} | ||
} | ||
@@ -256,2 +259,6 @@ // If the header isn't present, add it | ||
} | ||
// If the User-Agent isn't present, add it | ||
if (!userAgentFound) { | ||
headers['User-Agent'] = (0, util_2.getUserAgentString)(); | ||
} | ||
return headers; | ||
@@ -258,0 +265,0 @@ }, _XMLMultiPartUploadHelper_handleErrorResponse = function _XMLMultiPartUploadHelper_handleErrorResponse(err, bail) { |
@@ -75,2 +75,7 @@ /// <reference types="node" /> | ||
export declare function getRuntimeTrackingString(): string; | ||
/** | ||
* Looks at package.json and creates the user-agent string to be applied to request headers. | ||
* @returns {string} user agent string. | ||
*/ | ||
export declare function getUserAgentString(): string; | ||
export declare class PassThroughShim extends PassThrough { | ||
@@ -77,0 +82,0 @@ private shouldEmitReading; |
@@ -16,3 +16,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.PassThroughShim = exports.getRuntimeTrackingString = exports.formatAsUTCISO = exports.convertObjKeysToSnakeCase = exports.unicodeJSONStringify = exports.objectKeyToLowercase = exports.qsStringify = exports.encodeURI = exports.fixedEncodeURIComponent = exports.objectEntries = exports.normalize = void 0; | ||
exports.PassThroughShim = exports.getUserAgentString = exports.getRuntimeTrackingString = exports.formatAsUTCISO = exports.convertObjKeysToSnakeCase = exports.unicodeJSONStringify = exports.objectKeyToLowercase = exports.qsStringify = exports.encodeURI = exports.fixedEncodeURIComponent = exports.objectEntries = exports.normalize = void 0; | ||
const querystring = require("querystring"); | ||
@@ -173,2 +173,14 @@ const stream_1 = require("stream"); | ||
exports.getRuntimeTrackingString = getRuntimeTrackingString; | ||
/** | ||
* Looks at package.json and creates the user-agent string to be applied to request headers. | ||
* @returns {string} user agent string. | ||
*/ | ||
function getUserAgentString() { | ||
const pkg = require('../../package.json'); | ||
const hyphenatedPackageName = pkg.name | ||
.replace('@google-cloud', 'gcloud-node') // For legacy purposes. | ||
.replace('/', '-'); // For UA spec-compliance purposes. | ||
return hyphenatedPackageName + '/' + pkg.version; | ||
} | ||
exports.getUserAgentString = getUserAgentString; | ||
class PassThroughShim extends stream_1.PassThrough { | ||
@@ -175,0 +187,0 @@ constructor() { |
{ | ||
"name": "@google-cloud/storage", | ||
"description": "Cloud Storage Client Library for Node.js", | ||
"version": "7.3.0", | ||
"version": "7.3.1", | ||
"license": "Apache-2.0", | ||
@@ -67,3 +67,3 @@ "author": "Google Inc.", | ||
"p-limit": "^3.0.1", | ||
"retry-request": "^6.0.0", | ||
"retry-request": "^7.0.0", | ||
"teeny-request": "^9.0.0", | ||
@@ -88,3 +88,3 @@ "uuid": "^8.0.0" | ||
"@types/sinon": "^10.0.15", | ||
"@types/tmp": "0.2.4", | ||
"@types/tmp": "0.2.5", | ||
"@types/uuid": "^8.0.0", | ||
@@ -91,0 +91,0 @@ "@types/yargs": "^17.0.10", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
876832
17631
+ Added@types/caseless@0.12.5(transitive)
+ Added@types/node@22.5.4(transitive)
+ Added@types/request@2.48.12(transitive)
+ Added@types/tough-cookie@4.0.5(transitive)
+ Addedasynckit@0.4.0(transitive)
+ Addedcombined-stream@1.0.8(transitive)
+ Addeddelayed-stream@1.0.0(transitive)
+ Addedform-data@2.5.1(transitive)
+ Addedretry-request@7.0.2(transitive)
+ Addedundici-types@6.19.8(transitive)
- Removedretry-request@6.0.0(transitive)
Updatedretry-request@^7.0.0