Spaces:

ServiceX
/

Sublink

Paused

App Files Files Community

BirkhoffLee commited on 24 days ago

Commit

cf2569a

unverified ·

1 Parent(s): 4c031a8

feat: 增加了静态页面用于生成订阅 URL

Browse files

Files changed (4) hide show

.gitignore +1 -0
app/main.py +54 -3
app/static/index.html +466 -0
entrypoint.sh +1 -1

.gitignore ADDED Viewed

	@@ -0,0 +1 @@


1	+ uv.lock

app/main.py CHANGED Viewed

@@ -1,8 +1,59 @@
 from fastapi import FastAPI
 app = FastAPI()
-@app.get("/")
-def root():
-    return {"status": "ok"}

+from pathlib import Path
+from urllib.parse import urlencode, quote
 from fastapi import FastAPI
+from fastapi.responses import HTMLResponse
+from pydantic import BaseModel
 app = FastAPI()
+STATIC_DIR = Path(__file__).parent / "static"
+class ConvertRequest(BaseModel):
+    # 必填
+    target: str
+    url: str
+    # 可选文本
+    config: str | None = None
+    filename: str | None = None
+    include: str | None = None
+    exclude: str | None = None
+    group: str | None = None
+    ver: str | None = None
+    # bool 开关（None = 不传，由 subconverter 使用默认值）
+    emoji: bool | None = None
+    udp: bool | None = None
+    tfo: bool | None = None
+    sort: bool | None = None
+    fdn: bool | None = None
+    expand: bool | None = None
+    append_type: bool | None = None
+    list: bool | None = None
+    new_name: bool | None = None
+    scv: bool | None = None
+    append_info: bool | None = None
+@app.get("/", response_class=HTMLResponse)
+def index():
+    return HTMLResponse(content=(STATIC_DIR / "index.html").read_text())
+@app.post("/api/convert")
+def convert(req: ConvertRequest):
+    # 需要 URL 编码的字段
+    encode_fields = {"url", "config", "include", "exclude"}
+    params: list[tuple[str, str]] = []
+    for field, value in req.model_dump().items():
+        if value is None:
+            continue
+        if isinstance(value, bool):
+            params.append((field, "true" if value else "false"))
+        elif field in encode_fields:
+            params.append((field, quote(str(value), safe="")))
+        else:
+            params.append((field, str(value)))
+    return {"url": "/sub?" + "&".join(f"{k}={v}" for k, v in params)}

app/static/index.html ADDED Viewed

	@@ -0,0 +1,466 @@

+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Sublink — 订阅转换</title>
+<style>
+  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+  body {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    background: #0f1117;
+    color: #e2e8f0;
+    min-height: 100vh;
+    display: flex;
+    align-items: flex-start;
+    justify-content: center;
+    padding: 2rem 1rem;
+  }
+  .container {
+    width: 100%;
+    max-width: 680px;
+  }
+  h1 {
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-bottom: 0.25rem;
+    color: #f8fafc;
+  }
+  .subtitle {
+    font-size: 0.875rem;
+    color: #64748b;
+    margin-bottom: 2rem;
+  }
+  .card {
+    background: #1e2130;
+    border: 1px solid #2d3348;
+    border-radius: 12px;
+    padding: 1.5rem;
+  }
+  .field {
+    margin-bottom: 1.25rem;
+  }
+  label {
+    display: block;
+    font-size: 0.8125rem;
+    font-weight: 500;
+    color: #94a3b8;
+    margin-bottom: 0.4rem;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+  }
+  textarea, select, input[type="text"] {
+    width: 100%;
+    background: #131620;
+    border: 1px solid #2d3348;
+    border-radius: 8px;
+    color: #e2e8f0;
+    font-size: 0.9rem;
+    padding: 0.625rem 0.75rem;
+    outline: none;
+    transition: border-color 0.15s;
+    font-family: inherit;
+  }
+  textarea:focus, select:focus, input[type="text"]:focus {
+    border-color: #6366f1;
+  }
+  textarea {
+    resize: vertical;
+    min-height: 80px;
+  }
+  select {
+    cursor: pointer;
+    appearance: none;
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12'%3E%3Cpath fill='%2364748b' d='M6 8L1 3h10z'/%3E%3C/svg%3E");
+    background-repeat: no-repeat;
+    background-position: right 0.75rem center;
+    padding-right: 2rem;
+  }
+  select option { background: #1e2130; }
+  /* 高级选项折叠 */
+  .advanced-toggle {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    cursor: pointer;
+    font-size: 0.8125rem;
+    color: #64748b;
+    user-select: none;
+    margin-bottom: 1rem;
+    border: none;
+    background: none;
+    padding: 0;
+  }
+  .advanced-toggle:hover { color: #94a3b8; }
+  .toggle-icon {
+    display: inline-block;
+    transition: transform 0.2s;
+    font-style: normal;
+  }
+  .toggle-icon.open { transform: rotate(90deg); }
+  #advanced-section { display: none; }
+  #advanced-section.open { display: block; }
+  /* Bool 开关行 */
+  .bool-grid {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.5rem;
+    margin-top: 0.4rem;
+  }
+  .bool-item {
+    display: flex;
+    align-items: center;
+    gap: 0.375rem;
+    background: #131620;
+    border: 1px solid #2d3348;
+    border-radius: 6px;
+    padding: 0.3rem 0.6rem;
+    cursor: pointer;
+    font-size: 0.8125rem;
+    color: #94a3b8;
+    transition: border-color 0.15s, color 0.15s;
+  }
+  .bool-item:hover { border-color: #6366f1; color: #e2e8f0; }
+  .bool-item input[type="checkbox"] {
+    width: auto;
+    accent-color: #6366f1;
+    cursor: pointer;
+  }
+  /* 两列布局 */
+  .row-2 {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 1rem;
+  }
+  /* 按钮 */
+  .btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.4rem;
+    border: none;
+    border-radius: 8px;
+    font-size: 0.9rem;
+    font-weight: 500;
+    cursor: pointer;
+    transition: opacity 0.15s, background 0.15s;
+    font-family: inherit;
+  }
+  .btn:hover { opacity: 0.85; }
+  .btn:active { opacity: 0.7; }
+  .btn-primary {
+    background: #6366f1;
+    color: #fff;
+    padding: 0.65rem 1.5rem;
+    width: 100%;
+  }
+  .btn-sm {
+    background: #2d3348;
+    color: #e2e8f0;
+    padding: 0.4rem 0.85rem;
+    font-size: 0.8rem;
+  }
+  /* 结果区域 */
+  #result-section {
+    margin-top: 1.25rem;
+    display: none;
+  }
+  #result-section.show { display: block; }
+  .result-box {
+    background: #131620;
+    border: 1px solid #2d3348;
+    border-radius: 8px;
+    padding: 0.75rem 1rem;
+    word-break: break-all;
+    font-size: 0.8375rem;
+    color: #a5b4fc;
+    line-height: 1.5;
+    margin-bottom: 0.75rem;
+  }
+  .result-actions {
+    display: flex;
+    gap: 0.5rem;
+  }
+  /* 错误提示 */
+  #error-msg {
+    display: none;
+    background: #3b1f1f;
+    border: 1px solid #7f1d1d;
+    color: #fca5a5;
+    border-radius: 8px;
+    padding: 0.6rem 0.9rem;
+    font-size: 0.8375rem;
+    margin-top: 0.75rem;
+  }
+  #error-msg.show { display: block; }
+  /* Toast */
+  #toast {
+    position: fixed;
+    bottom: 1.5rem;
+    right: 1.5rem;
+    background: #22c55e;
+    color: #fff;
+    padding: 0.5rem 1rem;
+    border-radius: 8px;
+    font-size: 0.875rem;
+    opacity: 0;
+    transition: opacity 0.3s;
+    pointer-events: none;
+  }
+  #toast.show { opacity: 1; }
+</style>
+</head>
+<body>
+<div class="container">
+  <h1>Sublink</h1>
+  <p class="subtitle">订阅转换工具</p>
+  <div class="card">
+    <!-- 订阅链接 -->
+    <div class="field">
+      <label>订阅链接 <span style="color:#6366f1">*</span></label>
+      <textarea id="url" placeholder="输入订阅链接，多个链接用 | 分隔"></textarea>
+    </div>
+    <!-- 目标格式 -->
+    <div class="field">
+      <label>目标格式 <span style="color:#6366f1">*</span></label>
+      <select id="target-select">
+        <option value="clash">Clash</option>
+        <option value="surge4">Surge 4</option>
+        <option value="quanx">QuantumultX</option>
+        <option value="loon">Loon</option>
+        <option value="v2ray">V2Ray</option>
+        <option value="ss">SS</option>
+        <option value="ssr">SSR</option>
+        <option value="trojan">Trojan</option>
+        <option value="mixed">Mixed</option>
+        <option value="clash-list">Node List (Clash)</option>
+      </select>
+    </div>
+    <!-- 高级选项折叠 -->
+    <button class="advanced-toggle" type="button" id="advanced-toggle">
+      <i class="toggle-icon" id="toggle-icon">▶</i>
+      高级选项
+    </button>
+    <div id="advanced-section">
+      <!-- 外部配置 -->
+      <div class="field">
+        <label>外部配置 (config URL)</label>
+        <input type="text" id="config" placeholder="留空使用 subconverter 默认配置">
+      </div>
+      <!-- 文件名 -->
+      <div class="field">
+        <label>文件名 (filename)</label>
+        <input type="text" id="filename" placeholder="下载时的文件名">
+      </div>
+      <!-- 包含 / 排除 -->
+      <div class="row-2">
+        <div class="field">
+          <label>包含节点 (include)</label>
+          <input type="text" id="include" placeholder="正则表达式">
+        </div>
+        <div class="field">
+          <label>排除节点 (exclude)</label>
+          <input type="text" id="exclude" placeholder="正则表达式">
+        </div>
+      </div>
+      <!-- 分组 -->
+      <div class="field">
+        <label>代理分组 (group)</label>
+        <input type="text" id="group" placeholder="自定义分组名">
+      </div>
+      <!-- Bool 开关 -->
+      <div class="field">
+        <label>开关选项</label>
+        <div class="bool-grid">
+          <label class="bool-item"><input type="checkbox" id="emoji" checked> emoji</label>
+          <label class="bool-item"><input type="checkbox" id="udp"> udp</label>
+          <label class="bool-item"><input type="checkbox" id="tfo"> tfo</label>
+          <label class="bool-item"><input type="checkbox" id="sort"> sort</label>
+          <label class="bool-item"><input type="checkbox" id="fdn"> fdn</label>
+          <label class="bool-item"><input type="checkbox" id="expand" checked> expand</label>
+          <label class="bool-item"><input type="checkbox" id="append_type"> append_type</label>
+          <label class="bool-item"><input type="checkbox" id="scv"> scv</label>
+          <label class="bool-item"><input type="checkbox" id="append_info" checked> append_info</label>
+          <label class="bool-item"><input type="checkbox" id="new_name" checked> new_name</label>
+        </div>
+      </div>
+    </div>
+    <!-- 生成按钮 -->
+    <button class="btn btn-primary" id="gen-btn" type="button">生成订阅链接</button>
+    <!-- 错误 -->
+    <div id="error-msg"></div>
+    <!-- 结果 -->
+    <div id="result-section">
+      <div class="result-box" id="result-url"></div>
+      <div class="result-actions">
+        <button class="btn btn-sm" id="copy-btn" type="button">复制</button>
+        <button class="btn btn-sm" id="open-btn" type="button">在新标签打开</button>
+      </div>
+    </div>
+  </div>
+</div>
+<div id="toast">已复制</div>
+<script>
+// 高级选项折叠/展开
+const advancedToggle = document.getElementById('advanced-toggle');
+const advancedSection = document.getElementById('advanced-section');
+const toggleIcon = document.getElementById('toggle-icon');
+advancedToggle.addEventListener('click', () => {
+  const open = advancedSection.classList.toggle('open');
+  toggleIcon.classList.toggle('open', open);
+  toggleIcon.textContent = open ? '▼' : '▶';
+});
+// 生成链接
+document.getElementById('gen-btn').addEventListener('click', async () => {
+  const url = document.getElementById('url').value.trim();
+  if (!url) { showError('请填写订阅链接'); return; }
+  const targetVal = document.getElementById('target-select').value;
+  // target 映射
+  const targetMap = {
+    'clash':      { target: 'clash' },
+    'surge4':     { target: 'surge', ver: '4' },
+    'quanx':      { target: 'quanx' },
+    'loon':       { target: 'loon' },
+    'v2ray':      { target: 'v2ray' },
+    'ss':         { target: 'ss' },
+    'ssr':        { target: 'ssr' },
+    'trojan':     { target: 'trojan' },
+    'mixed':      { target: 'mixed' },
+    'clash-list': { target: 'clash', list: true },
+  };
+  const extra = targetMap[targetVal] || { target: targetVal };
+  // 读取 bool 开关（仅将被勾选的 checkbox 传给后端）
+  const boolFields = ['emoji','udp','tfo','sort','fdn','expand','append_type','scv','append_info','new_name'];
+  const boolValues = {};
+  boolFields.forEach(id => {
+    const el = document.getElementById(id);
+    // 只把勾选状态传递（后端处理 None = 不传）
+    boolValues[id] = el.checked;
+  });
+  // list 来自 extra（clash-list 模式）
+  if (extra.list !== undefined) {
+    boolValues.list = extra.list;
+    delete extra.list;
+  }
+  const body = {
+    url,
+    ...extra,
+    config:   document.getElementById('config').value.trim() || null,
+    filename: document.getElementById('filename').value.trim() || null,
+    include:  document.getElementById('include').value.trim() || null,
+    exclude:  document.getElementById('exclude').value.trim() || null,
+    group:    document.getElementById('group').value.trim() || null,
+    ...boolValues,
+  };
+  // 去掉 undefined/null 的 bool（后端会过滤 None，但前端先清理）
+  // bool 字段全部传，后端自己判断
+  hideError();
+  try {
+    const res = await fetch('/api/convert', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    });
+    if (!res.ok) {
+      const err = await res.json().catch(() => ({}));
+      showError(err.detail || `请求失败 (${res.status})`);
+      return;
+    }
+    const data = await res.json();
+    const fullUrl = window.location.origin + data.url;
+    document.getElementById('result-url').textContent = fullUrl;
+    document.getElementById('result-section').classList.add('show');
+    // 绑定按钮（每次生成都重新绑，避免重复监听器）
+    const copyBtn = document.getElementById('copy-btn');
+    const openBtn = document.getElementById('open-btn');
+    copyBtn.onclick = () => {
+      navigator.clipboard.writeText(fullUrl).then(() => showToast());
+    };
+    openBtn.onclick = () => window.open(fullUrl, '_blank');
+  } catch (e) {
+    showError('网络错误：' + e.message);
+  }
+});
+function showError(msg) {
+  const el = document.getElementById('error-msg');
+  el.textContent = msg;
+  el.classList.add('show');
+}
+function hideError() {
+  document.getElementById('error-msg').classList.remove('show');
+}
+function showToast() {
+  const t = document.getElementById('toast');
+  t.classList.add('show');
+  setTimeout(() => t.classList.remove('show'), 2000);
+}
+</script>
+</body>
+</html>

entrypoint.sh CHANGED Viewed

@@ -5,7 +5,7 @@ set -e
 /opt/subconverter/subconverter &
 # Start FastAPI via uv
-cd /app && uv run uvicorn main:app --host 127.0.0.1 --port 8000 &
 # Start Caddy (foreground, as PID 1 child)
 exec caddy run --config /etc/caddy/Caddyfile

 /opt/subconverter/subconverter &
 # Start FastAPI via uv
+cd /app && uv run python -m uvicorn main:app --host 127.0.0.1 --port 8000 &
 # Start Caddy (foreground, as PID 1 child)
 exec caddy run --config /etc/caddy/Caddyfile