hiddify changes cleaned

device/peer.go

@@ -53,7 +53,8 @@ type Peer struct {
 		inbound  *autodrainingInboundQueue            // sequential ordering of tun writing
 	}
 
-	trick bool
+	trick  bool
+	stopCh chan int
 
 	cookieGenerator             CookieGenerator
 	trieEntries                 list.List
@@ -79,7 +80,7 @@ func (device *Device) NewPeer(pk NoisePublicKey) (*Peer, error) {
 
 	// create peer
 	peer := new(Peer)
-
+	peer.stopCh = make(chan int, 1)
 	peer.trick = true
 	peer.cookieGenerator.Init(pk)
 	peer.device = device
@@ -267,6 +268,10 @@ func (peer *Peer) Stop() {
 		return
 	}
 
+	select {
+	case peer.stopCh <- 1:
+	default:
+	}
 	peer.device.log.Verbosef("%v - Stopping", peer)
 
 	peer.timersStop()

device/send.go

@@ -105,9 +105,12 @@ func (peer *Peer) sendRandomPackets() {
 			return
 		}
 
-		if i < numPackets-1 {
+		if i < numPackets-1 && peer.isRunning.Load() && !peer.device.isClosed() {
+			select {
+			case <-peer.stopCh:
 			// Wait for a random duration between 20 and 250 milliseconds
-			time.Sleep(time.Duration(randomInt(20, 250)) * time.Millisecond)
+			case <-time.After(time.Duration(randomInt(20, 250)) * time.Millisecond):
+			}
 		}
 	}
 }

warp/account.go

@@ -633,3 +633,36 @@ func CheckProfileExists(license string) bool {
 	}
 	return isOk
 }
+
+func RemoveDevice(account AccountData) error {
+
+	headers := map[string]string{
+		"Content-Type":      "application/json",
+		"User-Agent":        "okhttp/3.12.1",
+		"CF-Client-Version": "a-6.30-3596",
+		"Authorization":     "Bearer " + account.AccessToken,
+	}
+
+	req, err := http.NewRequest("DELETE", "https://api.cloudflareclient.com/v0a3596/reg/"+account.AccountID, nil)
+	if err != nil {
+		return err
+	}
+
+	// Set headers
+	for k, v := range MergeMaps(defaultHeaders, headers) {
+		req.Header.Set(k, v)
+	}
+
+	// Create HTTP client and execute request
+	response, err := client.Do(req)
+	if err != nil {
+		fmt.Println("sending request to remote server", err)
+		return err
+	}
+
+	if response.StatusCode != 204 {
+		return fmt.Errorf("error in deleting account %d %s", response.StatusCode, response.Status)
+	}
+
+	return nil
+}