mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-05-23 17:19:37 +02:00
Update @google-cloud/storage and remove one patch (#19259)
* Update `@google-cloud/storage` and remove its patches * Re-add patch on `@google-cloud/storage/retry-request` Replace mentions of `.pipe()` and run `patch-package @google-cloud/storage/retry-request` It was very hard to test whether the package could still cause bugs, so I'd rather put the patch back GitOrigin-RevId: be83b54b6d55849995ac131bfcf3c9acd9b6dd8e
This commit is contained in:
@@ -1,25 +1,25 @@
|
||||
diff --git a/node_modules/@google-cloud/storage/node_modules/retry-request/index.js b/node_modules/@google-cloud/storage/node_modules/retry-request/index.js
|
||||
index a293298..df21af6 100644
|
||||
index 2fae107..32ec707 100644
|
||||
--- a/node_modules/@google-cloud/storage/node_modules/retry-request/index.js
|
||||
+++ b/node_modules/@google-cloud/storage/node_modules/retry-request/index.js
|
||||
@@ -1,6 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
-const {PassThrough} = require('stream');
|
||||
+const { PassThrough, pipeline } = require('stream');
|
||||
const debug = require('debug')('retry-request');
|
||||
+const {PassThrough, pipeline} = require('stream');
|
||||
const extend = require('extend');
|
||||
|
||||
@@ -166,7 +166,7 @@ function retryRequest(requestOpts, opts, callback) {
|
||||
})
|
||||
.on('complete', retryStream.emit.bind(retryStream, 'complete'));
|
||||
let debug = () => {};
|
||||
@@ -185,7 +185,7 @@ function retryRequest(requestOpts, opts, callback) {
|
||||
.on('complete', (...params) => handleFinish(params))
|
||||
.on('finish', (...params) => handleFinish(params));
|
||||
|
||||
- requestStream.pipe(delayStream);
|
||||
+ pipeline(requestStream, delayStream, () => {});
|
||||
} else {
|
||||
activeRequest = opts.request(requestOpts, onResponse);
|
||||
}
|
||||
@@ -232,7 +232,7 @@ function retryRequest(requestOpts, opts, callback) {
|
||||
@@ -251,7 +251,7 @@ function retryRequest(requestOpts, opts, callback) {
|
||||
// No more attempts need to be made, just continue on.
|
||||
if (streamMode) {
|
||||
retryStream.emit('response', response);
|
||||
@@ -1,50 +0,0 @@
|
||||
diff --git a/node_modules/@google-cloud/storage/node_modules/teeny-request/build/src/index.js b/node_modules/@google-cloud/storage/node_modules/teeny-request/build/src/index.js
|
||||
index a2251ca..e29e796 100644
|
||||
--- a/node_modules/@google-cloud/storage/node_modules/teeny-request/build/src/index.js
|
||||
+++ b/node_modules/@google-cloud/storage/node_modules/teeny-request/build/src/index.js
|
||||
@@ -166,27 +166,27 @@ function teenyRequest(reqOpts, callback) {
|
||||
}
|
||||
if (callback === undefined) {
|
||||
// Stream mode
|
||||
- const requestStream = streamEvents(new stream_1.PassThrough());
|
||||
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
- let responseStream;
|
||||
- requestStream.once('reading', () => {
|
||||
- if (responseStream) {
|
||||
- responseStream.pipe(requestStream);
|
||||
- }
|
||||
- else {
|
||||
- requestStream.once('response', () => {
|
||||
- responseStream.pipe(requestStream);
|
||||
- });
|
||||
- }
|
||||
- });
|
||||
+ const requestStream = new stream_1.PassThrough();
|
||||
+ // // eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
+ // let responseStream;
|
||||
+ // requestStream.once('reading', () => {
|
||||
+ // if (responseStream) {
|
||||
+ // responseStream.pipe(requestStream);
|
||||
+ // }
|
||||
+ // else {
|
||||
+ // requestStream.once('response', () => {
|
||||
+ // responseStream.pipe(requestStream);
|
||||
+ // });
|
||||
+ // }
|
||||
+ // });
|
||||
options.compress = false;
|
||||
teenyRequest.stats.requestStarting();
|
||||
(0, node_fetch_1.default)(uri, options).then(res => {
|
||||
- teenyRequest.stats.requestFinished();
|
||||
- responseStream = res.body;
|
||||
- responseStream.on('error', (err) => {
|
||||
- requestStream.emit('error', err);
|
||||
- });
|
||||
+ teenyRequest.stats.requestFinished(); stream_1.pipeline(res.body, requestStream, () => {});
|
||||
+ // responseStream = res.body;
|
||||
+ // responseStream.on('error', (err) => {
|
||||
+ // requestStream.emit('error', err);
|
||||
+ // });
|
||||
const response = fetchToRequestResponse(options, res);
|
||||
requestStream.emit('response', response);
|
||||
}, err => {
|
||||
Reference in New Issue
Block a user