fix: backend optional types + firewall frontend initial code

backend/routers/nfregex.py

@@ -42,7 +42,7 @@ class RegexAddForm(BaseModel):
     service_id: str
     regex: str
     mode: str
-    active: bool|None
+    active: bool|None = None
     is_blacklist: bool
     is_case_sensitive: bool
 
@@ -54,7 +54,7 @@ class ServiceAddForm(BaseModel):
 
 class ServiceAddResponse(BaseModel):
     status:str
-    service_id: str|None
+    service_id: str|None = None
 
 app = APIRouter()
 

backend/routers/porthijack.py

@@ -32,7 +32,7 @@ class ServiceAddForm(BaseModel):
 
 class ServiceAddResponse(BaseModel):
     status:str
-    service_id: str|None
+    service_id: str|None = None
 
 class GeneralStatModel(BaseModel):
     services: int

backend/routers/regexproxy.py

@@ -156,8 +156,8 @@ async def regen_service_port(service_id: str):
     return {'status': 'ok'}
 
 class ChangePortForm(BaseModel):
-    port: int|None
-    internalPort: int|None
+    port: int|None = None
+    internalPort: int|None = None
 
 @app.post('/service/{service_id}/change-ports', response_model=StatusMessageModel)
 async def change_service_ports(service_id: str, change_port:ChangePortForm):
@@ -249,7 +249,7 @@ class RegexAddForm(BaseModel):
     service_id: str
     regex: str
     mode: str
-    active: bool|None
+    active: bool|None = None
     is_blacklist: bool
     is_case_sensitive: bool
 
@@ -272,11 +272,11 @@ async def add_new_regex(form: RegexAddForm):
 class ServiceAddForm(BaseModel):
     name: str
     port: PortType
-    internalPort: int|None
+    internalPort: int|None = None
 
 class ServiceAddStatus(BaseModel):
     status:str
-    id: str|None
+    id: str|None = None
 
 class RenameForm(BaseModel):
     name:str

backend/utils/loader.py

@@ -48,10 +48,10 @@ def list_routers():
     return [ele[:-3] for ele in list_files(ROUTERS_DIR) if ele != "__init__.py" and " " not in ele and ele.endswith(".py")]
 
 class RouterModule():
-    router: None|APIRouter
-    reset: None|Callable
-    startup: None|Callable
-    shutdown: None|Callable
+    router: APIRouter|None = None
+    reset: Callable|None = None
+    startup: Callable|None = None
+    shutdown: Callable|None = None
     name: str
     
     def __init__(self, router: APIRouter, reset: Callable, startup: Callable, shutdown: Callable, name:str):

backend/utils/models.py

@@ -17,7 +17,7 @@ class PasswordChangeForm(BaseModel):
 
 class ChangePasswordModel(BaseModel):
     status: str
-    access_token: str|None
+    access_token: str|None = None
 
 class IpInterface(BaseModel):
     addr: str