Nexom 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

nexom/app/auth.py

@@ -133,8 +133,7 @@ class AuthService:
     def handler(self, environ: dict) -> JsonResponse:
         req = Request(environ)
         try:
-            route = self.routing.get(req.path)
-            return route.call_handler(req)
+            return self.routing.handle(req)
 
         except NexomError as e:
             # error code -> proper HTTP status

nexom/app/middleware.py

@@ -48,4 +48,88 @@ class MiddlewareChain:
 
             return call_at(0, request, args)
 
-        return wrapped
+        return wrapped
+    
+
+class CORSMiddleware:
+    def __init__(
+        self,
+        allowed_origins: list[str] | None = None,   # None or ["*"] = allow all
+        allowed_methods: list[str] | None = None,
+        allowed_headers: list[str] | None = None,
+        access_control_allow_credentials: bool = False,
+        max_age: int | None = 600,
+    ) -> None:
+        self.allowed_origins = allowed_origins or ["*"]
+        self.allowed_methods = [m.upper() for m in (allowed_methods or ["GET", "POST", "PUT", "DELETE", "OPTIONS"])]
+        self.allowed_headers = allowed_headers or ["Content-Type", "Authorization"]
+        self.allow_credentials = access_control_allow_credentials
+        self.max_age = max_age
+
+    def _is_allowed_origin(self, origin: str) -> bool:
+        return "*" in self.allowed_origins or origin in self.allowed_origins
+
+    def _append_vary_origin(self, res: Response) -> None:
+        # append_header が単純 append なので、重複しないように軽くケア
+        for k, v in getattr(res, "headers", []):
+            if k.lower() == "vary":
+                # 既に Vary があるなら Origin が含まれてるかだけチェック
+                if "origin" in [p.strip().lower() for p in v.split(",")]:
+                    return
+                res.append_header("Vary", v + ", Origin")
+                return
+        res.append_header("Vary", "Origin")
+
+    def __call__(self, request: Request, args: dict[str, str | None], next_: Handler) -> Response:
+        origin = request.headers.get("origin")
+        if not origin:
+            return next_(request, args)
+
+        if not self._is_allowed_origin(origin):
+            return next_(request, args)
+
+        # preflight 判定
+        acrm = request.headers.get("access-control-request-method")
+        is_preflight = request.method == "OPTIONS" and acrm is not None
+
+        if is_preflight:
+            # 204で十分（body無し）
+            res = Response(b"", status=204)
+        else:
+            res = next_(request, args)
+
+        # Allow-Origin（単一 or *）
+        if "*" in self.allowed_origins and not self.allow_credentials:
+            res.append_header("Access-Control-Allow-Origin", "*")
+        else:
+            # credentials=True なら必ず echo（*は禁止）
+            res.append_header("Access-Control-Allow-Origin", origin)
+            self._append_vary_origin(res)
+
+        # Allow-Credentials
+        if self.allow_credentials:
+            res.append_header("Access-Control-Allow-Credentials", "true")
+
+        # Allow-Methods
+        if self.allowed_methods == ["*"]:
+            req_method = request.headers.get("access-control-request-method")
+            res.append_header("Access-Control-Allow-Methods", req_method or "GET, POST, PUT, DELETE, OPTIONS")
+        else:
+            res.append_header("Access-Control-Allow-Methods", ", ".join(self.allowed_methods))
+        
+        # Allow-Headers
+        if self.allowed_headers == ["*"]:
+            req_headers = request.headers.get("access-control-request-headers")
+            # ブラウザが要求してきたヘッダをそのまま許可
+            if req_headers:
+                res.append_header("Access-Control-Allow-Headers", req_headers)
+            else:
+                res.append_header("Access-Control-Allow-Headers", "Content-Type, Authorization")
+        else:
+            res.append_header("Access-Control-Allow-Headers", ", ".join(self.allowed_headers))
+
+
+        if self.max_age is not None:
+            res.append_header("Access-Control-Max-Age", str(self.max_age))
+
+        return res

nexom/app/path.py

@@ -48,7 +48,7 @@ class Path:
                 self.path_args[idx] = m.group(1)
 
         if detection_index == 0:
-            detection_index = 0 if path == "" else len(path_segments)
+            detection_index = len(path_segments)
 
         self.path: str = "/".join(path_segments[:detection_index])
         self.detection_range: int = detection_index
@@ -192,4 +192,10 @@ class Router(list[Path]):
 
         if self.raise_if_not_exist:
             raise PathNotFoundError(request_path)
-        return None
+        return None
+
+    def handle(self, request: Request) -> Response:
+        path = self.get(request.path, method=request.method)
+        if path is None:
+            raise PathNotFoundError(request.path)
+        return path.call_handler(request, tuple(self.middlewares))

nexom/app/response.py

@@ -62,6 +62,9 @@ class Response:
         """
         yield self.body
 
+    def append_header(self, key: str, value: str) -> None:
+        self.headers.append((key, value))
+
 class HtmlResponse(Response):
     def __init__(
         self,

nexom/assets/app/templates/default.html

@@ -2,7 +2,7 @@
 <Insert main>
     <div class="thumbnail-container">
         <div class="message-card">
-            <h1>Welcome Nexom v1.0.7 Deeeeeeeev</h1>
+            <h1>Welcome Nexom v1.0.9 Deeeeeeeev</h1>
             <p>How are you? I'm fine! Thank you!</p>
         </div>
         <div class="accounts-card">

nexom/assets/app/wsgi.py

@@ -39,8 +39,7 @@ def app(environ: dict, start_response: Callable) -> Iterable[bytes]:
         path = req.path
         method = req.method
 
-        p = routing.get(path, method=method)
-        res = p.call_handler(req)
+        res = routing.handle(req)
 
     except PathNotFoundError as e:
         logger.warn(str(e))

{nexom-1.0.7.dist-info → nexom-1.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Nexom
-Version: 1.0.7
+Version: 1.0.9
 Summary: Lightweight Python Web Framework (WSGI)
 Author: TouriAida
 License: MIT License

{nexom-1.0.7.dist-info → nexom-1.0.9.dist-info}/RECORD

@@ -1,21 +1,21 @@
 nexom/__init__.py,sha256=wMpCghSUTLo67kGxKbaK2QnU7DpfICyfp3-XbDObLSA,367
 nexom/__main__.py,sha256=VKT7WSe6552_mzwLwJqa55tfag5Olr28eYVhVnf9kWY,6196
 nexom/app/__init__.py,sha256=DgKTx8GtuRJkiRwBKmLhCLlf3l19zTWwXEmeRPznzlM,1089
-nexom/app/auth.py,sha256=u_srAJPVKNKr7W0yuQdY18xXSRUuxmymKaBZysdU8vI,13790
+nexom/app/auth.py,sha256=ahLgrzV7v1-QFjoLu5bk69_VjQhto5jiibc3Dq8zh1I,13744
 nexom/app/cookie.py,sha256=VCau9i8z6QlkaE_s8gKZXjcFtrV2bX1T4xssNtpJ5A0,2026
 nexom/app/db.py,sha256=fl3SrNPOltTT3d5PqjISdS4u7SXEMRqLPotbJE0FXsY,3320
 nexom/app/http_status_codes.py,sha256=R4ka3n4rijqvfahF5n5kS-Qrg8bZSsrvF8lGnpKWAgY,1934
-nexom/app/middleware.py,sha256=7bHGtEem92QhgULOvTFDFlZ4K719CQgu9RKj1g7XOW8,1429
-nexom/app/path.py,sha256=LdlJg7QRh7Zwgw5TsHzPF9ZYiIhlcNjOOEX5LEaud-o,6006
+nexom/app/middleware.py,sha256=PO3V76pdnPsKwVqxM9Lx02vqsTQeLEDU-bLJpZqUhvs,5017
+nexom/app/path.py,sha256=ELSqfuyZyTTZqo1m0rpg8IydZ8e3FMDy1drbNqU2tmk,6241
 nexom/app/request.py,sha256=4dvcfrrS9gKzVFtoizRw5eFvP7eHRXsavh21zEHXX2U,8867
-nexom/app/response.py,sha256=a5297XDlDkoArymss-oxLTJ1a0I-MNjFUvFel0CQnN8,4483
+nexom/app/response.py,sha256=1HznRpImlLTdnKb8r0Pd-5DAMkOK7HzoaL7qjbQ68Xo,4585
 nexom/app/template.py,sha256=sGaO39EPrPs-K_4gUxdhtEOyjzYyEPTUzpBzJqFP-_Y,3650
 nexom/app/user.py,sha256=6KLLsb08Ma39CnLBbq5y290o33tfxtHFWu9lu1kT0NM,623
 nexom/assets/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexom/assets/app/config.py,sha256=Ltpj40PE1--s0eRPTHiJNFqG8pFA7Lb6x02C39kwoYA,765
 nexom/assets/app/gunicorn.conf.py,sha256=0kAQ7ddfpnPpqLAZxIXqYPF6EuUzkjIC9aOTqfxn6rc,149
 nexom/assets/app/router.py,sha256=Rnm_H6k6fIAhNaP62IP7lcSsZ0O2q_TfSyYQWd9tdh4,412
-nexom/assets/app/wsgi.py,sha256=o-GtCPPHKiavTOmr8qxqCY95iUFU_IvRmwLqLK3ecwU,1743
+nexom/assets/app/wsgi.py,sha256=5wk74UzxVE5lnWwtXFcbjOW7Fz9nz9NWG9lq8Q6bzbw,1698
 nexom/assets/app/__pycache__/__init__.cpython-313.pyc,sha256=5qiNgiTI26RZcyxr09EKigB5YYYBSqRJxyq8LCVWR14,195
 nexom/assets/app/pages/__init__.py,sha256=DlX9iwM39JaMKfzK4mbgjE2uVMX3ax0wd2mCVnpg0b4,61
 nexom/assets/app/pages/_templates.py,sha256=1c8KUwfMHkoo7S4neFbYjs5ixK44evn-uFVAFR9Y834,213
@@ -26,7 +26,7 @@ nexom/assets/app/static/dog.jpeg,sha256=qGEhcg48FxRLRISzbmXvw1qvfbdluC_ukM8ZrHg7
 nexom/assets/app/static/github.png,sha256=DUwjX--e_sVBdKfABfwP4M4tY9NcIYmKtRSFhxETl6k,6223
 nexom/assets/app/static/style.css,sha256=9LxUcxaQ8ppnHEncJPuO-Mt_DYCUFv56wzlHq5ed264,12609
 nexom/assets/app/templates/base.html,sha256=RVW_63gA1sr7pqNkfB6Djk5an_VFpowahDIHGjfV-Wk,349
-nexom/assets/app/templates/default.html,sha256=iugOU0K39oLzgak_DtszWM_1dptscQlXVDldVg5-Qxw,617
+nexom/assets/app/templates/default.html,sha256=FGBT6ilK0uiFlAYibgYgEqoYe-EfLx_13m42C48R9FM,617
 nexom/assets/app/templates/document.html,sha256=XzKxibNf_i5DXBN2MHwLu2_Y5KNr9hSgIYxlY5l3gT8,5694
 nexom/assets/app/templates/footer.html,sha256=mh0mm4f1nHIGV3cjDFFi8gpYwEpgk5Jqpbjokh9DPbA,94
 nexom/assets/app/templates/header.html,sha256=ZqtFQtL7hP8Rf5naU8jMSfE6Ce1ktA9KRb2g0PbF8Kc,341
@@ -49,9 +49,9 @@ nexom/core/log.py,sha256=q0FYz1-kkTUHvNkEBW5V1zvUv1phMYchOqwAfUXGHQI,3016
 nexom/core/object_html_render.py,sha256=4yT3Aihia4oG62gr1rqZd757wEXsu78mTCCpjpVE7JM,7027
 nexom/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nexom/templates/auth.py,sha256=q-kNIpi2M1UH8fmEy7lmcnM1hCTpj9r78wHXgnW-Aak,4617
-nexom-1.0.7.dist-info/licenses/LICENSE,sha256=YbcHyxYLJ5jePeMS_NXpR9yiZjP5skhn32LvcKeknJw,1066
-nexom-1.0.7.dist-info/METADATA,sha256=HmkdqKobbJLQEjaQ4K3KpRDbrQVMjQUFls8Ld9UDyGs,5896
-nexom-1.0.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-nexom-1.0.7.dist-info/entry_points.txt,sha256=0r1egKZmF1MUo25AKPt-2d55sk5Q_EIBOQwD3JC8RgI,46
-nexom-1.0.7.dist-info/top_level.txt,sha256=mTyUruscL3rqXvYJRo8KGwDM6PWXRzgf4CamLr8LSX4,6
-nexom-1.0.7.dist-info/RECORD,,
+nexom-1.0.9.dist-info/licenses/LICENSE,sha256=YbcHyxYLJ5jePeMS_NXpR9yiZjP5skhn32LvcKeknJw,1066
+nexom-1.0.9.dist-info/METADATA,sha256=aaGusVrxjOLjB7gLbh-Xd_R2SdAiFKf0Brf-6R6UiGk,5896
+nexom-1.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nexom-1.0.9.dist-info/entry_points.txt,sha256=0r1egKZmF1MUo25AKPt-2d55sk5Q_EIBOQwD3JC8RgI,46
+nexom-1.0.9.dist-info/top_level.txt,sha256=mTyUruscL3rqXvYJRo8KGwDM6PWXRzgf4CamLr8LSX4,6
+nexom-1.0.9.dist-info/RECORD,,