got -> fetch, remove dns cache

Author: simon300000

README.md

@@ -84,9 +84,6 @@ Edit Settings by environment variables or by command line arguments.
   --uuid=<uuid>      UUID for stats tracking.
                      [env: UUID]
                      
-  --no-dns-cache     Disable DNS cache
-                     [env: NO_DNS_CACHE]
-                     
   --anonymous        Do not send platform info to the server.
                      [env: HIDE]
                      
@@ -96,17 +93,16 @@ Edit Settings by environment variables or by command line arguments.
 
 #### ENV:
 
-| ENV          | Default                  | Document                                                     |
-| ------------ | ------------------------ | ------------------------------------------------------------ |
-| URL          | `wss://cluster.vtbs.moe` | Upstream URL                                                 |
-| INTERVAL     | `1280`                   | Task interval in ms                                          |
-| LIMIT        | `Infinity`               | Live room relay WebSocket connections                        |
-| UUID         | `undefined`              | stats tracking                                               |
-| NO_DNS_CACHE | `false` *                | Disable internal DNS cache                                   |
-| HIDE         | `false` *                | hide all extra information including platform, client version, Node.js runtime version, docker status ** |
-| NICKNAME     | `undefined`              | A optional nickname to display on statistics board (in progress). |
-| docker       | Depends                  | Is Docker environment?                                       |
-| VERBOSE      | `false` *                | Verbose log                                                  |
+| ENV      | Default                  | Document                                                     |
+| -------- | ------------------------ | ------------------------------------------------------------ |
+| URL      | `wss://cluster.vtbs.moe` | Upstream URL                                                 |
+| INTERVAL | `1280`                   | Task interval in ms                                          |
+| LIMIT    | `Infinity`               | Live room relay WebSocket connections                        |
+| UUID     | `undefined`              | stats tracking                                               |
+| HIDE     | `false` *                | hide all extra information including platform, client version, Node.js runtime version, docker status ** |
+| NICKNAME | `undefined`              | A optional nickname to display on statistics board (in progress). |
+| docker   | Depends                  | Is Docker environment?                                       |
+| VERBOSE  | `false` *                | Verbose log                                                  |
 
 \* giving any value will make it `true`
 
@@ -115,3 +111,16 @@ Edit Settings by environment variables or by command line arguments.
 ## Contribution/Other information
 
 The source code of backend (Cluster Manager) is available at <https://github.com/dd-center/Cluster-center>
+
+
+
+### Note
+
+
+
+1.11.0 use `fetch`, Node 18, remove DNS cache.
+
+
+
+Use 1.10.0 if you need. tag `v1.10.0` commit `d0b2b7ec55fd393186c33f8deb2b1cf28cba55c7`
+

core.js

@@ -1,8 +1,5 @@
 const WebSocket = require('ws')
-const got = require('got')
 const EventEmitter = require('events')
-const CacheableLookup = require('cacheable-lookup')
-const QuickLRU = require('quick-lru')
 
 const relay = require('./relay')
 
@@ -16,7 +13,7 @@ const parse = string => {
 }
 
 class DDAtHome extends EventEmitter {
-  constructor(url, { PING_INTERVAL = 1000 * 30, INTERVAL = 480, start = true, wsLimit = Infinity, dnsCache = true } = {}) {
+  constructor(url, { PING_INTERVAL = 1000 * 30, INTERVAL = 480, start = true, wsLimit = Infinity } = {}) {
     super()
     this.url = url
     this.PING_INTERVAL = PING_INTERVAL
@@ -25,11 +22,6 @@ class DDAtHome extends EventEmitter {
     this.queryTable = new Map()
     this.wsLimit = wsLimit
     this.relay = relay(this)
-    this.dnsCache = dnsCache
-    this.dnsLookupCache = new CacheableLookup({
-      maxTtl: 60,
-      cache: new QuickLRU({ maxSize: 1000 })
-    })
     if (start) {
       this.start()
     }
@@ -45,10 +37,7 @@ class DDAtHome extends EventEmitter {
         this.emit('url', url)
         const time = Date.now()
         const opts = { headers: { Cookie: '_uuid=;rpdid=' } }
-        if (this.dnsCache) {
-          opts.dnsCache = this.dnsLookupCache
-        }
-        const { body: data } = await got(url, opts).catch(async e => ({ body: JSON.stringify({ code: e.response.statusCode }) })).catch(() => ({ body: JSON.stringify({ code: 233 }) }))
+        const data = await fetch(url, opts).then(w => w.text()).catch(() => JSON.stringify({ code: 233 }))
         const result = this.secureSend(JSON.stringify({
           key,
           data

index.js

@@ -23,9 +23,6 @@ Options:
   --uuid=<uuid>      UUID for stats tracking.
                      [env: UUID]
                      
-  --no-dns-cache     Disable DNS cache
-                     [env: NO_DNS_CACHE]
-                     
   --anonymous        Do not send platform info to the server.
                      [env: HIDE]
                      
@@ -44,7 +41,6 @@ start({
   nickname: args['--nickname'],
   limit: args['--ws-limit'],
   uuid: args['--uuid'],
-  noDnsCache: args['--no-dns-cache'],
   verbose: process.env.development || args['--verbose']
 })
 
@@ -55,7 +51,6 @@ function start({
   nickname,
   limit = Infinity,
   uuid,
-  noDnsCache = false,
   verbose = false
 }) {
   console.log(welcome() + '\n')
@@ -94,12 +89,11 @@ function start({
   console.log({
     INTERVAL: interval,
     limit,
-    noDnsCache,
     verbose
   })
   console.log(`using: ${url}\n`)
 
-  const ws = new DDAtHome(url, { INTERVAL: interval, wsLimit: limit, dnsCache: !noDnsCache })
+  const ws = new DDAtHome(url, { INTERVAL: interval, wsLimit: limit })
 
   if (verbose) {
     ws.on('log', console.log)