chore!: upgrade to Node 18

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
-  digest: sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429
+  digest: sha256:0d39e59663287ae929c1d4ccf8ebf7cef9946826c9b86eda7e85d8d752dbb584
 # created: 2024-10-01T19:34:30.797530443Z

.github/release-trigger.yml

@@ -1 +1,2 @@
 enabled: true
+multiScmName: teeny-request

.github/sync-repo-settings.yaml

@@ -8,9 +8,9 @@ branchProtectionRules:
       - "ci/kokoro: Samples test"
       - "ci/kokoro: System test"
       - lint
-      - test (14)
-      - test (16)
       - test (18)
+      - test (20)
+      - test (22)
       - cla/google
       - windows
       - OwlBot Post Processor

.github/workflows/ci.yaml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [14, 16, 18, 20]
+        node: [18, 20, 22]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
       - run: node --version
@@ -29,30 +29,30 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
       - run: npm install --engine-strict
       - run: npm test
         env:
           MOCHA_THROW_DEPRECATION: false
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
       - run: npm install
       - run: npm run lint
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
       - run: npm install
       - run: npm run docs
       - uses: JustinBeckwith/linkinator-action@v1

owlbot.py

@@ -14,4 +14,4 @@
 
 import synthtool.languages.node as node
 
-node.owlbot_main(templates_excludes=["README.md", ".github/ISSUE_TEMPLATE", ".github/scripts", ".github/workflows"])
+node.owlbot_main(templates_excludes=["README.md", ".github/ISSUE_TEMPLATE", ".github/scripts", ".github/workflows/issues-no-repro.yaml", ".github/workflows/response.yaml"])

package.json

@@ -5,7 +5,7 @@
   "main": "./build/src/index.js",
   "types": "./build/src/index.d.ts",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "scripts": {
     "test": "c8 mocha build/test",
@@ -40,27 +40,26 @@
   "dependencies": {
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
-    "node-fetch": "^2.6.9",
-    "stream-events": "^1.0.5",
-    "uuid": "^9.0.0"
+    "node-fetch": "^3.3.2",
+    "stream-events": "^1.0.5"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@types/mocha": "^10.0.0",
-    "@types/node-fetch": "^2.5.7",
-    "@types/sinon": "^17.0.0",
-    "@types/uuid": "^9.0.0",
-    "c8": "^9.0.0",
-    "codecov": "^3.1.0",
-    "gts": "^5.0.0",
-    "jsdoc": "^4.0.0",
+    "@types/mocha": "^10.0.10",
+    "@types/node-fetch": "^2.6.12",
+    "@types/sinon": "^17.0.3",
+    "@types/uuid": "^10.0.0",
+    "c8": "^10.1.3",
+    "codecov": "^3.8.3",
+    "gts": "^6.0.2",
+    "jsdoc": "^4.0.4",
     "jsdoc-fresh": "^3.0.0",
     "jsdoc-region-tag": "^3.0.0",
-    "linkinator": "^3.0.0",
-    "mocha": "^10.0.0",
-    "nock": "^13.0.0",
-    "sinon": "^17.0.0",
-    "typescript": "^5.1.6"
+    "linkinator": "^6.1.2",
+    "mocha": "^11.1.0",
+    "nock": "^14.0.1",
+    "sinon": "^19.0.2",
+    "typescript": "^5.7.3"
   },
   "nyc": {
     "exclude": [

src/TeenyStatistics.ts

@@ -153,7 +153,7 @@ export class TeenyStatistics {
           this._options.concurrentRequests +
           '. Use the TEENY_REQUEST_WARN_CONCURRENT_REQUESTS environment ' +
           'variable or the concurrentRequests option of teeny-request to ' +
-          'increase or disable (0) this warning.'
+          'increase or disable (0) this warning.',
       );
       warning.type = TeenyStatisticsWarning.CONCURRENT_REQUESTS;
       warning.value = this._concurrentRequests;
@@ -187,7 +187,7 @@ export class TeenyStatistics {
     let concurrentRequests = this.DEFAULT_WARN_CONCURRENT_REQUESTS;
 
     const envConcurrentRequests = Number(
-      process.env.TEENY_REQUEST_WARN_CONCURRENT_REQUESTS
+      process.env.TEENY_REQUEST_WARN_CONCURRENT_REQUESTS,
     );
     if (diConcurrentRequests !== undefined) {
       concurrentRequests = diConcurrentRequests;

src/agents.ts

@@ -66,7 +66,7 @@ function shouldUseProxyForURI(uri: string): boolean {
  */
 export function getAgent(
   uri: string,
-  reqOpts: Options
+  reqOpts: Options,
 ): HttpAnyAgent | undefined {
   const isHttp = uri.startsWith('http://');
   const proxy =

src/index.ts

@@ -17,14 +17,19 @@
 
 import {Agent, AgentOptions as HttpsAgentOptions} from 'https';
 import {AgentOptions as HttpAgentOptions} from 'http';
-import fetch, * as f from 'node-fetch';
+import type * as f from 'node-fetch' with {'resolution-mode': 'import'};
 import {PassThrough, Readable, pipeline} from 'stream';
-import * as uuid from 'uuid';
 import {getAgent} from './agents';
 import {TeenyStatistics} from './TeenyStatistics';
+import {randomUUID} from 'crypto';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const streamEvents = require('stream-events');
 
+import type nodeFetch from 'node-fetch' with {'resolution-mode': 'import'};
+
+const fetch = (...args: Parameters<typeof nodeFetch>) =>
+  import('node-fetch').then(({default: fetch}) => fetch(...args));
+
 export interface CoreOptions {
   method?: string;
   timeout?: number;
@@ -152,7 +157,7 @@ function fetchToRequestResponse(opts: f.RequestInit, res: f.Response) {
   const resHeaders = {} as Headers;
   res.headers.forEach((value, key) => (resHeaders[key] = value));
 
-  const response = Object.assign(res.body, {
+  const response = Object.assign(res.body as {}, {
     statusCode: res.status,
     statusMessage: res.statusText,
     request,
@@ -198,7 +203,7 @@ function teenyRequest(reqOpts: Options): Request;
 function teenyRequest(reqOpts: Options, callback: RequestCallback): void;
 function teenyRequest(
   reqOpts: Options,
-  callback?: RequestCallback
+  callback?: RequestCallback,
 ): Request | void {
   const {uri, options} = requestToFetchOptions(reqOpts);
 
@@ -208,7 +213,7 @@ function teenyRequest(
       // TODO: add support for multipart uploads through streaming
       throw new Error('Multipart without callback is not implemented.');
     }
-    const boundary: string = uuid.v4();
+    const boundary: string = randomUUID();
     (options.headers as Headers)['Content-Type'] =
       `multipart/related; boundary=${boundary}`;
     options.body = createMultipartStream(boundary, multipart);
@@ -232,7 +237,7 @@ function teenyRequest(
             },
             (err: Error) => {
               callback(err, response, body);
-            }
+            },
           );
           return;
         }
@@ -244,13 +249,13 @@ function teenyRequest(
           },
           err => {
             callback(err, response, body);
-          }
+          },
         );
       },
       err => {
         teenyRequest.stats.requestFinished();
         callback(err, null!, null);
-      }
+      },
     );
     return;
   }
@@ -287,7 +292,7 @@ function teenyRequest(
       err => {
         teenyRequest.stats.requestFinished();
         requestStream.emit('error', err);
-      }
+      },
     );
 
     // fetch doesn't supply the raw HTTP stream, instead it
@@ -320,7 +325,7 @@ function teenyRequest(
           },
           err => {
             callback(err, response, body);
-          }
+          },
         );
         return;
       }
@@ -333,13 +338,13 @@ function teenyRequest(
         },
         err => {
           callback(err, response, body);
-        }
+        },
       );
     },
     err => {
       teenyRequest.stats.requestFinished();
       callback(err, null!, null);
-    }
+    },
   );
   return;
 }