Merge pull request #1011 from nodejs/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/CODEOWNERS

@@ -181,3 +181,10 @@
 /lib/internal/navigator.js @nodejs/web-standards
 /test/fixtures/wpt/ @nodejs/web-standards
 /test/wpt/ @nodejs/web-standards
+
+# TypeScript
+
+/deps/amaro/ @nodejs/typescript
+/doc/api/typescript.md @nodejs/typescript
+/test/fixtures/typescript/ @nodejs/typescript
+/tools/dep_updaters/update-amaro.sh @nodejs/typescript

doc/api/worker_threads.md

@@ -290,10 +290,8 @@ the last one will try to communicate with the main thread.
 
 ```mjs
 import { fileURLToPath } from 'node:url';
-import { once } from 'node:events';
 import process from 'node:process';
 import {
-  isMainThread,
   postMessageToThread,
   threadId,
   workerData,
@@ -328,9 +326,7 @@ channel.onmessage = channel.close;
 ```
 
 ```cjs
-const { once } = require('node:events');
 const {
-  isMainThread,
   postMessageToThread,
   threadId,
   workerData,

lib/internal/child_process.js

@@ -557,7 +557,6 @@ class Control extends EventEmitter {
   unrefCounted() {
     if (--this.#refs === 0 && !this.#refExplicitlySet) {
       this.#channel.unref();
-      this.emit('unref');
     }
   }
 

lib/internal/modules/esm/resolve.js

@@ -1015,7 +1015,6 @@ function defaultResolve(specifier, context = {}) {
     }
   }
 
-  // This must come after checkIfDisallowedImport
   protocol ??= parsed?.protocol;
   if (protocol === 'node:') { return { __proto__: null, url: specifier }; }
 

lib/internal/webstreams/util.js

@@ -18,6 +18,7 @@ const {
 
 const {
   codes: {
+    ERR_ARG_NOT_ITERABLE,
     ERR_INVALID_ARG_VALUE,
     ERR_INVALID_STATE,
     ERR_OPERATION_FAILED,
@@ -235,6 +236,11 @@ function getIterator(obj, kind = 'sync', method) {
       method = obj[SymbolAsyncIterator];
       if (method === undefined) {
         const syncMethod = obj[SymbolIterator];
+
+        if (syncMethod === undefined) {
+          throw new ERR_ARG_NOT_ITERABLE(obj);
+        }
+
         const syncIteratorRecord = getIterator(obj, 'sync', syncMethod);
         return createAsyncFromSyncIterator(syncIteratorRecord);
       }
@@ -243,6 +249,10 @@ function getIterator(obj, kind = 'sync', method) {
     }
   }
 
+  if (method === undefined) {
+    throw new ERR_ARG_NOT_ITERABLE(obj);
+  }
+
   const iterator = FunctionPrototypeCall(method, obj);
   if (typeof iterator !== 'object' || iterator === null) {
     throw new ERR_INVALID_STATE.TypeError('The iterator method must return an object');

src/node_metadata.cc

@@ -52,14 +52,23 @@ Metadata metadata;
 
 #if HAVE_OPENSSL
 static constexpr size_t search(const char* s, char c, size_t n = 0) {
-  return *s == c ? n : search(s + 1, c, n + 1);
+  return *s == '\0' ? n : (*s == c ? n : search(s + 1, c, n + 1));
 }
 
 static inline std::string GetOpenSSLVersion() {
   // sample openssl version string format
   // for reference: "OpenSSL 1.1.0i 14 Aug 2018"
   const char* version = OpenSSL_version(OPENSSL_VERSION);
-  const size_t start = search(version, ' ') + 1;
+  const size_t first_space = search(version, ' ');
+
+  // When Node.js is linked to an alternative library implementing the
+  // OpenSSL API e.g. BoringSSL, the version string may not match the
+  //  expected pattern. In this case just return “0.0.0” as placeholder.
+  if (version[first_space] == '\0') {
+    return "0.0.0";
+  }
+
+  const size_t start = first_space + 1;
   const size_t len = search(&version[start], ' ');
   return std::string(version, start, len);
 }

test/parallel/test-webstream-readable-from.js

@@ -0,0 +1,9 @@
+'use strict';
+
+require('../common');
+const assert = require('node:assert');
+
+assert.throws(
+  () => ReadableStream.from({}),
+  { code: 'ERR_ARG_NOT_ITERABLE', name: 'TypeError' },
+);

typings/internalBinding/fs.d.ts

@@ -291,6 +291,7 @@ export interface FsBinding {
   utimes: typeof InternalFSBinding.utimes;
   writeBuffer: typeof InternalFSBinding.writeBuffer;
   writeBuffers: typeof InternalFSBinding.writeBuffers;
+  writeFileUtf8: typeof InternalFSBinding.writeFileUtf8;
   writeString: typeof InternalFSBinding.writeString;
 
   getFormatOfExtensionlessFile: typeof InternalFSBinding.getFormatOfExtensionlessFile;