fix(fetch): toUSVString

lib/fetch/body.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const util = require('../core/util')
-const { ReadableStreamFrom } = require('./util')
+const { ReadableStreamFrom, toUSVString } = require('./util')
 const { FormData } = require('./formdata')
 const { kState } = require('./symbols')
 const { Blob } = require('buffer')
@@ -156,7 +156,7 @@ function extractBody (object, keepalive = false) {
     // TODO: byte sequence?
     // TODO: scalar value string?
     // TODO: else?
-    source = String(object)
+    source = toUSVString(object)
     contentType = 'text/plain;charset=UTF-8'
   }
 
@@ -293,7 +293,7 @@ const methods = {
 
   async text () {
     const blob = await this.blob()
-    return await blob.text()
+    return toUSVString(await blob.text())
   },
 
   async json () {

lib/fetch/request.js

@@ -5,7 +5,7 @@
 const { extractBody, mixinBody, cloneBody } = require('./body')
 const { Headers, fill: fillHeaders, HeadersList } = require('./headers')
 const util = require('../core/util')
-const { isValidHTTPToken, EnvironmentSettingsObject } = require('./util')
+const { isValidHTTPToken, EnvironmentSettingsObject, toUSVString } = require('./util')
 const {
   forbiddenMethods,
   corsSafeListedMethods,
@@ -46,7 +46,7 @@ class Request {
         "Failed to construct 'Request': cannot convert to dictionary."
       )
     }
-    const input = args[0] instanceof Request ? args[0] : String(args[0])
+    const input = args[0] instanceof Request ? args[0] : toUSVString(args[0])
     const init = args.length >= 1 ? args[1] ?? {} : {}
 
     // TODO

lib/fetch/response.js

@@ -4,7 +4,7 @@ const { Headers, HeadersList, fill } = require('./headers')
 const { extractBody, cloneBody, mixinBody } = require('./body')
 const util = require('../core/util')
 const { kEnumerableProperty } = util
-const { responseURL, isValidReasonPhrase } = require('./util')
+const { responseURL, isValidReasonPhrase, toUSVString } = require('./util')
 const {
   redirectStatus,
   nullBodyStatus,
@@ -44,7 +44,7 @@ class Response {
     }
 
     const status = args.length >= 2 ? args[1] : 302
-    const url = String(args[0])
+    const url = toUSVString(args[0])
 
     // 1. Let parsedURL be the result of parsing url with current settings
     // object’s API base URL.

lib/fetch/util.js

@@ -280,6 +280,23 @@ function tryUpgradeRequestToAPotentiallyTrustworthyURL (request) {
   // TODO
 }
 
+function _toUSVString (val) {
+  // TODO: This is internal to node core...
+  return val
+}
+
+const unpairedSurrogateRe =
+  /(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])/
+
+// https://github.com/nodejs/node/blob/7ca38f05a023666274569343f128c5aed81599f3/lib/internal/url.js#L144
+function toUSVString (val) {
+  const str = `${val}`
+  // As of V8 5.5, `str.search()` (and `unpairedSurrogateRe[@@search]()`) are
+  // slower than `unpairedSurrogateRe.exec()`.
+  const match = unpairedSurrogateRe.exec(str)
+  return match ? _toUSVString(str, match.index) : str
+}
+
 class ServiceWorkerGlobalScope {} // dummy
 class Window {} // dummy
 class EnvironmentSettingsObject {} // dummy
@@ -290,6 +307,7 @@ module.exports = {
   ServiceWorkerGlobalScope,
   Window,
   EnvironmentSettingsObject,
+  toUSVString,
   tryUpgradeRequestToAPotentiallyTrustworthyURL,
   coarsenedSharedCurrentTime,
   matchRequestIntegrity,