Nexom 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

nexom/assets/auth_page/signup.html

@@ -5,64 +5,260 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width,initial-scale=1" />
   <title>Nexom Signup</title>
+
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Noto+Sans+JP:wght@400;600;700&display=swap" rel="stylesheet">
+
   <style>
-    body { font-family: system-ui, -apple-system, Segoe UI, Roboto, sans-serif; margin: 24px; }
-    .wrap { max-width: 720px; margin: 0 auto; }
-    .card { border: 1px solid #eee; border-radius: 14px; padding: 16px; background: #fff; }
-    label { display:block; font-size:12px; margin: 12px 0 6px; color:#333; }
-    input { width:100%; padding:10px 12px; border:1px solid #ddd; border-radius:10px; font-size:14px; }
-    button { margin-top: 14px; padding:10px 12px; border:1px solid #333; border-radius:10px; background:#333; color:#fff; cursor:pointer; }
-    .row { display:flex; gap:10px; align-items:center; flex-wrap:wrap; margin-top: 10px; }
-    a { color:#333; }
-    .help { color:#666; font-size:12px; }
-    .log { margin-top: 14px; padding: 12px; border-radius: 12px; background:#f7f7f7; border:1px solid #eee; white-space: pre-wrap;
-           font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 12px; }
-    .ok { color:#0a7; }
-    .ng { color:#c33; }
+    :root{
+      --bg:#0b0d12;
+      --card:#0f141c;
+      --line:rgba(255,255,255,.10);
+      --text:rgba(255,255,255,.92);
+      --muted:rgba(255,255,255,.62);
+      --danger:#ff5a6a;
+      --ok:#27d39b;
+      --btn:#ffffff;
+      --btnText:#0b0d12;
+      --shadow:0 20px 60px rgba(0,0,0,.45);
+    }
+    *{ box-sizing:border-box; }
+    html,body{ height:100%; }
+    body{
+      margin:0;
+      background: radial-gradient(1200px 600px at 20% 10%, rgba(106,140,255,.18), transparent 60%),
+                  radial-gradient(900px 500px at 85% 30%, rgba(39,211,155,.12), transparent 55%),
+                  var(--bg);
+      color:var(--text);
+      font-family: Inter, "Noto Sans JP", "Hiragino Sans", "ヒラギノ角ゴシック", "Yu Gothic", "游ゴシック", system-ui, -apple-system, "Segoe UI", sans-serif;
+      overflow:hidden; /* スクロール禁止 */
+    }
+    .wrap{
+      height:100%;
+      display:grid;
+      place-items:center;
+      padding:24px;
+    }
+    .card{
+      width:min(560px, 100%);
+      background: linear-gradient(180deg, rgba(255,255,255,.06), rgba(255,255,255,.03));
+      border:1px solid var(--line);
+      border-radius:18px;
+      box-shadow: var(--shadow);
+      padding:18px;
+      backdrop-filter: blur(10px);
+    }
+    h1{
+      margin:0 0 10px;
+      font-size:18px;
+      letter-spacing:.2px;
+    }
+    .sub{
+      margin:0 0 14px;
+      color:var(--muted);
+      font-size:12px;
+      line-height:1.5;
+    }
+
+    .grid{
+      display:grid;
+      grid-template-columns: 1fr 1fr;
+      gap:10px;
+    }
+    .grid .full{ grid-column:1 / -1; }
+    @media (max-width: 480px){
+      .grid .hurf{ grid-column:1 / -1; }
+    }
+
+    label{
+      display:block;
+      font-size:11px;
+      color:var(--muted);
+      margin:0 0 6px;
+    }
+    input{
+      width:100%;
+      height:40px;
+      padding:0 12px;
+      border-radius:12px;
+      border:1px solid var(--line);
+      background: rgba(0,0,0,.25);
+      color:var(--text);
+      outline:none;
+      font-size:13px;
+    }
+    input:focus{
+      border-color: rgba(255,255,255,.18);
+      box-shadow: 0 0 0 3px rgba(106,140,255,.12);
+    }
+
+    .row{
+      display:flex;
+      gap:10px;
+      align-items:center;
+      justify-content:space-between;
+      margin-top:12px;
+    }
+
+    button{
+      height:40px;
+      padding:0 14px;
+      border-radius:12px;
+      border:1px solid rgba(255,255,255,.08);
+      background: var(--btn);
+      color: var(--btnText);
+      font-weight:700;
+      cursor:pointer;
+      white-space:nowrap;
+    }
+    button:disabled{
+      opacity:.55;
+      cursor:not-allowed;
+    }
+    .link{
+      color:var(--muted);
+      font-size:12px;
+      text-decoration:none;
+      border-bottom:1px dotted rgba(255,255,255,.25);
+    }
+    .link:hover{ color:var(--text); }
+
+    .msg{
+      display:none;
+      margin-top:10px;
+      padding:10px 12px;
+      border-radius:12px;
+      border:1px solid var(--line);
+      font-size:12px;
+      line-height:1.5;
+      white-space:pre-wrap;
+      background: rgba(0,0,0,.22);
+    }
+    .msg.is-error{ display:block; border-color: rgba(255,90,106,.35); }
+    .msg.is-ok{ display:block; border-color: rgba(39,211,155,.35); }
+
+    .okPanel{
+      display:none;
+      margin-top:10px;
+      padding:12px;
+      border-radius:14px;
+      border:1px solid rgba(39,211,155,.35);
+      background: rgba(39,211,155,.10);
+    }
+    .okPanel.show{ display:block; }
+    .okTitle{
+      font-weight:700;
+      font-size:13px;
+      margin:0 0 6px;
+    }
+    .okText{
+      margin:0 0 10px;
+      font-size:12px;
+      color:var(--muted);
+      line-height:1.5;
+    }
+    .okBtn{
+      width:100%;
+      height:40px;
+      border-radius:12px;
+      border:1px solid rgba(255,255,255,.08);
+      background: rgba(255,255,255,.92);
+      color:#0b0d12;
+      font-weight:800;
+      cursor:pointer;
+    }
   </style>
 </head>
+
 <body>
   <div class="wrap">
-    <h1 style="margin:0 0 12px;font-size:20px;">Signup</h1>
-
     <section class="card">
-      <form id="formSignup">
-        <label for="user_id">user_id</label>
-        <input id="user_id" name="user_id" autocomplete="username" required />
+      <h1>Signup</h1>
+      <p class="sub">アカウントを作成</p>
 
-        <label for="public_name">public_name</label>
-        <input id="public_name" name="public_name" autocomplete="nickname" required />
+      <form id="form">
+        <div class="grid">
+          <div class="full">
+            <label for="user_id">ユーザーID</label>
+            <input id="user_id" name="user_id" autocomplete="username" required />
+          </div>
 
-        <label for="password">password</label>
-        <input id="password" name="password" type="password" autocomplete="new-password" required />
+          <div class="full">
+            <label for="public_name">公開名</label>
+            <input id="public_name" name="public_name" autocomplete="nickname" required />
+          </div>
 
-        <label for="password2">password (confirm)</label>
-        <input id="password2" name="password2" type="password" autocomplete="new-password" required />
-
-        <button type="submit">signup</button>
+          <div class="hurf">
+            <label for="password">パスワード</label>
+            <input id="password" name="password" type="password" autocomplete="new-password" required />
+          </div>
+          <div class="hurf">
+            <label for="password2">パスワード (確認)</label>
+            <input id="password2" name="password2" type="password" autocomplete="new-password" required />
+          </div>
+        </div>
 
         <div class="row">
-          <span class="help">送信先はこのアプリの <code>/signup/</code>（アプリ → AuthClient → AuthService）</span>
-          <a class="help" href="/login/">loginへ</a>
+          <a class="link" href="./login">アカウントがある場合</a>
+          <button id="btn" type="submit">作成</button>
         </div>
-      </form>
 
-      <div id="log" class="log">ready</div>
+        <div id="msg" class="msg"></div>
+
+        <div id="okPanel" class="okPanel">
+          <div class="okTitle">アカウントが作成されました</div>
+          <p class="okText">ログインしてください</p>
+          <button id="toLogin" class="okBtn" type="button">ログイン画面へ</button>
+        </div>
+      </form>
     </section>
   </div>
 
   <script>
-    const logEl = document.getElementById("log");
+    const AUTH_BASE = ""
+    const PAGE_PATH = "/{{ page_path }}"
 
-    function pretty(v) {
-      try { return JSON.stringify(v, null, 2); } catch { return String(v); }
+    const error_code_for_message = {
+      // ===== Auth errors =====
+      "A01": "フォームの入力内容に不足があります。",
+      "A02": "このユーザーIDはすでに使用されています。",
+      "A03": "ユーザーIDまたはパスワードが正しくありません。",
+      "A04": "このユーザーは無効化されています。",
+      "A05": "認証情報が見つかりません。再度ログインしてください。",
+      "A06": "認証情報が不正です。再度ログインしてください。",
+      "A07": "セッションの有効期限が切れています。再度ログインしてください。",
+      "A08": "このセッションは無効化されています。再度ログインしてください。",
+      "A09": "認証サービスに接続できません。しばらく時間をおいて再度お試しください。",
+
+      // fallback
+      "DEFAULT": "エラーが発生しました。もう一度お試しください。"
+    };
+    function getErrorMessage(code) {
+      if (typeof code !== "string") {
+        return error_code_for_message.DEFAULT;
+      }
+    
+      return error_code_for_message[code] ?? error_code_for_message.DEFAULT;
+    }
+
+    const form = document.getElementById("form");
+    const btn = document.getElementById("btn");
+    const msg = document.getElementById("msg");
+    const okPanel = document.getElementById("okPanel");
+    const toLogin = document.getElementById("toLogin");
+
+    function clearMsg(){
+      msg.className = "msg";
+      msg.textContent = "";
     }
-    function writeLog(ok, title, data) {
-      const cls = ok ? "ok" : "ng";
-      logEl.innerHTML = `<span class="${cls}">${title}</span>\n${pretty(data)}`;
+    function setError(text){
+      msg.className = "msg is-error";
+      msg.textContent = getErrorMessage(text);
     }
 
-    async function postJSON(url, bodyObj) {
+    async function postJSON(path, bodyObj){
+      const url = (AUTH_BASE || "") + path;
       const res = await fetch(url, {
         method: "POST",
         headers: {
@@ -75,12 +271,13 @@
       const text = await res.text();
       let data = {};
       try { data = text ? JSON.parse(text) : {}; } catch { data = { raw: text }; }
-
       return { ok: res.ok, status: res.status, data };
     }
 
-    document.getElementById("formSignup").addEventListener("submit", async (e) => {
+    form.addEventListener("submit", async (e) => {
       e.preventDefault();
+      clearMsg();
+      okPanel.classList.remove("show");
 
       const user_id = document.getElementById("user_id").value.trim();
       const public_name = document.getElementById("public_name").value.trim();
@@ -88,18 +285,36 @@
       const password2 = document.getElementById("password2").value;
 
       if (!user_id || !public_name || !password) {
-        writeLog(false, "signup: missing fields", { user_id, public_name });
+        setError("T: missing fields");
         return;
       }
       if (password !== password2) {
-        writeLog(false, "signup: password mismatch", {});
+        setError("T: password mismatch");
         return;
       }
 
-      const r = await postJSON("/signup/", { user_id, public_name, password });
-      writeLog(r.ok, `signup: ${r.status}`, r.data);
+      btn.disabled = true;
+      try{
+        const r = await postJSON(PAGE_PATH, { user_id, public_name, password });
+
+        if (!r.ok || !r.data || r.data.ok !== true) {
+
+          const code = (r.data && r.data.error) ? String(r.data.error) : "UnknownError";
+          setError(code);
+          return;
+        }
+
+        okPanel.classList.add("show");
+      }catch(e){
+        console.error(e)
+        setError("NetworkError");
+      }finally{
+        btn.disabled = false;
+      }
+    });
 
-      // if (r.ok) location.href = "/login/";
+    toLogin.addEventListener("click", () => {
+      location.href = "./login";
     });
   </script>
 </body>

nexom/buildTools/build.py

@@ -125,7 +125,7 @@ def create_app(
 
     # static
     static_pkg = "nexom.assets.app.static"
-    for fn in ("dog.jpeg", "style.css"):
+    for fn in ("dog.jpeg", "github.png", "style.css"):
         _copy_from_package(static_pkg, fn, static_dir / fn)
 
     # app files

nexom/core/error.py

@@ -160,68 +160,161 @@ class ObjectHTMLTypeError(NexomError):
 # =========================
 # DatabaseManager
 # =========================
-class DBMConnectionInvalidError(NexomError):
-    """Raised when an udbm connection is invalid."""
+class DBError(NexomError):
+    """
+    Base class for database-related errors.
+
+    This error represents a generic database failure that does not fall into
+    a more specific category such as connection, integrity, operational, or
+    programming errors.
+
+    It is typically used as a catch-all or wrapper error when the underlying
+    database exception cannot be safely or clearly classified.
+    """
+
+class DBMConnectionInvalidError(DBError):
+    """
+    Raised when the database manager connection is invalid or not initialized.
 
-    def __init__(self, message="Not started") -> None:
+    This error indicates that the database manager (DBM) is in an unusable state,
+    such as:
+    - the database connection has not been established yet
+    - the connection was already closed
+    - the DBM was accessed before proper initialization
+
+    This is typically a lifecycle or configuration error.
+    """
+    def __init__(self, message: str = "Not started") -> None:
         super().__init__(
             "DBM01",
             f"DBM connection is invalid. -> {message}",
         )
 
-class DBError(NexomError):
-    """Raised when an udbm connection is invalid."""
 
-    def __init__(self, message) -> None:
+class DBOperationalError(DBError):
+    """
+    Raised when a database operational error occurs.
+
+    This error represents failures related to the database runtime environment,
+    such as:
+    - inability to open or connect to the database file
+    - database being locked
+    - I/O errors during a query
+    - transaction failures caused by the database state
+
+    Typically maps to sqlite3.OperationalError.
+    """
+    def __init__(self, message: str) -> None:
         super().__init__(
             "DBM02",
-            f"DBM connection is invalid. -> {message}",
+            f"Database operational error. -> {message}",
         )
 
+
+class DBIntegrityError(DBError):
+    """
+    Raised when a database integrity constraint is violated.
+
+    This error indicates that a database constraint has been broken, such as:
+    - UNIQUE constraint violations
+    - FOREIGN KEY constraint failures
+    - NOT NULL constraint violations
+    - CHECK constraint failures
+
+    Typically maps to sqlite3.IntegrityError.
+    """
+    def __init__(self, message: str) -> None:
+        super().__init__(
+            "DBM03",
+            f"Database integrity constraint violated. -> {message}",
+        )
+
+
+class DBProgrammingError(DBError):
+    """
+    Raised when a database programming or SQL syntax error occurs.
+
+    This error indicates a bug in application code or query construction, such as:
+    - malformed SQL statements
+    - referencing non-existent tables or columns
+    - incorrect parameter binding
+    - misuse of the database API
+
+    Typically maps to sqlite3.ProgrammingError.
+    """
+    def __init__(self, message: str) -> None:
+        super().__init__(
+            "DBM04",
+            f"Database programming error. -> {message}",
+        )
+
+
 # =========================
 # Auth
 # =========================
 
 class AuthMissingFieldError(NexomError):
-    """Raised when required auth fields are missing."""
+    """Required auth fields are missing."""
     def __init__(self, key: str) -> None:
-        super().__init__(
-            "A01", 
-            f"Missing field. '{key}'"
-        )
+        super().__init__("A01", f"Missing field. '{key}'")
+
+
+class AuthUserIdAlreadyExistsError(NexomError):
+    """user_id already exists (signup conflict)."""
+    def __init__(self) -> None:
+        super().__init__("A02", "This user_id is already in use.")
 
 
 class AuthInvalidCredentialsError(NexomError):
-    """Raised when user_id or password is invalid."""
+    """user_id or password is invalid (login)."""
     def __init__(self) -> None:
-        super().__init__(
-            "A02", 
-            "Invalid credentials."
-        )
+        super().__init__("A03", "Invalid credentials.")
 
 
 class AuthUserDisabledError(NexomError):
-    """Raised when the user is inactive/disabled."""
+    """User is inactive/disabled."""
     def __init__(self) -> None:
-        super().__init__(
-            "A03", 
-            "This user is disabled."
-        )
+        super().__init__("A04", "This user is disabled.")
+
+
+class AuthTokenMissingError(NexomError):
+    """Token is missing."""
+    def __init__(self) -> None:
+        super().__init__("A05", "Token is missing.")
 
 
 class AuthTokenInvalidError(NexomError):
-    """Raised when token is missing/invalid/expired/revoked."""
+    """Token is invalid (malformed / not found)."""
     def __init__(self) -> None:
-        super().__init__(
-            "A04", 
-            "This token is invalid."
-        )
+        super().__init__("A06", "This token is invalid.")
+
+
+class AuthTokenExpiredError(NexomError):
+    """Token is expired."""
+    def __init__(self) -> None:
+        super().__init__("A07", "This token has expired.")
+
+
+class AuthTokenRevokedError(NexomError):
+    """Token is revoked (logout etc)."""
+    def __init__(self) -> None:
+        super().__init__("A08", "This token is revoked.")
 
 
 class AuthServiceUnavailableError(NexomError):
-    """Raised when AuthService is unreachable or failed to respond."""
+    """AuthService is unreachable / timed out / invalid response."""
     def __init__(self) -> None:
-        super().__init__(
-            "A05",
-            "Authentication service is currently unavailable."
-        )
+        super().__init__("A09", "Authentication service is currently unavailable.")
+
+def _status_for_auth_error(code: str) -> int:
+    return {
+        "A01": 400,  # missing field
+        "A02": 409,  # user_id already exists
+        "A03": 401,  # invalid credentials
+        "A04": 403,  # user disabled
+        "A05": 401,  # token missing
+        "A06": 401,  # token invalid
+        "A07": 401,  # token expired
+        "A08": 401,  # token revoked
+        "A09": 503,  # auth service unavailable
+    }.get(code, 400)