feat: better scanning logic

Author: GoodCoder666

dlgImport.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from PySide6.QtWidgets import QDialog, QDialogButtonBox
-from PySide6.QtCore import Slot
 from ui_dlgImport import Ui_Dialog
 
 __all__ = ['dlgImport']

dlgScan.ui

@@ -69,7 +69,7 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>5</number>
+        <number>7</number>
        </property>
        <item>
         <property name="text">
@@ -147,7 +147,7 @@
         <double>0.500000000000000</double>
        </property>
        <property name="value">
-        <double>2.500000000000000</double>
+        <double>1.500000000000000</double>
        </property>
       </widget>
      </item>
@@ -185,14 +185,31 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="chkBox_extendScan">
-     <property name="toolTip">
-      <string>扩大扫描范围，会扫描IPv6。建议在普通扫描结果较少或无结果时使用。</string>
-     </property>
-     <property name="text">
-      <string>扩展扫描（实验性功能）</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="extendScanLayout">
+     <item>
+      <widget class="QCheckBox" name="chkBox_extend4">
+       <property name="toolTip">
+        <string>扩大 IPv4 扫描范围。</string>
+       </property>
+       <property name="text">
+        <string>扩展扫描 IPv4</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkBox_extend6">
+       <property name="toolTip">
+        <string>扩大扫描范围，增加 IPv6 支持。</string>
+       </property>
+       <property name="text">
+        <string>扩展扫描 IPv6</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">

main.py

@@ -250,12 +250,13 @@ def on_btnWait_Scan_clicked(self):
             timeout = dlg.ui.spinBox_timeout.value()
             enableOptimization = dlg.ui.chkBox_optimize.isChecked()
             autoTest = dlg.ui.chkBox_autoTest.isChecked()
-            extendScan = dlg.ui.chkBox_extendScan.isChecked()
+            extend4 = dlg.ui.chkBox_extend4.isChecked()
+            extend6 = dlg.ui.chkBox_extend6.isChecked()
 
             self.__set_buttons_enabled(False)
             self.ui.ipList.clear()
             self.ui.statusbar.showMessage('开始扫描，请稍候...')
-            thread = ScanThread(self, max_ips, num_workers, timeout, enableOptimization, extendScan)
+            thread = ScanThread(self, max_ips, num_workers, timeout, enableOptimization, extend4, extend6)
             thread.finished.connect(self.__test_ips if autoTest else self.__scan_finished)
             thread.foundAvailable.connect(self.__got_scan_result)
             thread.start()

threads.py

@@ -66,52 +66,45 @@ def run(self):
 
 class ScanThread(QThread):
     foundAvailable = Signal(str)
-    available_suffixes = {90, 185}
 
     # https://repo.or.cz/gscan_quic.git/blob/89e4b91eb3642b12f7665f7a9f4fa33c403fc318:/iprange_gws_b.txt
     net_default = IPv4Network('142.250.0.0/15')
     ipv4_extend = [
-        IPv4Network('108.170.192.0/18'),
         IPv4Network('108.177.0.0/17'),
-        IPv4Network('172.110.32.0/21'),
         IPv4Network('172.217.0.0/16'),
         IPv4Network('172.253.0.0/16'),
         IPv4Network('216.58.192.0/19'),
-        IPv4Network('216.73.80.0/20'),
-        IPv4Network('216.239.32.0/19')
+        IPv4Network('72.14.192.0/18'),
+        IPv4Network('74.125.0.0/16')
     ]
 
     # https://repo.or.cz/gscan_quic.git/blob/89e4b91eb3642b12f7665f7a9f4fa33c403fc318:/iprange_gws_6_a.txt
     ipv6_extend = [
+        IPv6Network('2404:6800:4008:c15::0/112'),
         IPv6Network('2a00:1450:4001:802::0/112'),
-        IPv6Network('2a00:1450:4001:803::0/112'),
-        IPv6Network('2a00:1450:4001:809::0/112'),
-        IPv6Network('2a00:1450:4001:811::0/112'),
-        IPv6Network('2a00:1450:4001:827::0/112'),
-        IPv6Network('2a00:1450:4001:828::0/112'),
-        IPv6Network('2a00:1450:4001:829::0/112'),
-        IPv6Network('2a00:1450:4001:830::0/112'),
-        IPv6Network('2a00:1450:4001:831::0/112')
+        IPv6Network('2a00:1450:4001:803::0/112')
     ]
 
     def __init__(self, parent, max_ips=5, num_workers=80, timeout=2.5,
-                 enableOptimization=True, extendScan=False):
+                 enableOptimization=True, extend4=False, extend6=False):
         super().__init__(parent)
 
         self.max_ips = max_ips
         self.num_workers = num_workers
         self.timeout = timeout
 
         self.networks = [
-            [ip for ip in self.net_default if int(ip) & 0xff in self.available_suffixes]
+            [ip for ip in self.net_default if int(ip) & 0xff == 90]
             if enableOptimization else list(self.net_default)
         ]
-        if extendScan:
+
+        if extend4:
             self.networks.extend(self.ipv4_extend)
+        if extend6:
             self.networks.extend(self.ipv6_extend)
 
         self.currentIndex = 0
-        self.block_size = 15 if extendScan else max(15, self.num_workers // 4)
+        self.block_size = max(50, num_workers // 2)
 
     def __found_available(self, ip):
         if self.counter >= self.max_ips:
@@ -143,4 +136,5 @@ def run(self):
         self.pool.setMaxThreadCount(self.num_workers)
         self.counter = 0
         while self.counter < self.max_ips and self.__add_block():
-            self.pool.waitForDone()
+            self.pool.waitForDone()
+        self.pool.waitForDone()

ui_MainWindow.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'MainWindow.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.0
+## Created by: Qt User Interface Compiler version 6.5.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

ui_dlgImport.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'dlgImport.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.0
+## Created by: Qt User Interface Compiler version 6.5.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

ui_dlgScan.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'dlgScan.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.4.0
+## Created by: Qt User Interface Compiler version 6.5.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -95,7 +95,7 @@ def setupUi(self, Dialog):
         self.spinBox_timeout.setMinimum(1.000000000000000)
         self.spinBox_timeout.setMaximum(10.000000000000000)
         self.spinBox_timeout.setSingleStep(0.500000000000000)
-        self.spinBox_timeout.setValue(2.500000000000000)
+        self.spinBox_timeout.setValue(1.500000000000000)
 
         self.horizontalLayout.addWidget(self.spinBox_timeout)
 
@@ -124,10 +124,21 @@ def setupUi(self, Dialog):
 
         self.verticalLayout.addLayout(self.chkBoxLayout)
 
-        self.chkBox_extendScan = QCheckBox(Dialog)
-        self.chkBox_extendScan.setObjectName(u"chkBox_extendScan")
+        self.extendScanLayout = QHBoxLayout()
+        self.extendScanLayout.setObjectName(u"extendScanLayout")
+        self.chkBox_extend4 = QCheckBox(Dialog)
+        self.chkBox_extend4.setObjectName(u"chkBox_extend4")
+        self.chkBox_extend4.setChecked(True)
 
-        self.verticalLayout.addWidget(self.chkBox_extendScan)
+        self.extendScanLayout.addWidget(self.chkBox_extend4)
+
+        self.chkBox_extend6 = QCheckBox(Dialog)
+        self.chkBox_extend6.setObjectName(u"chkBox_extend6")
+
+        self.extendScanLayout.addWidget(self.chkBox_extend6)
+
+
+        self.verticalLayout.addLayout(self.extendScanLayout)
 
         self.buttonBox = QDialogButtonBox(Dialog)
         self.buttonBox.setObjectName(u"buttonBox")
@@ -141,7 +152,7 @@ def setupUi(self, Dialog):
         self.buttonBox.accepted.connect(Dialog.accept)
         self.buttonBox.rejected.connect(Dialog.reject)
 
-        self.comboBox_threads.setCurrentIndex(5)
+        self.comboBox_threads.setCurrentIndex(7)
 
 
         QMetaObject.connectSlotsByName(Dialog)
@@ -167,8 +178,12 @@ def retranslateUi(self, Dialog):
         self.chkBox_optimize.setText(QCoreApplication.translate("Dialog", u"\u542f\u7528\u626b\u63cf\u4f18\u5316", None))
         self.chkBox_autoTest.setText(QCoreApplication.translate("Dialog", u"\u5b8c\u6210\u540e\u81ea\u52a8\u6d4b\u901f", None))
 #if QT_CONFIG(tooltip)
-        self.chkBox_extendScan.setToolTip(QCoreApplication.translate("Dialog", u"\u6269\u5927\u626b\u63cf\u8303\u56f4\uff0c\u4f1a\u626b\u63cfIPv6\u3002\u5efa\u8bae\u5728\u666e\u901a\u626b\u63cf\u7ed3\u679c\u8f83\u5c11\u6216\u65e0\u7ed3\u679c\u65f6\u4f7f\u7528\u3002", None))
+        self.chkBox_extend4.setToolTip(QCoreApplication.translate("Dialog", u"\u6269\u5927 IPv4 \u626b\u63cf\u8303\u56f4\u3002", None))
+#endif // QT_CONFIG(tooltip)
+        self.chkBox_extend4.setText(QCoreApplication.translate("Dialog", u"\u6269\u5c55\u626b\u63cf IPv4", None))
+#if QT_CONFIG(tooltip)
+        self.chkBox_extend6.setToolTip(QCoreApplication.translate("Dialog", u"\u6269\u5927\u626b\u63cf\u8303\u56f4\uff0c\u589e\u52a0 IPv6 \u652f\u6301\u3002", None))
 #endif // QT_CONFIG(tooltip)
-        self.chkBox_extendScan.setText(QCoreApplication.translate("Dialog", u"\u6269\u5c55\u626b\u63cf\uff08\u5b9e\u9a8c\u6027\u529f\u80fd\uff09", None))
+        self.chkBox_extend6.setText(QCoreApplication.translate("Dialog", u"\u6269\u5c55\u626b\u63cf IPv6", None))
     # retranslateUi