Merge pull request #28 from taosdata/fix/xiaolei/3.0-rest-connect-cloud-failed

fix(driver):node-rest 3.0 connect cloud failed for default port

Author: xleili

typescript-rest/index.ts

@@ -6,7 +6,6 @@ let options: Options = {
     user: 'root',
     passwd: 'taosdata',
     host: "127.0.0.1",
-    port: 6041,
 }
 let connect = function connect(option: Options) {
     // console.log("index.options:"+JSON.stringify(option));

typescript-rest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdengine/rest",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A REST connector for TDengine",
   "source": "index.ts",
   "main": "dist/main/index.js",

typescript-rest/src/cursor.ts

@@ -43,15 +43,15 @@ export class TDengineCursor {
                 return new Result(res_json);
             }
 
-        }else if (response.status == 400) {
-             new Error("invalid parameters.")
-        }else if (response.status == 401) {
+        } else if (response.status == 400) {
+            new Error("invalid parameters.")
+        } else if (response.status == 401) {
             throw new Error("Authentication failed.")
-        }else if (response.status == 404) {
+        } else if (response.status == 404) {
             throw new Error("interface not exists.")
-        }else if (response.status == 500) {
+        } else if (response.status == 500) {
             throw new Error("internal error.")
-        }else if (response.status == 503) {
+        } else if (response.status == 503) {
             throw new Error("insufficient system resource.")
         }
         throw new Error("http request failed.");

typescript-rest/src/request.ts

@@ -36,8 +36,11 @@ export class TDResRequest {
         } else {
             //do nothing 
         }
-        url = `${this.uri.scheme}://${this.uri.host}:${this.uri.port}${this.uri.path}`
-
+        if (this.uri.port) {
+            url = `${this.uri.scheme}://${this.uri.host}:${this.uri.port}${this.uri.path}`
+        } else {
+            url = `${this.uri.scheme}://${this.uri.host}${this.uri.path}`
+        }
         if (this.uri.query) {
             url += '?'
             Object.keys(this.uri.query).forEach(
@@ -103,6 +106,7 @@ export class TDResRequest {
 
     request(command: string): Promise<any> {
         this._body(command);
+        //console.log(this._makeUrl());
         return fetch(this._makeUrl(), this.options);
     }
 }