url, bugfix: allow pass number type port to url.format. (#728)

fibjs · Jul 11, 2022 · 24bbe7e · 24bbe7e
1 parent 6db9329
commit 24bbe7e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/fibjs/src/net/Url.cpp b/fibjs/src/net/Url.cpp
@@ -448,14 +448,19 @@ result_t Url::parse(exlib::string url, bool parseQueryString, bool slashesDenote
 }
 
 bool getString(Isolate* isolate, v8::Local<v8::Object>& args,
-    const char* key, exlib::string& retVal)
+    const char* key, exlib::string& retVal, bool allowNumber = false)
 {
     v8::Local<v8::Context> context = isolate->context();
     JSValue v = args->Get(context, isolate->NewString(key));
 
-    if (!v.IsEmpty() && (v->IsString() || v->IsStringObject())) {
-        retVal = isolate->toString(v);
-        return true;
+    if (!v.IsEmpty()) {
+        if (v->IsString() || v->IsStringObject()) {
+            retVal = isolate->toString(v);
+            return true;
+        } else if (allowNumber && (v->IsNumber() || v->IsNumberObject())) {
+            retVal = isolate->toString(v);
+            return true;
+        }
     }
 
     return false;
@@ -481,7 +486,7 @@ result_t Url::format(v8::Local<v8::Object> args)
 
     if (getString(isolate, args, "host", str))
         set__host(str);
-    if (getString(isolate, args, "port", str))
+    if (getString(isolate, args, "port", str, true))
         set_port(str);
 
     if (getString(isolate, args, "hostname", str))

diff --git a/test/url_test.js b/test/url_test.js
@@ -630,6 +630,15 @@ describe("url", () => {
             'hash': 'h',
             'query': 's'
         },
+        'https://a.com:447/a/b/c?s#h': {
+            'href': 'https://a.com:447/a/b/c?s#h',
+            'protocol': 'https',
+            'hostname': 'a.com',
+            'pathname': 'a/b/c',
+            'port': 447,
+            'hash': 'h',
+            'query': 's'
+        },
         'http://atpass:foo%40bar@127.0.0.1/': {
             'href': 'http://atpass:foo%40bar@127.0.0.1/',
             'username': 'atpass',