ruantiblock-mod-lua, ruantiblock-mod-py: removed ruab_sum_ip.lua, ruab_sum_ip.py

ruantiblock-mod-py/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock-mod-py
 PKG_VERSION:=1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
@@ -32,8 +32,6 @@ endef
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/libexec/ruantiblock
 	$(INSTALL_BIN) ./files/usr/libexec/ruantiblock/ruab_parser.py $(1)/usr/libexec/ruantiblock/ruab_parser.py
-	$(INSTALL_DIR) $(1)/usr/lib/python3.11
-	$(INSTALL_DATA) ./files/usr/lib/python3.11/ruab_sum_ip.py $(1)/usr/lib/python3.11/ruab_sum_ip.py
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/etc/uci-defaults/ruantiblock-mod-py $(1)/etc/uci-defaults/ruantiblock-mod-py
 endef

ruantiblock-mod-py/files/usr/lib/python3.11/ruab_sum_ip.py

@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
-
-from ipaddress import IPv4Address, IPv4Network, summarize_address_range
-from typing import List, Tuple, Set, Union
-
-HOSTS_LIMIT: int = 0
-NETS_LIMIT: int = 0
-
-
-def _sort_ip_func(e: str) -> IPv4Address:
-    return IPv4Address(e)
-
-
-def _group_ip_ranges(ip_list: List, raw_list: Union[List, Set] = None) -> Tuple:
-    def remove_items(start: IPv4Address, end: IPv4Address) -> None:
-        for ip in range(int(start), int(end) + 1):
-            raw_list.remove(str(IPv4Address(ip)))
-
-    start = end = None
-    hosts = 1
-    for ip in ip_list:
-        ip_obj = IPv4Address(ip)
-        if end and (end + 1) == ip_obj:
-            hosts += 1
-        else:
-            if hosts > 1 and hosts >= HOSTS_LIMIT:
-                if raw_list:
-                    remove_items(start, end)
-                yield start, end
-            start = ip_obj
-            hosts = 1
-        end = ip_obj
-    else:
-        if hosts > 1 and hosts >= HOSTS_LIMIT:
-            if raw_list:
-                remove_items(start, end)
-            yield start, end
-
-
-def summarize_ip_ranges(ip_list: Union[List, Set], modify_raw_list: bool = False) -> IPv4Network:
-    for s, e in _group_ip_ranges(sorted(ip_list, key=_sort_ip_func),
-                                 modify_raw_list and ip_list):
-        for i in summarize_address_range(s, e):
-            if i.prefixlen == 32:
-                if modify_raw_list:
-                    if type(ip_list) == set:
-                        ip_list.add(i.network_address)
-                    else:
-                        ip_list.append(i.network_address)
-            else:
-                yield i
-
-
-def _sort_net_func(e: str) -> IPv4Network:
-    return IPv4Network(e)
-
-
-def _group_nets(cidr_list: List, raw_list: Union[List, Set] = None) -> IPv4Network:
-    def remove_items(start: IPv4Address, end: IPv4Address) -> None:
-        for ip in range(int(start), int(end) + 1, 256):
-            raw_list.remove(str(IPv4Address(ip)) + "/24")
-
-    start = end = curr_super_net = None
-    nets = 1
-    for net in cidr_list:
-        net_obj = IPv4Network(net)
-        prefix_len = net_obj.prefixlen
-        if prefix_len == 24:
-            address = net_obj.network_address
-            super_net = net_obj.supernet(new_prefix=16)
-            if end and super_net == curr_super_net and (end + 256) == address:
-                nets += 1
-            else:
-                if nets > 1 and nets >= NETS_LIMIT:
-                    if raw_list:
-                        remove_items(start, end)
-                    yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
-                start = address
-                curr_super_net = super_net
-                nets = 1
-            end = address
-    else:
-        if nets > 1 and nets >= NETS_LIMIT:
-            if raw_list:
-                remove_items(start, end)
-            yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
-
-
-def summarize_nets(cidr_list: Union[List, Set]) -> IPv4Network:
-    for i in _group_nets(sorted(cidr_list, key=_sort_net_func), cidr_list):
-        for j in i:
-            yield j

ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py

@@ -2,19 +2,19 @@
 # -*- coding: utf-8 -*-
 
 """
-(с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
+(с) 2023 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
 
  Python >= 3.6
 """
 
 from contextlib import contextmanager
+from ipaddress import IPv4Address, IPv4Network, summarize_address_range
 import os
 import re
 import socket
 import ssl
 import sys
 from urllib import request
-from ruab_sum_ip import summarize_ip_ranges, summarize_nets
 
 
 class Config:
@@ -120,6 +120,98 @@ class Config:
             cls._load_filter(file_path or cls.BLLIST_IP_FILTER_FILE, cls.BLLIST_IP_FILTER_PATTERNS)
 
 
+class Summarize:
+    HOSTS_LIMIT = 0
+    NETS_LIMIT = 0
+
+    @staticmethod
+    def _sort_ip_func(e):
+        return IPv4Address(e)
+
+    @classmethod
+    def _group_ip_ranges(cls, ip_list, raw_list=None):
+
+        def remove_items(start, end):
+            for ip in range(int(start), int(end) + 1):
+                raw_list.remove(str(IPv4Address(ip)))
+
+        start = end = None
+        hosts = 1
+        for ip in ip_list:
+            ip_obj = IPv4Address(ip)
+            if end and (end + 1) == ip_obj:
+                hosts += 1
+            else:
+                if hosts > 1 and hosts >= cls.HOSTS_LIMIT:
+                    if raw_list:
+                        remove_items(start, end)
+                    yield start, end
+                start = ip_obj
+                hosts = 1
+            end = ip_obj
+        else:
+            if hosts > 1 and hosts >= HOSTS_LIMIT:
+                if raw_list:
+                    remove_items(start, end)
+                yield start, end
+
+    @classmethod
+    def summarize_ip_ranges(cls, ip_list, modify_raw_list=False):
+        for s, e in cls._group_ip_ranges(sorted(ip_list, key=cls._sort_ip_func),
+                                    modify_raw_list and ip_list):
+            for i in summarize_address_range(s, e):
+                if i.prefixlen == 32:
+                    if modify_raw_list:
+                        if type(ip_list) == set:
+                            ip_list.add(i.network_address)
+                        else:
+                            ip_list.append(i.network_address)
+                else:
+                    yield i
+
+    @staticmethod
+    def _sort_net_func(e):
+        return IPv4Network(e)
+
+    @classmethod
+    def _group_nets(cls, cidr_list, raw_list=None):
+
+        def remove_items(start, end):
+            for ip in range(int(start), int(end) + 1, 256):
+                raw_list.remove(str(IPv4Address(ip)) + "/24")
+
+        start = end = curr_super_net = None
+        nets = 1
+        for net in cidr_list:
+            net_obj = IPv4Network(net)
+            prefix_len = net_obj.prefixlen
+            if prefix_len == 24:
+                address = net_obj.network_address
+                super_net = net_obj.supernet(new_prefix=16)
+                if end and super_net == curr_super_net and (end + 256) == address:
+                    nets += 1
+                else:
+                    if nets > 1 and nets >= cls.NETS_LIMIT:
+                        if raw_list:
+                            remove_items(start, end)
+                        yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
+                    start = address
+                    curr_super_net = super_net
+                    nets = 1
+                end = address
+        else:
+            if nets > 1 and nets >= cls.NETS_LIMIT:
+                if raw_list:
+                    remove_items(start, end)
+                yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
+
+    @classmethod
+    def summarize_nets(cls, cidr_list):
+        for i in cls._group_nets(sorted(cidr_list, key=cls._sort_net_func), cidr_list):
+            for j in i:
+                yield j
+
+
 class ParserError(Exception):
     def __init__(self, reason=None):
         super().__init__(reason)
@@ -349,13 +441,13 @@ class BlackListParser(Config):
 
     def _group_ip_ranges(self):
         if self.BLLIST_SUMMARIZE_IP:
-            for i in summarize_ip_ranges(self.ip_set, True):
+            for i in Summarize.summarize_ip_ranges(self.ip_set, True):
                 self.cidr_set.add(i.with_prefixlen)
             self.ip_count = len(self.ip_set)
 
     def _group_cidr_ranges(self):
         if self.BLLIST_SUMMARIZE_CIDR:
-            for i in summarize_nets(self.cidr_set):
+            for i in Summarize.summarize_nets(self.cidr_set):
                 self.cidr_set.add(i.with_prefixlen)
         self.cidr_count = len(self.cidr_set)