Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

chore: fixes for Node 18 migration #2596

Closed
organize wants to merge 3 commits into from
Closed

chore: fixes for Node 18 migration #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50a8bd4
Add missing type check
organize May 29, 2025
7bfd929
Fix promise hanging when deleting a file
organize May 29, 2025
23eb116
Fix double forward slash in requests;
organize May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/nodejs-common/service-object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,20 +294,28 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {

let url = `${this.baseUrl}/${this.id}`;
if (this.parent instanceof Bucket) {
url = `${this.parent.baseUrl}/${this.parent.id}/${url}`;
url = `${this.parent.baseUrl}/${this.parent.id}${url}`;
}

this.storageTransport
.makeRequest({
method: 'DELETE',
responseType: 'json',
url,
...methodConfig.reqOpts,
queryParameters: {
...methodConfig.reqOpts?.queryParameters,
...options,
.makeRequest(
{
method: 'DELETE',
responseType: 'json',
url,
...methodConfig.reqOpts,
queryParameters: {
...methodConfig.reqOpts?.queryParameters,
...options,
},
},
(err, _, resp) => {
if (err && err.status === 404 && ignoreNotFound) {
err = null;
}
callback(err, resp);
},
})
)
.catch(({err, resp}) => {
if (err) {
if (err.status === 404 && ignoreNotFound) {
Expand Down Expand Up @@ -438,7 +446,7 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {

let url = `${this.baseUrl}/${this.id}`;
if (this.parent instanceof Bucket) {
url = `${this.parent.baseUrl}/${this.parent.id}/${url}`;
url = `${this.parent.baseUrl}/${this.parent.id}${url}`;
}

this.storageTransport
Expand Down Expand Up @@ -496,7 +504,7 @@ class ServiceObject<T, K extends BaseMetadata> extends EventEmitter {

let url = `${this.baseUrl}/${this.name}`;
if (this.parent instanceof Bucket) {
url = `${this.parent.baseUrl}/${this.parent.name}/${url}`;
url = `${this.parent.baseUrl}/${this.parent.name}${url}`;
}

const body = Object.assign({}, methodConfig.reqOpts?.body, metadata);
Expand Down
6 changes: 5 additions & 1 deletion src/nodejs-common/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ export class Util {
if (reason === 'userRateLimitExceeded') {
return true;
}
if (reason && reason.includes('EAI_AGAIN')) {
if (
reason &&
typeof reason === 'string' &&
reason.includes('EAI_AGAIN')
) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/notification.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class Notification extends ServiceObject<Notification, NotificationMetadata> {
super({
storageTransport: bucket.storage.storageTransport,
parent: bucket,
baseUrl: 'notificationConfigs',
baseUrl: '/notificationConfigs',
id: id.toString(),
createMethod: bucket.createNotification.bind(bucket),
methods,
Expand Down
16 changes: 8 additions & 8 deletions test/file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ describe('File', () => {
});

describe('delete', () => {
it('should set the correct query string with options', async done => {
it('should set the correct query string with options', async () => {
const options = {
generation: 2,
userProject: 'user-project',
Expand All @@ -154,9 +154,9 @@ describe('File', () => {

STORAGE.storageTransport.makeRequest = sandbox
.stub()
.callsFake(reqOpts => {
.callsFake((reqOpts, callback) => {
assert.strictEqual(reqOpts.method, 'DELETE');
assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
assert.strictEqual(reqOpts.url, '/b/bucket-name/o/file-name.png');
assert.deepStrictEqual(
reqOpts.queryParameters.generation,
options.generation,
Expand All @@ -181,7 +181,7 @@ describe('File', () => {
reqOpts.queryParameters.preconditionOpts.ifMetagenerationNotMatch,
options.preconditionOpts.ifMetagenerationNotMatch,
);
done();
callback(null);
return Promise.resolve({data: {}});
});
await file.delete(options);
Expand Down Expand Up @@ -214,7 +214,7 @@ describe('File', () => {
.stub()
.callsFake((reqOpts, callback) => {
assert.strictEqual(reqOpts.method, 'GET');
assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
assert.strictEqual(reqOpts.url, '/b/bucket-name/o/file-name.png');
assert.deepStrictEqual(
reqOpts.queryParameters.generation,
options.generation,
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('File', () => {
.stub()
.callsFake((reqOpts, callback) => {
assert.strictEqual(reqOpts.method, 'GET');
assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
assert.strictEqual(reqOpts.url, '/b/bucket-name/o/file-name.png');
assert.deepStrictEqual(
reqOpts.queryParameters.generation,
options.generation,
Expand Down Expand Up @@ -330,7 +330,7 @@ describe('File', () => {
.stub()
.callsFake((reqOpts, callback) => {
assert.strictEqual(reqOpts.method, 'GET');
assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
assert.strictEqual(reqOpts.url, '/b/bucket-name/o/file-name.png');
assert.deepStrictEqual(
reqOpts.queryParameters.generation,
options.generation,
Expand Down Expand Up @@ -382,7 +382,7 @@ describe('File', () => {
.callsFake((reqOpts, callback) => {
const body = JSON.parse(reqOpts.body);
assert.strictEqual(reqOpts.method, 'PATCH');
assert.strictEqual(reqOpts.url, '/b/bucket-name//o/file-name.png');
assert.strictEqual(reqOpts.url, '/b/bucket-name/o/file-name.png');
assert.deepStrictEqual(body.temporaryHold, options.temporaryHold);
callback(null);
return Promise.resolve();
Expand Down