Merge branch 'main' of https://github.com/CUBETIQ/http-tunnel-client into main

Bump @types/node from 18.11.5 to 18.11.9

.github/workflows/node.js.yml

@@ -0,0 +1,30 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present

CHANGELOG.md

@@ -0,0 +1,15 @@
+### 11/11/2022
+
+-   Fixed axios is not a function
+-   Add generate token with data (clientId, apiKey) to server
+
+### 20/10/2022
+
+-   Upgraded packages and fixed some bugs
+
+### Initialized
+
+-   HTTP tunnel between server and client via https link
+-   Custom profile (using `-p myprofile`)
+-   Suffix url (using `-s`)
+-   Config (get/set token,access,server,client,key configs)

README.md

@@ -9,56 +9,68 @@ npm i -g @cubetiq/hlt
 
 OR
 
-npx @cubetiq/hlt
+npx -y @cubetiq/hlt
 
 ```
 
-### Usage
+### Usages
+
+-   If installed to global (bin), please using cli
+
+```shell
+hlt [command] [options]
+```
 
 -   Initialize Client and Start (Quick)
 
 ```shell
 # Initialize a client and token for connect (default's profile)
-npx @cubetiq/hlt init
+npx -y @cubetiq/hlt init
 
 # Start port 3000 to remote server
-npx @cubetiq/hlt start 3000
+npx -y @cubetiq/hlt start 3000
 ```
 
+# Start port 3000 with suffix to remote server
+
+npx -y @cubetiq/hlt start 3000 -s mytest
+
+````
+
 - Initialize Client and Start (Quick with custom's profile)
 
 ```shell
 # Initialize a client and token for connect (mytest's profile)
-npx @cubetiq/hlt init -p mytest
+npx -y @cubetiq/hlt init -p mytest
 
 # Start port 3000 to remote server (mytest's profile)
-npx @cubetiq/hlt start 3000 -p mytest
+npx -y @cubetiq/hlt start 3000 -p mytest
-```
+````
 
 ### Custom Config
 
 -   Generate Client Key
 
 ```shell
-npx @cubetiq/hlt config client new
+npx -y @cubetiq/hlt config client new
 ```
 
 -   Set Client Token (Required, contact to vendor)
 
 ```shell
-npx @cubetiq/hlt config token $TOKEN
+npx -y @cubetiq/hlt config token $TOKEN
 ```
 
-- Custom Server
+-   Set Custom Server
 
 ```shell
-npx @cubetiq/hlt config server https://lt.ctdn.net
+npx -y @cubetiq/hlt config server https://lt.ctdn.net
 ```
 
 -   Start Client
 
 ```shell
-npx @cubetiq/hlt start $YOUR_PORT
+npx -y @cubetiq/hlt start $YOUR_PORT
 ```
 
 ### Contributors

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "@cubetiq/hlt",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@cubetiq/hlt",
-      "version": "0.1.0",
+      "version": "0.1.2",
       "license": "ISC",
       "dependencies": {
-        "axios": "^0.27.2",
+        "axios": "^1.0.0",
         "commander": "^9.3.0",
         "https-proxy-agent": "^5.0.1",
         "socket.io-client": "^4.5.1"
@@ -90,9 +90,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.0.3",
+      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
       "dev": true
     },
     "node_modules/@types/strip-bom": {
@@ -164,12 +164,13 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "0.27.2",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
       "dependencies": {
-        "follow-redirects": "^1.14.9",
+        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0"
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "node_modules/balanced-match": {
@@ -254,9 +255,9 @@
       }
     },
     "node_modules/commander": {
-      "version": "9.4.0",
+      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
-      "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
       "engines": {
         "node": "^12.20.0 || >=14"
       }
@@ -316,9 +317,9 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.2.2",
+      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz",
-      "integrity": "sha512-8ZQmx0LQGRTYkHuogVZuGSpDqYZtCM/nv8zQ68VZ+JkOpazJ7ICdsSpaO6iXwvaU30oFg5QJOJWj8zWqhbKjkQ==",
+      "integrity": "sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
@@ -636,6 +637,11 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -678,13 +684,13 @@
       }
     },
     "node_modules/socket.io-client": {
-      "version": "4.5.1",
+      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
-      "integrity": "sha512-e6nLVgiRYatS+AHXnOnGi4ocOpubvOUCGhyWw8v+/FxW8saHkinG6Dfhi9TU0Kt/8mwJIAASxvw6eujQmjdZVA==",
+      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~6.2.1",
+        "engine.io-client": "~6.2.3",
         "socket.io-parser": "~4.2.0"
       },
       "engines": {
@@ -692,9 +698,9 @@
       }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.0",
+      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-tLfmEwcEwnlQTxFB7jibL/q2+q8dlVQzj4JdRLJ/W/G1+Fu9VSxCx1Lo+n1HvXxKnM//dUuD0xgiA7tQf57Vng==",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -863,9 +869,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.7.4",
+      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -996,9 +1002,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.0.3",
+      "version": "18.11.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz",
-      "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==",
+      "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==",
       "dev": true
     },
     "@types/strip-bom": {
@@ -1055,12 +1061,13 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "0.27.2",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
       "requires": {
-        "follow-redirects": "^1.14.9",
+        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0"
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
     "balanced-match": {
@@ -1125,9 +1132,9 @@
       }
     },
     "commander": {
-      "version": "9.4.0",
+      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
-      "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -1170,9 +1177,9 @@
       }
     },
     "engine.io-client": {
-      "version": "6.2.2",
+      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz",
-      "integrity": "sha512-8ZQmx0LQGRTYkHuogVZuGSpDqYZtCM/nv8zQ68VZ+JkOpazJ7ICdsSpaO6iXwvaU30oFg5QJOJWj8zWqhbKjkQ==",
+      "integrity": "sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1",
@@ -1403,6 +1410,11 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -1433,20 +1445,20 @@
       }
     },
     "socket.io-client": {
-      "version": "4.5.1",
+      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.3.tgz",
-      "integrity": "sha512-e6nLVgiRYatS+AHXnOnGi4ocOpubvOUCGhyWw8v+/FxW8saHkinG6Dfhi9TU0Kt/8mwJIAASxvw6eujQmjdZVA==",
+      "integrity": "sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~6.2.1",
+        "engine.io-client": "~6.2.3",
         "socket.io-parser": "~4.2.0"
       }
     },
     "socket.io-parser": {
-      "version": "4.2.0",
+      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
-      "integrity": "sha512-tLfmEwcEwnlQTxFB7jibL/q2+q8dlVQzj4JdRLJ/W/G1+Fu9VSxCx1Lo+n1HvXxKnM//dUuD0xgiA7tQf57Vng==",
+      "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
       "requires": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
@@ -1553,9 +1565,9 @@
       }
     },
     "typescript": {
-      "version": "4.7.4",
+      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true
     },
     "v8-compile-cache-lib": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubetiq/hlt",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A lightweight http tunnel client using nodejs and socket.io client",
   "main": "dist/client.js",
   "bin": {
@@ -21,7 +21,7 @@
   "author": "Sambo Chea <sombochea@cubetiqs.com>",
   "license": "ISC",
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^1.0.0",
     "commander": "^9.3.0",
     "https-proxy-agent": "^5.0.1",
     "socket.io-client": "^4.5.1"

src/client.ts

@@ -265,8 +265,13 @@ program
 
     if (!config.token) {
       console.log("Generating token...");
-      await getTokenFree(config.server)
+      await getTokenFree(config.server, {
+        timestamp: (new Date().getTime()),
+        clientId: config.clientId,
+        apiKey: config.apiKey,
+      })
         .then((resp: any) => {
+          console.log("Token generated successfully!");
           if (resp.data?.token) {
             config.token = resp.data?.token;
           } else {

src/sdk.ts

@@ -1,4 +1,4 @@
-const axios = require("axios").default;
+const axios = require("axios");
 
 const getTokenFree = async (baseUrl: string, data: any = {}) => {
   const url = `${baseUrl}/__free__/api/get_token`;