From 3f59967f7bab0da9ccdb4179190a5ea505f45f97 Mon Sep 17 00:00:00 2001 From: krau <71133316+krau@users.noreply.github.com> Date: Sat, 31 Oct 2026 16:17:19 +0800 Subject: [PATCH 001/118] feat: rebuilt configuration, Telegram clients, and web console --- .dockerignore | 4 +- .github/workflows/build-release.yml | 15 + .gitignore | 3 + Dockerfile | 8 + Dockerfile.micro | 8 + Dockerfile.pico | 8 + Makefile | 6 + api/auth.go | 243 +- api/factory.go | 28 +- api/handlers.go | 270 -- api/progress.go | 16 +- api/router.go | 118 + api/server.go | 160 -- api/settings.go | 39 + api/storages.go | 133 + api/system.go | 38 + api/tasks.go | 199 ++ api/telegram.go | 111 + api/tgfiles.go | 9 +- api/types.go | 154 +- api/users.go | 188 ++ app/app.go | 180 ++ app/telegram.go | 203 ++ app/userbot_auth.go | 140 + boot/boot.go | 75 + boot/flags.go | 61 + client/bot/bot.go | 231 +- client/bot/handlers/add_task.go | 4 +- client/bot/handlers/cancel_task.go | 4 +- client/bot/handlers/config.go | 4 +- client/bot/handlers/dir.go | 4 +- client/bot/handlers/dl.go | 2 +- client/bot/handlers/help.go | 4 +- client/bot/handlers/link.go | 4 +- client/bot/handlers/media.go | 4 +- client/bot/handlers/media_group.go | 4 +- client/bot/handlers/middleware.go | 4 +- client/bot/handlers/middleware_test.go | 16 +- client/bot/handlers/parse.go | 4 +- client/bot/handlers/parser.go | 4 +- client/bot/handlers/register.go | 15 +- client/bot/handlers/rule.go | 4 +- client/bot/handlers/save.go | 4 +- client/bot/handlers/silent.go | 4 +- client/bot/handlers/sync_peers.go | 6 +- client/bot/handlers/tasks.go | 4 +- client/bot/handlers/telegraph.go | 4 +- client/bot/handlers/transfer.go | 4 +- client/bot/handlers/update.go | 4 +- client/bot/handlers/utils/filters/url.go | 4 +- client/bot/handlers/utils/shortcut/aria2.go | 4 +- .../handlers/utils/shortcut/directlinks.go | 4 +- client/bot/handlers/utils/shortcut/message.go | 6 +- client/bot/handlers/utils/shortcut/parsed.go | 4 +- client/bot/handlers/utils/shortcut/tftask.go | 4 +- client/bot/handlers/utils/shortcut/tphtask.go | 4 +- client/bot/handlers/utils/shortcut/ytdlp.go | 4 +- client/bot/handlers/watch.go | 20 +- client/bot/handlers/watch_notify.go | 4 +- client/bot/handlers/watch_notify_test.go | 2 +- client/bot/handlers/ytdlp.go | 4 +- client/user/auth_terminal.go | 57 - client/user/userclient.go | 276 +- client/user/watch.go | 4 +- cmd/root.go | 4 +- cmd/run.go | 94 +- cmd/upload/cmd.go | 18 +- cmd/watch/cmd.go | 17 +- common/utils/tgutil/context.go | 2 +- common/utils/tgutil/message.go | 2 +- common/utils/tgutil/resolve.go | 7 +- config/aria2.go | 8 + config/config.go | 178 ++ config/db.go | 3 +- config/flags.go | 75 - config/parser.go | 2 +- config/storage/factory.go | 55 + config/tg.go | 13 +- config/user.go | 38 +- config/viper.go | 236 -- core/core.go | 103 +- core/tasks/ytdlp/output.go | 2 +- database/chat.go | 27 +- database/db.go | 64 +- database/model.go | 51 + database/setting.go | 53 + database/storage_record.go | 66 + database/task_record.go | 57 + database/websession.go | 30 + go.mod | 13 +- go.sum | 20 +- pkg/aria2/client_test.go | 3 +- pkg/queue/queue.go | 8 + pkg/tfile/tgfile.go | 4 +- settings/legacy.go | 196 ++ settings/settings.go | 709 +++++ storage/alist/alist.go | 11 +- storage/load.go | 109 +- storage/storage.go | 5 + storage/telegram/telegram.go | 2 +- storage/telegram/upload_limit_test.go | 2 +- storage/telegram/util.go | 46 +- storage/telegram/video_split.go | 2 +- web/dist/.gitkeep | 0 web/embed.go | 6 + web/server.go | 104 + web/ui/.oxfmtrc.json | 7 + web/ui/index.html | 15 + web/ui/package-lock.json | 1679 ++++++++++++ web/ui/package.json | 22 + web/ui/public/favicon.svg | 7 + web/ui/src/App.vue | 8 + web/ui/src/api.ts | 285 ++ web/ui/src/assets/main.css | 2390 +++++++++++++++++ web/ui/src/components/AppIcon.vue | 98 + web/ui/src/components/AppLayout.vue | 236 ++ web/ui/src/components/AppSelect.vue | 249 ++ web/ui/src/components/AppToaster.vue | 33 + web/ui/src/components/BrandMark.vue | 24 + web/ui/src/components/ConfirmDialog.vue | 50 + web/ui/src/components/PageHeader.vue | 18 + web/ui/src/components/StorageForm.vue | 194 ++ web/ui/src/components/TaskForm.vue | 235 ++ web/ui/src/components/TaskTable.vue | 127 + web/ui/src/env.d.ts | 1 + web/ui/src/main.ts | 27 + web/ui/src/router.ts | 100 + web/ui/src/settingsFields.ts | 238 ++ web/ui/src/storageFields.ts | 160 ++ web/ui/src/stores/auth.ts | 65 + web/ui/src/stores/toasts.ts | 49 + web/ui/src/stores/ui.ts | 24 + web/ui/src/taskFields.ts | 162 ++ web/ui/src/types.ts | 184 ++ web/ui/src/utils.ts | 160 ++ web/ui/src/views/DashboardView.vue | 292 ++ web/ui/src/views/LoginView.vue | 117 + web/ui/src/views/SettingsView.vue | 294 ++ web/ui/src/views/StoragesView.vue | 175 ++ web/ui/src/views/SystemView.vue | 124 + web/ui/src/views/TasksView.vue | 162 ++ web/ui/src/views/TelegramView.vue | 468 ++++ web/ui/src/views/UsersView.vue | 274 ++ web/ui/tsconfig.json | 24 + web/ui/vite.config.ts | 24 + 145 files changed, 13104 insertions(+), 1302 deletions(-) delete mode 100644 api/handlers.go create mode 100644 api/router.go delete mode 100644 api/server.go create mode 100644 api/settings.go create mode 100644 api/storages.go create mode 100644 api/system.go create mode 100644 api/tasks.go create mode 100644 api/telegram.go create mode 100644 api/users.go create mode 100644 app/app.go create mode 100644 app/telegram.go create mode 100644 app/userbot_auth.go create mode 100644 boot/boot.go create mode 100644 boot/flags.go delete mode 100644 client/user/auth_terminal.go create mode 100644 config/aria2.go create mode 100644 config/config.go delete mode 100644 config/flags.go delete mode 100644 config/viper.go create mode 100644 database/setting.go create mode 100644 database/storage_record.go create mode 100644 database/task_record.go create mode 100644 database/websession.go create mode 100644 settings/legacy.go create mode 100644 settings/settings.go create mode 100644 web/dist/.gitkeep create mode 100644 web/embed.go create mode 100644 web/server.go create mode 100644 web/ui/.oxfmtrc.json create mode 100644 web/ui/index.html create mode 100644 web/ui/package-lock.json create mode 100644 web/ui/package.json create mode 100644 web/ui/public/favicon.svg create mode 100644 web/ui/src/App.vue create mode 100644 web/ui/src/api.ts create mode 100644 web/ui/src/assets/main.css create mode 100644 web/ui/src/components/AppIcon.vue create mode 100644 web/ui/src/components/AppLayout.vue create mode 100644 web/ui/src/components/AppSelect.vue create mode 100644 web/ui/src/components/AppToaster.vue create mode 100644 web/ui/src/components/BrandMark.vue create mode 100644 web/ui/src/components/ConfirmDialog.vue create mode 100644 web/ui/src/components/PageHeader.vue create mode 100644 web/ui/src/components/StorageForm.vue create mode 100644 web/ui/src/components/TaskForm.vue create mode 100644 web/ui/src/components/TaskTable.vue create mode 100644 web/ui/src/env.d.ts create mode 100644 web/ui/src/main.ts create mode 100644 web/ui/src/router.ts create mode 100644 web/ui/src/settingsFields.ts create mode 100644 web/ui/src/storageFields.ts create mode 100644 web/ui/src/stores/auth.ts create mode 100644 web/ui/src/stores/toasts.ts create mode 100644 web/ui/src/stores/ui.ts create mode 100644 web/ui/src/taskFields.ts create mode 100644 web/ui/src/types.ts create mode 100644 web/ui/src/utils.ts create mode 100644 web/ui/src/views/DashboardView.vue create mode 100644 web/ui/src/views/LoginView.vue create mode 100644 web/ui/src/views/SettingsView.vue create mode 100644 web/ui/src/views/StoragesView.vue create mode 100644 web/ui/src/views/SystemView.vue create mode 100644 web/ui/src/views/TasksView.vue create mode 100644 web/ui/src/views/TelegramView.vue create mode 100644 web/ui/src/views/UsersView.vue create mode 100644 web/ui/tsconfig.json create mode 100644 web/ui/vite.config.ts diff --git a/.dockerignore b/.dockerignore index 7af87d81..356c25c2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -9,4 +9,6 @@ cache/ docs/ config.example.toml docker-compose.* -playwright/ \ No newline at end of file +playwright/ +web/ui/node_modules +web/dist diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 77885e9e..9036eceb 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -45,12 +45,27 @@ jobs: - name: Checkout uses: actions/checkout@v6 + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: "1.26.x" + + - name: Setup Node + uses: actions/setup-node@v7 + with: + node-version: 24 + cache: npm + cache-dependency-path: web/ui/package-lock.json + - name: Extract version from Git Ref id: extract_version run: | VERSION=$(echo "${{ github.ref }}" | sed 's/refs\/tags\/v//') echo "VERSION=${VERSION}" >> $GITHUB_ENV + - name: Build Web UI + run: npm --prefix web/ui ci && npm --prefix web/ui run build + - name: Release Go Binary uses: wangyoucao577/go-release-action@v1 with: diff --git a/.gitignore b/.gitignore index 480bc4ef..e69e2aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ testplugins/ tmp-* saveany-bot .codegraph/ +web/ui/node_modules/ +web/dist/* +!web/dist/.gitkeep diff --git a/Dockerfile b/Dockerfile index 4d155aa0..d94ba78a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,10 @@ +FROM node:24-alpine AS web +WORKDIR /ui +COPY web/ui/package*.json ./ +RUN npm ci +COPY web/ui ./ +RUN npm run build + FROM golang:alpine AS builder ARG VERSION="dev" @@ -11,6 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download COPY . . +COPY --from=web /dist ./web/dist RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ CGO_ENABLED=0 \ diff --git a/Dockerfile.micro b/Dockerfile.micro index ca82d24b..096ba392 100644 --- a/Dockerfile.micro +++ b/Dockerfile.micro @@ -1,3 +1,10 @@ +FROM node:24-alpine AS web +WORKDIR /ui +COPY web/ui/package*.json ./ +RUN npm ci +COPY web/ui ./ +RUN npm run build + FROM golang:alpine AS builder ARG VERSION="dev" @@ -11,6 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download COPY . . +COPY --from=web /dist ./web/dist RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ CGO_ENABLED=0 \ diff --git a/Dockerfile.pico b/Dockerfile.pico index 8671dad8..a2f439e2 100644 --- a/Dockerfile.pico +++ b/Dockerfile.pico @@ -1,4 +1,11 @@ # pico is the minimum build of SaveAnyBot, which disables all the optional features like JS parsing and MinIO support. +FROM node:24-alpine AS web +WORKDIR /ui +COPY web/ui/package*.json ./ +RUN npm ci +COPY web/ui ./ +RUN npm run build + FROM golang:alpine AS builder ARG VERSION="dev" @@ -14,6 +21,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \ go mod download COPY . . +COPY --from=web /dist ./web/dist RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ CGO_ENABLED=0 \ diff --git a/Makefile b/Makefile index 404f3819..6e313bd7 100644 --- a/Makefile +++ b/Makefile @@ -6,3 +6,9 @@ run: down: docker compose -f docker-compose.local.yml down --remove-orphans + +web: + cd web/ui && npm ci && npm run build && touch ../dist/.gitkeep + +build: web + CGO_ENABLED=0 go build -trimpath -o saveany-bot . diff --git a/api/auth.go b/api/auth.go index 454ed055..3da30a32 100644 --- a/api/auth.go +++ b/api/auth.go @@ -1,38 +1,243 @@ package api import ( + "context" + "crypto/rand" "crypto/subtle" + "encoding/base64" + "encoding/json" + "net" "net/http" "strings" + "sync" + "time" - "github.com/krau/SaveAny-Bot/config" + "golang.org/x/time/rate" + + "github.com/krau/SaveAny-Bot/database" +) + +const ( + sessionCookieName = "sab_session" + sessionTTL = 7 * 24 * time.Hour + csrfHeader = "X-CSRF-Token" ) -func AuthMiddleware() func(http.Handler) http.Handler { - return func(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - cfg := config.C().API +type sessionCtxKey struct{} - authHeader := r.Header.Get("Authorization") - if authHeader == "" { - WriteError(w, http.StatusUnauthorized, "unauthorized", "missing authorization header") - return +func sessionFromContext(ctx context.Context) *database.WebSession { + session, _ := ctx.Value(sessionCtxKey{}).(*database.WebSession) + return session +} + +type loginLimiter struct { + mu sync.Mutex + limiter map[string]*rate.Limiter + lastSeen map[string]time.Time +} + +func newLoginLimiter() *loginLimiter { + return &loginLimiter{ + limiter: make(map[string]*rate.Limiter), + lastSeen: make(map[string]time.Time), + } +} + +func (l *loginLimiter) cleanup(maxAge time.Duration) { + cutoff := time.Now().Add(-maxAge) + l.mu.Lock() + defer l.mu.Unlock() + for key, seen := range l.lastSeen { + if seen.Before(cutoff) { + delete(l.lastSeen, key) + delete(l.limiter, key) + } + } +} + +func (l *loginLimiter) allow(key string) bool { + l.mu.Lock() + defer l.mu.Unlock() + l.lastSeen[key] = time.Now() + lim, ok := l.limiter[key] + if !ok { + lim = rate.NewLimiter(rate.Every(12*time.Second), 5) + l.limiter[key] = lim + } + return lim.Allow() +} + +func randomToken() (string, error) { + buf := make([]byte, 32) + if _, err := rand.Read(buf); err != nil { + return "", err + } + return base64.RawURLEncoding.EncodeToString(buf), nil +} + +func (s *server) isPublic(r *http.Request) bool { + if r.URL.Path == "/health" { + return true + } + return r.Method == http.MethodPost && r.URL.Path == "/api/v1/auth/login" +} + +func (s *server) bearerToken() string { + return s.deps.Settings.Config().Web.APIToken +} + +func (s *server) authMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if s.isPublic(r) { + next.ServeHTTP(w, r) + return + } + + if token := s.bearerToken(); token != "" { + header := r.Header.Get("Authorization") + if len(header) > 7 && strings.EqualFold(header[:7], "Bearer ") { + if subtle.ConstantTimeCompare([]byte(header[7:]), []byte(token)) == 1 { + next.ServeHTTP(w, r) + return + } } + } - parts := strings.SplitN(authHeader, " ", 2) - if len(parts) != 2 || strings.ToLower(parts[0]) != "bearer" { - WriteError(w, http.StatusUnauthorized, "unauthorized", "invalid authorization header format") + cookie, err := r.Cookie(sessionCookieName) + if err != nil || cookie.Value == "" { + WriteError(w, http.StatusUnauthorized, "unauthorized", "authentication required") + return + } + session, err := database.GetWebSession(r.Context(), cookie.Value) + if err != nil { + WriteError(w, http.StatusUnauthorized, "unauthorized", "session expired") + return + } + if r.Method != http.MethodGet && r.Method != http.MethodHead && r.Method != http.MethodOptions { + if subtle.ConstantTimeCompare([]byte(r.Header.Get(csrfHeader)), []byte(session.CSRF)) != 1 { + WriteError(w, http.StatusForbidden, "csrf_failed", "invalid csrf token") return } + } + next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), sessionCtxKey{}, session))) + }) +} - token := parts[1] +func (s *server) login(w http.ResponseWriter, r *http.Request) { + host, _, err := net.SplitHostPort(r.RemoteAddr) + if err != nil { + host = r.RemoteAddr + } + if !s.logins.allow(host) { + WriteError(w, http.StatusTooManyRequests, "too_many_attempts", "too many login attempts") + return + } + var body struct { + Password string `json:"password"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if !s.deps.Settings.VerifyAdminPassword(body.Password) { + WriteError(w, http.StatusUnauthorized, "invalid_credentials", "invalid password") + return + } + id, err := randomToken() + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", "failed to create session") + return + } + csrf, err := randomToken() + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", "failed to create session") + return + } + session := &database.WebSession{ + ID: id, + CSRF: csrf, + CreatedAt: time.Now(), + ExpiresAt: time.Now().Add(sessionTTL), + } + if err := database.CreateWebSession(r.Context(), session); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", "failed to store session") + return + } + http.SetCookie(w, &http.Cookie{ + Name: sessionCookieName, + Value: id, + Path: "/", + MaxAge: int(sessionTTL.Seconds()), + HttpOnly: true, + SameSite: http.SameSiteLaxMode, + Secure: s.deps.Settings.Config().Web.SecureCookie, + }) + WriteJSON(w, http.StatusOK, map[string]string{"csrf_token": csrf}) +} - if subtle.ConstantTimeCompare([]byte(token), []byte(cfg.Token)) != 1 { - WriteError(w, http.StatusUnauthorized, "unauthorized", "invalid token") - return - } +func (s *server) logout(w http.ResponseWriter, r *http.Request) { + if session := sessionFromContext(r.Context()); session != nil { + _ = database.DeleteWebSession(r.Context(), session.ID) + } + http.SetCookie(w, &http.Cookie{ + Name: sessionCookieName, + Value: "", + Path: "/", + MaxAge: -1, + HttpOnly: true, + SameSite: http.SameSiteLaxMode, + }) + w.WriteHeader(http.StatusNoContent) +} - next.ServeHTTP(w, r) - }) +func (s *server) me(w http.ResponseWriter, r *http.Request) { + session := sessionFromContext(r.Context()) + if session == nil { + WriteJSON(w, http.StatusOK, map[string]any{"authenticated": false}) + return + } + WriteJSON(w, http.StatusOK, map[string]any{ + "authenticated": true, + "csrf_token": session.CSRF, + }) +} + +func (s *server) changePassword(w http.ResponseWriter, r *http.Request) { + var body struct { + CurrentPassword string `json:"current_password"` + NewPassword string `json:"new_password"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if err := s.deps.Settings.ChangeAdminPassword(body.CurrentPassword, body.NewPassword); err != nil { + WriteError(w, http.StatusBadRequest, "password_change_failed", err.Error()) + return + } + keepID := "" + if session := sessionFromContext(r.Context()); session != nil { + keepID = session.ID + } + if err := database.DeleteOtherWebSessions(r.Context(), keepID); err != nil { + WriteError(w, http.StatusInternalServerError, "session_cleanup_failed", err.Error()) + return + } + WriteJSON(w, http.StatusOK, map[string]any{"ok": true}) +} + +func (s *server) sessionCleanup(ctx context.Context) { + _ = database.DeleteExpiredWebSessions(ctx) + s.logins.cleanup(24 * time.Hour) + ticker := time.NewTicker(time.Hour) + defer ticker.Stop() + for { + select { + case <-ctx.Done(): + return + case <-ticker.C: + _ = database.DeleteExpiredWebSessions(ctx) + s.logins.cleanup(24 * time.Hour) + } } } diff --git a/api/factory.go b/api/factory.go index f5d511b6..683eb109 100644 --- a/api/factory.go +++ b/api/factory.go @@ -3,9 +3,14 @@ package api import ( "context" "encoding/json" + "errors" "fmt" "time" + "github.com/charmbracelet/log" + "github.com/krau/SaveAny-Bot/client/bot" + userclient "github.com/krau/SaveAny-Bot/client/user" + "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/core" "github.com/krau/SaveAny-Bot/core/tasks/aria2dl" @@ -18,6 +23,7 @@ import ( "github.com/krau/SaveAny-Bot/core/tasks/ytdlp" "github.com/krau/SaveAny-Bot/parsers/parsers" "github.com/krau/SaveAny-Bot/pkg/aria2" + storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage" "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/parser" "github.com/krau/SaveAny-Bot/pkg/taskevent" @@ -26,6 +32,8 @@ import ( "github.com/rs/xid" ) +var ErrClientUnavailable = errors.New("no telegram client available") + type TaskFactory struct { ctx context.Context } @@ -39,6 +47,9 @@ func (f *TaskFactory) CreateTask(req *CreateTaskRequest) (*CreateTaskResponse, e if !ok { return nil, fmt.Errorf("storage not found: %s", req.Storage) } + if req.Type != tasktype.TaskTypeTransfer && stor.Type() == storenum.Telegram && bot.ExtContext() == nil && userclient.GetCtx() == nil { + return nil, ErrClientUnavailable + } taskID := xid.New().String() createdAt := time.Now() @@ -71,12 +82,19 @@ func (f *TaskFactory) registerAndEnqueueTask(task core.Executable, taskType task // the API store (and fire the webhook on terminal states) without the task // knowing about the API. taskCtx := taskevent.WithSink(f.ctx, info) + if botCtx := bot.ExtContext(); botCtx != nil { + taskCtx = tgutil.ExtWithContext(taskCtx, botCtx) + } else if userCtx := userclient.GetCtx(); userCtx != nil { + taskCtx = tgutil.ExtWithContext(taskCtx, userCtx) + } - err := core.AddTask(taskCtx, task) - if err != nil { + if err := core.AddTaskWithSource(taskCtx, task, "api"); err != nil { DeleteTask(taskID) return fmt.Errorf("failed to add task: %w", err) } + if err := core.EnrichTaskRecord(f.ctx, taskID, storageName, path); err != nil { + log.Errorf("Failed to enrich task record %s: %v", taskID, err) + } return nil } @@ -222,6 +240,9 @@ func (f *TaskFactory) createTGFilesTask(taskID string, createdAt time.Time, req if len(params.MessageLinks) == 0 { return nil, fmt.Errorf("no message links provided") } + if bot.ExtContext() == nil && userclient.GetCtx() == nil { + return nil, ErrClientUnavailable + } files, err := ExtractFilesFromLinks(f.ctx, params.MessageLinks) if err != nil { @@ -316,6 +337,9 @@ func (f *TaskFactory) createTransferTask(taskID string, createdAt time.Time, req if !ok { return nil, fmt.Errorf("target storage not found: %s", params.TargetStorage) } + if targetStor.Type() == storenum.Telegram && bot.ExtContext() == nil && userclient.GetCtx() == nil { + return nil, ErrClientUnavailable + } sourceReadable, ok := sourceStor.(storage.StorageReadable) if !ok { diff --git a/api/handlers.go b/api/handlers.go deleted file mode 100644 index 350196f7..00000000 --- a/api/handlers.go +++ /dev/null @@ -1,270 +0,0 @@ -package api - -import ( - "context" - "encoding/json" - "net/http" - "sort" - "strings" - "time" - - "github.com/krau/SaveAny-Bot/core" - "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" - "github.com/krau/SaveAny-Bot/storage" -) - -type mediaMetadataExtractor func(ctx context.Context, url string) (*MediaMetadataResponse, error) - -type Handlers struct { - factory *TaskFactory - mediaMetadataExtractor mediaMetadataExtractor -} - -func NewHandlers(factory *TaskFactory) *Handlers { - return &Handlers{ - factory: factory, - mediaMetadataExtractor: extractMediaMetadata, - } -} - -func (h *Handlers) CreateTaskHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only POST method is allowed") - return - } - - var req CreateTaskRequest - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { - WriteError(w, http.StatusBadRequest, "invalid_request", "failed to decode request body: "+err.Error()) - return - } - - if req.Type == "" { - WriteError(w, http.StatusBadRequest, "invalid_request", "task type is required") - return - } - - if req.Storage == "" { - WriteError(w, http.StatusBadRequest, "invalid_request", "storage is required") - return - } - - resp, err := h.factory.CreateTask(&req) - if err != nil { - WriteError(w, http.StatusBadRequest, "task_creation_failed", err.Error()) - return - } - - WriteJSON(w, http.StatusCreated, resp) -} - -func (h *Handlers) ListTasksHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed") - return - } - - tasks := GetAllTasks() - response := make([]TaskInfoResponse, 0, len(tasks)) - - for _, task := range tasks { - info := convertTaskProgressToResponse(task) - response = append(response, info) - } - - // GetAllTasks walks a map, so the order is otherwise nondeterministic. - // Newest first, breaking ties on task ID to keep the order stable across - // calls when two tasks share a creation timestamp. - sort.Slice(response, func(i, j int) bool { - if !response[i].CreatedAt.Equal(response[j].CreatedAt) { - return response[i].CreatedAt.After(response[j].CreatedAt) - } - return response[i].TaskID > response[j].TaskID - }) - - WriteJSON(w, http.StatusOK, TasksListResponse{ - Tasks: response, - Total: len(response), - }) -} - -func (h *Handlers) GetTaskHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed") - return - } - - taskID := extractTaskIDFromPath(r.URL.Path) - if taskID == "" { - WriteError(w, http.StatusBadRequest, "invalid_request", "task ID is required") - return - } - - task, ok := GetTask(taskID) - if !ok { - WriteError(w, http.StatusNotFound, "task_not_found", "task not found: "+taskID) - return - } - - resp := convertTaskProgressToResponse(task) - WriteJSON(w, http.StatusOK, resp) -} - -func (h *Handlers) CancelTaskHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodDelete { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only DELETE method is allowed") - return - } - - taskID := extractTaskIDFromPath(r.URL.Path) - if taskID == "" { - WriteError(w, http.StatusBadRequest, "invalid_request", "task ID is required") - return - } - - task, ok := GetTask(taskID) - if !ok { - WriteError(w, http.StatusNotFound, "task_not_found", "task not found: "+taskID) - return - } - - // Cancel the task; the terminal status is set via the task event stream. - if err := core.CancelTask(r.Context(), taskID); err != nil { - WriteError(w, http.StatusInternalServerError, "cancel_failed", "failed to cancel task: "+err.Error()) - return - } - - task.UpdateStatus(TaskStatusCancelled) - WriteJSON(w, http.StatusOK, map[string]string{"message": "task cancelled successfully"}) -} - -func (h *Handlers) ListStoragesHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed") - return - } - - all := storage.AllStorages() - storages := make([]StorageInfo, 0, len(all)) - for name, stor := range all { - storages = append(storages, StorageInfo{ - Name: name, - Type: string(stor.Type()), - }) - } - - WriteJSON(w, http.StatusOK, StoragesResponse{Storages: storages}) -} - -func (h *Handlers) GetMediaMetadataHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed") - return - } - - mediaURL := strings.TrimSpace(r.URL.Query().Get("url")) - if mediaURL == "" { - WriteError(w, http.StatusBadRequest, "invalid_request", "url query parameter is required") - return - } - - ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second) - defer cancel() - - resp, err := h.mediaMetadataExtractor(ctx, mediaURL) - if err != nil { - WriteError(w, http.StatusBadRequest, "metadata_extraction_failed", err.Error()) - return - } - - WriteJSON(w, http.StatusOK, resp) -} - -func (h *Handlers) GetTaskTypesHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "only GET method is allowed") - return - } - - types := []tasktype.TaskType{ - tasktype.TaskTypeDirectlinks, - tasktype.TaskTypeYtdlp, - tasktype.TaskTypeAria2, - tasktype.TaskTypeParseditem, - tasktype.TaskTypeTgfiles, - tasktype.TaskTypeTphpics, - tasktype.TaskTypeTransfer, - } - - WriteJSON(w, http.StatusOK, map[string]any{ - "types": types, - }) -} - -func (h *Handlers) HealthCheckHandler(w http.ResponseWriter, r *http.Request) { - WriteJSON(w, http.StatusOK, map[string]string{ - "status": "ok", - }) -} - -// 路径格式: /api/v1/tasks/:id -func extractTaskIDFromPath(path string) string { - parts := strings.Split(strings.Trim(path, "/"), "/") - if len(parts) < 4 { - return "" - } - return parts[3] -} - -// convertTaskProgressToResponse renders a task's current state, computing -// percent and speed from the snapshot taken under the task's mutex. -func convertTaskProgressToResponse(task *TaskProgressInfo) TaskInfoResponse { - status, total, downloaded, totalFiles, downloadedFiles, startedAt, errMsg, updatedAt := task.snapshot() - - resp := TaskInfoResponse{ - TaskID: task.TaskID, - Type: tasktype.TaskType(task.Type), - Status: status, - Title: task.Title, - Storage: task.Storage, - Path: task.Path, - Error: errMsg, - CreatedAt: task.CreatedAt, - UpdatedAt: updatedAt, - } - - var percent float64 - var speedMBPS float64 - if total > 0 { - percent = float64(downloaded) * 100 / float64(total) - } else if totalFiles > 0 { - percent = float64(downloadedFiles) * 100 / float64(totalFiles) - } - if !startedAt.IsZero() { - elapsed := time.Since(startedAt).Seconds() - if elapsed > 0 { - speedMBPS = float64(downloaded) / elapsed / (1024 * 1024) - } - } - - if total > 0 || totalFiles > 0 { - resp.Progress = &TaskProgress{ - TotalBytes: total, - DownloadedBytes: downloaded, - TotalFiles: totalFiles, - DownloadedFiles: downloadedFiles, - Percent: percent, - SpeedMBPS: speedMBPS, - } - } - - return resp -} - -func NotFoundHandler(w http.ResponseWriter, r *http.Request) { - WriteError(w, http.StatusNotFound, "not_found", "endpoint not found: "+r.URL.Path) -} - -func MethodNotAllowedHandler(w http.ResponseWriter, r *http.Request) { - WriteError(w, http.StatusMethodNotAllowed, "method_not_allowed", "method not allowed: "+r.Method) -} diff --git a/api/progress.go b/api/progress.go index f168f840..f3731462 100644 --- a/api/progress.go +++ b/api/progress.go @@ -153,6 +153,10 @@ func (t *TaskProgressInfo) snapshot() (status TaskStatus, total, downloaded int6 // status/progress updates and fires the webhook on terminal transitions. func (t *TaskProgressInfo) Emit(e taskevent.Event) { t.mu.Lock() + if t.Status == TaskStatusCancelled || t.Status == TaskStatusCompleted || t.Status == TaskStatusFailed { + t.mu.Unlock() + return + } switch e.Phase { case taskevent.PhaseStart: t.Status = TaskStatusRunning @@ -175,11 +179,13 @@ func (t *TaskProgressInfo) Emit(e taskevent.Event) { t.DownloadedFiles = e.DownloadedFiles } case taskevent.PhaseDone: - if e.Err != nil { - t.Status = TaskStatusFailed - t.Error = e.Err.Error() - } else { - t.Status = TaskStatusCompleted + if t.Status != TaskStatusCancelled { + if e.Err != nil { + t.Status = TaskStatusFailed + t.Error = e.Err.Error() + } else { + t.Status = TaskStatusCompleted + } } } t.UpdatedAt = time.Now() diff --git a/api/router.go b/api/router.go new file mode 100644 index 00000000..bdee7393 --- /dev/null +++ b/api/router.go @@ -0,0 +1,118 @@ +package api + +import ( + "net/http" + "time" + + "github.com/charmbracelet/log" + + "github.com/krau/SaveAny-Bot/config" +) + +type server struct { + deps Deps + factory *TaskFactory + mediaMetadataExtractor mediaMetadataExtractor + logins *loginLimiter + startedAt time.Time +} + +// NewHandler builds the redesigned JSON API mounted under /api/v1. +func NewHandler(deps Deps) http.Handler { + s := &server{ + deps: deps, + factory: NewTaskFactory(deps.Ctx), + mediaMetadataExtractor: extractMediaMetadata, + logins: newLoginLimiter(), + startedAt: time.Now(), + } + go s.sessionCleanup(deps.Ctx) + StartCleanupLoop(deps.Ctx) + + mux := http.NewServeMux() + mux.HandleFunc("GET /health", s.health) + mux.HandleFunc("POST /api/v1/auth/login", s.login) + mux.HandleFunc("POST /api/v1/auth/logout", s.logout) + mux.HandleFunc("GET /api/v1/auth/me", s.me) + mux.HandleFunc("POST /api/v1/auth/password", s.changePassword) + + mux.HandleFunc("GET /api/v1/settings", s.getSettings) + mux.HandleFunc("PUT /api/v1/settings/{group}", s.updateSettings) + + mux.HandleFunc("GET /api/v1/storages", s.listStorages) + mux.HandleFunc("POST /api/v1/storages", s.createStorage) + mux.HandleFunc("PUT /api/v1/storages/{id}", s.updateStorage) + mux.HandleFunc("DELETE /api/v1/storages/{id}", s.deleteStorage) + mux.HandleFunc("POST /api/v1/storages/{id}/test", s.testStorage) + + mux.HandleFunc("GET /api/v1/users", s.listUsers) + mux.HandleFunc("POST /api/v1/users", s.createUser) + mux.HandleFunc("PUT /api/v1/users/{id}", s.updateUser) + mux.HandleFunc("DELETE /api/v1/users/{id}", s.deleteUser) + + mux.HandleFunc("GET /api/v1/telegram/status", s.telegramStatus) + mux.HandleFunc("POST /api/v1/telegram/bot/start", s.startBot) + mux.HandleFunc("POST /api/v1/telegram/bot/stop", s.stopBot) + mux.HandleFunc("POST /api/v1/telegram/bot/restart", s.restartBot) + mux.HandleFunc("POST /api/v1/telegram/userbot/login", s.startUserbotLogin) + mux.HandleFunc("POST /api/v1/telegram/userbot/login/{flow}/code", s.submitUserbotCode) + mux.HandleFunc("POST /api/v1/telegram/userbot/login/{flow}/password", s.submitUserbotPassword) + mux.HandleFunc("DELETE /api/v1/telegram/userbot/login/{flow}", s.cancelUserbotLogin) + mux.HandleFunc("POST /api/v1/telegram/userbot/logout", s.logoutUserbot) + + mux.HandleFunc("GET /api/v1/tasks", s.listTasks) + mux.HandleFunc("POST /api/v1/tasks", s.createTask) + mux.HandleFunc("GET /api/v1/tasks/{id}", s.getTask) + mux.HandleFunc("POST /api/v1/tasks/{id}/cancel", s.cancelTask) + mux.HandleFunc("DELETE /api/v1/tasks/{id}", s.deleteTask) + mux.HandleFunc("GET /api/v1/task-types", s.taskTypes) + mux.HandleFunc("GET /api/v1/media-metadata", s.mediaMetadata) + + mux.HandleFunc("GET /api/v1/system/info", s.systemInfo) + mux.HandleFunc("POST /api/v1/system/restart", s.restartSystem) + + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + WriteError(w, http.StatusNotFound, "not_found", "endpoint not found: "+r.URL.Path) + }) + + var handler http.Handler = mux + handler = s.authMiddleware(handler) + handler = loggingMiddleware(handler) + handler = recoveryMiddleware(handler) + return handler +} + +func (s *server) health(w http.ResponseWriter, r *http.Request) { + WriteJSON(w, http.StatusOK, map[string]string{"status": "ok", "version": config.Version}) +} + +func loggingMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + start := time.Now() + wrapped := &responseWriter{ResponseWriter: w, statusCode: http.StatusOK} + next.ServeHTTP(wrapped, r) + log.Infof("%s %s %d %s", r.Method, r.URL.Path, wrapped.statusCode, time.Since(start)) + }) +} + +func recoveryMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + defer func() { + if err := recover(); err != nil { + log.Errorf("Panic recovered: %v", err) + WriteError(w, http.StatusInternalServerError, "internal_error", "internal server error") + } + }() + next.ServeHTTP(w, r) + }) +} + +type responseWriter struct { + http.ResponseWriter + statusCode int +} + +func (rw *responseWriter) WriteHeader(code int) { + rw.statusCode = code + rw.ResponseWriter.WriteHeader(code) +} diff --git a/api/server.go b/api/server.go deleted file mode 100644 index 42c2060d..00000000 --- a/api/server.go +++ /dev/null @@ -1,160 +0,0 @@ -package api - -import ( - "context" - "fmt" - "net" - "net/http" - "time" - - "github.com/charmbracelet/log" - "github.com/krau/SaveAny-Bot/config" -) - -type Server struct { - httpServer *http.Server - factory *TaskFactory -} - -func NewServer(ctx context.Context) *Server { - cfg := config.C().API - - factory := NewTaskFactory(ctx) - handlers := NewHandlers(factory) - - mux := http.NewServeMux() - - mux.HandleFunc("/health", handlers.HealthCheckHandler) - - mux.HandleFunc("/api/v1/tasks", func(w http.ResponseWriter, r *http.Request) { - switch r.Method { - case http.MethodGet: - handlers.ListTasksHandler(w, r) - case http.MethodPost: - handlers.CreateTaskHandler(w, r) - default: - MethodNotAllowedHandler(w, r) - } - }) - mux.HandleFunc("/api/v1/tasks/", func(w http.ResponseWriter, r *http.Request) { - switch r.Method { - case http.MethodGet: - handlers.GetTaskHandler(w, r) - case http.MethodDelete: - handlers.CancelTaskHandler(w, r) - default: - MethodNotAllowedHandler(w, r) - } - }) - mux.HandleFunc("/api/v1/storages", handlers.ListStoragesHandler) - mux.HandleFunc("/api/v1/media-metadata", handlers.GetMediaMetadataHandler) - mux.HandleFunc("/api/v1/task-types", handlers.GetTaskTypesHandler) - - mux.HandleFunc("/", NotFoundHandler) - - var handler http.Handler = mux - - token := cfg.Token - if token != "" { - handler = AuthMiddleware()(handler) - } - - handler = loggingMiddleware(handler) - - handler = recoveryMiddleware(handler) - - return &Server{ - httpServer: &http.Server{ - Addr: fmt.Sprintf("%s:%d", cfg.Host, cfg.Port), - Handler: handler, - ReadTimeout: 30 * time.Second, - WriteTimeout: 30 * time.Second, - IdleTimeout: 120 * time.Second, - }, - factory: factory, - } -} - -func (s *Server) Start(ctx context.Context) error { - logger := log.FromContext(ctx).With("module", "api") - - logger.Infof("Starting API server on %s", s.httpServer.Addr) - - // Bind synchronously so listen failures are returned to the caller. - ln, err := net.Listen("tcp", s.httpServer.Addr) - if err != nil { - return fmt.Errorf("failed to listen on %s: %w", s.httpServer.Addr, err) - } - - go func() { - if err := s.httpServer.Serve(ln); err != nil && err != http.ErrServerClosed { - logger.Errorf("API server error: %v", err) - } - }() - - go func() { - <-ctx.Done() - shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) - defer cancel() - if err := s.httpServer.Shutdown(shutdownCtx); err != nil { - logger.Errorf("API server shutdown error: %v", err) - } - }() - - return nil -} - -func loggingMiddleware(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - start := time.Now() - - wrapped := &responseWriter{ResponseWriter: w, statusCode: http.StatusOK} - - next.ServeHTTP(wrapped, r) - - log.Infof("%s %s %d %s", r.Method, r.URL.Path, wrapped.statusCode, time.Since(start)) - }) -} - -func recoveryMiddleware(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - defer func() { - if err := recover(); err != nil { - log.Errorf("Panic recovered: %v", err) - WriteError(w, http.StatusInternalServerError, "internal_error", "internal server error") - } - }() - next.ServeHTTP(w, r) - }) -} - -type responseWriter struct { - http.ResponseWriter - statusCode int -} - -func (rw *responseWriter) WriteHeader(code int) { - rw.statusCode = code - rw.ResponseWriter.WriteHeader(code) -} - -// Start initializes and starts the API server. It refuses to start without a -// token, since an open download proxy is a security risk. -func Start(ctx context.Context) error { - cfg := config.C().API - - if !cfg.Enable { - return nil - } - - if cfg.Token == "" { - return fmt.Errorf("API server is enabled but no token is set; refusing to start insecurely") - } - - server := NewServer(ctx) - if err := server.Start(ctx); err != nil { - return err - } - StartCleanupLoop(ctx) - return nil -} diff --git a/api/settings.go b/api/settings.go new file mode 100644 index 00000000..b3f8eb36 --- /dev/null +++ b/api/settings.go @@ -0,0 +1,39 @@ +package api + +import ( + "encoding/json" + "net/http" +) + +func (s *server) getSettings(w http.ResponseWriter, r *http.Request) { + values, err := s.deps.Settings.PublicSettings() + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + WriteJSON(w, http.StatusOK, values) +} + +func (s *server) updateSettings(w http.ResponseWriter, r *http.Request) { + group := r.PathValue("group") + var patch json.RawMessage + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&patch); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + restart, err := s.deps.Settings.UpdateGroup(r.Context(), group, patch) + if err != nil { + WriteError(w, http.StatusBadRequest, "settings_update_failed", err.Error()) + return + } + warnings := make([]string, 0) + if group == "telegram" { + if err := s.deps.Telegram.ApplyTelegram(r.Context()); err != nil { + warnings = append(warnings, err.Error()) + } + } + WriteJSON(w, http.StatusOK, map[string]any{ + "restart_required": restart, + "warnings": warnings, + }) +} diff --git a/api/storages.go b/api/storages.go new file mode 100644 index 00000000..d42c1892 --- /dev/null +++ b/api/storages.go @@ -0,0 +1,133 @@ +package api + +import ( + "encoding/json" + "errors" + "net/http" + "strconv" + + "github.com/krau/SaveAny-Bot/database" + "github.com/krau/SaveAny-Bot/settings" + "github.com/krau/SaveAny-Bot/storage" +) + +var storageSecretKeys = map[string]struct{}{ + "password": {}, "token": {}, "secret": {}, "access_key_id": {}, "secret_access_key": {}, +} + +func maskStorageConfig(config map[string]any) map[string]any { + out := make(map[string]any, len(config)) + for key, value := range config { + if _, secret := storageSecretKeys[key]; secret { + if s, ok := value.(string); ok && s != "" { + out[key] = "__MASKED__" + continue + } + } + out[key] = value + } + return out +} + +func storageResponse(record *database.StorageRecord, initErr string) StorageRecord { + var config map[string]any + if record.Config != "" { + _ = json.Unmarshal([]byte(record.Config), &config) + } + if config == nil { + config = make(map[string]any) + } + return StorageRecord{ + ID: record.ID, + Name: record.Name, + Type: record.Type, + Enable: record.Enable, + Config: maskStorageConfig(config), + Error: initErr, + } +} + +func (s *server) listStorages(w http.ResponseWriter, r *http.Request) { + records, err := database.ListStorageRecords(r.Context()) + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + initErrors := storage.LastErrors() + out := make([]StorageRecord, 0, len(records)) + for i := range records { + out = append(out, storageResponse(&records[i], initErrors[records[i].Name])) + } + WriteJSON(w, http.StatusOK, map[string]any{"storages": out}) +} + +func (s *server) createStorage(w http.ResponseWriter, r *http.Request) { + var in StorageInput + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&in); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + record, err := s.deps.Settings.CreateStorage(r.Context(), settings.StorageInput{ + Name: in.Name, Type: in.Type, Enable: in.Enable, Config: in.Config, + }) + if err != nil { + if errors.Is(err, settings.ErrStorageExists) { + WriteError(w, http.StatusConflict, "storage_exists", err.Error()) + return + } + WriteError(w, http.StatusBadRequest, "storage_create_failed", err.Error()) + return + } + WriteJSON(w, http.StatusCreated, storageResponse(record, "")) +} + +func (s *server) updateStorage(w http.ResponseWriter, r *http.Request) { + id64, err := strconv.ParseUint(r.PathValue("id"), 10, 64) + if err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid storage id") + return + } + var in StorageInput + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&in); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + record, err := s.deps.Settings.UpdateStorage(r.Context(), uint(id64), settings.StorageInput{ + Name: in.Name, Type: in.Type, Enable: in.Enable, Config: in.Config, + }) + if err != nil { + WriteError(w, http.StatusBadRequest, "storage_update_failed", err.Error()) + return + } + WriteJSON(w, http.StatusOK, storageResponse(record, "")) +} + +func (s *server) deleteStorage(w http.ResponseWriter, r *http.Request) { + id64, err := strconv.ParseUint(r.PathValue("id"), 10, 64) + if err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid storage id") + return + } + if err := s.deps.Settings.DeleteStorage(r.Context(), uint(id64)); err != nil { + if errors.Is(err, settings.ErrStorageInUse) { + WriteError(w, http.StatusConflict, "storage_in_use", err.Error()) + return + } + WriteError(w, http.StatusBadRequest, "storage_delete_failed", err.Error()) + return + } + w.WriteHeader(http.StatusNoContent) +} + +func (s *server) testStorage(w http.ResponseWriter, r *http.Request) { + id64, err := strconv.ParseUint(r.PathValue("id"), 10, 64) + if err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid storage id") + return + } + if err := s.deps.Settings.TestStorage(r.Context(), uint(id64)); err != nil { + WriteJSON(w, http.StatusOK, map[string]any{"ok": false, "error": err.Error()}) + return + } + WriteJSON(w, http.StatusOK, map[string]any{"ok": true}) +} diff --git a/api/system.go b/api/system.go new file mode 100644 index 00000000..e0e1e23f --- /dev/null +++ b/api/system.go @@ -0,0 +1,38 @@ +package api + +import ( + "net/http" + "time" + + "github.com/krau/SaveAny-Bot/config" + "github.com/krau/SaveAny-Bot/core" +) + +func (s *server) systemInfo(w http.ResponseWriter, r *http.Request) { + cfg := s.deps.Settings.Config() + WriteJSON(w, http.StatusOK, map[string]any{ + "version": config.Version, + "commit": config.GitCommit, + "build_time": config.BuildTime, + "docker": config.Docker == "true", + "uptime_seconds": int64(time.Since(s.startedAt).Seconds()), + "data_dir": s.deps.DataDir, + "db_path": s.deps.DBPath, + "workers": cfg.Workers, + "queued_tasks": len(core.GetQueuedTasks(r.Context())), + "running_tasks": len(core.GetRunningTasks(r.Context())), + }) +} + +func (s *server) restartSystem(w http.ResponseWriter, r *http.Request) { + force := decodeForce(r) + if !force && core.ActiveTaskCount() > 0 { + WriteError(w, http.StatusConflict, "tasks_running", "tasks are running; use {\"force\":true} to restart anyway") + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"restarting": true}) + go func() { + time.Sleep(200 * time.Millisecond) + s.deps.Telegram.RestartProcess() + }() +} diff --git a/api/tasks.go b/api/tasks.go new file mode 100644 index 00000000..239c0318 --- /dev/null +++ b/api/tasks.go @@ -0,0 +1,199 @@ +package api + +import ( + "context" + "encoding/json" + "errors" + "net/http" + "strconv" + "time" + + "github.com/krau/SaveAny-Bot/core" + "github.com/krau/SaveAny-Bot/database" + "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" +) + +type mediaMetadataExtractor func(ctx context.Context, url string) (*MediaMetadataResponse, error) + +func (s *server) createTask(w http.ResponseWriter, r *http.Request) { + var req CreateTaskRequest + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&req); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "failed to decode request body: "+err.Error()) + return + } + if req.Type == "" { + WriteError(w, http.StatusBadRequest, "invalid_request", "task type is required") + return + } + if req.Storage == "" { + WriteError(w, http.StatusBadRequest, "invalid_request", "storage is required") + return + } + resp, err := s.factory.CreateTask(&req) + if err != nil { + if errors.Is(err, ErrClientUnavailable) { + WriteError(w, http.StatusServiceUnavailable, "client_unavailable", err.Error()) + return + } + WriteError(w, http.StatusBadRequest, "task_creation_failed", err.Error()) + return + } + WriteJSON(w, http.StatusCreated, resp) +} + +func (s *server) listTasks(w http.ResponseWriter, r *http.Request) { + query := r.URL.Query() + limit, _ := strconv.Atoi(query.Get("limit")) + offset, _ := strconv.Atoi(query.Get("offset")) + records, total, err := database.ListTaskRecords(r.Context(), database.TaskFilter{ + Status: query.Get("status"), + Type: query.Get("type"), + Limit: limit, + Offset: offset, + }) + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + tasks := make([]TaskInfoResponse, 0, len(records)) + for i := range records { + tasks = append(tasks, taskResponse(&records[i])) + } + WriteJSON(w, http.StatusOK, TasksListResponse{Tasks: tasks, Total: total}) +} + +func (s *server) getTask(w http.ResponseWriter, r *http.Request) { + record, err := database.GetTaskRecord(r.Context(), r.PathValue("id")) + if err != nil { + WriteError(w, http.StatusNotFound, "task_not_found", "task not found") + return + } + WriteJSON(w, http.StatusOK, taskResponse(record)) +} + +func (s *server) cancelTask(w http.ResponseWriter, r *http.Request) { + record, err := database.GetTaskRecord(r.Context(), r.PathValue("id")) + if err != nil { + WriteError(w, http.StatusNotFound, "task_not_found", "task not found") + return + } + if isTerminal(record.Status) { + WriteError(w, http.StatusConflict, "task_not_active", "task is not active") + return + } + if task, ok := GetTask(record.TaskID); ok { + task.UpdateStatus(TaskStatusCancelled) + } + if err := core.CancelTask(r.Context(), record.TaskID); err != nil { + if task, ok := GetTask(record.TaskID); ok { + task.UpdateStatus(TaskStatus(record.Status)) + } + WriteError(w, http.StatusInternalServerError, "cancel_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"task_id": record.TaskID, "status": TaskStatusCancelled}) +} + +func (s *server) deleteTask(w http.ResponseWriter, r *http.Request) { + taskID := r.PathValue("id") + record, err := database.GetTaskRecord(r.Context(), taskID) + if err != nil { + WriteError(w, http.StatusNotFound, "task_not_found", "task not found") + return + } + if !isTerminal(record.Status) { + WriteError(w, http.StatusConflict, "task_active", "cancel the task before deleting it") + return + } + if err := database.DeleteTaskRecord(r.Context(), taskID); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + DeleteTask(taskID) + w.WriteHeader(http.StatusNoContent) +} + +func (s *server) taskTypes(w http.ResponseWriter, r *http.Request) { + types := []tasktype.TaskType{ + tasktype.TaskTypeDirectlinks, + tasktype.TaskTypeYtdlp, + tasktype.TaskTypeAria2, + tasktype.TaskTypeParseditem, + tasktype.TaskTypeTgfiles, + tasktype.TaskTypeTphpics, + tasktype.TaskTypeTransfer, + } + out := make([]map[string]string, 0, len(types)) + for _, t := range types { + out = append(out, map[string]string{"type": t.String(), "label": t.String()}) + } + WriteJSON(w, http.StatusOK, map[string]any{"types": out}) +} + +func (s *server) mediaMetadata(w http.ResponseWriter, r *http.Request) { + mediaURL := r.URL.Query().Get("url") + if mediaURL == "" { + WriteError(w, http.StatusBadRequest, "invalid_request", "url query parameter is required") + return + } + ctx, cancel := context.WithTimeout(r.Context(), 30*time.Second) + defer cancel() + resp, err := s.mediaMetadataExtractor(ctx, mediaURL) + if err != nil { + WriteError(w, http.StatusBadRequest, "metadata_extraction_failed", err.Error()) + return + } + WriteJSON(w, http.StatusOK, resp) +} + +func isTerminal(status string) bool { + return status == string(TaskStatusCompleted) || status == string(TaskStatusFailed) || status == string(TaskStatusCancelled) +} + +func taskResponse(record *database.TaskRecord) TaskInfoResponse { + resp := TaskInfoResponse{ + TaskID: record.TaskID, + Type: tasktype.TaskType(record.Type), + Status: TaskStatus(record.Status), + Title: record.Title, + Storage: record.Storage, + Path: record.Path, + Source: record.Source, + Error: record.Error, + CreatedAt: record.CreatedAt, + StartedAt: record.StartedAt, + FinishedAt: record.FinishedAt, + UpdatedAt: record.UpdatedAt, + } + if info, ok := GetTask(record.TaskID); ok { + status, total, downloaded, totalFiles, downloadedFiles, startedAt, errMsg, updatedAt := info.snapshot() + resp.Status = status + resp.Error = errMsg + resp.UpdatedAt = updatedAt + if resp.StartedAt == nil && !startedAt.IsZero() { + resp.StartedAt = &startedAt + } + var percent, speedMBPS float64 + if total > 0 { + percent = float64(downloaded) * 100 / float64(total) + } else if totalFiles > 0 { + percent = float64(downloadedFiles) * 100 / float64(totalFiles) + } + if !startedAt.IsZero() { + if elapsed := time.Since(startedAt).Seconds(); elapsed > 0 { + speedMBPS = float64(downloaded) / elapsed / (1024 * 1024) + } + } + if total > 0 || totalFiles > 0 { + resp.Progress = &TaskProgress{ + TotalBytes: total, + DownloadedBytes: downloaded, + TotalFiles: totalFiles, + DownloadedFiles: downloadedFiles, + Percent: percent, + SpeedMBPS: speedMBPS, + } + } + } + return resp +} diff --git a/api/telegram.go b/api/telegram.go new file mode 100644 index 00000000..eb5934d1 --- /dev/null +++ b/api/telegram.go @@ -0,0 +1,111 @@ +package api + +import ( + "encoding/json" + "io" + "net/http" + "strings" +) + +func decodeForce(r *http.Request) bool { + var body struct { + Force bool `json:"force"` + } + _ = json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(&body) + return body.Force +} + +func (s *server) telegramStatus(w http.ResponseWriter, r *http.Request) { + WriteJSON(w, http.StatusOK, s.deps.Telegram.Status(r.Context())) +} + +func (s *server) startBot(w http.ResponseWriter, r *http.Request) { + cfg := s.deps.Settings.Config() + if strings.TrimSpace(cfg.Telegram.Token) == "" { + WriteError(w, http.StatusBadRequest, "missing_bot_token", "bot token is not configured") + return + } + if err := s.deps.Telegram.StartBot(r.Context()); err != nil { + WriteError(w, http.StatusBadRequest, "bot_start_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"state": "starting"}) +} + +func (s *server) stopBot(w http.ResponseWriter, r *http.Request) { + if err := s.deps.Telegram.StopBot(r.Context(), decodeForce(r)); err != nil { + WriteError(w, http.StatusConflict, "bot_stop_failed", err.Error()) + return + } + w.WriteHeader(http.StatusNoContent) +} + +func (s *server) restartBot(w http.ResponseWriter, r *http.Request) { + if err := s.deps.Telegram.RestartBot(r.Context(), decodeForce(r)); err != nil { + WriteError(w, http.StatusConflict, "bot_restart_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"state": "starting"}) +} + +func (s *server) startUserbotLogin(w http.ResponseWriter, r *http.Request) { + var body struct { + Phone string `json:"phone"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + flowID, err := s.deps.Telegram.StartUserbotLogin(r.Context(), strings.TrimSpace(body.Phone)) + if err != nil { + WriteError(w, http.StatusConflict, "userbot_login_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"flow_id": flowID}) +} + +func (s *server) submitUserbotCode(w http.ResponseWriter, r *http.Request) { + var body struct { + Code string `json:"code"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if err := s.deps.Telegram.SubmitUserbotCode(r.Context(), r.PathValue("flow"), strings.TrimSpace(body.Code)); err != nil { + WriteError(w, http.StatusConflict, "userbot_login_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"ok": true}) +} + +func (s *server) submitUserbotPassword(w http.ResponseWriter, r *http.Request) { + var body struct { + Password string `json:"password"` + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if err := s.deps.Telegram.SubmitUserbotPassword(r.Context(), r.PathValue("flow"), body.Password); err != nil { + WriteError(w, http.StatusConflict, "userbot_login_failed", err.Error()) + return + } + WriteJSON(w, http.StatusAccepted, map[string]any{"ok": true}) +} + +func (s *server) cancelUserbotLogin(w http.ResponseWriter, r *http.Request) { + if err := s.deps.Telegram.CancelUserbotLogin(r.Context(), r.PathValue("flow")); err != nil { + WriteError(w, http.StatusConflict, "userbot_login_failed", err.Error()) + return + } + w.WriteHeader(http.StatusNoContent) +} + +func (s *server) logoutUserbot(w http.ResponseWriter, r *http.Request) { + if err := s.deps.Telegram.LogoutUserbot(r.Context()); err != nil { + WriteError(w, http.StatusInternalServerError, "userbot_logout_failed", err.Error()) + return + } + w.WriteHeader(http.StatusNoContent) +} diff --git a/api/tgfiles.go b/api/tgfiles.go index 066a7e78..0e30d95c 100644 --- a/api/tgfiles.go +++ b/api/tgfiles.go @@ -7,13 +7,14 @@ import ( "strconv" "strings" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" + "github.com/gotd/td/constant" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot" userclient "github.com/krau/SaveAny-Bot/client/user" "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/pkg/tfile" + "github.com/krau/mygotg/ext" ) type MessageContext struct { @@ -36,11 +37,7 @@ func getClientContext() (*ext.Context, error) { func resolveChatID(_ context.Context, idOrUsername string) (int64, error) { if id, err := strconv.ParseInt(idOrUsername, 10, 64); err == nil { - // 私有频道 ID 需要加上 -100 前缀 - if id > 0 { - return -1000000000000 - id, nil - } - return id, nil + return constant.TDLibPeerID(id).ToPlain(), nil } clientCtx, err := getClientContext() diff --git a/api/types.go b/api/types.go index 7b82909d..44208e21 100644 --- a/api/types.go +++ b/api/types.go @@ -1,13 +1,82 @@ package api import ( + "context" "encoding/json" "net/http" "time" "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" + "github.com/krau/SaveAny-Bot/settings" ) +type Deps struct { + Ctx context.Context + Settings *settings.Service + Telegram TelegramController + DataDir string + DBPath string +} + +type StorageInput struct { + Name string `json:"name"` + Type string `json:"type"` + Enable bool `json:"enable"` + Config map[string]any `json:"config"` +} + +type StorageRecord struct { + ID uint `json:"id"` + Name string `json:"name"` + Type string `json:"type"` + Enable bool `json:"enable"` + Config map[string]any `json:"config"` + Error string `json:"error,omitempty"` +} + +type BotStatus struct { + State string `json:"state"` + ID int64 `json:"id,omitempty"` + Username string `json:"username,omitempty"` + Error string `json:"error,omitempty"` + StartedAt time.Time `json:"started_at"` +} + +type LoginFlow struct { + FlowID string `json:"flow_id"` + State string `json:"state"` + Error string `json:"error,omitempty"` +} + +type UserbotStatus struct { + Enabled bool `json:"enabled"` + State string `json:"state"` + ID int64 `json:"id,omitempty"` + Username string `json:"username,omitempty"` + Phone string `json:"phone,omitempty"` + Error string `json:"error,omitempty"` + Login *LoginFlow `json:"login,omitempty"` +} + +type TelegramStatus struct { + Bot BotStatus `json:"bot"` + Userbot UserbotStatus `json:"userbot"` +} + +type TelegramController interface { + Status(ctx context.Context) TelegramStatus + StartBot(ctx context.Context) error + StopBot(ctx context.Context, force bool) error + RestartBot(ctx context.Context, force bool) error + StartUserbotLogin(ctx context.Context, phone string) (flowID string, err error) + SubmitUserbotCode(ctx context.Context, flowID, code string) error + SubmitUserbotPassword(ctx context.Context, flowID, password string) error + CancelUserbotLogin(ctx context.Context, flowID string) error + LogoutUserbot(ctx context.Context) error + ApplyTelegram(ctx context.Context) error + RestartProcess() +} + type TaskStatus string const ( @@ -43,30 +112,57 @@ type TaskProgress struct { } type TaskInfoResponse struct { - TaskID string `json:"task_id"` - Type tasktype.TaskType `json:"type"` - Status TaskStatus `json:"status"` - Title string `json:"title"` - Progress *TaskProgress `json:"progress,omitempty"` - Storage string `json:"storage"` - Path string `json:"path"` - Error string `json:"error,omitempty"` - CreatedAt time.Time `json:"created_at"` - UpdatedAt time.Time `json:"updated_at"` + TaskID string `json:"task_id"` + Type tasktype.TaskType `json:"type"` + Status TaskStatus `json:"status"` + Title string `json:"title"` + Progress *TaskProgress `json:"progress,omitempty"` + Storage string `json:"storage"` + Path string `json:"path"` + Source string `json:"source,omitempty"` + Error string `json:"error,omitempty"` + CreatedAt time.Time `json:"created_at"` + StartedAt *time.Time `json:"started_at,omitempty"` + FinishedAt *time.Time `json:"finished_at,omitempty"` + UpdatedAt time.Time `json:"updated_at"` } type TasksListResponse struct { Tasks []TaskInfoResponse `json:"tasks"` - Total int `json:"total"` -} - -type StoragesResponse struct { - Storages []StorageInfo `json:"storages"` -} - -type StorageInfo struct { - Name string `json:"name"` - Type string `json:"type"` + Total int64 `json:"total"` +} + +type UserStorageFilter struct { + Storages []string `json:"storages"` + Blacklist bool `json:"blacklist"` +} + +type UserResponse struct { + ID uint `json:"id"` + ChatID int64 `json:"chat_id"` + Enabled bool `json:"enabled"` + Silent bool `json:"silent"` + DefaultStorage string `json:"default_storage"` + DefaultDir uint `json:"default_dir"` + ApplyRule bool `json:"apply_rule"` + FilenameStrategy string `json:"filename_strategy"` + FilenameTemplate string `json:"filename_template"` + ConflictStrategy string `json:"conflict_strategy"` + WatchNotify bool `json:"watch_notify"` + StorageFilter UserStorageFilter `json:"storage_filter"` +} + +type UserPatch struct { + Enabled *bool `json:"enabled,omitempty"` + Silent *bool `json:"silent,omitempty"` + DefaultStorage *string `json:"default_storage,omitempty"` + DefaultDir *uint `json:"default_dir,omitempty"` + ApplyRule *bool `json:"apply_rule,omitempty"` + FilenameStrategy *string `json:"filename_strategy,omitempty"` + FilenameTemplate *string `json:"filename_template,omitempty"` + ConflictStrategy *string `json:"conflict_strategy,omitempty"` + WatchNotify *bool `json:"watch_notify,omitempty"` + StorageFilter *UserStorageFilter `json:"storage_filter,omitempty"` } type WebhookPayload struct { @@ -80,8 +176,9 @@ type WebhookPayload struct { } type ErrorResponse struct { - Error string `json:"error"` - Message string `json:"message,omitempty"` + Error string `json:"error"` + Message string `json:"message,omitempty"` + Fields map[string]string `json:"fields,omitempty"` } type APIError struct { @@ -90,9 +187,7 @@ type APIError struct { Message string } -func (e *APIError) Error() string { - return e.Message -} +func (e *APIError) Error() string { return e.Message } func WriteJSON(w http.ResponseWriter, statusCode int, data any) error { w.Header().Set("Content-Type", "application/json") @@ -101,10 +196,11 @@ func WriteJSON(w http.ResponseWriter, statusCode int, data any) error { } func WriteError(w http.ResponseWriter, statusCode int, errCode, message string) error { - return WriteJSON(w, statusCode, ErrorResponse{ - Error: errCode, - Message: message, - }) + return WriteJSON(w, statusCode, ErrorResponse{Error: errCode, Message: message}) +} + +func WriteFieldErrors(w http.ResponseWriter, statusCode int, message string, fields map[string]string) error { + return WriteJSON(w, statusCode, ErrorResponse{Error: "validation_failed", Message: message, Fields: fields}) } type DirectLinksParams struct { diff --git a/api/users.go b/api/users.go new file mode 100644 index 00000000..17081212 --- /dev/null +++ b/api/users.go @@ -0,0 +1,188 @@ +package api + +import ( + "encoding/json" + "net/http" + "strconv" + + "github.com/krau/SaveAny-Bot/config" + "github.com/krau/SaveAny-Bot/database" +) + +func (s *server) listUsers(w http.ResponseWriter, r *http.Request) { + users, err := database.GetAllUsers(r.Context()) + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + out := make([]UserResponse, 0, len(users)) + for i := range users { + out = append(out, userResponse(&users[i])) + } + WriteJSON(w, http.StatusOK, map[string]any{"users": out}) +} + +func (s *server) createUser(w http.ResponseWriter, r *http.Request) { + var body struct { + ChatID int64 `json:"chat_id"` + UserPatch + } + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if body.ChatID == 0 { + WriteFieldErrors(w, http.StatusBadRequest, "chat_id is required", map[string]string{"chat_id": "required"}) + return + } + if _, err := database.GetUserByChatID(r.Context(), body.ChatID); err == nil { + WriteError(w, http.StatusConflict, "user_exists", "user already exists") + return + } else if !database.IsNotFound(err) { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + candidate := &database.User{ChatID: body.ChatID, Enabled: true} + if fields := applyUserPatch(candidate, body.UserPatch); len(fields) > 0 { + WriteFieldErrors(w, http.StatusBadRequest, "invalid user fields", fields) + return + } + if err := database.CreateUser(r.Context(), body.ChatID); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + user, err := database.GetUserByChatID(r.Context(), body.ChatID) + if err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + if fields := applyUserPatch(user, body.UserPatch); len(fields) > 0 { + WriteFieldErrors(w, http.StatusBadRequest, "invalid user fields", fields) + return + } + if err := database.UpdateUser(r.Context(), user); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + _ = s.deps.Settings.ReloadConfig(r.Context()) + WriteJSON(w, http.StatusCreated, userResponse(user)) +} + +func (s *server) updateUser(w http.ResponseWriter, r *http.Request) { + id64, err := strconv.ParseUint(r.PathValue("id"), 10, 64) + if err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid user id") + return + } + user, err := database.GetUserByID(r.Context(), uint(id64)) + if err != nil { + WriteError(w, http.StatusNotFound, "user_not_found", "user not found") + return + } + var body UserPatch + if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 1<<20)).Decode(&body); err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid request body") + return + } + if fields := applyUserPatch(user, body); len(fields) > 0 { + WriteFieldErrors(w, http.StatusBadRequest, "invalid user fields", fields) + return + } + if err := database.UpdateUser(r.Context(), user); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + _ = s.deps.Settings.ReloadConfig(r.Context()) + WriteJSON(w, http.StatusOK, userResponse(user)) +} + +func (s *server) deleteUser(w http.ResponseWriter, r *http.Request) { + id64, err := strconv.ParseUint(r.PathValue("id"), 10, 64) + if err != nil { + WriteError(w, http.StatusBadRequest, "invalid_request", "invalid user id") + return + } + user, err := database.GetUserByID(r.Context(), uint(id64)) + if err != nil { + WriteError(w, http.StatusNotFound, "user_not_found", "user not found") + return + } + if err := database.DeleteUser(r.Context(), user); err != nil { + WriteError(w, http.StatusInternalServerError, "internal_error", err.Error()) + return + } + _ = s.deps.Settings.ReloadConfig(r.Context()) + w.WriteHeader(http.StatusNoContent) +} + +func userResponse(user *database.User) UserResponse { + names := make([]string, 0) + if user.StoragesJSON != "" { + _ = json.Unmarshal([]byte(user.StoragesJSON), &names) + } + return UserResponse{ + ID: user.ID, + ChatID: user.ChatID, + Enabled: user.Enabled, + Silent: user.Silent, + DefaultStorage: user.DefaultStorage, + DefaultDir: user.DefaultDir, + ApplyRule: user.ApplyRule, + FilenameStrategy: user.FilenameStrategy, + FilenameTemplate: user.FilenameTemplate, + ConflictStrategy: user.ConflictStrategy, + WatchNotify: user.WatchNotify, + StorageFilter: UserStorageFilter{Storages: names, Blacklist: user.Blacklist}, + } +} + +func applyUserPatch(user *database.User, patch UserPatch) map[string]string { + fields := make(map[string]string) + if patch.Enabled != nil { + user.Enabled = *patch.Enabled + } + if patch.Silent != nil { + user.Silent = *patch.Silent + } + if patch.DefaultStorage != nil { + if *patch.DefaultStorage != "" && config.C().GetStorageByName(*patch.DefaultStorage) == nil { + fields["default_storage"] = "unknown storage" + } else { + user.DefaultStorage = *patch.DefaultStorage + } + } + if patch.DefaultDir != nil { + user.DefaultDir = *patch.DefaultDir + } + if patch.ApplyRule != nil { + user.ApplyRule = *patch.ApplyRule + } + if patch.FilenameStrategy != nil { + user.FilenameStrategy = *patch.FilenameStrategy + } + if patch.FilenameTemplate != nil { + user.FilenameTemplate = *patch.FilenameTemplate + } + if patch.ConflictStrategy != nil { + user.ConflictStrategy = *patch.ConflictStrategy + } + if patch.WatchNotify != nil { + user.WatchNotify = *patch.WatchNotify + } + if patch.StorageFilter != nil { + for _, name := range patch.StorageFilter.Storages { + if config.C().GetStorageByName(name) == nil { + fields["storage_filter.storages"] = "unknown storage: " + name + break + } + } + raw, err := json.Marshal(patch.StorageFilter.Storages) + if err != nil { + fields["storage_filter.storages"] = err.Error() + } else { + user.StoragesJSON = string(raw) + user.Blacklist = patch.StorageFilter.Blacklist + } + } + return fields +} diff --git a/app/app.go b/app/app.go new file mode 100644 index 00000000..4d5345ea --- /dev/null +++ b/app/app.go @@ -0,0 +1,180 @@ +package app + +import ( + "context" + "errors" + "fmt" + "strings" + "sync" + "time" + + "github.com/charmbracelet/log" + "github.com/krau/mygotg/ext" + + "github.com/krau/SaveAny-Bot/api" + "github.com/krau/SaveAny-Bot/client/bot" + "github.com/krau/SaveAny-Bot/client/bot/handlers" + "github.com/krau/SaveAny-Bot/client/user" + "github.com/krau/SaveAny-Bot/common/selfupdate" + "github.com/krau/SaveAny-Bot/core" + "github.com/krau/SaveAny-Bot/database" + "github.com/krau/SaveAny-Bot/parsers" + "github.com/krau/SaveAny-Bot/settings" + "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/SaveAny-Bot/web" +) + +type Options struct { + DataDir string + DBPath string + Listen string + NoWeb bool +} + +type App struct { + ctx context.Context + cancel context.CancelFunc + svc *settings.Service + opts Options + web *web.Server + + applyMu sync.Mutex + mu sync.Mutex + appliedBotCred string + appliedUserbotSession string + flowMu sync.Mutex + flow *loginFlow +} + +func New(parent context.Context, svc *settings.Service, opts Options) *App { + ctx, cancel := context.WithCancel(parent) + return &App{ctx: ctx, cancel: cancel, svc: svc, opts: opts} +} + +func (a *App) Done() <-chan struct{} { return a.ctx.Done() } + +func (a *App) Start() error { + bot.SetRestartHandler(a.RequestRestart) + if err := database.MarkInterruptedTaskRecords(a.ctx); err != nil { + log.Errorf("Failed to mark interrupted tasks: %v", err) + } + core.Run(a.ctx) + + cfg := a.svc.Config() + if cfg.Parser.PluginEnable { + for _, dir := range cfg.Parser.PluginDirs { + if err := parsers.LoadPlugins(a.ctx, dir); err != nil { + log.Error("Failed to load parser plugins", "dir", dir, "error", err) + } + } + } + go handlers.ListenUserbotMediaEvents(a.ctx, func() *ext.Context { + if botCtx := bot.ExtContext(); botCtx != nil { + return botCtx + } + return user.GetCtx() + }) + + if !a.opts.NoWeb && cfg.Web.Enable { + a.web = web.New(a.opts.Listen, api.NewHandler(api.Deps{ + Ctx: a.ctx, + Settings: a.svc, + Telegram: a, + DataDir: a.opts.DataDir, + DBPath: a.opts.DBPath, + })) + if err := a.web.Start(a.ctx); err != nil { + return err + } + } + + go func() { + if err := a.ApplyTelegram(a.ctx); err != nil { + log.Errorf("Failed to apply telegram settings: %v", err) + } + }() + return nil +} + +func (a *App) ApplyTelegram(ctx context.Context) error { + a.applyMu.Lock() + defer a.applyMu.Unlock() + cfg := a.svc.Config() + cred := strings.Join([]string{ + cfg.Telegram.Token, + fmt.Sprintf("%d", cfg.Telegram.AppID), + fmt.Sprintf("%d", cfg.Telegram.RpcRetry), + cfg.Telegram.AppHash, + fmt.Sprintf("%t", cfg.Telegram.Proxy.Enable), + cfg.Telegram.Proxy.URL, + }, "|") + + userbotSession := cfg.Telegram.Userbot.Session + a.mu.Lock() + changed := cred != a.appliedBotCred + userbotSessionChanged := userbotSession != a.appliedUserbotSession + a.appliedBotCred = cred + a.appliedUserbotSession = userbotSession + a.mu.Unlock() + + botStatus := bot.CurrentStatus() + switch { + case cfg.Telegram.Token == "": + if botStatus.State != "stopped" { + bot.Stop() + } + case changed: + bot.Stop() + go func() { + if err := bot.Start(a.ctx); err != nil { + log.Errorf("Failed to start bot: %v", err) + } + }() + case botStatus.State == "stopped" || botStatus.State == "error": + go func() { + if err := bot.Start(a.ctx); err != nil { + log.Errorf("Failed to start bot: %v", err) + } + }() + } + + userStatus := user.CurrentStatus() + if userbotSessionChanged && (userStatus.State == "running" || userStatus.State == "starting") { + user.Stop() + userStatus = user.CurrentStatus() + } + if !cfg.Telegram.Userbot.Enable { + if userStatus.State == "running" || userStatus.State == "starting" { + user.Stop() + } + } else if userStatus.State == "stopped" || userStatus.State == "error" || userStatus.State == "login_required" { + go func() { + if err := user.Start(a.ctx, nil, cfg.Telegram.Userbot.Phone); err != nil && !errors.Is(err, user.ErrLoginRequired) { + log.Errorf("Failed to start userbot: %v", err) + } + }() + } + return nil +} + +func (a *App) RequestRestart() { + selfupdate.RequestRestart() + a.cancel() +} + +func (a *App) Stop() { + a.cancel() + if a.web != nil { + stopCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + _ = a.web.Stop(stopCtx) + cancel() + } + bot.Stop() + user.Stop() + core.Close() + if !core.WaitWorkers(10 * time.Second) { + log.Warn("Timed out waiting for task workers to stop") + } + storage.CloseAll() + _ = database.Close() +} diff --git a/app/telegram.go b/app/telegram.go new file mode 100644 index 00000000..eb18c9f1 --- /dev/null +++ b/app/telegram.go @@ -0,0 +1,203 @@ +package app + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "strings" + + "github.com/charmbracelet/log" + "github.com/rs/xid" + + "github.com/krau/SaveAny-Bot/api" + "github.com/krau/SaveAny-Bot/client/bot" + "github.com/krau/SaveAny-Bot/client/user" + "github.com/krau/SaveAny-Bot/core" + "github.com/krau/SaveAny-Bot/settings" +) + +func (a *App) Status(ctx context.Context) api.TelegramStatus { + botStatus := bot.CurrentStatus() + userStatus := user.CurrentStatus() + cfg := a.svc.Config() + + status := api.TelegramStatus{ + Bot: api.BotStatus{ + State: botStatus.State, + ID: botStatus.ID, + Username: botStatus.Username, + Error: botStatus.Error, + StartedAt: botStatus.StartedAt, + }, + Userbot: api.UserbotStatus{ + Enabled: cfg.Telegram.Userbot.Enable, + State: userStatus.State, + ID: userStatus.ID, + Username: userStatus.Username, + Phone: userStatus.Phone, + Error: userStatus.Error, + }, + } + a.flowMu.Lock() + flow := a.flow + a.flowMu.Unlock() + if flow != nil { + state, errMsg := flow.status() + status.Userbot.Login = &api.LoginFlow{FlowID: flow.id, State: state, Error: errMsg} + } + return status +} + +func (a *App) StartBot(ctx context.Context) error { + if strings.TrimSpace(a.svc.Config().Telegram.Token) == "" { + return errors.New("bot token is not configured") + } + if bot.CurrentStatus().State == "running" || bot.CurrentStatus().State == "starting" { + return nil + } + go func() { + if err := bot.Start(a.ctx); err != nil { + log.Errorf("Failed to start bot: %v", err) + } + }() + return nil +} + +func (a *App) StopBot(ctx context.Context, force bool) error { + if !force && core.ActiveTaskCount() > 0 { + return errors.New("tasks are running") + } + bot.Stop() + return nil +} + +func (a *App) RestartBot(ctx context.Context, force bool) error { + if !force && core.ActiveTaskCount() > 0 { + return errors.New("tasks are running") + } + bot.Stop() + go func() { + if err := bot.Start(a.ctx); err != nil { + log.Errorf("Failed to restart bot: %v", err) + } + }() + return nil +} + +func (a *App) StartUserbotLogin(ctx context.Context, phone string) (string, error) { + if phone == "" { + return "", errors.New("phone number is required") + } + if user.CurrentStatus().State == "running" || user.CurrentStatus().State == "starting" { + return "", errors.New("userbot is already running") + } + cfg := a.svc.Config() + if cfg.Telegram.AppID == 0 || cfg.Telegram.AppHash == "" { + return "", errors.New("telegram app_id and app_hash are required") + } + + a.flowMu.Lock() + if a.flow != nil { + state, _ := a.flow.status() + if state != "failed" && state != "cancelled" && state != "done" { + a.flowMu.Unlock() + return "", errors.New("a login flow is already active") + } + } + flow := newLoginFlow(a.ctx, xid.New().String(), phone) + a.flow = flow + a.flowMu.Unlock() + + go func() { + err := user.Start(a.ctx, &webConversator{flow: flow}, phone) + if err != nil { + flow.markFailed(err) + return + } + if flow.ctx.Err() != nil { + user.Stop() + return + } + patch, _ := json.Marshal(map[string]any{ + "userbot": map[string]any{"enable": true, "phone": phone}, + }) + if _, err := a.svc.UpdateGroup(a.ctx, settings.GroupTelegram, patch); err != nil { + flow.markFailed(err) + user.Stop() + return + } + if !flow.markDone() { + user.Stop() + disable, _ := json.Marshal(map[string]any{ + "userbot": map[string]any{"enable": false}, + }) + _, _ = a.svc.UpdateGroup(a.ctx, settings.GroupTelegram, disable) + return + } + flow.cancel() + }() + return flow.id, nil +} + +func (a *App) SubmitUserbotCode(ctx context.Context, flowID, code string) error { + flow, err := a.getFlow(flowID) + if err != nil { + return err + } + return flow.submitCode(code) +} + +func (a *App) SubmitUserbotPassword(ctx context.Context, flowID, password string) error { + flow, err := a.getFlow(flowID) + if err != nil { + return err + } + return flow.submitPassword(password) +} + +func (a *App) CancelUserbotLogin(ctx context.Context, flowID string) error { + flow, err := a.getFlow(flowID) + if err != nil { + return err + } + if state, _ := flow.status(); state == "done" { + return errors.New("login already completed") + } + flow.cancel() + flow.setState("cancelled", "") + user.Stop() + return nil +} + +func (a *App) LogoutUserbot(ctx context.Context) error { + a.flowMu.Lock() + if a.flow != nil { + a.flow.cancel() + a.flow = nil + } + a.flowMu.Unlock() + if err := user.Logout(); err != nil { + return err + } + patch, _ := json.Marshal(map[string]any{ + "userbot": map[string]any{"enable": false}, + }) + if _, err := a.svc.UpdateGroup(ctx, settings.GroupTelegram, patch); err != nil { + return fmt.Errorf("failed to persist logout: %w", err) + } + return nil +} + +func (a *App) RestartProcess() { + a.RequestRestart() +} + +func (a *App) getFlow(flowID string) (*loginFlow, error) { + a.flowMu.Lock() + defer a.flowMu.Unlock() + if a.flow == nil || a.flow.id != flowID { + return nil, errors.New("unknown login flow") + } + return a.flow, nil +} diff --git a/app/userbot_auth.go b/app/userbot_auth.go new file mode 100644 index 00000000..7ea779bb --- /dev/null +++ b/app/userbot_auth.go @@ -0,0 +1,140 @@ +package app + +import ( + "context" + "fmt" + "sync" + "time" + + gotgproto "github.com/krau/mygotg" +) + +type loginFlow struct { + id string + phone string + ctx context.Context + cancel context.CancelFunc + + mu sync.Mutex + state string + errMsg string + codeCh chan string + pwdCh chan string +} + +func newLoginFlow(parent context.Context, id, phone string) *loginFlow { + ctx, cancel := context.WithTimeout(parent, 5*time.Minute) + return &loginFlow{ + id: id, + phone: phone, + ctx: ctx, + cancel: cancel, + state: "starting", + codeCh: make(chan string, 1), + pwdCh: make(chan string, 1), + } +} + +func (f *loginFlow) setState(state, errMsg string) { + f.mu.Lock() + f.state = state + f.errMsg = errMsg + f.mu.Unlock() +} + +func (f *loginFlow) status() (string, string) { + f.mu.Lock() + defer f.mu.Unlock() + return f.state, f.errMsg +} + +func (f *loginFlow) markDone() bool { + f.mu.Lock() + defer f.mu.Unlock() + if f.state == "cancelled" { + return false + } + f.state = "done" + return true +} + +func (f *loginFlow) markFailed(err error) { + f.mu.Lock() + defer f.mu.Unlock() + if f.state == "cancelled" { + return + } + f.state = "failed" + f.errMsg = err.Error() +} + +func (f *loginFlow) submitCode(code string) error { + state, _ := f.status() + if state != "code_required" { + return fmt.Errorf("login flow is not waiting for a code (state %s)", state) + } + select { + case f.codeCh <- code: + return nil + case <-f.ctx.Done(): + return f.ctx.Err() + } +} + +func (f *loginFlow) submitPassword(password string) error { + state, _ := f.status() + if state != "password_required" { + return fmt.Errorf("login flow is not waiting for a password (state %s)", state) + } + select { + case f.pwdCh <- password: + return nil + case <-f.ctx.Done(): + return f.ctx.Err() + } +} + +type webConversator struct { + flow *loginFlow +} + +func (c *webConversator) AskPhoneNumber() (string, error) { return c.flow.phone, nil } + +func (c *webConversator) AskCode() (string, error) { + c.flow.setState("code_required", "") + select { + case <-c.flow.ctx.Done(): + return "", c.flow.ctx.Err() + case code := <-c.flow.codeCh: + c.flow.setState("verifying", "") + return code, nil + } +} + +func (c *webConversator) AskPassword() (string, error) { + c.flow.setState("password_required", "") + select { + case <-c.flow.ctx.Done(): + return "", c.flow.ctx.Err() + case password := <-c.flow.pwdCh: + c.flow.setState("verifying", "") + return password, nil + } +} + +func (c *webConversator) AuthStatus(status gotgproto.AuthStatus) { + switch status.Event { + case gotgproto.AuthStatusPhoneCodeAsked: + c.flow.setState("code_required", "") + case gotgproto.AuthStatusPasswordAsked: + c.flow.setState("password_required", "") + case gotgproto.AuthStatusPhoneCodeRetrial, gotgproto.AuthStatusPasswordRetrial, gotgproto.AuthStatusPhoneRetrial: + c.flow.setState("code_required", fmt.Sprintf("incorrect credential, attempts left: %d", status.AttemptsLeft)) + case gotgproto.AuthStatusPhoneCodeFailed, gotgproto.AuthStatusPasswordFailed: + c.flow.setState("failed", "credential verification failed") + case gotgproto.AuthStatusSuccess: + // The flow is marked done only after the client is fully started and + // the enabled flag has been persisted. + c.flow.setState("verifying", "") + } +} diff --git a/boot/boot.go b/boot/boot.go new file mode 100644 index 00000000..3299cf49 --- /dev/null +++ b/boot/boot.go @@ -0,0 +1,75 @@ +package boot + +import ( + "context" + "net/http" + "os" + "strings" + + "github.com/charmbracelet/log" + + "github.com/krau/SaveAny-Bot/common/cache" + "github.com/krau/SaveAny-Bot/common/i18n" + "github.com/krau/SaveAny-Bot/config" + "github.com/krau/SaveAny-Bot/database" + "github.com/krau/SaveAny-Bot/settings" +) + +type Result struct { + Config config.Config + Settings *settings.Service + DataDir string + DBPath string + Listen string + NoWeb bool +} + +func Init(ctx context.Context, opts Options) (Result, error) { + if err := os.MkdirAll(opts.DataDir, 0o755); err != nil { + return Result{}, err + } + database.Init(ctx, opts.DBPath) + if !settings.LegacyImported(ctx) { + if err := settings.ImportLegacy(ctx, opts.ConfigPath, opts.DataDir); err != nil { + log.Errorf("Failed to import legacy configuration: %v", err) + } + } + svc, err := settings.NewService(ctx, opts.DataDir) + if err != nil { + return Result{}, err + } + if opts.Listen != "" { + svc.SetListenOverride(opts.Listen) + } + cfg := svc.Config() + if opts.InitWeb && !opts.NoWeb && cfg.Web.Enable { + // The generated password is emitted at Warn; force a level that shows it. + log.SetLevel(log.InfoLevel) + if err := svc.EnsureAdmin(os.Getenv("SAVEANY_ADMIN_PASSWORD")); err != nil { + return Result{}, err + } + } + if level, err := log.ParseLevel(strings.TrimSpace(cfg.Log.Level)); err == nil { + log.SetLevel(level) + } else { + log.Warn("Invalid log level, using info", "level", cfg.Log.Level) + } + i18n.Init(cfg.Lang) + cache.Init() + if cfg.Proxy != "" { + transport, err := config.ProxyTransport(cfg.Proxy) + if err != nil { + log.Errorf("Invalid proxy configuration: %v", err) + } else { + http.DefaultTransport = transport + } + } + return Result{ + Config: cfg, + Settings: svc, + DataDir: opts.DataDir, + DBPath: opts.DBPath, + Listen: cfg.Web.Listen, + NoWeb: opts.NoWeb, + }, nil +} diff --git a/boot/flags.go b/boot/flags.go new file mode 100644 index 00000000..8970a54d --- /dev/null +++ b/boot/flags.go @@ -0,0 +1,61 @@ +package boot + +import ( + "os" + "path/filepath" + + "github.com/spf13/cobra" +) + +func RegisterFlags(cmd *cobra.Command) { + flags := cmd.PersistentFlags() + flags.StringP("config", "c", "", "legacy config file path or URL (imported once)") + flags.String("data-dir", "", "data directory (default ./data)") + flags.String("db-path", "", "database file path (default /saveany.db)") + flags.String("listen", "", "override the web listen address") + flags.Bool("no-web", false, "do not start the web server") +} + +type Options struct { + ConfigPath string + DataDir string + DBPath string + Listen string + NoWeb bool + InitWeb bool +} + +func Parse(cmd *cobra.Command) Options { + flags := cmd.Flags() + configPath, _ := flags.GetString("config") + dataDir, _ := flags.GetString("data-dir") + dbPath, _ := flags.GetString("db-path") + listen, _ := flags.GetString("listen") + noWeb, _ := flags.GetBool("no-web") + + if dataDir == "" { + dataDir = os.Getenv("SAVEANY_DATA_DIR") + } + if dataDir == "" { + dataDir = "./data" + } + if configPath == "" { + configPath = os.Getenv("SAVEANY_CONFIG") + } + if dbPath == "" { + dbPath = os.Getenv("SAVEANY_DB_PATH") + } + if dbPath == "" { + dbPath = filepath.Join(dataDir, "saveany.db") + } + if listen == "" { + listen = os.Getenv("SAVEANY_LISTEN") + } + return Options{ + ConfigPath: configPath, + DataDir: dataDir, + DBPath: dbPath, + Listen: listen, + NoWeb: noWeb, + } +} diff --git a/client/bot/bot.go b/client/bot/bot.go index 71c1a1bb..c08dde11 100644 --- a/client/bot/bot.go +++ b/client/bot/bot.go @@ -2,14 +2,17 @@ package bot import ( "context" + "errors" + "sync" "time" - "github.com/celestix/gotgproto" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" - "github.com/celestix/gotgproto/sessionMaker" "github.com/charmbracelet/log" "github.com/gotd/td/tg" + gotgproto "github.com/krau/mygotg" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" + "github.com/krau/mygotg/session" + "github.com/krau/SaveAny-Bot/client/bot/handlers" "github.com/krau/SaveAny-Bot/client/middleware" "github.com/krau/SaveAny-Bot/common/i18n" @@ -18,27 +21,79 @@ import ( "github.com/krau/SaveAny-Bot/database" ) -var ectx *ext.Context +type Status struct { + State string + ID int64 + Username string + Error string + StartedAt time.Time +} + +type manager struct { + mu sync.RWMutex + client *gotgproto.Client + ectx *ext.Context + status Status + starting bool + generation uint64 + startCancel context.CancelFunc + restartHandler func() +} + +var mgr = &manager{status: Status{State: "stopped"}} +func SetRestartHandler(fn func()) { + mgr.mu.Lock() + mgr.restartHandler = fn + mgr.mu.Unlock() +} + +func CurrentStatus() Status { + mgr.mu.RLock() + defer mgr.mu.RUnlock() + return mgr.status +} + +// ExtContext returns the bot context, or nil when the bot is not running. func ExtContext() *ext.Context { - return ectx + mgr.mu.RLock() + defer mgr.mu.RUnlock() + return mgr.ectx } -func Init(ctx context.Context) <-chan struct{} { - log.FromContext(ctx).Info("Initializing Bot...") - resultChan := make(chan struct { +// Start connects the bot using the current configuration. It is idempotent +// while a client is already running. +func Start(ctx context.Context) error { + mgr.mu.Lock() + if mgr.client != nil { + mgr.mu.Unlock() + return nil + } + if mgr.starting { + mgr.mu.Unlock() + return errors.New("bot is already starting") + } + mgr.starting = true + mgr.generation++ + gen := mgr.generation + startCtx, cancelStart := context.WithCancel(ctx) + mgr.startCancel = cancelStart + mgr.status = Status{State: "starting"} + mgr.mu.Unlock() + + logger := log.FromContext(ctx) + logger.Info("Initializing Bot...") + + type result struct { client *gotgproto.Client err error - }) - shouldRestart := make(chan struct{}) + } + resultChan := make(chan result, 1) go func() { resolver, err := tgutil.NewConfigProxyResolver() if err != nil { - resultChan <- struct { - client *gotgproto.Client - err error - }{nil, err} + resultChan <- result{nil, err} return } client, err := gotgproto.NewClient( @@ -46,16 +101,22 @@ func Init(ctx context.Context) <-chan struct{} { config.C().Telegram.AppHash, gotgproto.ClientTypeBot(config.C().Telegram.Token), &gotgproto.ClientOpts{ - Session: sessionMaker.SqlSession(database.GetDialect(config.C().DB.Session)), - DisableCopyright: true, - Middlewares: middleware.NewDefaultMiddlewares(ctx, 5*time.Minute), - Resolver: resolver, - Context: ctx, - MaxRetries: config.C().Telegram.RpcRetry, - AutoFetchReply: true, + Session: session.SqlSession(database.GetDialect(config.C().DB.Session)), + DisableCopyright: true, + DeferUpdateRecovery: true, + Middlewares: middleware.NewDefaultMiddlewares(startCtx, 5*time.Minute), + Resolver: resolver, + Context: startCtx, + MaxRetries: config.C().Telegram.RpcRetry, + AutoFetchReply: true, ErrorHandler: func(ctx *ext.Context, u *ext.Update, s string) error { if s == "SAVEANTBOT-RESTART" { - shouldRestart <- struct{}{} + mgr.mu.RLock() + handler := mgr.restartHandler + mgr.mu.RUnlock() + if handler != nil { + handler() + } return dispatcher.EndGroups } log.FromContext(ctx).Errorf("unhandled error: %s", s) @@ -63,37 +124,105 @@ func Init(ctx context.Context) <-chan struct{} { }, }, ) - if err != nil { - resultChan <- struct { - client *gotgproto.Client - err error - }{nil, err} - return - } - commands := make([]tg.BotCommand, 0, len(handlers.CommandHandlers)) - for _, info := range handlers.CommandHandlers { - commands = append(commands, tg.BotCommand{Command: info.Cmd, Description: i18n.T(info.Desc)}) - } - _, err = client.API().BotsSetBotCommands(ctx, &tg.BotsSetBotCommandsRequest{ - Scope: &tg.BotCommandScopeDefault{}, - Commands: commands, - }) - resultChan <- struct { - client *gotgproto.Client - err error - }{client, err} + resultChan <- result{client, err} }() + var res result select { - case <-ctx.Done(): - log.FromContext(ctx).Errorf("Bot initialization cancelled: %s", ctx.Err()) - case result := <-resultChan: - if result.err != nil { - log.FromContext(ctx).Fatalf("Failed to initialize Bot: %s", result.err) + case <-startCtx.Done(): + mgr.mu.Lock() + if mgr.generation == gen { + mgr.starting = false + mgr.generation++ + mgr.startCancel = nil + mgr.status = Status{State: "stopped"} + } + mgr.mu.Unlock() + return startCtx.Err() + case res = <-resultChan: + } + + if res.err != nil { + mgr.mu.Lock() + if mgr.generation == gen { + mgr.starting = false + mgr.startCancel = nil + mgr.status = Status{State: "error", Error: res.err.Error()} + } + mgr.mu.Unlock() + return res.err + } + + mgr.mu.RLock() + stale := mgr.generation != gen || startCtx.Err() != nil + mgr.mu.RUnlock() + if stale { + res.client.Stop() + return errors.New("bot start canceled") + } + + ectx := res.client.CreateContext() + handlers.Register(res.client.Dispatcher) + if err := res.client.StartUpdateRecovery(startCtx); err != nil { + res.client.Stop() + mgr.mu.Lock() + if mgr.generation == gen { + mgr.starting = false + mgr.startCancel = nil + mgr.status = Status{State: "error", Error: err.Error()} } - ectx = result.client.CreateContext() - handlers.Register(result.client.Dispatcher, ectx) - log.FromContext(ctx).Info("Bot initialization completed.") + mgr.mu.Unlock() + return err + } + + commands := make([]tg.BotCommand, 0, len(handlers.CommandHandlers)) + for _, info := range handlers.CommandHandlers { + commands = append(commands, tg.BotCommand{Command: info.Cmd, Description: i18n.T(info.Desc)}) + } + if _, err := res.client.API().BotsSetBotCommands(startCtx, &tg.BotsSetBotCommandsRequest{ + Scope: &tg.BotCommandScopeDefault{}, + Commands: commands, + }); err != nil { + logger.Errorf("Failed to set bot commands: %v", err) + } + + status := Status{State: "running", StartedAt: time.Now()} + if res.client.Self != nil { + status.ID = res.client.Self.ID + status.Username = res.client.Self.Username + } + + mgr.mu.Lock() + if mgr.generation != gen { + mgr.mu.Unlock() + res.client.Stop() + return errors.New("bot start canceled") + } + mgr.client = res.client + mgr.ectx = ectx + mgr.starting = false + mgr.startCancel = nil + mgr.status = status + mgr.mu.Unlock() + + logger.Info("Bot initialization completed.") + return nil +} + +func Stop() { + mgr.mu.Lock() + client := mgr.client + mgr.client = nil + mgr.ectx = nil + mgr.starting = false + if mgr.startCancel != nil { + mgr.startCancel() + mgr.startCancel = nil + } + mgr.generation++ + mgr.status = Status{State: "stopped"} + mgr.mu.Unlock() + if client != nil { + client.Stop() } - return shouldRestart } diff --git a/client/bot/handlers/add_task.go b/client/bot/handlers/add_task.go index e8338a2f..82e2e446 100644 --- a/client/bot/handlers/add_task.go +++ b/client/bot/handlers/add_task.go @@ -6,8 +6,6 @@ import ( "path" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -19,6 +17,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "gorm.io/gorm" ) diff --git a/client/bot/handlers/cancel_task.go b/client/bot/handlers/cancel_task.go index e3a03c1b..c80c3608 100644 --- a/client/bot/handlers/cancel_task.go +++ b/client/bot/handlers/cancel_task.go @@ -4,14 +4,14 @@ import ( "fmt" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/core" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleCancelCallback(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/config.go b/client/bot/handlers/config.go index c8c363dc..deaf09cc 100644 --- a/client/bot/handlers/config.go +++ b/client/bot/handlers/config.go @@ -5,8 +5,6 @@ import ( "strings" "text/template" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/conflictutil" "github.com/krau/SaveAny-Bot/common/i18n" @@ -15,6 +13,8 @@ import ( "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/enums/fnamest" "github.com/krau/SaveAny-Bot/pkg/tcbdata" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleConfigCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/dir.go b/client/bot/handlers/dir.go index 85058eb1..3d206d18 100644 --- a/client/bot/handlers/dir.go +++ b/client/bot/handlers/dir.go @@ -4,8 +4,6 @@ import ( "strconv" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" "github.com/krau/SaveAny-Bot/common/i18n" @@ -13,6 +11,8 @@ import ( "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleDirCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/dl.go b/client/bot/handlers/dl.go index 29664066..76763586 100644 --- a/client/bot/handlers/dl.go +++ b/client/bot/handlers/dl.go @@ -5,7 +5,6 @@ import ( "strings" "sync" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/duke-git/lancet/v2/slice" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -16,6 +15,7 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/ext" ) func handleDlCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/help.go b/client/bot/handlers/help.go index 0f18e3bc..2071d235 100644 --- a/client/bot/handlers/help.go +++ b/client/bot/handlers/help.go @@ -3,11 +3,11 @@ package handlers import ( "fmt" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/config" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleHelpCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/link.go b/client/bot/handlers/link.go index d4369b1e..9d1ac6eb 100644 --- a/client/bot/handlers/link.go +++ b/client/bot/handlers/link.go @@ -1,8 +1,6 @@ package handlers import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -11,6 +9,8 @@ import ( "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleMessageLink(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/media.go b/client/bot/handlers/media.go index 6a7e554a..96201bc9 100644 --- a/client/bot/handlers/media.go +++ b/client/bot/handlers/media.go @@ -1,8 +1,6 @@ package handlers import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil" @@ -12,6 +10,8 @@ import ( "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleMediaMessage(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/media_group.go b/client/bot/handlers/media_group.go index 8230ddd8..d167fcd5 100644 --- a/client/bot/handlers/media_group.go +++ b/client/bot/handlers/media_group.go @@ -4,8 +4,6 @@ import ( "sync" "time" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil" @@ -18,6 +16,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/pkg/tfile" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) // mediaGroupKey uniquely identifies a media group by chat, sender, and group diff --git a/client/bot/handlers/middleware.go b/client/bot/handlers/middleware.go index 678db352..7bce5838 100644 --- a/client/bot/handlers/middleware.go +++ b/client/bot/handlers/middleware.go @@ -3,8 +3,6 @@ package handlers import ( "errors" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/duke-git/lancet/v2/slice" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -13,6 +11,8 @@ import ( "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) // responsibleUserID returns the sender's ID. Callback queries carry it diff --git a/client/bot/handlers/middleware_test.go b/client/bot/handlers/middleware_test.go index f752c7bc..09e740ab 100644 --- a/client/bot/handlers/middleware_test.go +++ b/client/bot/handlers/middleware_test.go @@ -1,14 +1,12 @@ package handlers import ( - "os" - "path/filepath" "testing" - "github.com/celestix/gotgproto/ext" - "github.com/celestix/gotgproto/types" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/config" + "github.com/krau/mygotg/ext" + "github.com/krau/mygotg/types" ) // Regression: callback queries usually arrive as updateShort without entity @@ -62,13 +60,9 @@ func TestResponsibleUserID(t *testing.T) { // it as an error, so every permitted callback was swallowed before the real // handler ran. func TestWithPermissionInvokesHandler(t *testing.T) { - path := filepath.Join(t.TempDir(), "config.toml") - if err := os.WriteFile(path, []byte("workers = 2\n\n[[users]]\nid = 42\n"), 0o644); err != nil { - t.Fatal(err) - } - if err := config.Init(t.Context(), path); err != nil { - t.Fatal(err) - } + cfg := config.Default(t.TempDir()) + cfg.Users = []config.UserConfig{{ID: 42, Enabled: true}} + config.Set(cfg) update := &ext.Update{CallbackQuery: &tg.UpdateBotCallbackQuery{UserID: 42}} called := false diff --git a/client/bot/handlers/parse.go b/client/bot/handlers/parse.go index 907140d8..3922cfd6 100644 --- a/client/bot/handlers/parse.go +++ b/client/bot/handlers/parse.go @@ -7,8 +7,6 @@ import ( "path" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/dirutil" @@ -22,6 +20,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleTextMessage(ctx *ext.Context, u *ext.Update) error { diff --git a/client/bot/handlers/parser.go b/client/bot/handlers/parser.go index 651e781e..a228ae0a 100644 --- a/client/bot/handlers/parser.go +++ b/client/bot/handlers/parser.go @@ -4,13 +4,13 @@ import ( "bytes" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/parsers" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleParserCmd(ctx *ext.Context, u *ext.Update) error { diff --git a/client/bot/handlers/register.go b/client/bot/handlers/register.go index 624b8725..b0c8f8e0 100644 --- a/client/bot/handlers/register.go +++ b/client/bot/handlers/register.go @@ -3,16 +3,14 @@ package handlers import ( "regexp" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/dispatcher/handlers" - "github.com/celestix/gotgproto/dispatcher/handlers/filters" - "github.com/celestix/gotgproto/ext" sabotfilters "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/filters" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/re" - userclient "github.com/krau/SaveAny-Bot/client/user" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" - "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/pkg/tcbdata" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/dispatcher/handlers" + "github.com/krau/mygotg/dispatcher/handlers/filters" + "github.com/krau/mygotg/ext" ) type DescCommandHandler struct { @@ -45,7 +43,7 @@ var CommandHandlers = []DescCommandHandler{ {"update", i18nk.BotMsgCmdUpdate, handleUpdateCmd}, } -func Register(disp dispatcher.Dispatcher, botCtx *ext.Context) { +func Register(disp dispatcher.Dispatcher) { disp.AddHandler(handlers.NewMessage(filters.Message.ChatType(filters.ChatTypeChannel), func(ctx *ext.Context, u *ext.Update) error { return dispatcher.EndGroups })) @@ -66,7 +64,4 @@ func Register(disp dispatcher.Dispatcher, botCtx *ext.Context) { disp.AddHandler(handlers.NewMessage(filters.Message.Media, handleSilentMode(handleMediaMessage, handleSilentSaveMedia))) disp.AddHandler(handlers.NewMessage(filters.Message.Text, handleSilentMode(handleTextMessage, handleSilentSaveText))) - if config.C().Telegram.Userbot.Enable { - go listenMediaMessageEvent(userclient.GetMediaMessageCh(), botCtx) - } } diff --git a/client/bot/handlers/rule.go b/client/bot/handlers/rule.go index 7d7bf11e..e650b081 100644 --- a/client/bot/handlers/rule.go +++ b/client/bot/handlers/rule.go @@ -5,8 +5,6 @@ import ( "strconv" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/duke-git/lancet/v2/slice" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -16,6 +14,8 @@ import ( "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/rule" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleRuleCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/save.go b/client/bot/handlers/save.go index 4500b910..1dcfd422 100644 --- a/client/bot/handlers/save.go +++ b/client/bot/handlers/save.go @@ -4,8 +4,6 @@ import ( "regexp" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/duke-git/lancet/v2/validator" "github.com/gotd/td/tg" @@ -21,6 +19,8 @@ import ( "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/pkg/tfile" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/krau/SaveAny-Bot/storage" ) diff --git a/client/bot/handlers/silent.go b/client/bot/handlers/silent.go index f83c5fcb..71e88245 100644 --- a/client/bot/handlers/silent.go +++ b/client/bot/handlers/silent.go @@ -4,8 +4,6 @@ import ( "fmt" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" "github.com/krau/SaveAny-Bot/common/cache" @@ -14,6 +12,8 @@ import ( "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleSilentCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/sync_peers.go b/client/bot/handlers/sync_peers.go index c3f0057f..ab9b5e16 100644 --- a/client/bot/handlers/sync_peers.go +++ b/client/bot/handlers/sync_peers.go @@ -4,15 +4,15 @@ import ( "context" "sync" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" - "github.com/celestix/gotgproto/storage" "github.com/charmbracelet/log" "github.com/gotd/td/telegram/query/dialogs" "github.com/krau/SaveAny-Bot/client/user" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/config" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" + "github.com/krau/mygotg/storage" ) var syncpeerMu sync.Mutex diff --git a/client/bot/handlers/tasks.go b/client/bot/handlers/tasks.go index ac1c3c07..a8d3cf53 100644 --- a/client/bot/handlers/tasks.go +++ b/client/bot/handlers/tasks.go @@ -4,13 +4,13 @@ import ( "strings" "time" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/telegram/message/styling" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/core" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleTaskCmd(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/telegraph.go b/client/bot/handlers/telegraph.go index 6f30600a..60b6ba56 100644 --- a/client/bot/handlers/telegraph.go +++ b/client/bot/handlers/telegraph.go @@ -4,8 +4,6 @@ import ( "fmt" "path" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/telegram/message/entity" "github.com/gotd/td/telegram/message/styling" @@ -18,6 +16,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) func handleTelegraphUrlMessage(ctx *ext.Context, update *ext.Update) error { diff --git a/client/bot/handlers/transfer.go b/client/bot/handlers/transfer.go index f0d0a6e8..2bea4b84 100644 --- a/client/bot/handlers/transfer.go +++ b/client/bot/handlers/transfer.go @@ -5,8 +5,6 @@ import ( "regexp" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -20,6 +18,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/storagetypes" "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/update.go b/client/bot/handlers/update.go index 30b3515e..8ae2f4b3 100644 --- a/client/bot/handlers/update.go +++ b/client/bot/handlers/update.go @@ -6,8 +6,6 @@ import ( "strings" "github.com/blang/semver" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/telegram/message/html" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -15,6 +13,8 @@ import ( "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/common/selfupdate" "github.com/krau/SaveAny-Bot/config" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/unvgo/ghselfupdate" ) diff --git a/client/bot/handlers/utils/filters/url.go b/client/bot/handlers/utils/filters/url.go index 8de50ef1..6ab09e66 100644 --- a/client/bot/handlers/utils/filters/url.go +++ b/client/bot/handlers/utils/filters/url.go @@ -4,9 +4,9 @@ import ( "regexp" "slices" - "github.com/celestix/gotgproto/dispatcher/handlers/filters" - "github.com/celestix/gotgproto/types" "github.com/krau/SaveAny-Bot/common/utils/tgutil" + "github.com/krau/mygotg/dispatcher/handlers/filters" + "github.com/krau/mygotg/types" ) func RegexUrl(r *regexp.Regexp) filters.MessageFilter { diff --git a/client/bot/handlers/utils/shortcut/aria2.go b/client/bot/handlers/utils/shortcut/aria2.go index 66fda149..82816f90 100644 --- a/client/bot/handlers/utils/shortcut/aria2.go +++ b/client/bot/handlers/utils/shortcut/aria2.go @@ -1,8 +1,6 @@ package shortcut import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/common/i18n" @@ -12,6 +10,8 @@ import ( "github.com/krau/SaveAny-Bot/core/tasks/aria2dl" "github.com/krau/SaveAny-Bot/pkg/aria2" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/utils/shortcut/directlinks.go b/client/bot/handlers/utils/shortcut/directlinks.go index 9fc0bf3b..dfae55e2 100644 --- a/client/bot/handlers/utils/shortcut/directlinks.go +++ b/client/bot/handlers/utils/shortcut/directlinks.go @@ -1,8 +1,6 @@ package shortcut import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/common/i18n" @@ -11,6 +9,8 @@ import ( "github.com/krau/SaveAny-Bot/core" "github.com/krau/SaveAny-Bot/core/tasks/directlinks" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/utils/shortcut/message.go b/client/bot/handlers/utils/shortcut/message.go index ef3c5dd6..33378139 100644 --- a/client/bot/handlers/utils/shortcut/message.go +++ b/client/bot/handlers/utils/shortcut/message.go @@ -7,9 +7,6 @@ import ( "net/url" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" - "github.com/celestix/gotgproto/types" "github.com/charmbracelet/log" "github.com/gotd/td/telegram/downloader" "github.com/gotd/td/tg" @@ -26,6 +23,9 @@ import ( "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/telegraph" "github.com/krau/SaveAny-Bot/pkg/tfile" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" + "github.com/krau/mygotg/types" ) func GetFileFromMessageWithReply(ctx *ext.Context, update *ext.Update, message *tg.Message, tfileopts ...tfile.TGFileOption) (replied *types.Message, diff --git a/client/bot/handlers/utils/shortcut/parsed.go b/client/bot/handlers/utils/shortcut/parsed.go index 12863d9a..ceec33ea 100644 --- a/client/bot/handlers/utils/shortcut/parsed.go +++ b/client/bot/handlers/utils/shortcut/parsed.go @@ -1,8 +1,6 @@ package shortcut import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -13,6 +11,8 @@ import ( parsed "github.com/krau/SaveAny-Bot/core/tasks/parsed" "github.com/krau/SaveAny-Bot/pkg/parser" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/utils/shortcut/tftask.go b/client/bot/handlers/utils/shortcut/tftask.go index d6f5d5c0..4a274192 100644 --- a/client/bot/handlers/utils/shortcut/tftask.go +++ b/client/bot/handlers/utils/shortcut/tftask.go @@ -4,8 +4,6 @@ import ( "path" "strings" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/conflictutil" @@ -22,6 +20,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/tcbdata" "github.com/krau/SaveAny-Bot/pkg/tfile" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/utils/shortcut/tphtask.go b/client/bot/handlers/utils/shortcut/tphtask.go index c2d0d54b..15bd6ce2 100644 --- a/client/bot/handlers/utils/shortcut/tphtask.go +++ b/client/bot/handlers/utils/shortcut/tphtask.go @@ -1,8 +1,6 @@ package shortcut import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" @@ -14,6 +12,8 @@ import ( tphtask "github.com/krau/SaveAny-Bot/core/tasks/telegraph" "github.com/krau/SaveAny-Bot/pkg/telegraph" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/client/bot/handlers/utils/shortcut/ytdlp.go b/client/bot/handlers/utils/shortcut/ytdlp.go index 2c2325e1..a59f547d 100644 --- a/client/bot/handlers/utils/shortcut/ytdlp.go +++ b/client/bot/handlers/utils/shortcut/ytdlp.go @@ -1,10 +1,10 @@ package shortcut import ( - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" "github.com/krau/SaveAny-Bot/common/i18n" diff --git a/client/bot/handlers/watch.go b/client/bot/handlers/watch.go index da62720a..90ce191f 100644 --- a/client/bot/handlers/watch.go +++ b/client/bot/handlers/watch.go @@ -1,6 +1,7 @@ package handlers import ( + "context" "fmt" "path" "regexp" @@ -9,8 +10,6 @@ import ( "text/template" "time" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/mediautil" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/ruleutil" @@ -25,6 +24,8 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/fnamest" "github.com/krau/SaveAny-Bot/pkg/tfile" "github.com/krau/SaveAny-Bot/storage" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) @@ -205,12 +206,15 @@ func (w *watchMediaGroupHandler) addFile(chatID int64, userID uint, file tfile.T }) } -func listenMediaMessageEvent(ch chan userclient.MediaMessageEvent, botCtx *ext.Context) { - if userclient.GetCtx() == nil { - return - } - logger := log.FromContext(userclient.GetCtx()) - for event := range ch { +// ListenUserbotMediaEvents consumes userbot media events until the channel is +// closed. resolve returns the client context used for notifications. +func ListenUserbotMediaEvents(runCtx context.Context, resolve func() *ext.Context) { + logger := log.FromContext(runCtx) + for event := range userclient.GetMediaMessageCh() { + botCtx := resolve() + if botCtx == nil { + continue + } logger.Debug("Received media message event", "chat_id", event.ChatID, "file_name", event.File.Name()) ctx := event.Ctx file := event.File diff --git a/client/bot/handlers/watch_notify.go b/client/bot/handlers/watch_notify.go index c1a0c3ec..9b57ec2e 100644 --- a/client/bot/handlers/watch_notify.go +++ b/client/bot/handlers/watch_notify.go @@ -5,10 +5,10 @@ import ( "strings" "sync" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/tg" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" diff --git a/client/bot/handlers/watch_notify_test.go b/client/bot/handlers/watch_notify_test.go index eddf167e..edf1288a 100644 --- a/client/bot/handlers/watch_notify_test.go +++ b/client/bot/handlers/watch_notify_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" + "github.com/krau/mygotg/ext" "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/utils/tgutil" diff --git a/client/bot/handlers/ytdlp.go b/client/bot/handlers/ytdlp.go index 1f9c8edd..a413fac2 100644 --- a/client/bot/handlers/ytdlp.go +++ b/client/bot/handlers/ytdlp.go @@ -5,9 +5,9 @@ import ( "strings" "unicode" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" "github.com/krau/SaveAny-Bot/client/bot/handlers/utils/msgelem" "github.com/krau/SaveAny-Bot/common/i18n" diff --git a/client/user/auth_terminal.go b/client/user/auth_terminal.go deleted file mode 100644 index 96811cbc..00000000 --- a/client/user/auth_terminal.go +++ /dev/null @@ -1,57 +0,0 @@ -package user - -import ( - "bufio" - "fmt" - "os" - "strings" - - "github.com/celestix/gotgproto" - "golang.org/x/term" -) - -type terminalAuthConversator struct{} - -func readLine(prompt string) (string, error) { - fmt.Print(prompt) - reader := bufio.NewReader(os.Stdin) - text, err := reader.ReadString('\n') - if err != nil { - return "", err - } - return strings.TrimSpace(text), nil -} - -func (t *terminalAuthConversator) AskPhoneNumber() (string, error) { - fmt.Println("Your Phone Number (e.g. +44 123456):") - return readLine("> ") -} - -func (t *terminalAuthConversator) AskCode() (string, error) { - fmt.Println("Your Code (e.g. 123456):") - return readLine("> ") -} - -func (t *terminalAuthConversator) AskPassword() (string, error) { - fmt.Println("Your 2FA Password:") - fmt.Print("> ") - bytePwd, err := term.ReadPassword(int(os.Stdin.Fd())) - fmt.Println() - if err != nil { - return "", err - } - - return strings.TrimSpace(string(bytePwd)), nil -} - -func (t *terminalAuthConversator) AuthStatus(authStatus gotgproto.AuthStatus) { - switch authStatus.Event { - case gotgproto.AuthStatusPhoneRetrial: - fmt.Printf("The phone number is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft) - case gotgproto.AuthStatusPasswordRetrial: - fmt.Printf("The 2FA password is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft) - case gotgproto.AuthStatusPhoneCodeRetrial: - fmt.Printf("The OTP code is incorrect. Attempts left: %d\n", authStatus.AttemptsLeft) - default: - } -} diff --git a/client/user/userclient.go b/client/user/userclient.go index edc9dbc6..449709df 100644 --- a/client/user/userclient.go +++ b/client/user/userclient.go @@ -2,113 +2,251 @@ package user import ( "context" + "errors" + "os" "sync" "time" - "github.com/celestix/gotgproto" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/dispatcher/handlers" - "github.com/celestix/gotgproto/dispatcher/handlers/filters" - "github.com/celestix/gotgproto/ext" - "github.com/celestix/gotgproto/sessionMaker" - "github.com/charmbracelet/log" "github.com/gotd/td/tg" + gotgproto "github.com/krau/mygotg" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/dispatcher/handlers" + "github.com/krau/mygotg/dispatcher/handlers/filters" + gotgerrors "github.com/krau/mygotg/errors" + "github.com/krau/mygotg/ext" + "github.com/krau/mygotg/session" + "github.com/krau/SaveAny-Bot/client/middleware" "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/config" "github.com/krau/SaveAny-Bot/database" ) -var uc *gotgproto.Client +var ErrLoginRequired = errors.New("telegram login required") + +type Status struct { + State string + ID int64 + Username string + Phone string + Error string +} + +type failConversator struct{} -// getEctx lazily creates the user-client ext.Context exactly once. Guarded by -// sync.OnceValue so concurrent GetCtx calls cannot race on ectx creation. -var getEctx = sync.OnceValue(func() *ext.Context { - return uc.CreateContext() -}) +func (failConversator) AskPhoneNumber() (string, error) { return "", ErrLoginRequired } +func (failConversator) AskCode() (string, error) { return "", ErrLoginRequired } +func (failConversator) AskPassword() (string, error) { return "", ErrLoginRequired } +func (failConversator) AuthStatus(gotgproto.AuthStatus) {} +var ( + ucMu sync.RWMutex + uc *gotgproto.Client + uctx *ext.Context + ustatus = Status{State: "stopped"} + starting bool + generation uint64 + startCancel context.CancelFunc +) + +func CurrentStatus() Status { + ucMu.RLock() + defer ucMu.RUnlock() + return ustatus +} + +// GetCtx returns the userbot context, or nil when the userbot is not running. func GetCtx() *ext.Context { - if uc == nil { - return nil - } - return getEctx() + ucMu.RLock() + defer ucMu.RUnlock() + return uctx } -func Login(ctx context.Context) (*gotgproto.Client, error) { - log.FromContext(ctx).Debug("Logging in user client") +// Start connects the userbot, asking conv for credentials when the session is +// not authorized. Passing nil uses a conversator that fails with +// ErrLoginRequired. +func Start(ctx context.Context, conv gotgproto.AuthConversator, phone string) error { + ucMu.Lock() if uc != nil { - return uc, nil + ucMu.Unlock() + return nil + } + if starting { + ucMu.Unlock() + return errors.New("userbot is already starting") + } + starting = true + generation++ + gen := generation + startCtx, cancelStart := context.WithCancel(ctx) + startCancel = cancelStart + ustatus = Status{State: "starting"} + ucMu.Unlock() + + autoStart := conv == nil + if conv == nil { + conv = failConversator{} } - res := make(chan struct { + logger := log.FromContext(ctx) + logger.Debug("Logging in user client") + + type result struct { client *gotgproto.Client err error - }) + } + res := make(chan result, 1) go func() { resolver, err := tgutil.NewConfigProxyResolver() if err != nil { - res <- struct { - client *gotgproto.Client - err error - }{nil, err} + res <- result{nil, err} return } tclient, err := gotgproto.NewClient( config.C().Telegram.AppID, config.C().Telegram.AppHash, - gotgproto.ClientTypePhone(""), + gotgproto.ClientTypePhone(phone), &gotgproto.ClientOpts{ - Session: sessionMaker.SqlSession(database.GetDialect(config.C().Telegram.Userbot.Session)), - AuthConversator: &terminalAuthConversator{}, - Context: ctx, - DisableCopyright: true, - Resolver: resolver, - MaxRetries: config.C().Telegram.RpcRetry, - AutoFetchReply: true, - Middlewares: middleware.NewDefaultMiddlewares(ctx, 5*time.Minute), + Session: session.SqlSession(database.GetDialect(config.C().Telegram.Userbot.Session)), + AuthConversator: conv, + NoAutoAuth: autoStart, + Context: startCtx, + DisableCopyright: true, + DeferUpdateRecovery: true, + Resolver: resolver, + MaxRetries: config.C().Telegram.RpcRetry, + AutoFetchReply: true, + Middlewares: middleware.NewDefaultMiddlewares(startCtx, 5*time.Minute), ErrorHandler: func(ctx *ext.Context, u *ext.Update, s string) error { log.FromContext(ctx).Errorf("Unhandled error: %s", s) return dispatcher.EndGroups }, }, ) - if err != nil { - res <- struct { - client *gotgproto.Client - err error - }{nil, err} - } - res <- struct { - client *gotgproto.Client - err error - }(struct { - client *gotgproto.Client - err error - }{tclient, nil}) + res <- result{tclient, err} }() + var r result select { - case <-ctx.Done(): - return nil, ctx.Err() - case r := <-res: - if r.err != nil { - return nil, r.err + case <-startCtx.Done(): + ucMu.Lock() + if generation == gen { + starting = false + generation++ + startCancel = nil + ustatus = Status{State: "stopped"} + } + ucMu.Unlock() + return startCtx.Err() + case r = <-res: + } + if r.err != nil { + state := "error" + if errors.Is(r.err, ErrLoginRequired) || (autoStart && errors.Is(r.err, gotgerrors.ErrSessionUnauthorized)) { + state = "login_required" + } + ucMu.Lock() + if generation == gen { + starting = false + startCancel = nil + ustatus = Status{State: state, Error: r.err.Error(), Phone: phone} + } + ucMu.Unlock() + return r.err + } + + if startCtx.Err() != nil { + r.client.Stop() + ucMu.Lock() + if generation == gen { + starting = false + startCancel = nil + ustatus = Status{State: "stopped"} + } + ucMu.Unlock() + return startCtx.Err() + } + tclient := r.client + tclient.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, func(ctx *ext.Context, u *ext.Update) error { + switch u.UpdateClass.(type) { + case *tg.UpdateEditChannelMessage, *tg.UpdateEditMessage, *tg.UpdateDeleteChannelMessages, *tg.UpdateDeleteMessages: + return dispatcher.EndGroups + } + chatID := u.EffectiveChat().GetID() + watchChats, err := database.GetWatchChatsByChatID(ctx, chatID) + if err != nil || len(watchChats) == 0 { + return dispatcher.EndGroups + } + return dispatcher.ContinueGroups + })) + tclient.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, handleMediaMessage)) + if err := tclient.StartUpdateRecovery(startCtx); err != nil { + tclient.Stop() + ucMu.Lock() + if generation == gen { + starting = false + startCancel = nil + ustatus = Status{State: "error", Error: err.Error(), Phone: phone} + } + ucMu.Unlock() + return err + } + + status := Status{State: "running", Phone: phone} + if tclient.Self != nil { + status.ID = tclient.Self.ID + status.Username = tclient.Self.Username + } + ucMu.Lock() + if generation != gen { + ucMu.Unlock() + tclient.Stop() + return errors.New("userbot start canceled") + } + uc = tclient + uctx = tclient.CreateContext() + starting = false + startCancel = nil + ustatus = status + ucMu.Unlock() + + if tclient.Self != nil { + logger.Infof("User client logged in successfully: %s %s", tclient.Self.FirstName, tclient.Self.LastName) + } else { + logger.Info("User client logged in successfully") + } + return nil +} + +func Stop() { + ucMu.Lock() + client := uc + uc = nil + uctx = nil + starting = false + if startCancel != nil { + startCancel() + startCancel = nil + } + generation++ + ustatus = Status{State: "stopped"} + ucMu.Unlock() + if client != nil { + client.Stop() + } +} + +// Logout stops the userbot and removes its persisted session. +func Logout() error { + Stop() + sessionPath := config.C().Telegram.Userbot.Session + if sessionPath == "" { + return nil + } + for _, path := range []string{sessionPath, sessionPath + "-wal", sessionPath + "-shm"} { + if err := os.Remove(path); err != nil && !os.IsNotExist(err) { + return err } - uc = r.client - uc.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, func(ctx *ext.Context, u *ext.Update) error { - switch u.UpdateClass.(type) { - case *tg.UpdateEditChannelMessage, *tg.UpdateEditMessage, *tg.UpdateDeleteChannelMessages, *tg.UpdateDeleteMessages: - return dispatcher.EndGroups - } - chatId := u.EffectiveChat().GetID() - watchChats, err := database.GetWatchChatsByChatID(ctx, chatId) - if err != nil || len(watchChats) == 0 { - return dispatcher.EndGroups - } - return dispatcher.ContinueGroups - })) - uc.Dispatcher.AddHandler(handlers.NewMessage(filters.Message.Media, handleMediaMessage)) - log.FromContext(ctx).Infof("User client logged in successfully: %s", uc.Self.FirstName+" "+uc.Self.LastName) - return uc, nil } + return nil } diff --git a/client/user/watch.go b/client/user/watch.go index 5506fb39..247633bf 100644 --- a/client/user/watch.go +++ b/client/user/watch.go @@ -4,11 +4,11 @@ import ( "sync" "time" - "github.com/celestix/gotgproto/dispatcher" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/pkg/tfile" + "github.com/krau/mygotg/dispatcher" + "github.com/krau/mygotg/ext" ) type MediaMessageEvent struct { diff --git a/cmd/root.go b/cmd/root.go index 35bb6444..579fbdfa 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/krau/SaveAny-Bot/boot" "github.com/krau/SaveAny-Bot/cmd/upload" "github.com/krau/SaveAny-Bot/cmd/watch" - "github.com/krau/SaveAny-Bot/config" "github.com/spf13/cobra" ) @@ -17,7 +17,7 @@ var rootCmd = &cobra.Command{ } func init() { - config.RegisterFlags(rootCmd) + boot.RegisterFlags(rootCmd) upload.Register(rootCmd) watch.Register(rootCmd) } diff --git a/cmd/run.go b/cmd/run.go index cf244567..d873482a 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -10,23 +10,18 @@ import ( "slices" "github.com/charmbracelet/log" - "github.com/krau/SaveAny-Bot/api" - "github.com/krau/SaveAny-Bot/client/bot" - userclient "github.com/krau/SaveAny-Bot/client/user" - "github.com/krau/SaveAny-Bot/common/cache" - "github.com/krau/SaveAny-Bot/common/i18n" + "github.com/spf13/cobra" + + "github.com/krau/SaveAny-Bot/app" + "github.com/krau/SaveAny-Bot/boot" "github.com/krau/SaveAny-Bot/common/selfupdate" "github.com/krau/SaveAny-Bot/common/utils/fsutil" "github.com/krau/SaveAny-Bot/config" - "github.com/krau/SaveAny-Bot/core" - "github.com/krau/SaveAny-Bot/database" - "github.com/krau/SaveAny-Bot/parsers" - "github.com/krau/SaveAny-Bot/storage" - "github.com/spf13/cobra" ) func Run(cmd *cobra.Command, _ []string) { ctx, cancel := context.WithCancel(cmd.Context()) + defer cancel() logger := log.NewWithOptions(os.Stdout, log.Options{ Level: log.InfoLevel, ReportTimestamp: true, @@ -38,34 +33,32 @@ func Run(cmd *cobra.Command, _ []string) { selfupdate.CleanLeftovers() - configFile := config.GetConfigFile(cmd) - if err := config.Init(ctx, configFile); err != nil { + opts := boot.Parse(cmd) + opts.InitWeb = true + res, err := boot.Init(ctx, opts) + if err != nil { logger.Fatal("Init failed", "error", err) } - - level, err := log.ParseLevel(strings.TrimSpace(config.C().Log.Level)) - if err != nil { - logger.Warn("Invalid log level, fallback to debug", "level", config.C().Log.Level, "error", err) - level = log.DebugLevel + cfg := res.Config + if level, err := log.ParseLevel(strings.TrimSpace(cfg.Log.Level)); err == nil { + logger.SetLevel(level) } - logger.SetLevel(level) - exitChan, err := initAll(ctx) - if err != nil { + application := app.New(ctx, res.Settings, app.Options{ + DataDir: res.DataDir, + DBPath: res.DBPath, + Listen: res.Listen, + NoWeb: res.NoWeb, + }) + if err := application.Start(); err != nil { logger.Fatal("Init failed", "error", err) } - go func() { - <-exitChan - cancel() - }() - core.Run(ctx) - - <-ctx.Done() + <-application.Done() logger.Info("Exiting...") defer logger.Info("Exit complete") - core.Close() - cleanCache() + application.Stop() + cleanCache(res.Settings.Config()) if selfupdate.ShouldRestart() { logger.Info("Restarting to run the updated version...") if err := selfupdate.Restart(); err != nil { @@ -74,41 +67,13 @@ func Run(cmd *cobra.Command, _ []string) { } } -func initAll(ctx context.Context) (<-chan struct{}, error) { - cache.Init() - logger := log.FromContext(ctx) - i18n.Init(config.C().Lang) - logger.Info("Initializing...") - database.Init(ctx) - storage.LoadStorages(ctx) - if config.C().Parser.PluginEnable { - for _, dir := range config.C().Parser.PluginDirs { - if err := parsers.LoadPlugins(ctx, dir); err != nil { - logger.Error("Failed to load parser plugins", "dir", dir, "error", err) - } else { - logger.Debug("Loaded parser plugins from directory", "dir", dir) - } - } - } - if config.C().Telegram.Userbot.Enable { - _, err := userclient.Login(ctx) - if err != nil { - logger.Fatal("User login failed", "error", err) - } - } - if err := api.Start(ctx); err != nil { - logger.Fatal("Failed to start API server", "error", err) - } - return bot.Init(ctx), nil -} - -func cleanCache() { - if config.C().NoCleanCache { +func cleanCache(cfg config.Config) { + if cfg.NoCleanCache { return } - if config.C().Temp.BasePath != "" && !config.C().Stream { - if slices.Contains([]string{"/", ".", "\\", ".."}, filepath.Clean(config.C().Temp.BasePath)) { - log.Error("Invalid cache directory", "path", config.C().Temp.BasePath) + if cfg.Temp.BasePath != "" && !cfg.Stream { + if slices.Contains([]string{"/", ".", "\\", ".."}, filepath.Clean(cfg.Temp.BasePath)) { + log.Error("Invalid cache directory", "path", cfg.Temp.BasePath) return } currentDir, err := os.Getwd() @@ -116,12 +81,15 @@ func cleanCache() { log.Error("Failed to get working directory", "error", err) return } - cachePath := filepath.Join(currentDir, config.C().Temp.BasePath) + cachePath := filepath.Join(currentDir, cfg.Temp.BasePath) cachePath, err = filepath.Abs(cachePath) if err != nil { log.Error("Failed to get absolute cache path", "error", err) return } + if _, err := os.Stat(cachePath); os.IsNotExist(err) { + return + } log.Info("Cleaning cache directory", "path", cachePath) if err := fsutil.RemoveAllInDir(cachePath); err != nil { log.Error("Failed to clean cache directory", "error", err) diff --git a/cmd/upload/cmd.go b/cmd/upload/cmd.go index 9648c595..b575d42b 100644 --- a/cmd/upload/cmd.go +++ b/cmd/upload/cmd.go @@ -9,13 +9,10 @@ import ( "path/filepath" "github.com/charmbracelet/log" + "github.com/krau/SaveAny-Bot/boot" "github.com/krau/SaveAny-Bot/client/bot" - "github.com/krau/SaveAny-Bot/common/cache" - "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/utils/ioutil" "github.com/krau/SaveAny-Bot/common/utils/tgutil" - "github.com/krau/SaveAny-Bot/config" - "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/enums/ctxkey" stortype "github.com/krau/SaveAny-Bot/pkg/enums/storage" "github.com/krau/SaveAny-Bot/storage" @@ -58,13 +55,11 @@ func Upload(cmd *cobra.Command, args []string) error { ctx := cmd.Context() log := log.FromContext(ctx) - configFile := config.GetConfigFile(cmd) - if err := config.Init(ctx, configFile); err != nil { + opts := boot.Parse(cmd) + opts.InitWeb = false + if _, err := boot.Init(ctx, opts); err != nil { return fmt.Errorf("failed to load config: %w", err) } - i18n.Init(config.C().Lang) - cache.Init() - database.Init(ctx) stor, err := storage.GetStorageByName(ctx, storname) if err != nil { @@ -73,7 +68,10 @@ func Upload(cmd *cobra.Command, args []string) error { switch stor.Type() { case stortype.Telegram: - bot.Init(ctx) + if err := bot.Start(ctx); err != nil { + return fmt.Errorf("failed to start bot: %w", err) + } + defer bot.Stop() default: // placeholder for other storage types that may need special initialization } diff --git a/cmd/watch/cmd.go b/cmd/watch/cmd.go index aee8b88a..88cfa3e3 100644 --- a/cmd/watch/cmd.go +++ b/cmd/watch/cmd.go @@ -5,12 +5,10 @@ import ( "time" "github.com/charmbracelet/log" + "github.com/krau/SaveAny-Bot/boot" "github.com/krau/SaveAny-Bot/client/bot" - "github.com/krau/SaveAny-Bot/common/cache" - "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/utils/tgutil" "github.com/krau/SaveAny-Bot/config" - "github.com/krau/SaveAny-Bot/database" stortype "github.com/krau/SaveAny-Bot/pkg/enums/storage" "github.com/krau/SaveAny-Bot/storage" "github.com/spf13/cobra" @@ -84,13 +82,11 @@ func runWatch(cmd *cobra.Command, _ []string) error { ctx := cmd.Context() logger := log.FromContext(ctx) - configFile := config.GetConfigFile(cmd) - if err := config.Init(ctx, configFile); err != nil { + opts := boot.Parse(cmd) + opts.InitWeb = false + if _, err := boot.Init(ctx, opts); err != nil { return fmt.Errorf("failed to load config: %w", err) } - i18n.Init(config.C().Lang) - cache.Init() - database.Init(ctx) stor, err := storage.GetStorageByName(ctx, storName) if err != nil { @@ -99,7 +95,10 @@ func runWatch(cmd *cobra.Command, _ []string) error { // Telegram storage needs the bot client and its ext context injected into ctx. if stor.Type() == stortype.Telegram { - bot.Init(ctx) + if err := bot.Start(ctx); err != nil { + return fmt.Errorf("failed to start bot: %w", err) + } + defer bot.Stop() ctx = tgutil.ExtWithContext(ctx, bot.ExtContext()) } diff --git a/common/utils/tgutil/context.go b/common/utils/tgutil/context.go index a0ce1f41..27759794 100644 --- a/common/utils/tgutil/context.go +++ b/common/utils/tgutil/context.go @@ -3,7 +3,7 @@ package tgutil import ( "context" - "github.com/celestix/gotgproto/ext" + "github.com/krau/mygotg/ext" ) type contextKey struct{} diff --git a/common/utils/tgutil/message.go b/common/utils/tgutil/message.go index 8890e2e7..8c29e018 100644 --- a/common/utils/tgutil/message.go +++ b/common/utils/tgutil/message.go @@ -8,7 +8,6 @@ import ( "unicode" "unicode/utf16" - "github.com/celestix/gotgproto/ext" "github.com/duke-git/lancet/v2/maputil" "github.com/duke-git/lancet/v2/mathutil" "github.com/duke-git/lancet/v2/slice" @@ -21,6 +20,7 @@ import ( "github.com/krau/SaveAny-Bot/common/i18n" "github.com/krau/SaveAny-Bot/common/i18n/i18nk" "github.com/krau/SaveAny-Bot/common/utils/strutil" + "github.com/krau/mygotg/ext" "github.com/rs/xid" ) diff --git a/common/utils/tgutil/resolve.go b/common/utils/tgutil/resolve.go index b5e975c0..80d78b59 100644 --- a/common/utils/tgutil/resolve.go +++ b/common/utils/tgutil/resolve.go @@ -6,9 +6,10 @@ import ( "strconv" "strings" - "github.com/celestix/gotgproto/ext" "github.com/duke-git/lancet/v2/validator" + "github.com/gotd/td/constant" "github.com/gotd/td/tg" + "github.com/krau/mygotg/ext" ) func ParseChatID(ctx *ext.Context, idOrUsername string) (int64, error) { @@ -18,12 +19,12 @@ func ParseChatID(ctx *ext.Context, idOrUsername string) (int64, error) { if err != nil { return 0, err } - return int64(chatID), nil + return constant.TDLibPeerID(chatID).ToPlain(), nil } username := idOrUsername peer := ctx.PeerStorage.GetPeerByUsername(username) if peer != nil && peer.ID != 0 { - return peer.ID, nil + return constant.TDLibPeerID(peer.ID).ToPlain(), nil } chat, err := ctx.ResolveUsername(username) if err != nil { diff --git a/config/aria2.go b/config/aria2.go new file mode 100644 index 00000000..fc1b96cb --- /dev/null +++ b/config/aria2.go @@ -0,0 +1,8 @@ +package config + +type aria2Config struct { + Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` + Url string `toml:"url" mapstructure:"url" json:"url"` + Secret string `toml:"secret" mapstructure:"secret" json:"secret"` + KeepFile bool `toml:"keep_file" mapstructure:"keep_file" json:"keep_file"` +} diff --git a/config/config.go b/config/config.go new file mode 100644 index 00000000..508d7df4 --- /dev/null +++ b/config/config.go @@ -0,0 +1,178 @@ +package config + +import ( + "context" + "crypto/rand" + "encoding/base64" + "fmt" + "net" + "net/http" + "net/url" + "path/filepath" + "sync/atomic" + "time" + + "github.com/krau/SaveAny-Bot/config/storage" + "golang.org/x/net/proxy" +) + +type Config struct { + Lang string `toml:"lang" mapstructure:"lang" json:"lang"` + Workers int `toml:"workers" mapstructure:"workers" json:"workers"` + Retry int `toml:"retry" mapstructure:"retry" json:"retry"` + NoCleanCache bool `toml:"no_clean_cache" mapstructure:"no_clean_cache" json:"no_clean_cache"` + Threads int `toml:"threads" mapstructure:"threads" json:"threads"` + Stream bool `toml:"stream" mapstructure:"stream" json:"stream"` + Proxy string `toml:"proxy" mapstructure:"proxy" json:"proxy"` + Log logConfig `toml:"log" mapstructure:"log" json:"log"` + Aria2 aria2Config `toml:"aria2" mapstructure:"aria2" json:"aria2"` + Cache cacheConfig `toml:"cache" mapstructure:"cache" json:"cache"` + Users []UserConfig `toml:"users" mapstructure:"users" json:"-"` + Temp tempConfig `toml:"temp" mapstructure:"temp" json:"temp"` + DB dbConfig `toml:"db" mapstructure:"db" json:"db"` + Telegram telegramConfig `toml:"telegram" mapstructure:"telegram" json:"telegram"` + Storages []storage.StorageConfig `toml:"-" mapstructure:"-" json:"-"` + Parser parserConfig `toml:"parser" mapstructure:"parser" json:"parser"` + Hook hookConfig `toml:"hook" mapstructure:"hook" json:"hook"` + Ytdlp YtdlpConfig `toml:"ytdlp" mapstructure:"ytdlp" json:"ytdlp"` + Web webConfig `toml:"web" mapstructure:"web" json:"web"` +} + +type webConfig struct { + Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` + Listen string `toml:"listen" mapstructure:"listen" json:"listen"` + APIToken string `toml:"api_token" mapstructure:"api_token" json:"api_token"` + SecureCookie bool `toml:"secure_cookie" mapstructure:"secure_cookie" json:"secure_cookie"` +} + +var current atomic.Pointer[Config] + +func init() { + cfg := Default("./data") + current.Store(&cfg) +} + +// C returns a snapshot of the current configuration. Callers must not mutate it. +func C() Config { + return *current.Load() +} + +// Set replaces the current configuration snapshot. +func Set(cfg Config) { + current.Store(&cfg) +} + +func DefaultsMap(dataDir string) map[string]any { + return map[string]any{ + "lang": "zh-Hans", + "workers": 3, + "retry": 3, + "no_clean_cache": false, + "threads": 4, + "log.level": "debug", + + "cache.ttl": 86400, + "cache.num_counters": 1e5, + "cache.max_cost": 1e6, + + "telegram.app_id": 1025907, + "telegram.app_hash": "452b0359b988148995f22ff0f4229750", + "telegram.rpc_retry": 5, + "telegram.userbot.enable": false, + "telegram.userbot.session": filepath.Join(dataDir, "usersession.db"), + + "temp.base_path": "cache/", + + "db.session": filepath.Join(dataDir, "session.db"), + + "web.enable": true, + "web.listen": "0.0.0.0:8080", + "web.api_token": "", + "web.secure_cookie": false, + + "ytdlp.recode": "mp4", + "ytdlp.filename_template": DefaultYtdlpFilenameTemplate, + "ytdlp.max_height": 0, + "ytdlp.format": "", + "ytdlp.restrict_filenames": false, + } +} + +func Default(dataDir string) Config { + return Config{ + Lang: "zh-Hans", + Workers: 3, + Retry: 3, + Threads: 4, + Log: logConfig{Level: "debug"}, + Cache: cacheConfig{ + TTL: 86400, + NumCounters: 1e5, + MaxCost: 1e6, + }, + Temp: tempConfig{BasePath: "cache/"}, + DB: dbConfig{Session: filepath.Join(dataDir, "session.db")}, + Telegram: telegramConfig{ + AppID: 1025907, + AppHash: "452b0359b988148995f22ff0f4229750", + RpcRetry: 5, + Userbot: userbotConfig{Session: filepath.Join(dataDir, "usersession.db")}, + }, + Ytdlp: YtdlpConfig{ + Recode: "mp4", + FilenameTemplate: DefaultYtdlpFilenameTemplate, + }, + Web: webConfig{ + Enable: true, + Listen: "0.0.0.0:8080", + }, + } +} + +func (c Config) GetStorageByName(name string) storage.StorageConfig { + for _, st := range c.Storages { + if st.GetName() == name { + return st + } + } + return nil +} + +// ProxyTransport builds the HTTP transport used for the configured proxy. +func ProxyTransport(proxyStr string) (*http.Transport, error) { + proxyURL, err := url.Parse(proxyStr) + if err != nil { + return nil, err + } + transport := &http.Transport{ + ForceAttemptHTTP2: true, + MaxIdleConns: 100, + IdleConnTimeout: 90 * time.Second, + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, + } + switch proxyURL.Scheme { + case "http", "https": + transport.Proxy = http.ProxyURL(proxyURL) + case "socks5", "socks5h": + dialer, err := proxy.FromURL(proxyURL, proxy.Direct) + if err != nil { + return nil, err + } + transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) { + return dialer.(proxy.ContextDialer).DialContext(ctx, network, addr) + } + default: + return nil, fmt.Errorf("unsupported proxy type: %s", proxyURL.Scheme) + } + return transport, nil +} + +// GeneratePassword returns a URL-safe random password with ~120 bits of entropy. +func GeneratePassword() string { + buf := make([]byte, 15) + if _, err := rand.Read(buf); err != nil { + panic(fmt.Sprintf("failed to read random bytes: %v", err)) + } + return base64.RawURLEncoding.EncodeToString(buf) +} diff --git a/config/db.go b/config/db.go index ba7b2a60..2b80686b 100644 --- a/config/db.go +++ b/config/db.go @@ -1,6 +1,5 @@ package config type dbConfig struct { - Path string `toml:"path" mapstructure:"path"` - Session string `toml:"session" mapstructure:"session"` + Session string `toml:"session" mapstructure:"session" json:"session"` } diff --git a/config/flags.go b/config/flags.go deleted file mode 100644 index e0bc0b3f..00000000 --- a/config/flags.go +++ /dev/null @@ -1,75 +0,0 @@ -package config - -import ( - "github.com/spf13/cobra" - "github.com/spf13/viper" -) - -func RegisterFlags(cmd *cobra.Command) { - flags := cmd.Flags() - - flags.StringP("config", "c", "", "config file path") - flags.StringP("lang", "l", "", "language (e.g., zh-Hans, en)") - flags.IntP("workers", "w", 0, "number of workers") - flags.Int("retry", 0, "retry times") - flags.Int("threads", 0, "number of threads") - flags.Bool("stream", false, "enable stream mode") - flags.Bool("no-clean-cache", false, "do not clean cache on exit") - flags.String("proxy", "", "proxy URL (http, https, socks5, socks5h)") - flags.String("log-level", "", "log level (trace/debug, info, warn, error, fatal)") - - flags.String("telegram-token", "", "telegram bot token") - flags.Int("telegram-app-id", 0, "telegram app id") - flags.String("telegram-app-hash", "", "telegram app hash") - flags.Int("telegram-rpc-retry", 0, "telegram rpc retry times") - flags.Bool("telegram-userbot-enable", false, "enable userbot") - flags.String("telegram-userbot-session", "", "userbot session path") - flags.Bool("telegram-proxy-enable", false, "enable telegram proxy") - flags.String("telegram-proxy-url", "", "telegram proxy URL") - - flags.String("db-path", "", "database path") - flags.String("db-session", "", "session database path") - - flags.String("temp-base-path", "", "temp directory base path") - - flags.Bool("parser-plugin-enable", false, "enable parser plugins") - flags.StringSlice("parser-plugin-dirs", nil, "parser plugin directories") - flags.String("parser-proxy", "", "parser proxy URL") - - bindFlags(cmd) -} - -func bindFlags(cmd *cobra.Command) { - flags := cmd.Flags() - - viper.BindPFlag("lang", flags.Lookup("lang")) - viper.BindPFlag("workers", flags.Lookup("workers")) - viper.BindPFlag("retry", flags.Lookup("retry")) - viper.BindPFlag("threads", flags.Lookup("threads")) - viper.BindPFlag("stream", flags.Lookup("stream")) - viper.BindPFlag("no_clean_cache", flags.Lookup("no-clean-cache")) - viper.BindPFlag("proxy", flags.Lookup("proxy")) - viper.BindPFlag("log.level", flags.Lookup("log-level")) - - viper.BindPFlag("telegram.token", flags.Lookup("telegram-token")) - viper.BindPFlag("telegram.app_id", flags.Lookup("telegram-app-id")) - viper.BindPFlag("telegram.app_hash", flags.Lookup("telegram-app-hash")) - viper.BindPFlag("telegram.rpc_retry", flags.Lookup("telegram-rpc-retry")) - viper.BindPFlag("telegram.userbot.enable", flags.Lookup("telegram-userbot-enable")) - viper.BindPFlag("telegram.userbot.session", flags.Lookup("telegram-userbot-session")) - viper.BindPFlag("telegram.proxy.enable", flags.Lookup("telegram-proxy-enable")) - viper.BindPFlag("telegram.proxy.url", flags.Lookup("telegram-proxy-url")) - - viper.BindPFlag("db.path", flags.Lookup("db-path")) - viper.BindPFlag("db.session", flags.Lookup("db-session")) - viper.BindPFlag("temp.base_path", flags.Lookup("temp-base-path")) - - viper.BindPFlag("parser.plugin_enable", flags.Lookup("parser-plugin-enable")) - viper.BindPFlag("parser.plugin_dirs", flags.Lookup("parser-plugin-dirs")) - viper.BindPFlag("parser.proxy", flags.Lookup("parser-proxy")) -} - -func GetConfigFile(cmd *cobra.Command) string { - configFile, _ := cmd.Flags().GetString("config") - return configFile -} diff --git a/config/parser.go b/config/parser.go index b7920955..e4118b0d 100644 --- a/config/parser.go +++ b/config/parser.go @@ -4,7 +4,7 @@ type parserConfig struct { PluginEnable bool `toml:"plugin_enable" mapstructure:"plugin_enable" json:"plugin_enable"` PluginDirs []string `toml:"plugin_dirs" mapstructure:"plugin_dirs" json:"plugin_dirs"` Proxy string `toml:"proxy" mapstructure:"proxy" json:"proxy"` - ParserCfgs map[string]map[string]any `mapstructure:",remain"` + ParserCfgs map[string]map[string]any `mapstructure:",remain" json:"configs"` } func (c Config) GetParserConfigByName(name string) map[string]any { diff --git a/config/storage/factory.go b/config/storage/factory.go index 8deeab4b..15bd89ab 100644 --- a/config/storage/factory.go +++ b/config/storage/factory.go @@ -1,6 +1,7 @@ package storage import ( + "encoding/json" "fmt" "reflect" @@ -9,6 +10,16 @@ import ( "github.com/spf13/viper" ) +var storageConfigPrototypes = map[storenum.StorageType]StorageConfig{ + storenum.Local: &LocalStorageConfig{}, + storenum.Alist: &AlistStorageConfig{}, + storenum.Webdav: &WebdavStorageConfig{}, + storenum.Minio: &MinioStorageConfig{}, + storenum.S3: &S3StorageConfig{}, + storenum.Telegram: &TelegramStorageConfig{}, + storenum.Rclone: &RcloneStorageConfig{}, +} + var storageFactories = map[storenum.StorageType]func(cfg *BaseConfig) (StorageConfig, error){ storenum.Local: createStorageConfig(&LocalStorageConfig{}), storenum.Alist: createStorageConfig(&AlistStorageConfig{}), @@ -68,3 +79,47 @@ func LoadStorageConfigs(v *viper.Viper) ([]StorageConfig, error) { return configs, nil } + +// NewStorageConfig builds a storage config from a BaseConfig carrying remaining keys. +func NewStorageConfig(base *BaseConfig) (StorageConfig, error) { + st, err := storenum.ParseStorageType(base.Type) + if err != nil { + return nil, err + } + factory, ok := storageFactories[st] + if !ok { + return nil, fmt.Errorf("unsupported storage type: %s", base.Type) + } + return factory(base) +} + +// NewStorageConfigFromJSON builds a storage config from JSON-encoded type-specific fields. +func NewStorageConfigFromJSON(name, typ string, enable bool, raw []byte) (StorageConfig, error) { + st, err := storenum.ParseStorageType(typ) + if err != nil { + return nil, fmt.Errorf("invalid storage type %s: %w", typ, err) + } + proto, ok := storageConfigPrototypes[st] + if !ok { + return nil, fmt.Errorf("unsupported storage type: %s", typ) + } + configValue := reflect.New(reflect.TypeOf(proto).Elem()).Interface().(StorageConfig) + if len(raw) > 0 { + if err := json.Unmarshal(raw, configValue); err != nil { + return nil, fmt.Errorf("failed to decode %s storage config: %w", typ, err) + } + } + reflect.ValueOf(configValue).Elem().FieldByName("BaseConfig").Set(reflect.ValueOf(BaseConfig{ + Name: name, Type: typ, Enable: enable, + })) + return configValue, nil +} + +// LoadAllBaseConfigs unmarshals every storage entry, including disabled ones. +func LoadAllBaseConfigs(v *viper.Viper) ([]BaseConfig, error) { + var baseConfigs []BaseConfig + if err := v.UnmarshalKey("storages", &baseConfigs); err != nil { + return nil, fmt.Errorf("failed to unmarshal storage configs: %w", err) + } + return baseConfigs, nil +} diff --git a/config/tg.go b/config/tg.go index 9b26e403..2d7f5372 100644 --- a/config/tg.go +++ b/config/tg.go @@ -1,21 +1,22 @@ package config type telegramConfig struct { - Token string `toml:"token" mapstructure:"token"` + Token string `toml:"token" mapstructure:"token" json:"token"` AppID int `toml:"app_id" mapstructure:"app_id" json:"app_id"` AppHash string `toml:"app_hash" mapstructure:"app_hash" json:"app_hash"` - Proxy tgProxyConfig `toml:"proxy" mapstructure:"proxy"` + Proxy tgProxyConfig `toml:"proxy" mapstructure:"proxy" json:"proxy"` RpcRetry int `toml:"rpc_retry" mapstructure:"rpc_retry" json:"rpc_retry"` Userbot userbotConfig `toml:"userbot" mapstructure:"userbot" json:"userbot"` MediaGroupTimeout int `toml:"media_group_timeout" mapstructure:"media_group_timeout" json:"media_group_timeout"` } type userbotConfig struct { - Enable bool `toml:"enable" mapstructure:"enable"` - Session string `toml:"session" mapstructure:"session"` + Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` + Session string `toml:"session" mapstructure:"session" json:"session"` + Phone string `toml:"phone" mapstructure:"phone" json:"phone"` } type tgProxyConfig struct { - Enable bool `toml:"enable" mapstructure:"enable"` - URL string `toml:"url" mapstructure:"url"` + Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` + URL string `toml:"url" mapstructure:"url" json:"url"` } diff --git a/config/user.go b/config/user.go index ac97e0e2..d20be01b 100644 --- a/config/user.go +++ b/config/user.go @@ -4,32 +4,40 @@ import ( "github.com/duke-git/lancet/v2/slice" ) -type userConfig struct { +type UserConfig struct { ID int64 `toml:"id" mapstructure:"id" json:"id"` // telegram user id + Enabled bool `toml:"enabled" mapstructure:"enabled" json:"enabled"` // whether the user may use the bot Storages []string `toml:"storages" mapstructure:"storages" json:"storages"` // storage names - Blacklist bool `toml:"blacklist" mapstructure:"blacklist" json:"blacklist"` // 黑名单模式, storage names 中的存储将不会被使用, 默认为白名单模式 + Blacklist bool `toml:"blacklist" mapstructure:"blacklist" json:"blacklist"` // blacklist mode: listed storages are denied } -var userIDs []int64 -var storages []string -var userStorages = make(map[int64][]string) - func (c Config) GetStorageNamesByUserID(userID int64) []string { - us, ok := userStorages[userID] - if ok { - return us + for _, u := range c.Users { + if u.ID != userID || !u.Enabled { + continue + } + if !u.Blacklist { + return u.Storages + } + all := make([]string, 0, len(c.Storages)) + for _, st := range c.Storages { + all = append(all, st.GetName()) + } + return slice.Compact(slice.Difference(all, u.Storages)) } return nil } func (c Config) GetUsersID() []int64 { - return userIDs + ids := make([]int64, 0, len(c.Users)) + for _, u := range c.Users { + if u.Enabled { + ids = append(ids, u.ID) + } + } + return ids } func (c Config) HasStorage(userID int64, storageName string) bool { - us, ok := userStorages[userID] - if !ok { - return false - } - return slice.Contain(us, storageName) + return slice.Contain(c.GetStorageNamesByUserID(userID), storageName) } diff --git a/config/viper.go b/config/viper.go deleted file mode 100644 index ad5b0fe2..00000000 --- a/config/viper.go +++ /dev/null @@ -1,236 +0,0 @@ -package config - -import ( - "context" - "fmt" - "net" - "net/http" - "net/url" - "strings" - "time" - - "github.com/charmbracelet/log" - "github.com/duke-git/lancet/v2/slice" - "github.com/krau/SaveAny-Bot/config/storage" - "github.com/spf13/viper" - "golang.org/x/net/proxy" -) - -type Config struct { - Lang string `toml:"lang" mapstructure:"lang" json:"lang"` - Workers int `toml:"workers" mapstructure:"workers"` - Retry int `toml:"retry" mapstructure:"retry"` - NoCleanCache bool `toml:"no_clean_cache" mapstructure:"no_clean_cache" json:"no_clean_cache"` - Threads int `toml:"threads" mapstructure:"threads" json:"threads"` - Stream bool `toml:"stream" mapstructure:"stream" json:"stream"` - Proxy string `toml:"proxy" mapstructure:"proxy" json:"proxy"` - Log logConfig `toml:"log" mapstructure:"log" json:"log"` - Aria2 aria2Config `toml:"aria2" mapstructure:"aria2" json:"aria2"` - API apiConfig `toml:"api" mapstructure:"api" json:"api"` - - Cache cacheConfig `toml:"cache" mapstructure:"cache" json:"cache"` - Users []userConfig `toml:"users" mapstructure:"users" json:"users"` - Temp tempConfig `toml:"temp" mapstructure:"temp"` - DB dbConfig `toml:"db" mapstructure:"db"` - Telegram telegramConfig `toml:"telegram" mapstructure:"telegram"` - Storages []storage.StorageConfig `toml:"-" mapstructure:"-" json:"storages"` - Parser parserConfig `toml:"parser" mapstructure:"parser" json:"parser"` - Hook hookConfig `toml:"hook" mapstructure:"hook" json:"hook"` - Ytdlp YtdlpConfig `toml:"ytdlp" mapstructure:"ytdlp" json:"ytdlp"` -} - -type aria2Config struct { - Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` - Url string `toml:"url" mapstructure:"url" json:"url"` - Secret string `toml:"secret" mapstructure:"secret" json:"secret"` - KeepFile bool `toml:"keep_file" mapstructure:"keep_file" json:"keep_file"` -} - -type apiConfig struct { - Enable bool `toml:"enable" mapstructure:"enable" json:"enable"` - Host string `toml:"host" mapstructure:"host" json:"host"` - Port int `toml:"port" mapstructure:"port" json:"port"` - Token string `toml:"token" mapstructure:"token" json:"token"` -} - -var cfg = &Config{} - -func C() Config { - return *cfg -} - -func (c Config) GetStorageByName(name string) storage.StorageConfig { - for _, storage := range c.Storages { - if storage.GetName() == name { - return storage - } - } - return nil -} - -func Init(ctx context.Context, configFile ...string) error { - logger := log.FromContext(ctx) - - // Reset side tables for re-init. - storages = nil - userIDs = nil - userStorages = make(map[int64][]string) - - viper.SetConfigType("toml") - viper.SetEnvPrefix("SAVEANY") - viper.AutomaticEnv() - replacer := strings.NewReplacer(".", "_") - viper.SetEnvKeyReplacer(replacer) - - // 配置文件支持传入一个 http(s) URL 地址 - loadedFromURL := false - if len(configFile) > 0 && configFile[0] != "" { - cfg := configFile[0] - if strings.HasPrefix(cfg, "http://") || strings.HasPrefix(cfg, "https://") { - client := &http.Client{Timeout: 30 * time.Second} - resp, err := client.Get(cfg) - if err != nil { - return fmt.Errorf("failed to fetch remote config file: %w", err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - return fmt.Errorf("failed to fetch remote config file: status code %d", resp.StatusCode) - } - if err := viper.ReadConfig(resp.Body); err != nil { - return fmt.Errorf("failed to read remote config file: %w", err) - } - loadedFromURL = true - } else { - viper.SetConfigFile(cfg) - } - } else { - viper.SetConfigName("config") - viper.AddConfigPath(".") - viper.AddConfigPath("/etc/saveany/") - } - - defaultConfigs := map[string]any{ - "lang": "zh-Hans", - "workers": 3, - "retry": 3, - "threads": 4, - "log.level": "debug", - - "cache.ttl": 86400, - "cache.num_counters": 1e5, - "cache.max_cost": 1e6, - - "telegram.app_id": 1025907, - "telegram.app_hash": "452b0359b988148995f22ff0f4229750", - "telegram.rpc_retry": 5, - "telegram.userbot.enable": false, - "telegram.userbot.session": "data/usersession.db", - - "temp.base_path": "cache/", - - "db.path": "data/saveany.db", - "db.session": "data/session.db", - - "api.enable": false, - "api.host": "0.0.0.0", - "api.port": 8080, - "api.token": "", - - "ytdlp.recode": "mp4", - "ytdlp.filename_template": DefaultYtdlpFilenameTemplate, - "ytdlp.max_height": 0, - "ytdlp.format": "", - "ytdlp.restrict_filenames": false, - } - - for key, value := range defaultConfigs { - viper.SetDefault(key, value) - } - - if !loadedFromURL { - if err := viper.ReadInConfig(); err != nil { - logger.Errorf("Error reading config file: %v", err) - return err - } - } - - if err := viper.Unmarshal(cfg); err != nil { - logger.Errorf("Error unmarshalling config file: %v", err) - return err - } - - storagesConfig, err := storage.LoadStorageConfigs(viper.GetViper()) - if err != nil { - return fmt.Errorf("error loading storage configs: %w", err) - } - cfg.Storages = storagesConfig - - storageNames := make(map[string]struct{}) - for _, storage := range cfg.Storages { - if _, ok := storageNames[storage.GetName()]; ok { - return fmt.Errorf("duplicate storage name: %s", storage.GetName()) - } - storageNames[storage.GetName()] = struct{}{} - } - - if cfg.Workers < 1 { - cfg.Workers = 1 - } - if cfg.Threads < 1 { - cfg.Threads = 1 - } - if cfg.Retry < 1 { - cfg.Retry = 1 - } - - for _, storage := range cfg.Storages { - storages = append(storages, storage.GetName()) - } - for _, user := range cfg.Users { - userIDs = append(userIDs, user.ID) - if user.Blacklist { - userStorages[user.ID] = slice.Compact(slice.Difference(storages, user.Storages)) - } else { - userStorages[user.ID] = user.Storages - } - } - if cfg.Proxy != "" { - http.DefaultTransport, err = newProxyTransport(cfg.Proxy) - if err != nil { - return fmt.Errorf("failed to create proxy transport: %w", err) - } - } - return nil -} - -func newProxyTransport(proxyStr string) (*http.Transport, error) { - proxyURL, err := url.Parse(proxyStr) - if err != nil { - return nil, err - } - transport := &http.Transport{ - ForceAttemptHTTP2: true, - MaxIdleConns: 100, - IdleConnTimeout: 90 * time.Second, - TLSHandshakeTimeout: 10 * time.Second, - ExpectContinueTimeout: 1 * time.Second, - } - switch proxyURL.Scheme { - case "http", "https": - transport.Proxy = http.ProxyURL(proxyURL) - - case "socks5", "socks5h": - dialer, err := proxy.FromURL(proxyURL, proxy.Direct) - if err != nil { - return nil, err - } - transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) { - return dialer.(proxy.ContextDialer).DialContext(ctx, network, addr) - } - - default: - return nil, fmt.Errorf("unsupported proxy type: %s", proxyURL.Scheme) - } - - return transport, nil -} diff --git a/core/core.go b/core/core.go index e10d0862..1e7060a6 100644 --- a/core/core.go +++ b/core/core.go @@ -4,9 +4,11 @@ import ( "context" "errors" "sync" + "time" "github.com/charmbracelet/log" "github.com/krau/SaveAny-Bot/config" + "github.com/krau/SaveAny-Bot/database" "github.com/krau/SaveAny-Bot/pkg/enums/tasktype" "github.com/krau/SaveAny-Bot/pkg/queue" "github.com/krau/SaveAny-Bot/pkg/taskevent" @@ -15,6 +17,7 @@ import ( var ( queueOnce sync.Once queueInstance *queue.TaskQueue[Executable] + workerWG sync.WaitGroup ) // initQueue lazily creates the shared task queue. @@ -33,30 +36,44 @@ type Executable interface { } func worker(ctx context.Context, qe *queue.TaskQueue[Executable], semaphore chan struct{}) { + defer workerWG.Done() logger := log.FromContext(ctx) execHooks := config.C().Hook.Exec for { semaphore <- struct{}{} qtask, err := qe.Get() if err != nil { - logger.Error("Failed to get task from queue:", err) + if !errors.Is(err, queue.ErrQueueClosed) { + logger.Error("Failed to get task from queue:", err) + } break // queue closed and empty } exe := qtask.Data taskCtx := qtask.Context() + recordCtx := context.WithoutCancel(taskCtx) logger.Infof("Processing task: %s", exe.TaskID()) taskevent.Emit(taskCtx, taskevent.Event{TaskID: exe.TaskID(), Phase: taskevent.PhaseStart}) if err := ExecCommandString(taskCtx, execHooks.TaskBeforeStart); err != nil { logger.Errorf("Failed to execute before start hook for task %s: %v", exe.TaskID(), err) } + startedAt := time.Now() + if dbErr := database.UpdateTaskRecord(recordCtx, exe.TaskID(), map[string]any{ + "status": "running", + "started_at": startedAt, + }); dbErr != nil { + logger.Errorf("Failed to update task record for %s: %v", exe.TaskID(), dbErr) + } err = exe.Execute(taskCtx) + status := "completed" if err != nil { if errors.Is(taskCtx.Err(), context.Canceled) { + status = "cancelled" logger.Infof("Task %s was canceled", exe.TaskID()) if err := ExecCommandString(ctx, execHooks.TaskCancel); err != nil { logger.Errorf("Failed to execute cancel hook for task %s: %v", exe.TaskID(), err) } } else { + status = "failed" logger.Errorf("Failed to execute task %s: %v", exe.TaskID(), err) if err := ExecCommandString(ctx, execHooks.TaskFail); err != nil { logger.Errorf("Failed to execute fail hook for task %s: %v", exe.TaskID(), err) @@ -68,6 +85,16 @@ func worker(ctx context.Context, qe *queue.TaskQueue[Executable], semaphore chan logger.Errorf("Failed to execute success hook for task %s: %v", exe.TaskID(), err) } } + recordFields := map[string]any{ + "status": status, + "finished_at": time.Now(), + } + if err != nil && status != "cancelled" { + recordFields["error"] = err.Error() + } + if dbErr := database.UpdateTaskRecord(recordCtx, exe.TaskID(), recordFields); dbErr != nil { + logger.Errorf("Failed to finish task record for %s: %v", exe.TaskID(), dbErr) + } taskevent.Emit(taskCtx, taskevent.Event{TaskID: exe.TaskID(), Phase: taskevent.PhaseDone, Err: err}) qe.Done(qtask.ID) <-semaphore @@ -78,10 +105,11 @@ func Run(ctx context.Context) { log.FromContext(ctx).Info("Start processing tasks...") semaphore := make(chan struct{}, config.C().Workers) q := initQueue() - for range config.C().Workers { + workers := config.C().Workers + workerWG.Add(workers) + for range workers { go worker(ctx, q, semaphore) } - } // Close stops the queue and unblocks workers in Get. @@ -91,19 +119,86 @@ func Close() { } } +// WaitWorkers waits up to timeout for all worker goroutines to exit. +func WaitWorkers(timeout time.Duration) bool { + done := make(chan struct{}) + go func() { + workerWG.Wait() + close(done) + }() + select { + case <-done: + return true + case <-time.After(timeout): + return false + } +} + func AddTask(ctx context.Context, task Executable) error { - return initQueue().Add(queue.NewTask(ctx, task.TaskID(), task.Title(), task)) + return AddTaskWithSource(ctx, task, "bot") +} + +// AddTaskWithSource records the task before enqueueing it so every execution +// has a matching database row. +func AddTaskWithSource(ctx context.Context, task Executable, source string) error { + logger := log.FromContext(ctx) + record := &database.TaskRecord{ + TaskID: task.TaskID(), + Type: task.Type().String(), + Title: task.Title(), + Status: "queued", + Source: source, + } + if err := database.CreateTaskRecord(ctx, record); err != nil { + logger.Errorf("Failed to create task record for %s: %v", task.TaskID(), err) + } + if err := initQueue().Add(queue.NewTask(ctx, task.TaskID(), task.Title(), task)); err != nil { + if dbErr := database.DeleteTaskRecord(ctx, task.TaskID()); dbErr != nil { + logger.Errorf("Failed to remove task record for %s: %v", task.TaskID(), dbErr) + } + return err + } + return nil +} + +func EnrichTaskRecord(ctx context.Context, taskID, storageName, storagePath string) error { + return database.UpdateTaskRecord(ctx, taskID, map[string]any{ + "storage": storageName, + "path": storagePath, + }) } func CancelTask(ctx context.Context, id string) error { + if queueInstance == nil { + return errors.New("task queue is not initialized") + } err := queueInstance.CancelTask(id) + if err == nil { + if dbErr := database.UpdateTaskRecord(context.WithoutCancel(ctx), id, map[string]any{ + "status": "cancelled", + "finished_at": time.Now(), + }); dbErr != nil { + log.FromContext(ctx).Errorf("Failed to cancel task record for %s: %v", id, dbErr) + } + } return err } func GetLength(ctx context.Context) int { + if queueInstance == nil { + return 0 + } return queueInstance.ActiveLength() } +// ActiveTaskCount includes queued and running tasks regardless of cancellation. +func ActiveTaskCount() int { + if queueInstance == nil { + return 0 + } + return queueInstance.ActiveCount() +} + func GetRunningTasks(ctx context.Context) []queue.TaskInfo { return queueInstance.RunningTasks() } diff --git a/core/tasks/ytdlp/output.go b/core/tasks/ytdlp/output.go index 05e9d68f..37962ff7 100644 --- a/core/tasks/ytdlp/output.go +++ b/core/tasks/ytdlp/output.go @@ -93,7 +93,7 @@ func splitTypePrefix(template string) (prefix, rest string) { if !ok { return "", template } - for _, k := range strings.Split(key, "+") { + for k := range strings.SplitSeq(key, "+") { if _, known := ytdlpOutputTypes[k]; !known { return "", template } diff --git a/database/chat.go b/database/chat.go index 6e6c6ae2..b721e612 100644 --- a/database/chat.go +++ b/database/chat.go @@ -1,6 +1,10 @@ package database -import "context" +import ( + "context" + + "github.com/gotd/td/constant" +) func (user *User) WatchChat(ctx context.Context, chat WatchChat) error { if len(user.WatchChats) == 0 { @@ -37,3 +41,24 @@ func GetWatchChatsByChatID(ctx context.Context, chatID int64) ([]*WatchChat, err } return watchChats, nil } + +// MigrateLegacyPeerIDs converts TDLib-encoded watch chat IDs written by +// gotgproto to the plain IDs used by mygotg. +func MigrateLegacyPeerIDs(ctx context.Context) error { + var chats []WatchChat + if err := db.WithContext(ctx).Where("chat_id < 0").Find(&chats).Error; err != nil { + return err + } + for _, chat := range chats { + plain := constant.TDLibPeerID(chat.ChatID).ToPlain() + if plain == 0 || plain == chat.ChatID { + continue + } + if err := db.WithContext(ctx).Model(&WatchChat{}). + Where("id = ?", chat.ID). + Update("chat_id", plain).Error; err != nil { + return err + } + } + return nil +} diff --git a/database/db.go b/database/db.go index 3c4300e3..3fea36e6 100644 --- a/database/db.go +++ b/database/db.go @@ -8,20 +8,19 @@ import ( "time" "github.com/charmbracelet/log" - "github.com/krau/SaveAny-Bot/config" "gorm.io/gorm" glogger "gorm.io/gorm/logger" ) var db *gorm.DB -func Init(ctx context.Context) { +func Init(ctx context.Context, path string) { logger := log.FromContext(ctx) - if err := os.MkdirAll(filepath.Dir(config.C().DB.Path), 0755); err != nil { - logger.Fatal("Failed to create data directory: ", err) + if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { + logger.Fatalf("Failed to create data directory: %v", err) } var err error - db, err = gorm.Open(GetDialect(config.C().DB.Path), &gorm.Config{ + db, err = gorm.Open(GetDialect(path), &gorm.Config{ Logger: glogger.New(logger, glogger.Config{ Colorful: true, SlowThreshold: time.Second * 5, @@ -32,53 +31,30 @@ func Init(ctx context.Context) { PrepareStmt: true, }) if err != nil { - logger.Fatal("Failed to open database: ", err) + logger.Fatalf("Failed to open database: %v", err) } + _ = os.Chmod(path, 0o600) logger.Debug("Database connected") - if err := db.AutoMigrate(&User{}, &Dir{}, &Rule{}, &WatchChat{}); err != nil { - logger.Fatal("Database migration failed; if upgrading from an old version, try deleting the database file and retrying", "error", err) + if err := db.AutoMigrate(&User{}, &Dir{}, &Rule{}, &WatchChat{}, &Setting{}, &StorageRecord{}, &TaskRecord{}, &WebSession{}); err != nil { + logger.Fatalf("Database migration failed: %v", err) } - if err := syncUsers(ctx); err != nil { - logger.Fatal("Failed to sync users:", err) + if err := MigrateLegacyPeerIDs(ctx); err != nil { + logger.Errorf("Failed to migrate legacy peer IDs: %v", err) } - logger.Debug("Database migrated") logger.Info("Database initialized") } -func syncUsers(ctx context.Context) error { - logger := log.FromContext(ctx) - dbUsers, err := GetAllUsers(ctx) - if err != nil { - return fmt.Errorf("failed to get users: %w", err) - } - - dbUserMap := make(map[int64]User) - for _, u := range dbUsers { - dbUserMap[u.ChatID] = u - } - - cfgUserMap := make(map[int64]struct{}) - for _, u := range config.C().Users { - cfgUserMap[u.ID] = struct{}{} +func Close() error { + if db == nil { + return nil } - - for cfgID := range cfgUserMap { - if _, exists := dbUserMap[cfgID]; !exists { - if err := CreateUser(ctx, cfgID); err != nil { - return fmt.Errorf("failed to create user %d: %w", cfgID, err) - } - logger.Infof("Created user from config: %d", cfgID) - } - } - - for dbID, dbUser := range dbUserMap { - if _, exists := cfgUserMap[dbID]; !exists { - if err := DeleteUser(ctx, &dbUser); err != nil { - return fmt.Errorf("failed to delete user %d: %w", dbID, err) - } - logger.Infof("Deleted user not present in config: %d", dbID) - } + sqlDB, err := db.DB() + if err != nil { + return fmt.Errorf("failed to get sql db: %w", err) } + return sqlDB.Close() +} - return nil +func Transaction(ctx context.Context, fn func(tx *gorm.DB) error) error { + return db.WithContext(ctx).Transaction(fn) } diff --git a/database/model.go b/database/model.go index f3e68ead..c91c4e51 100644 --- a/database/model.go +++ b/database/model.go @@ -1,6 +1,8 @@ package database import ( + "time" + "gorm.io/gorm" ) @@ -18,6 +20,9 @@ type User struct { FilenameStrategy string FilenameTemplate string ConflictStrategy string + Enabled bool `gorm:"not null;default:true"` + StoragesJSON string `gorm:"column:storages;type:text"` + Blacklist bool } type WatchChat struct { @@ -42,3 +47,49 @@ type Rule struct { StorageName string DirPath string } + +type Setting struct { + Key string `gorm:"primaryKey;size:64"` + Value string `gorm:"type:text;not null"` + UpdatedAt time.Time +} + +type StorageRecord struct { + gorm.Model + Name string `gorm:"uniqueIndex;size:64;not null"` + Type string `gorm:"size:32;not null"` + Enable bool `gorm:"not null"` + Config string `gorm:"type:text;not null"` +} + +func (StorageRecord) TableName() string { return "storages" } + +type TaskRecord struct { + ID uint `gorm:"primaryKey"` + TaskID string `gorm:"uniqueIndex;size:32;not null"` + Type string `gorm:"size:32;not null"` + Title string + Status string `gorm:"size:16;index;not null"` + Storage string + Path string + Source string `gorm:"size:16;not null"` + Error string `gorm:"type:text"` + CreatedAt time.Time + StartedAt *time.Time + FinishedAt *time.Time + UpdatedAt time.Time +} + +type WebSession struct { + ID string `gorm:"primaryKey;size:64"` + CSRF string `gorm:"size:64;not null"` + CreatedAt time.Time + ExpiresAt time.Time `gorm:"index"` +} + +type TaskFilter struct { + Status string + Type string + Limit int + Offset int +} diff --git a/database/setting.go b/database/setting.go new file mode 100644 index 00000000..762d28cb --- /dev/null +++ b/database/setting.go @@ -0,0 +1,53 @@ +package database + +import ( + "context" + + "gorm.io/gorm" + "gorm.io/gorm/clause" +) + +func GetSetting(ctx context.Context, key string) (string, bool, error) { + var setting Setting + err := db.WithContext(ctx).Where("key = ?", key).First(&setting).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return "", false, nil + } + return "", false, err + } + return setting.Value, true, nil +} + +func SetSetting(ctx context.Context, key, value string) error { + return db.WithContext(ctx).Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "key"}}, + DoUpdates: clause.AssignmentColumns([]string{"value", "updated_at"}), + }).Create(&Setting{Key: key, Value: value}).Error +} + +func SetSettingsTx(ctx context.Context, values map[string]string) error { + return Transaction(ctx, func(tx *gorm.DB) error { + for key, value := range values { + if err := tx.Clauses(clause.OnConflict{ + Columns: []clause.Column{{Name: "key"}}, + DoUpdates: clause.AssignmentColumns([]string{"value", "updated_at"}), + }).Create(&Setting{Key: key, Value: value}).Error; err != nil { + return err + } + } + return nil + }) +} + +func ListSettings(ctx context.Context) (map[string]string, error) { + var settings []Setting + if err := db.WithContext(ctx).Find(&settings).Error; err != nil { + return nil, err + } + out := make(map[string]string, len(settings)) + for _, s := range settings { + out[s.Key] = s.Value + } + return out, nil +} diff --git a/database/storage_record.go b/database/storage_record.go new file mode 100644 index 00000000..9dfa9b6c --- /dev/null +++ b/database/storage_record.go @@ -0,0 +1,66 @@ +package database + +import ( + "context" + "encoding/json" + "errors" + "slices" + + "gorm.io/gorm" +) + +func CreateStorageRecord(ctx context.Context, record *StorageRecord) error { + return db.WithContext(ctx).Create(record).Error +} + +func ListStorageRecords(ctx context.Context) ([]StorageRecord, error) { + var records []StorageRecord + err := db.WithContext(ctx).Order("name").Find(&records).Error + return records, err +} + +func GetStorageRecord(ctx context.Context, id uint) (*StorageRecord, error) { + var record StorageRecord + if err := db.WithContext(ctx).First(&record, id).Error; err != nil { + return nil, err + } + return &record, nil +} + +func UpdateStorageRecord(ctx context.Context, record *StorageRecord) error { + return db.WithContext(ctx).Save(record).Error +} + +func DeleteStorageRecord(ctx context.Context, id uint) error { + return db.WithContext(ctx).Unscoped().Delete(&StorageRecord{}, id).Error +} + +// StorageReferences returns how many entities still reference the storage name. +func StorageReferences(ctx context.Context, name string) (users, dirs, rules int64, err error) { + var allUsers []User + if err = db.WithContext(ctx).Find(&allUsers).Error; err != nil { + return 0, 0, 0, err + } + for _, u := range allUsers { + if u.DefaultStorage == name { + users++ + continue + } + var names []string + if u.StoragesJSON != "" { + _ = json.Unmarshal([]byte(u.StoragesJSON), &names) + } + if slices.Contains(names, name) { + users++ + } + } + if err = db.WithContext(ctx).Model(&Dir{}).Where("storage_name = ?", name).Count(&dirs).Error; err != nil { + return + } + if err = db.WithContext(ctx).Model(&Rule{}).Where("storage_name = ?", name).Count(&rules).Error; err != nil { + return + } + return users, dirs, rules, nil +} + +func IsNotFound(err error) bool { return errors.Is(err, gorm.ErrRecordNotFound) } diff --git a/database/task_record.go b/database/task_record.go new file mode 100644 index 00000000..b32a27bc --- /dev/null +++ b/database/task_record.go @@ -0,0 +1,57 @@ +package database + +import ( + "context" + "time" +) + +func CreateTaskRecord(ctx context.Context, record *TaskRecord) error { + return db.WithContext(ctx).Create(record).Error +} + +func UpdateTaskRecord(ctx context.Context, taskID string, fields map[string]any) error { + return db.WithContext(ctx).Model(&TaskRecord{}).Where("task_id = ?", taskID).Updates(fields).Error +} + +func GetTaskRecord(ctx context.Context, taskID string) (*TaskRecord, error) { + var record TaskRecord + if err := db.WithContext(ctx).Where("task_id = ?", taskID).First(&record).Error; err != nil { + return nil, err + } + return &record, nil +} + +func ListTaskRecords(ctx context.Context, filter TaskFilter) ([]TaskRecord, int64, error) { + query := db.WithContext(ctx).Model(&TaskRecord{}) + if filter.Status != "" { + query = query.Where("status = ?", filter.Status) + } + if filter.Type != "" { + query = query.Where("type = ?", filter.Type) + } + var total int64 + if err := query.Count(&total).Error; err != nil { + return nil, 0, err + } + limit := filter.Limit + if limit <= 0 || limit > 200 { + limit = 50 + } + var records []TaskRecord + err := query.Order("created_at DESC").Limit(limit).Offset(filter.Offset).Find(&records).Error + return records, total, err +} + +func DeleteTaskRecord(ctx context.Context, taskID string) error { + return db.WithContext(ctx).Unscoped().Where("task_id = ?", taskID).Delete(&TaskRecord{}).Error +} + +func MarkInterruptedTaskRecords(ctx context.Context) error { + return db.WithContext(ctx).Model(&TaskRecord{}). + Where("status IN ?", []string{"queued", "running"}). + Updates(map[string]any{ + "status": "failed", + "error": "interrupted by restart", + "finished_at": time.Now(), + }).Error +} diff --git a/database/websession.go b/database/websession.go new file mode 100644 index 00000000..deca8395 --- /dev/null +++ b/database/websession.go @@ -0,0 +1,30 @@ +package database + +import ( + "context" + "time" +) + +func CreateWebSession(ctx context.Context, session *WebSession) error { + return db.WithContext(ctx).Create(session).Error +} + +func GetWebSession(ctx context.Context, id string) (*WebSession, error) { + var session WebSession + if err := db.WithContext(ctx).Where("id = ? AND expires_at > ?", id, time.Now()).First(&session).Error; err != nil { + return nil, err + } + return &session, nil +} + +func DeleteWebSession(ctx context.Context, id string) error { + return db.WithContext(ctx).Unscoped().Where("id = ?", id).Delete(&WebSession{}).Error +} + +func DeleteOtherWebSessions(ctx context.Context, keepID string) error { + return db.WithContext(ctx).Unscoped().Where("id <> ?", keepID).Delete(&WebSession{}).Error +} + +func DeleteExpiredWebSessions(ctx context.Context) error { + return db.WithContext(ctx).Unscoped().Where("expires_at <= ?", time.Now()).Delete(&WebSession{}).Error +} diff --git a/go.mod b/go.mod index d42171e8..b4ded56c 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,15 @@ module github.com/krau/SaveAny-Bot -go 1.25.0 +go 1.26.0 require ( github.com/blang/semver v3.5.1+incompatible - github.com/celestix/gotgproto v1.0.0-beta22 github.com/cenkalti/backoff/v4 v4.3.0 github.com/charmbracelet/log v1.0.0 github.com/gabriel-vasile/mimetype v1.4.15 github.com/goccy/go-yaml v1.19.2 github.com/gotd/contrib v0.21.1 - github.com/gotd/td v0.149.0 + github.com/gotd/td v0.159.0 github.com/johannesboyne/gofakes3 v0.0.0-20250916175020-ebf3e50324d3 github.com/krau/ffmpeg-go v0.6.0 github.com/lrstanley/go-ytdlp v1.3.5 @@ -21,14 +20,15 @@ require ( github.com/spf13/viper v1.21.0 github.com/unvgo/ghselfupdate v1.0.1 github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c + golang.org/x/crypto v0.54.0 golang.org/x/net v0.57.0 - golang.org/x/term v0.45.0 golang.org/x/time v0.15.0 ) require ( github.com/AnimeKaizoku/cacher v1.0.3 // indirect github.com/ProtonMail/go-crypto v1.4.1 // indirect + github.com/andybalholm/brotli v1.2.2 // indirect github.com/aws/smithy-go v1.24.0 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -62,6 +62,8 @@ require ( github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gotd/ige v0.3.0 // indirect + github.com/gotd/log v0.1.0 // indirect + github.com/gotd/log/logzap v0.1.1 // indirect github.com/gotd/neo v0.1.5 // indirect github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect github.com/jinzhu/inflection v1.0.0 // indirect @@ -81,6 +83,7 @@ require ( github.com/ogen-go/ogen v1.24.0 // indirect github.com/philhofer/fwd v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/refraction-networking/utls v1.8.2 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect @@ -98,7 +101,6 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/crypto v0.54.0 // indirect golang.org/x/mod v0.39.0 // indirect golang.org/x/tools v0.48.0 // indirect gopkg.in/ini.v1 v1.67.3 // indirect @@ -118,6 +120,7 @@ require ( github.com/glebarez/sqlite v1.11.0 github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.19.2 // indirect + github.com/krau/mygotg v0.4.1 github.com/mitchellh/mapstructure v1.5.0 github.com/ncruces/go-sqlite3 v0.35.3 // indirect github.com/ncruces/go-sqlite3/gormlite v0.34.0 diff --git a/go.sum b/go.sum index b444cb20..e0d9e26d 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAw github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM= github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= +github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtnceM= +github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= @@ -36,8 +38,6 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/celestix/gotgproto v1.0.0-beta22 h1:Iu78cFA08nV8+flmxKs9CJ3W73+HG30fx0nLOs5A6fI= -github.com/celestix/gotgproto v1.0.0-beta22/go.mod h1:JYC9Js/5KLUhFR5M2RslQi2DFAcF7EdrgJMXo0YrzGQ= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -140,10 +140,14 @@ github.com/gotd/contrib v0.21.1 h1:NSF+0YEnosQ34QEo2o4s6MA5YFDAor1LVvLhN1L3H1M= github.com/gotd/contrib v0.21.1/go.mod h1:trVJBP9Q/TJbjmJbVnLc0cnX/8T4N0RpQBULVa3BNnE= github.com/gotd/ige v0.3.0 h1:4f6LEHWsVDLBG0bT9wWG2/9TZb5aWm265G8ZlTXmRRU= github.com/gotd/ige v0.3.0/go.mod h1:FE9bTaQtvfArizAcZuI4sS6gXaEUBmixdUufVHoCKac= +github.com/gotd/log v0.1.0 h1:4LJUEvafD1xtBwx2QkrlzFnRgbYXTlWqJPDi8BvrLbU= +github.com/gotd/log v0.1.0/go.mod h1:5ilhdu1Ux0QvDY/FF3Ojfw24Ws3SlCtyLwOpXy8KYXs= +github.com/gotd/log/logzap v0.1.1 h1:O6l7d8HUbODe+UMcrM47eXYDwdJ6RNmpQejLjrlcEIQ= +github.com/gotd/log/logzap v0.1.1/go.mod h1:5ObZkITbfhbsBOLzBkzmMk9QxXc0eNQpimau7zRL+Y8= github.com/gotd/neo v0.1.5 h1:oj0iQfMbGClP8xI59x7fE/uHoTJD7NZH9oV1WNuPukQ= github.com/gotd/neo v0.1.5/go.mod h1:9A2a4bn9zL6FADufBdt7tZt+WMhvZoc5gWXihOPoiBQ= -github.com/gotd/td v0.149.0 h1:vXzNO99FFzWKKyI0vizvtgkpI7AqmbcXHLWjxkD+69o= -github.com/gotd/td v0.149.0/go.mod h1:+s0fRWlKL+RqoKJAMnCRoj0sWtxzRlWm886elNZEpJQ= +github.com/gotd/td v0.159.0 h1:kKXt2NLmfIOgebbFS34FSlZbdydaf5fsta+nP69nP+w= +github.com/gotd/td v0.159.0/go.mod h1:rdZ2NfOMUViApJa3EvYJ94GAxENjCB0b98tJbfS9NCc= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8= @@ -169,6 +173,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/krau/ffmpeg-go v0.6.0 h1:F4HWvOrKXQsfLsFTOnUfP0HY6WISJqOrsAFGSIzkKto= github.com/krau/ffmpeg-go v0.6.0/go.mod h1:sa7/bWHB6fO9j4lhmxnWQ1U07o+dE1leFjhctotxU7A= +github.com/krau/mygotg v0.4.1 h1:RosBdZRJ+mY0qe4ntnPYbyqmlssA/fs5GX7BGo/Xy2s= +github.com/krau/mygotg v0.4.1/go.mod h1:djnRqzJcRjS4pX8iUrhDPwGxiQI4vdArzSMCL6XlckU= github.com/lrstanley/go-ytdlp v1.3.5 h1:eT+29mK3Lp+XPMQOH25+jVerrrjifYW1o3IkTYJ9SMs= github.com/lrstanley/go-ytdlp v1.3.5/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI= github.com/lucasb-eyer/go-colorful v1.4.1 h1:1EO+WB73+EH8EVbzlrG3KLAfEypQWVHIBqlTf+2hNss= @@ -215,6 +221,8 @@ github.com/playwright-community/playwright-go v0.6000.0 h1:R7sENcRI6n0Zd5ZoW8EKd github.com/playwright-community/playwright-go v0.6000.0/go.mod h1:z/YpFVdU4LAi+0f9VPOCkGvmdH6dCrtza9nxnXFXgiE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo= +github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= @@ -264,6 +272,8 @@ github.com/unvgo/ghselfupdate v1.0.1 h1:4clbOkfPbfEmRnnYxVXDSBs0JG12DO+0FfqplJck github.com/unvgo/ghselfupdate v1.0.1/go.mod h1:3snWV5vEHGXQqqhY7FwKjPOtH6e7cFdHYN7UMAihhxs= github.com/xo/terminfo v1.0.0 h1:2ZpYzqWzyyytjk3TP6aJVDhkMAkc99/1xKQdA3TDTBY= github.com/xo/terminfo v1.0.0/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c h1:xA2TJS9Hu/ivzaZIrDcwvpJ3Fnpsk5fDOJ4iSnL6J0w= github.com/yapingcat/gomedia v0.0.0-20240906162731-17feea57090c/go.mod h1:WSZ59bidJOO40JSJmLqlkBJrjZCtjbKKkygEMfzY/kc= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -339,8 +349,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= -golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/pkg/aria2/client_test.go b/pkg/aria2/client_test.go index fab13114..e887720b 100644 --- a/pkg/aria2/client_test.go +++ b/pkg/aria2/client_test.go @@ -258,8 +258,7 @@ func TestClient_RPCError(t *testing.T) { t.Error("Expected RPC error, got nil") } - var rpcErr *rpcError - if !errors.As(err, &rpcErr) { + if _, ok := errors.AsType[*rpcError](err); !ok { t.Errorf("Expected rpcError, got %T", err) } } diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go index 47c248d3..dad7e58f 100644 --- a/pkg/queue/queue.go +++ b/pkg/queue/queue.go @@ -184,3 +184,11 @@ func (tq *TaskQueue[T]) Close() { tq.closed = true tq.cond.Broadcast() } + +// ActiveCount returns the number of queued and running tasks, including +// tasks whose context has already been cancelled. +func (tq *TaskQueue[T]) ActiveCount() int { + tq.mu.RLock() + defer tq.mu.RUnlock() + return tq.tasks.Len() + len(tq.runningTaskMap) +} diff --git a/pkg/tfile/tgfile.go b/pkg/tfile/tgfile.go index 5c3ed9b2..67b17f8e 100644 --- a/pkg/tfile/tgfile.go +++ b/pkg/tfile/tgfile.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/celestix/gotgproto/functions" "github.com/gotd/td/telegram/downloader" "github.com/gotd/td/tg" + "github.com/krau/mygotg/functions" ) type TGFile interface { @@ -88,7 +88,7 @@ func FromMedia(media tg.MessageMediaClass, client downloader.Client, opts ...TGF } } file := NewTGFile( - document.AsInputDocumentFileLocation(), + document.AsInputDocumentFileLocation(""), client, document.Size, fileName, diff --git a/settings/legacy.go b/settings/legacy.go new file mode 100644 index 00000000..913f897f --- /dev/null +++ b/settings/legacy.go @@ -0,0 +1,196 @@ +package settings + +import ( + "context" + "encoding/json" + "fmt" + "io" + "net/http" + "os" + "strings" + "time" + + "github.com/charmbracelet/log" + "github.com/spf13/viper" + "gorm.io/gorm" + + "github.com/krau/SaveAny-Bot/config" + storcfg "github.com/krau/SaveAny-Bot/config/storage" + "github.com/krau/SaveAny-Bot/database" +) + +const legacyImportedKey = "meta.legacy_config_imported" + +func LegacyImported(ctx context.Context) bool { + _, ok, err := database.GetSetting(ctx, legacyImportedKey) + if err != nil { + log.Errorf("Failed to read legacy import marker: %v", err) + return false + } + return ok +} + +// ImportLegacy imports a legacy TOML configuration exactly once. +func ImportLegacy(ctx context.Context, src, dataDir string) error { + data, err := readLegacyConfig(src) + if err != nil { + return err + } + if data == nil { + return nil + } + + v := viper.New() + v.SetConfigType("toml") + for key, value := range config.DefaultsMap(dataDir) { + v.SetDefault(key, value) + } + if err := v.ReadConfig(strings.NewReader(string(data))); err != nil { + return fmt.Errorf("failed to parse legacy config: %w", err) + } + var cfg config.Config + if err := v.Unmarshal(&cfg); err != nil { + return fmt.Errorf("failed to unmarshal legacy config: %w", err) + } + baseConfigs, err := storcfg.LoadAllBaseConfigs(v) + if err != nil { + return fmt.Errorf("failed to load legacy storages: %w", err) + } + + existing, err := database.ListSettings(ctx) + if err != nil { + return err + } + groups := make(map[string]string) + for _, group := range []string{GroupCore, GroupLog, GroupDB, GroupTelegram, GroupAria2, GroupCache, GroupTemp, GroupYtdlp, GroupParser, GroupHook} { + if _, ok := existing[group]; ok { + continue + } + value, err := groupValue(cfg, group) + if err != nil { + return err + } + raw, err := json.Marshal(value) + if err != nil { + return err + } + groups[group] = string(raw) + } + if _, ok := existing[GroupWeb]; !ok { + listen := cfgListenFromAPI(v) + web := map[string]any{ + "enable": true, + "listen": listen, + "api_token": v.GetString("api.token"), + "secure_cookie": false, + } + raw, _ := json.Marshal(web) + groups[GroupWeb] = string(raw) + } + + legacyChatIDs := make([]int64, 0, len(cfg.Users)) + for _, u := range cfg.Users { + legacyChatIDs = append(legacyChatIDs, u.ID) + } + + return database.Transaction(ctx, func(tx *gorm.DB) error { + for key, value := range groups { + if err := tx.Save(&database.Setting{Key: key, Value: value}).Error; err != nil { + return err + } + } + for _, base := range baseConfigs { + var count int64 + if err := tx.Model(&database.StorageRecord{}).Where("name = ?", base.Name).Count(&count).Error; err != nil { + return err + } + if count > 0 { + continue + } + raw, err := json.Marshal(base.RawConfig) + if err != nil { + return err + } + if err := tx.Create(&database.StorageRecord{ + Name: base.Name, Type: base.Type, Enable: base.Enable, Config: string(raw), + }).Error; err != nil { + return err + } + } + for _, u := range cfg.Users { + raw, err := json.Marshal(u.Storages) + if err != nil { + return err + } + var user database.User + findErr := tx.Where("chat_id = ?", u.ID).First(&user).Error + if findErr != nil && !database.IsNotFound(findErr) { + return findErr + } + if database.IsNotFound(findErr) { + if err := tx.Create(&database.User{ + ChatID: u.ID, Enabled: true, StoragesJSON: string(raw), Blacklist: u.Blacklist, + }).Error; err != nil { + return err + } + continue + } + if err := tx.Model(&user).Updates(map[string]any{ + "enabled": true, "storages": string(raw), "blacklist": u.Blacklist, + }).Error; err != nil { + return err + } + } + query := tx.Model(&database.User{}) + if len(legacyChatIDs) > 0 { + query = query.Where("chat_id NOT IN ?", legacyChatIDs) + } + if err := query.Update("enabled", false).Error; err != nil { + return err + } + return tx.Save(&database.Setting{ + Key: legacyImportedKey, Value: time.Now().UTC().Format(time.RFC3339), + }).Error + }) +} + +func cfgListenFromAPI(v *viper.Viper) string { + host := strings.TrimSpace(v.GetString("api.host")) + if host == "" { + host = "0.0.0.0" + } + port := v.GetInt("api.port") + if port <= 0 { + port = 8080 + } + return fmt.Sprintf("%s:%d", host, port) +} + +func readLegacyConfig(src string) ([]byte, error) { + if src == "" { + for _, candidate := range []string{"./config.toml", "/etc/saveany/config.toml"} { + if data, err := os.ReadFile(candidate); err == nil { + log.Warn("Importing legacy configuration; config files are deprecated", "path", candidate) + return data, nil + } + } + return nil, nil + } + if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") { + client := &http.Client{Timeout: 30 * time.Second} + resp, err := client.Get(src) + if err != nil { + return nil, fmt.Errorf("failed to fetch remote config: %w", err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("failed to fetch remote config: status code %d", resp.StatusCode) + } + return io.ReadAll(resp.Body) + } + data, err := os.ReadFile(src) + if err != nil { + return nil, err + } + return data, nil +} diff --git a/settings/settings.go b/settings/settings.go new file mode 100644 index 00000000..b1c93525 --- /dev/null +++ b/settings/settings.go @@ -0,0 +1,709 @@ +package settings + +import ( + "context" + "encoding/json" + "errors" + "fmt" + "maps" + "net" + "strings" + "sync" + + "github.com/charmbracelet/log" + "golang.org/x/crypto/bcrypt" + + "github.com/krau/SaveAny-Bot/common/i18n" + "github.com/krau/SaveAny-Bot/config" + storcfg "github.com/krau/SaveAny-Bot/config/storage" + "github.com/krau/SaveAny-Bot/database" + storages "github.com/krau/SaveAny-Bot/storage" +) + +const ( + GroupCore = "core" + GroupLog = "log" + GroupDB = "db" + GroupTelegram = "telegram" + GroupAria2 = "aria2" + GroupCache = "cache" + GroupTemp = "temp" + GroupYtdlp = "ytdlp" + GroupParser = "parser" + GroupHook = "hook" + GroupWeb = "web" +) + +const maskedValue = "__MASKED__" + +var ErrUnknownGroup = errors.New("unknown settings group") + +var ( + ErrStorageInUse = errors.New("storage is in use") + ErrStorageExists = errors.New("storage already exists") +) + +type coreGroup struct { + Lang string `json:"lang"` + Workers int `json:"workers"` + Retry int `json:"retry"` + Threads int `json:"threads"` + Stream bool `json:"stream"` + NoCleanCache bool `json:"no_clean_cache"` + Proxy string `json:"proxy"` +} + +type authGroup struct { + PasswordHash string `json:"password_hash"` +} + +type StorageInput struct { + Name string `json:"name"` + Type string `json:"type"` + Enable bool `json:"enable"` + Config map[string]any `json:"config"` +} + +func groupValue(cfg config.Config, group string) (any, error) { + switch group { + case GroupCore: + return coreGroup{ + Lang: cfg.Lang, + Workers: cfg.Workers, + Retry: cfg.Retry, + Threads: cfg.Threads, + Stream: cfg.Stream, + NoCleanCache: cfg.NoCleanCache, + Proxy: cfg.Proxy, + }, nil + case GroupLog: + return cfg.Log, nil + case GroupDB: + return cfg.DB, nil + case GroupTelegram: + return cfg.Telegram, nil + case GroupAria2: + return cfg.Aria2, nil + case GroupCache: + return cfg.Cache, nil + case GroupTemp: + return cfg.Temp, nil + case GroupYtdlp: + return cfg.Ytdlp, nil + case GroupParser: + return cfg.Parser, nil + case GroupHook: + return cfg.Hook, nil + case GroupWeb: + return cfg.Web, nil + default: + return nil, ErrUnknownGroup + } +} + +func applyGroup(cfg *config.Config, group string, raw []byte) error { + switch group { + case GroupCore: + var g coreGroup + if err := json.Unmarshal(raw, &g); err != nil { + return err + } + cfg.Lang = g.Lang + cfg.Workers = g.Workers + cfg.Retry = g.Retry + cfg.Threads = g.Threads + cfg.Stream = g.Stream + cfg.NoCleanCache = g.NoCleanCache + cfg.Proxy = g.Proxy + return nil + case GroupLog: + return json.Unmarshal(raw, &cfg.Log) + case GroupDB: + return json.Unmarshal(raw, &cfg.DB) + case GroupTelegram: + return json.Unmarshal(raw, &cfg.Telegram) + case GroupAria2: + return json.Unmarshal(raw, &cfg.Aria2) + case GroupCache: + return json.Unmarshal(raw, &cfg.Cache) + case GroupTemp: + return json.Unmarshal(raw, &cfg.Temp) + case GroupYtdlp: + return json.Unmarshal(raw, &cfg.Ytdlp) + case GroupParser: + return json.Unmarshal(raw, &cfg.Parser) + case GroupHook: + return json.Unmarshal(raw, &cfg.Hook) + case GroupWeb: + return json.Unmarshal(raw, &cfg.Web) + default: + return ErrUnknownGroup + } +} + +// Load builds a config snapshot from the database. +func Load(ctx context.Context, dataDir string) (config.Config, error) { + cfg := config.Default(dataDir) + raw, err := database.ListSettings(ctx) + if err != nil { + return cfg, fmt.Errorf("failed to list settings: %w", err) + } + for group, value := range raw { + if group == "auth" || strings.HasPrefix(group, "meta.") { + continue + } + if err := applyGroup(&cfg, group, []byte(value)); err != nil { + if errors.Is(err, ErrUnknownGroup) { + log.Warn("Ignoring unknown settings group", "group", group) + continue + } + log.Error("Invalid settings group, keeping defaults", "group", group, "error", err) + } + } + + users, err := database.GetAllUsers(ctx) + if err != nil { + return cfg, fmt.Errorf("failed to load users: %w", err) + } + cfg.Users = make([]config.UserConfig, 0, len(users)) + for _, u := range users { + var names []string + if u.StoragesJSON != "" { + if err := json.Unmarshal([]byte(u.StoragesJSON), &names); err != nil { + log.Error("Invalid storage filter for user", "chat_id", u.ChatID, "error", err) + } + } + cfg.Users = append(cfg.Users, config.UserConfig{ + ID: u.ChatID, + Enabled: u.Enabled, + Storages: names, + Blacklist: u.Blacklist, + }) + } + + records, err := database.ListStorageRecords(ctx) + if err != nil { + return cfg, fmt.Errorf("failed to load storages: %w", err) + } + seen := make(map[string]struct{}, len(records)) + cfg.Storages = nil + for _, rec := range records { + if _, ok := seen[rec.Name]; ok { + return cfg, fmt.Errorf("duplicate storage name: %s", rec.Name) + } + seen[rec.Name] = struct{}{} + if !rec.Enable { + continue + } + cfgStorage, err := storcfg.NewStorageConfigFromJSON(rec.Name, rec.Type, true, []byte(rec.Config)) + if err != nil { + log.Error("Invalid storage config, skipping", "storage", rec.Name, "error", err) + continue + } + if err := cfgStorage.Validate(); err != nil { + log.Error("Invalid storage config, skipping", "storage", rec.Name, "error", err) + continue + } + cfg.Storages = append(cfg.Storages, cfgStorage) + } + + if cfg.Workers < 1 { + cfg.Workers = 1 + } + if cfg.Threads < 1 { + cfg.Threads = 1 + } + if cfg.Retry < 1 { + cfg.Retry = 1 + } + return cfg, nil +} + +type Service struct { + ctx context.Context + dataDir string + mu sync.Mutex + listenOverride string +} + +func NewService(ctx context.Context, dataDir string) (*Service, error) { + s := &Service{ctx: ctx, dataDir: dataDir} + if err := s.Reload(ctx); err != nil { + return nil, err + } + return s, nil +} + +func (s *Service) Config() config.Config { + return config.C() +} + +// SetListenOverride forces the in-process listen address (from --listen) +// without persisting it, so settings reloads do not lose the CLI override. +func (s *Service) SetListenOverride(listen string) { + s.mu.Lock() + s.listenOverride = listen + s.mu.Unlock() + if listen == "" { + return + } + cfg := config.C() + cfg.Web.Listen = listen + config.Set(cfg) +} + +// ReloadConfig reloads settings and users without reinitializing storages. +func (s *Service) ReloadConfig(ctx context.Context) error { + s.mu.Lock() + defer s.mu.Unlock() + cfg, err := Load(ctx, s.dataDir) + if err != nil { + return err + } + if s.listenOverride != "" { + cfg.Web.Listen = s.listenOverride + } + config.Set(cfg) + i18n.Init(cfg.Lang) + if level, err := log.ParseLevel(strings.TrimSpace(cfg.Log.Level)); err == nil { + log.SetLevel(level) + } + return nil +} + +// Reload reloads settings, users, and storages. +func (s *Service) Reload(ctx context.Context) error { + if err := s.ReloadConfig(ctx); err != nil { + return err + } + for _, err := range storages.Reload(context.WithoutCancel(ctx)) { + log.Errorf("Failed to initialize storage: %v", err) + } + return nil +} + +func (s *Service) PublicSettings() (map[string]any, error) { + cfg := s.Config() + out := make(map[string]any) + for _, group := range []string{GroupCore, GroupLog, GroupDB, GroupTelegram, GroupAria2, GroupCache, GroupTemp, GroupYtdlp, GroupParser, GroupHook, GroupWeb} { + value, err := groupValue(cfg, group) + if err != nil { + return nil, err + } + out[group] = value + } + maskSecrets(out) + return out, nil +} + +func maskSecrets(groups map[string]any) { + mask := func(group string, keys ...string) { + m, ok := groups[group].(map[string]any) + if !ok { + raw, err := json.Marshal(groups[group]) + if err != nil { + return + } + m = make(map[string]any) + if err := json.Unmarshal(raw, &m); err != nil { + return + } + groups[group] = m + } + for _, key := range keys { + if v, ok := m[key].(string); ok && v != "" { + m[key] = maskedValue + } + } + } + // Values are structs here; normalize through JSON before masking. + for group, value := range groups { + raw, err := json.Marshal(value) + if err != nil { + continue + } + var m map[string]any + if err := json.Unmarshal(raw, &m); err != nil { + continue + } + groups[group] = m + } + mask(GroupTelegram, "token", "app_hash") + mask(GroupAria2, "secret") + mask(GroupWeb, "api_token") +} + +func (s *Service) UpdateGroup(ctx context.Context, group string, patch json.RawMessage) ([]string, error) { + s.mu.Lock() + defer s.mu.Unlock() + + oldCfg := s.Config() + current, err := groupValue(oldCfg, group) + if err != nil { + return nil, err + } + currentJSON, err := json.Marshal(current) + if err != nil { + return nil, err + } + var currentMap map[string]any + if err := json.Unmarshal(currentJSON, ¤tMap); err != nil { + return nil, err + } + var patchMap map[string]any + if err := json.Unmarshal(patch, &patchMap); err != nil { + return nil, fmt.Errorf("invalid patch: %w", err) + } + for key := range patchMap { + if _, ok := currentMap[key]; !ok { + return nil, fmt.Errorf("unknown field %q for group %s", key, group) + } + } + if group == GroupWeb && s.listenOverride != "" { + if _, provided := patchMap["listen"]; !provided { + listen := config.Default(s.dataDir).Web.Listen + if raw, ok, err := database.GetSetting(ctx, GroupWeb); err == nil && ok { + var stored map[string]any + if json.Unmarshal([]byte(raw), &stored) == nil { + if v, ok := stored["listen"].(string); ok { + listen = v + } + } + } + currentMap["listen"] = listen + } + } + merged := mergeJSON(currentMap, patchMap) + mergedJSON, err := json.Marshal(merged) + if err != nil { + return nil, err + } + + newCfg := oldCfg + if err := applyGroup(&newCfg, group, mergedJSON); err != nil { + return nil, err + } + if err := validateGroup(&newCfg, group); err != nil { + return nil, err + } + if err := database.SetSetting(ctx, group, string(mergedJSON)); err != nil { + return nil, err + } + if err := s.reloadConfigLocked(ctx); err != nil { + return nil, err + } + return restartRequired(oldCfg, s.Config()), nil +} + +func mergeJSON(current, patch map[string]any) map[string]any { + out := make(map[string]any, len(current)) + maps.Copy(out, current) + for key, value := range patch { + if s, ok := value.(string); ok && s == maskedValue { + continue + } + if patchMap, ok := value.(map[string]any); ok { + if currentMap, ok := out[key].(map[string]any); ok { + out[key] = mergeJSON(currentMap, patchMap) + continue + } + } + out[key] = value + } + return out +} + +func validateGroup(cfg *config.Config, group string) error { + switch group { + case GroupCore: + if cfg.Workers < 1 || cfg.Retry < 1 || cfg.Threads < 1 { + return errors.New("workers, retry and threads must be at least 1") + } + if cfg.Proxy != "" { + if _, err := config.ProxyTransport(cfg.Proxy); err != nil { + return fmt.Errorf("invalid proxy: %w", err) + } + } + case GroupLog: + if _, err := log.ParseLevel(strings.TrimSpace(cfg.Log.Level)); err != nil { + return fmt.Errorf("invalid log level: %w", err) + } + case GroupWeb: + if _, _, err := net.SplitHostPort(cfg.Web.Listen); err != nil { + return fmt.Errorf("invalid listen address: %w", err) + } + case GroupTelegram: + if cfg.Telegram.AppID < 0 { + return errors.New("app_id must be non-negative") + } + } + return nil +} + +func (s *Service) reloadConfigLocked(ctx context.Context) error { + cfg, err := Load(ctx, s.dataDir) + if err != nil { + return err + } + if s.listenOverride != "" { + cfg.Web.Listen = s.listenOverride + } + config.Set(cfg) + i18n.Init(cfg.Lang) + if level, err := log.ParseLevel(strings.TrimSpace(cfg.Log.Level)); err == nil { + log.SetLevel(level) + } + return nil +} + +func restartRequired(oldCfg, newCfg config.Config) []string { + var fields []string + if oldCfg.Workers != newCfg.Workers { + fields = append(fields, "core.workers") + } + if oldCfg.Proxy != newCfg.Proxy { + fields = append(fields, "core.proxy") + } + if oldCfg.DB.Session != newCfg.DB.Session { + fields = append(fields, "db.session") + } + if oldCfg.Cache != newCfg.Cache { + fields = append(fields, "cache.ttl", "cache.num_counters", "cache.max_cost") + } + if oldCfg.Parser.PluginEnable != newCfg.Parser.PluginEnable || !equalStrings(oldCfg.Parser.PluginDirs, newCfg.Parser.PluginDirs) { + fields = append(fields, "parser.plugin_enable", "parser.plugin_dirs") + } + if oldCfg.Hook != newCfg.Hook { + fields = append(fields, "hook.exec") + } + if oldCfg.Web.Enable != newCfg.Web.Enable { + fields = append(fields, "web.enable") + } + if oldCfg.Web.Listen != newCfg.Web.Listen { + fields = append(fields, "web.listen") + } + return fields +} + +func equalStrings(a, b []string) bool { + if len(a) != len(b) { + return false + } + for i := range a { + if a[i] != b[i] { + return false + } + } + return true +} + +func (s *Service) EnsureAdmin(initialPassword string) error { + if _, ok, err := database.GetSetting(s.ctx, "auth"); err != nil { + return err + } else if ok { + return nil + } + password := initialPassword + generated := false + if password == "" { + password = config.GeneratePassword() + generated = true + } + hash, err := bcrypt.GenerateFromPassword([]byte(password), 12) + if err != nil { + return err + } + data, err := json.Marshal(authGroup{PasswordHash: string(hash)}) + if err != nil { + return err + } + if err := database.SetSetting(s.ctx, "auth", string(data)); err != nil { + return err + } + if generated { + log.Warn("Generated web admin password; change it after login", "password", password) + } + return nil +} + +func (s *Service) VerifyAdminPassword(password string) bool { + value, ok, err := database.GetSetting(s.ctx, "auth") + if err != nil || !ok { + return false + } + var auth authGroup + if err := json.Unmarshal([]byte(value), &auth); err != nil { + return false + } + return bcrypt.CompareHashAndPassword([]byte(auth.PasswordHash), []byte(password)) == nil +} + +func (s *Service) ChangeAdminPassword(current, next string) error { + if !s.VerifyAdminPassword(current) { + return errors.New("current password is incorrect") + } + if len(next) < 8 { + return errors.New("new password must be at least 8 characters") + } + hash, err := bcrypt.GenerateFromPassword([]byte(next), 12) + if err != nil { + return err + } + data, err := json.Marshal(authGroup{PasswordHash: string(hash)}) + if err != nil { + return err + } + return database.SetSetting(s.ctx, "auth", string(data)) +} + +func (s *Service) CreateStorage(ctx context.Context, in StorageInput) (*database.StorageRecord, error) { + s.mu.Lock() + defer s.mu.Unlock() + if strings.TrimSpace(in.Name) == "" || strings.TrimSpace(in.Type) == "" { + return nil, errors.New("name and type are required") + } + records, err := database.ListStorageRecords(ctx) + if err != nil { + return nil, err + } + for _, rec := range records { + if rec.Name == in.Name { + return nil, fmt.Errorf("%w: %s", ErrStorageExists, in.Name) + } + } + raw, err := json.Marshal(in.Config) + if err != nil { + return nil, err + } + if err := validateStorage(ctx, in.Name, in.Type, in.Enable, raw); err != nil { + return nil, err + } + record := &database.StorageRecord{Name: in.Name, Type: in.Type, Enable: in.Enable, Config: string(raw)} + if err := database.CreateStorageRecord(ctx, record); err != nil { + return nil, err + } + if err := s.reloadAllLocked(ctx); err != nil { + return nil, err + } + return record, nil +} + +func (s *Service) UpdateStorage(ctx context.Context, id uint, in StorageInput) (*database.StorageRecord, error) { + s.mu.Lock() + defer s.mu.Unlock() + record, err := database.GetStorageRecord(ctx, id) + if err != nil { + return nil, err + } + if in.Name != "" && in.Name != record.Name { + return nil, errors.New("storage name is immutable") + } + var current map[string]any + if record.Config != "" { + if err := json.Unmarshal([]byte(record.Config), ¤t); err != nil { + current = make(map[string]any) + } + } + if current == nil { + current = make(map[string]any) + } + for key, value := range in.Config { + if s, ok := value.(string); ok && s == maskedValue { + continue + } + current[key] = value + } + raw, err := json.Marshal(current) + if err != nil { + return nil, err + } + if err := validateStorage(ctx, record.Name, record.Type, in.Enable, raw); err != nil { + return nil, err + } + record.Config = string(raw) + record.Enable = in.Enable + if err := database.UpdateStorageRecord(ctx, record); err != nil { + return nil, err + } + if err := s.reloadAllLocked(ctx); err != nil { + return nil, err + } + return record, nil +} + +func (s *Service) DeleteStorage(ctx context.Context, id uint) error { + s.mu.Lock() + defer s.mu.Unlock() + record, err := database.GetStorageRecord(ctx, id) + if err != nil { + return err + } + users, dirs, rules, err := database.StorageReferences(ctx, record.Name) + if err != nil { + return err + } + if users+dirs+rules > 0 { + return fmt.Errorf("%w: %d user(s), %d dir(s), %d rule(s) reference %s", ErrStorageInUse, users, dirs, rules, record.Name) + } + if err := database.DeleteStorageRecord(ctx, id); err != nil { + return err + } + return s.reloadAllLocked(ctx) +} + +func (s *Service) TestStorage(ctx context.Context, id uint) error { + record, err := database.GetStorageRecord(ctx, id) + if err != nil { + return err + } + cfg, err := storcfg.NewStorageConfigFromJSON(record.Name, record.Type, true, []byte(record.Config)) + if err != nil { + return err + } + if err := cfg.Validate(); err != nil { + return err + } + st, err := storages.NewStorage(ctx, cfg) + if err != nil { + return err + } + if closer, ok := st.(storages.StorageCloser); ok { + defer closer.Close() + } + if listable, ok := st.(storages.StorageListable); ok { + _, err = listable.ListFiles(ctx, "") + return err + } + if !st.Exists(ctx, "") { + return errors.New("storage did not accept the test request") + } + return nil +} + +func validateStorage(ctx context.Context, name, typ string, enable bool, raw []byte) error { + cfg, err := storcfg.NewStorageConfigFromJSON(name, typ, enable, raw) + if err != nil { + return err + } + if err := cfg.Validate(); err != nil { + return err + } + st, err := storages.NewStorage(ctx, cfg) + if err != nil { + return err + } + if closer, ok := st.(storages.StorageCloser); ok { + closer.Close() + } + return nil +} + +func (s *Service) reloadAllLocked(ctx context.Context) error { + if err := s.reloadConfigLocked(ctx); err != nil { + return err + } + for _, err := range storages.Reload(context.WithoutCancel(ctx)) { + log.Errorf("Failed to initialize storage: %v", err) + } + return nil +} diff --git a/storage/alist/alist.go b/storage/alist/alist.go index 1e7137d1..b9424a8a 100644 --- a/storage/alist/alist.go +++ b/storage/alist/alist.go @@ -32,6 +32,7 @@ type Alist struct { loginInfo *loginRequest config config.AlistStorageConfig logger *log.Logger + cancel context.CancelFunc } // authHeader returns the current token for use in API requests. @@ -102,10 +103,18 @@ func (a *Alist) Init(ctx context.Context, cfg config.StorageConfig) error { a.tokenMu.Unlock() a.logger.Debug("Logged in to Alist") - go a.refreshToken(ctx, *alistConfig) + runCtx, cancel := context.WithCancel(context.WithoutCancel(ctx)) + a.cancel = cancel + go a.refreshToken(runCtx, *alistConfig) return nil } +func (a *Alist) Close() { + if a.cancel != nil { + a.cancel() + } +} + func (a *Alist) Type() storenum.StorageType { return storenum.Alist } diff --git a/storage/load.go b/storage/load.go index 02964155..9b30391d 100644 --- a/storage/load.go +++ b/storage/load.go @@ -17,9 +17,11 @@ var ( // Storages maps storage names to initialized storage instances. Storages = make(map[string]Storage) - userStoragesMu sync.RWMutex - // UserStorages maps user IDs to their available storage instances. - UserStorages = make(map[int64][]Storage) + errorsMu sync.RWMutex + lastErrors = make(map[string]string) + + retiredMu sync.Mutex + retired []Storage initFlight singleflight.Group ) @@ -42,8 +44,16 @@ func AllStorages() map[string]Storage { return out } -// GetStorageByName returns storage by name from cache or creates new one -// It should NOT be used to get storage for user, use GetStorageByUserIDAndName instead +// LastErrors returns the initialization errors from the last Reload. +func LastErrors() map[string]string { + errorsMu.RLock() + defer errorsMu.RUnlock() + out := make(map[string]string, len(lastErrors)) + maps.Copy(out, lastErrors) + return out +} + +// GetStorageByName returns storage by name from cache or creates a new one. func GetStorageByName(ctx context.Context, name string) (Storage, error) { if name == "" { return nil, ErrStorageNameEmpty @@ -60,7 +70,6 @@ func GetStorageByName(ctx context.Context, name string) (Storage, error) { return nil, fmt.Errorf("storage %s not found", name) } - // Merge concurrent first-time initializations. v, err, _ := initFlight.Do("storage:"+name, func() (any, error) { storageMu.RLock() if existing, ok := Storages[name]; ok { @@ -90,11 +99,9 @@ func GetStorageByUserIDAndName(ctx context.Context, chatID int64, name string) ( if name == "" { return nil, ErrStorageNameEmpty } - if !config.C().HasStorage(chatID, name) { return nil, fmt.Errorf("no storage %s for user %d", name, chatID) } - return GetStorageByName(ctx, name) } @@ -102,12 +109,6 @@ func GetUserStorages(ctx context.Context, chatID int64) []Storage { if chatID <= 0 { return nil } - userStoragesMu.RLock() - cached, ok := UserStorages[chatID] - userStoragesMu.RUnlock() - if ok { - return cached - } var storages []Storage for _, name := range config.C().GetStorageNamesByUserID(chatID) { storage, err := GetStorageByName(ctx, name) @@ -119,29 +120,77 @@ func GetUserStorages(ctx context.Context, chatID int64) []Storage { return storages } -func LoadStorages(ctx context.Context) { +// Reload rebuilds the storage registry from the current config snapshot. +func Reload(ctx context.Context) []error { logger := log.FromContext(ctx) - logger.Debug("loading storages...") - for _, storage := range config.C().Storages { - _, err := GetStorageByName(ctx, storage.GetName()) + logger.Debug("reloading storages...") + + initCtx := context.WithoutCancel(ctx) + newStorages := make(map[string]Storage) + errs := make(map[string]string) + var out []error + for _, storageCfg := range config.C().Storages { + name := storageCfg.GetName() + st, err := NewStorage(initCtx, storageCfg) if err != nil { - logger.Errorf("failed to load storage %s: %v", storage.GetName(), err) + errs[name] = err.Error() + out = append(out, fmt.Errorf("storage %s: %w", name, err)) + logger.Errorf("failed to load storage %s: %v", name, err) + continue } + newStorages[name] = st } - storageMu.RLock() - loaded := len(Storages) - storageMu.RUnlock() - logger.Infof("successfully loaded %d storages", loaded) - for user := range config.C().GetUsersID() { - uid := int64(user) - storages := GetUserStorages(ctx, uid) - userStoragesMu.Lock() - UserStorages[uid] = storages - userStoragesMu.Unlock() + + if err := ctx.Err(); err != nil { + for _, st := range newStorages { + if closer, ok := st.(StorageCloser); ok { + closer.Close() + } + } + return append(out, err) + } + + storageMu.Lock() + old := Storages + Storages = newStorages + storageMu.Unlock() + + // Keep retired instances alive: in-flight tasks may still hold them. + retiredMu.Lock() + for _, st := range old { + retired = append(retired, st) + } + retiredMu.Unlock() + + errorsMu.Lock() + lastErrors = errs + errorsMu.Unlock() + + logger.Infof("successfully loaded %d storages", len(newStorages)) + return out +} + +// CloseAll closes every initialized storage. +func CloseAll() { + storageMu.Lock() + all := make([]Storage, 0, len(Storages)) + for _, st := range Storages { + all = append(all, st) + } + Storages = make(map[string]Storage) + storageMu.Unlock() + retiredMu.Lock() + all = append(all, retired...) + retired = nil + retiredMu.Unlock() + for _, st := range all { + if closer, ok := st.(StorageCloser); ok { + closer.Close() + } } } -// GetTelegramStorageByUserID returns the first enabled Telegram storage for the user +// GetTelegramStorageByUserID returns the first enabled Telegram storage for the user. func GetTelegramStorageByUserID(ctx context.Context, chatID int64) (Storage, error) { storages := GetUserStorages(ctx, chatID) for _, stor := range storages { diff --git a/storage/storage.go b/storage/storage.go index 44265b94..5a29d076 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -85,6 +85,11 @@ var _ StorageReadable = (*rclone.Rclone)(nil) var _ StorageListable = (*webdav.Webdav)(nil) var _ StorageReadable = (*webdav.Webdav)(nil) +type StorageCloser interface { + Storage + Close() +} + type StorageConstructor func() Storage var storageConstructors = map[storenum.StorageType]StorageConstructor{ diff --git a/storage/telegram/telegram.go b/storage/telegram/telegram.go index f9cb254a..9bc196d8 100644 --- a/storage/telegram/telegram.go +++ b/storage/telegram/telegram.go @@ -10,7 +10,6 @@ import ( "strings" "time" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/duke-git/lancet/v2/retry" "github.com/duke-git/lancet/v2/slice" @@ -28,6 +27,7 @@ import ( "github.com/krau/SaveAny-Bot/pkg/enums/ctxkey" storenum "github.com/krau/SaveAny-Bot/pkg/enums/storage" "github.com/krau/SaveAny-Bot/pkg/storagetypes" + "github.com/krau/mygotg/ext" "github.com/rs/xid" "golang.org/x/time/rate" ) diff --git a/storage/telegram/upload_limit_test.go b/storage/telegram/upload_limit_test.go index 2f6c4afa..16abc191 100644 --- a/storage/telegram/upload_limit_test.go +++ b/storage/telegram/upload_limit_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/tg" "github.com/krau/SaveAny-Bot/pkg/storagetypes" + "github.com/krau/mygotg/ext" ) func TestMaxUploadFileSize(t *testing.T) { diff --git a/storage/telegram/util.go b/storage/telegram/util.go index db5a5592..52b7da85 100644 --- a/storage/telegram/util.go +++ b/storage/telegram/util.go @@ -8,10 +8,10 @@ import ( "os" "time" - "github.com/celestix/gotgproto/ext" "github.com/gotd/td/constant" "github.com/gotd/td/tg" "github.com/krau/ffmpeg-go" + "github.com/krau/mygotg/ext" "github.com/yapingcat/gomedia/go-mp4" ) @@ -167,27 +167,39 @@ func extractFrameAt(rs io.ReadSeeker, timestamp float64) ([]byte, error) { return out.Bytes(), nil } -func tryGetInputPeer(ctx *ext.Context, chatID int64) tg.InputPeerClass { - peer := ctx.PeerStorage.GetInputPeerById(chatID) - if peer != nil && !peer.Zero() { - return peer +func normalizeInputPeer(peer tg.InputPeerClass) tg.InputPeerClass { + switch p := peer.(type) { + case *tg.InputPeerChannel: + if p.ChannelID < 0 { + return &tg.InputPeerChannel{ + ChannelID: constant.TDLibPeerID(p.ChannelID).ToPlain(), + AccessHash: p.AccessHash, + } + } + case *tg.InputPeerChat: + if p.ChatID < 0 { + return &tg.InputPeerChat{ChatID: constant.TDLibPeerID(p.ChatID).ToPlain()} + } } - id := constant.TDLibPeerID(chatID) - plain := id.ToPlain() + return peer +} + +func tryGetInputPeer(ctx *ext.Context, chatID int64) tg.InputPeerClass { + plain := constant.TDLibPeerID(chatID).ToPlain() var channel constant.TDLibPeerID channel.Channel(plain) - peer = ctx.PeerStorage.GetInputPeerById(int64(channel)) - if peer != nil && !peer.Zero() { - return peer - } var chat constant.TDLibPeerID chat.Chat(plain) - peer = ctx.PeerStorage.GetInputPeerById(int64(chat)) - if peer != nil && !peer.Zero() { - return peer - } var user constant.TDLibPeerID user.User(plain) - peer = ctx.PeerStorage.GetInputPeerById(int64(user)) - return peer + for _, id := range []int64{chatID, plain, int64(channel), int64(chat), int64(user)} { + if id == 0 { + continue + } + peer := ctx.PeerStorage.GetInputPeerById(id) + if peer != nil && !peer.Zero() { + return normalizeInputPeer(peer) + } + } + return nil } diff --git a/storage/telegram/video_split.go b/storage/telegram/video_split.go index afb5c551..0feb7fcf 100644 --- a/storage/telegram/video_split.go +++ b/storage/telegram/video_split.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "github.com/celestix/gotgproto/ext" "github.com/charmbracelet/log" "github.com/gotd/td/telegram/message" + "github.com/krau/mygotg/ext" "github.com/rs/xid" "github.com/krau/SaveAny-Bot/config" diff --git a/web/dist/.gitkeep b/web/dist/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/web/embed.go b/web/embed.go new file mode 100644 index 00000000..9baa84e1 --- /dev/null +++ b/web/embed.go @@ -0,0 +1,6 @@ +package web + +import "embed" + +//go:embed all:dist +var distFS embed.FS diff --git a/web/server.go b/web/server.go new file mode 100644 index 00000000..e4586a9c --- /dev/null +++ b/web/server.go @@ -0,0 +1,104 @@ +package web + +import ( + "context" + "fmt" + "io/fs" + "net" + "net/http" + "strings" + "time" + + "github.com/charmbracelet/log" +) + +type Server struct { + listen string + apiHandler http.Handler + httpServer *http.Server +} + +func New(listen string, apiHandler http.Handler) *Server { + s := &Server{listen: listen, apiHandler: apiHandler} + root := http.NewServeMux() + root.Handle("/api/", apiHandler) + root.Handle("/health", apiHandler) + root.HandleFunc("/", s.serveUI) + s.httpServer = &http.Server{ + Handler: securityHeaders(root), + ReadHeaderTimeout: 10 * time.Second, + ReadTimeout: 30 * time.Second, + WriteTimeout: 30 * time.Second, + IdleTimeout: 120 * time.Second, + } + return s +} + +func securityHeaders(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("X-Content-Type-Options", "nosniff") + w.Header().Set("X-Frame-Options", "DENY") + w.Header().Set("Referrer-Policy", "no-referrer") + next.ServeHTTP(w, r) + }) +} + +func (s *Server) Start(ctx context.Context) error { + ln, err := net.Listen("tcp", s.listen) + if err != nil { + return fmt.Errorf("failed to listen on %s: %w", s.listen, err) + } + log.FromContext(ctx).Infof("Starting web server on %s", s.listen) + go func() { + if err := s.httpServer.Serve(ln); err != nil && err != http.ErrServerClosed { + log.FromContext(ctx).Errorf("Web server error: %v", err) + } + }() + go func() { + <-ctx.Done() + stopCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := s.httpServer.Shutdown(stopCtx); err != nil { + log.FromContext(ctx).Errorf("Web server shutdown error: %v", err) + } + }() + return nil +} + +func (s *Server) Stop(ctx context.Context) error { + return s.httpServer.Shutdown(ctx) +} + +func (s *Server) serveUI(w http.ResponseWriter, r *http.Request) { + if r.Method != http.MethodGet && r.Method != http.MethodHead { + http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + return + } + sub, err := fs.Sub(distFS, "dist") + if err != nil { + http.Error(w, "Web UI not built: run make web", http.StatusServiceUnavailable) + return + } + index, err := fs.ReadFile(sub, "index.html") + if err != nil { + http.Error(w, "Web UI not built: run make web", http.StatusServiceUnavailable) + return + } + path := strings.TrimPrefix(r.URL.Path, "/") + if path != "" { + if file, err := sub.Open(path); err == nil { + info, statErr := file.Stat() + _ = file.Close() + if statErr == nil && !info.IsDir() { + if strings.HasPrefix(path, "assets/") { + w.Header().Set("Cache-Control", "public, max-age=31536000, immutable") + } + http.FileServer(http.FS(sub)).ServeHTTP(w, r) + return + } + } + } + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.Header().Set("Cache-Control", "no-cache") + _, _ = w.Write(index) +} diff --git a/web/ui/.oxfmtrc.json b/web/ui/.oxfmtrc.json new file mode 100644 index 00000000..9fa8fe95 --- /dev/null +++ b/web/ui/.oxfmtrc.json @@ -0,0 +1,7 @@ +{ + "semi": false, + "singleQuote": true, + "printWidth": 100, + "trailingComma": "all", + "vueIndentScriptAndStyle": false +} diff --git a/web/ui/index.html b/web/ui/index.html new file mode 100644 index 00000000..c08382e2 --- /dev/null +++ b/web/ui/index.html @@ -0,0 +1,15 @@ + + + + + + + + + SaveAny-Bot + + +
+ + + diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json new file mode 100644 index 00000000..03c4fc30 --- /dev/null +++ b/web/ui/package-lock.json @@ -0,0 +1,1679 @@ +{ + "name": "saveany-bot-web", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "saveany-bot-web", + "version": "1.0.0", + "dependencies": { + "pinia": "^3.0.0", + "vue": "^3.5.0", + "vue-router": "^4.5.0" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^6.0.0", + "typescript": "^5.8.0", + "vite": "^7.0.0", + "vue-tsc": "^3.0.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.11.tgz", + "integrity": "sha512-snZbO7MEDOof+hvNa97EjEY7qD7h2kwvQr5AJC3ZhQudKW5dnej6k3kP9NQV88hJwaS8vDqRLFo9rivLEhle2g==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.12", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz", + "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.11" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.11.tgz", + "integrity": "sha512-WCsemW40Cpc6gouC1SrY6PBaZ+oLRlEVY9XBvZBI7il/HyUrb2nJ505wE1MHEFyDZNnrWDEuy4jL50WVHfTTSQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.29.11", + "@babel/helper-validator-identifier": "^7.29.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.2.tgz", + "integrity": "sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.2.tgz", + "integrity": "sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.2.tgz", + "integrity": "sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.2.tgz", + "integrity": "sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.2.tgz", + "integrity": "sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.2.tgz", + "integrity": "sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.2.tgz", + "integrity": "sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.2.tgz", + "integrity": "sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.2.tgz", + "integrity": "sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.2.tgz", + "integrity": "sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.2.tgz", + "integrity": "sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.2.tgz", + "integrity": "sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.2.tgz", + "integrity": "sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.2.tgz", + "integrity": "sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.2.tgz", + "integrity": "sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.2.tgz", + "integrity": "sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.2.tgz", + "integrity": "sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.2.tgz", + "integrity": "sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.2.tgz", + "integrity": "sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.2.tgz", + "integrity": "sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.2.tgz", + "integrity": "sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.2.tgz", + "integrity": "sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.2.tgz", + "integrity": "sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.2.tgz", + "integrity": "sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.2.tgz", + "integrity": "sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.2.tgz", + "integrity": "sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", + "license": "MIT" + }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" + } + }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", + "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.67.2.tgz", + "integrity": "sha512-qB7Gzl1QI45zP1zXgqLKzjFmOBGQw2s2MLtdw0eB4xdFGPNE8LhmOnItFgyYJXXNSW8Go9c2ovvXrUUzw5sAMQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.67.2.tgz", + "integrity": "sha512-8+hXNO1J+GsYCGHwyJuBlnhyozivEvIEm/P6NkJeuoVUN+60TDvYYXk38UTm5bKRTLhIpqEQYx4d9CeN6kjh0Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-x64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-x64/-/rollup-android-x64-4.67.2.tgz", + "integrity": "sha512-/uEZY+tcWDE8DXa/rajU3Bwv6IfvQavvzjmbkn39GgQenT+UYtAxfEMdB7VKr74y8aonncm0eQa1EbiNfg+Cjg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.67.2.tgz", + "integrity": "sha512-3tCLEgakEvb5M3/KyYdhPjoteyWYziMTeznoXfcs/31eeFu+Vgs0VNRlb6Zc+YC07/sLa84OwTDF5zHOMFk92Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.67.2.tgz", + "integrity": "sha512-z31ODzkdkX7OOJCssvpz++hhtkQKWKw2L0eO2HAxFP7RMSXXedzkrTjesqCUxs4XLckRShjNfxsNxjGY5DQCGg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.67.2.tgz", + "integrity": "sha512-CTvrb0KTAQqcrpcj7rg8FgAI0+jRWnCl+En6exqXDZztCo7vspxlRUX8z9Hp/J/ja2XRnQ1JDbexkBtRyD9jSw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.67.2.tgz", + "integrity": "sha512-SJdblZpBkbOh1e4JwMM5pJJ2PdVmD3WWbMTXvncMSRLA3DdZuwU+P93RaSChOAXN4Mu53tBoFp1ADPzi3dIVAA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.67.2.tgz", + "integrity": "sha512-pUBEd7uI9dAu3TpbPcvi9eU2aJslsjIomormeTaQHmzWNhyqNx3mmq+ekC6blGNZu8F3uTHngTibKp7tbblF0A==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.67.2.tgz", + "integrity": "sha512-wW6ARw2Ah0/teOBTgTeSJIpVdPKaxQmEgZ/irkUfr3F9sgimqpApCv/NbQzjm0Nfi5EFilHh1H8kz01uQLaq5Q==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.67.2.tgz", + "integrity": "sha512-xcFYMHNL42fRu2MFipvxznr+zd+DRqwL98bhNvDWbMPRcFtMYf34NAz4xVOlnEhzgpNRE5htSemcqAsAxf2eQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.67.2.tgz", + "integrity": "sha512-U9HrnJ9PFXqA//P/oEGaXBIJraEqzYMS9yuQOdOcPCvHZIC1FFOlnd8ocAaeDDPDpY8xOrhfxMRtr6KqKi3gyg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.67.2.tgz", + "integrity": "sha512-2hZN8CFGfsbDw+DNtImkPRitpLNjVM2XEbi4ZQ5igLxMFD4gI/P6Zo9czGxuvQXtRyZtZyZp8Kr4ERsAipplBw==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.67.2.tgz", + "integrity": "sha512-HZO7UfWEsReAnkdVByyQaFsNXJCtvdfun/LFb2Xd4qnhgF1ZfhikpbgqrTRtNMmB5OgNnSwFLiPobOT8oNT9iw==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.67.2.tgz", + "integrity": "sha512-AdYIihuLkJ2TScy9BpSPiDex3zOMjkNJLsFlk9NeJ0U3WEtOx4W8z0nOkPEhDS2S4gwsRWBa6ZZexJ9e6OxyzQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.67.2.tgz", + "integrity": "sha512-iZE0NXcAGqLoCWeHRPkBxJe93JT4Q981z1ZqR+y7qAiIksdRlWhw8hmqHFo1B4ZnU66He31NUb52Iyv+vwMEBQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.67.2.tgz", + "integrity": "sha512-vC7EAtJpSqSrrbg8huMfgxtwlR8fUsFCe5rStDk1WA8POky/6EEp52dxENMmqLKjSfdM3TT1WWPcZ01hiYZcdw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.67.2.tgz", + "integrity": "sha512-DdqG6x72MHpQOlkK/cqrru9b2QMJHLkNojCB3bteB5fmkE/7XEAkReJMANp8wgef8eiEC99SvdP/BH7Ho/BpLA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.67.2.tgz", + "integrity": "sha512-F10mjdnRmGg9K+LGdqQVeUYFr08f3fVBOh7YNE5p1KIpTzhtKKOLqcQEsqZG6yEM2eouXaMo2AZzeDAcseVTrQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.67.2.tgz", + "integrity": "sha512-ChzK9f3iE4N5GInBquiZtzWOqh+CYS5nlLlXGJxeG3d2T9rk8L1Hxg0s+v2Eh6vmAc/1T6IhOVkQU0ORP2eV7g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.67.2.tgz", + "integrity": "sha512-95WwzC+KH9hPHtbgwvwwW6MkKME6vMAdAQLS2diCvoi/iUiYdC0Y1RIPYVESx0iWqkN5ZaZq6qD1BflLcyTMEQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.67.2.tgz", + "integrity": "sha512-eKbpwlolQmDKd/dbFjvqB1+2qdYQLrgxi3Mtbijp7/3yBBvO9OoHtQ3ecYIaCdW46ijSjy5/yydyrrxHI416/g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.67.2.tgz", + "integrity": "sha512-is9lnlv6khapl+H9Hjp0gIVsUVtDxQga2nwMHpQbhDXMCMGcNmlel4/q9ihf/3FvvbL4GdGOPOGvWoei2RCggg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.67.2.tgz", + "integrity": "sha512-yTq+7YjsgbBcMdlk7Wq+VoJilGQtdtRc4PyTvN7vhO958atCO2nQeIjCF/YANSD/Z/fnrCr27fYsGgC6PFTndQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.67.2.tgz", + "integrity": "sha512-nAvZib4Xz1zx8OKhtRuyCsSmCmbfegv1AGbfpG+CowQKxCBW1pLlfYWjcr1+GI3BzRKQbBl7l9640GwWAwOF7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.67.2.tgz", + "integrity": "sha512-R3CVbEbNa1OXjpldD1tOLarb5rB08xjQiRMpe7PZKtT8eHCZhrV4ClSPfLLbSgRMM1RfLtmAfouBRf14f47lMA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.67.2.tgz", + "integrity": "sha512-DeuVFilvaGtoS9TFIbTIQ0Kt4CBqP3xnjJ8SFqWWbXlFbrpmCdivEW7Rm38trRA8rZzQQ8lhs73nEetWotJpTg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.10.tgz", + "integrity": "sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@vitejs/plugin-vue": { + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.10.tgz", + "integrity": "sha512-b80aUQh3n+qEzzZm5oQp3rT2QImeCx58K6eFl/RkJ3d65KW0kTuv5lNsLRVAjbW9YRUpo/wzmvzMgV34bTAItA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rolldown/pluginutils": "^1.0.1" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "peerDependencies": { + "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", + "vue": "^3.2.25 || ^3.6.0-rc.10" + } + }, + "node_modules/@volar/language-core": { + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.30.tgz", + "integrity": "sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/source-map": "2.4.30" + } + }, + "node_modules/@volar/language-service": { + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.30.tgz", + "integrity": "sha512-w/xDsASiqC71ggCOm7sTDXDNk/l72XEptodeRC68tgZ0e5QM4hM3zAqBGC7mBctvhrpYwKfMG+t9xcUo2hEFtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.30", + "vscode-languageserver-protocol": "^3.17.5", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "typescript": "<7" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@volar/source-map": { + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.30.tgz", + "integrity": "sha512-zym1ob/KwDDyN+0jGVtxwbxJSRRnUvv5HspCtz3yEfVVdCG4/dzxJktMGPAgemqRuVs81O0o/y0q3qOUErR8kg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@volar/typescript": { + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.30.tgz", + "integrity": "sha512-/DgA5tgYFPfrLFuSjIMXMGHk1LQv2+P8eny6+BhGNzFJELWIW7UZlc56ZLIRFhLsPpMfIFxM8/HvOPBggrjTZg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.30", + "@volar/language-service": "2.4.30", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" + }, + "peerDependencies": { + "typescript": "<7" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/compiler-core": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.44.tgz", + "integrity": "sha512-k34nCytbK8PQ1gR2mGROYOw6Pnv/mumqIdrZ3x2tbyXZDWm7ViKGLTfdB+DRrWqEQsLgGJvn0WN9jBif5zCTLQ==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.29.9", + "@vue/shared": "3.5.44", + "entities": "^7.0.1", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.2" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.44.tgz", + "integrity": "sha512-W5AoBFWdw1lQAKiHowkfgFKFab82oSRT6sGsPfw/q1GRjsy/ZJFLHGhJyBRIFN9APLTUduDH9U2JAiPOIyKuYg==", + "license": "MIT", + "dependencies": { + "@vue/compiler-core": "3.5.44", + "@vue/shared": "3.5.44" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.44.tgz", + "integrity": "sha512-dzHmQ4jXTpdr5FjIQUeykVakN/uzqFbUo9/C5ikBFg3a3PeM6uRxeczx1ZbXBML0/zJstEh3ygYipzR5Z7b2Pw==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.29.9", + "@vue/compiler-core": "3.5.44", + "@vue/compiler-dom": "3.5.44", + "@vue/compiler-ssr": "3.5.44", + "@vue/shared": "3.5.44", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.21", + "postcss": "^8.5.29", + "source-map-js": "^1.2.2" + } + }, + "node_modules/@vue/compiler-ssr": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.44.tgz", + "integrity": "sha512-xr5gb1JVHlfXJwSlRz1FeP6uxoazdzHuMTVLE7up+4Vrqxk219CvxLPxD9NXBt47yvZW7+p4DXfyp4O1fkByIA==", + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.44", + "@vue/shared": "3.5.44" + } + }, + "node_modules/@vue/devtools-api": { + "version": "7.7.10", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.10.tgz", + "integrity": "sha512-KxtEpUOOpFz/qOGRrAwA36QF7DqIA+FXgCYit9mk9wjbaZt0sXOFz81ElOZtKA4HbWHUdwNjZHBFsFFyp5BZiA==", + "license": "MIT", + "dependencies": { + "@vue/devtools-kit": "^7.7.10" + } + }, + "node_modules/@vue/devtools-kit": { + "version": "7.7.10", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.10.tgz", + "integrity": "sha512-3WNi2Kq4tbpVbmhml7RiphmAt0279oh3fKNeWMQIrltfX8Q91b4i5PL8DtyNKdwmcsGrV4fg+erwWOmD05CLIw==", + "license": "MIT", + "dependencies": { + "@vue/devtools-shared": "^7.7.10", + "birpc": "^2.3.0", + "hookable": "^5.5.3", + "mitt": "^3.0.1", + "perfect-debounce": "^1.0.0", + "speakingurl": "^14.0.1", + "superjson": "^2.2.2" + } + }, + "node_modules/@vue/devtools-shared": { + "version": "7.7.10", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.10.tgz", + "integrity": "sha512-wOPslzB8vTvpxwdaOcR2qAbwmuSP0L+rhpoC6Cf56V3Jip+HWb7PQQXOUPgBNQARpXsbQX/+mvi8kKucmBGRwQ==", + "license": "MIT", + "dependencies": { + "rfdc": "^1.4.1" + } + }, + "node_modules/@vue/language-core": { + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.14.tgz", + "integrity": "sha512-kRB+3hHg0c+BdD1XLAvwjVMQd5pC05zijSlPDRI3ERvC/s04JlRs5upy2KjeMg/9m9oD5zuMVh9yVvkKfZqoJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/language-core": "2.4.30", + "@vue/compiler-dom": "^3.5.0", + "@vue/shared": "^3.5.0", + "alien-signals": "^3.2.1", + "muggle-string": "^0.4.1", + "path-browserify": "^1.0.1", + "picomatch": "^4.0.4" + } + }, + "node_modules/@vue/reactivity": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.44.tgz", + "integrity": "sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==", + "license": "MIT", + "dependencies": { + "@vue/shared": "3.5.44" + } + }, + "node_modules/@vue/runtime-core": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.44.tgz", + "integrity": "sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==", + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.44", + "@vue/shared": "3.5.44" + } + }, + "node_modules/@vue/runtime-dom": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.44.tgz", + "integrity": "sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==", + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.44", + "@vue/runtime-core": "3.5.44", + "@vue/shared": "3.5.44", + "csstype": "^3.2.3" + } + }, + "node_modules/@vue/server-renderer": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.44.tgz", + "integrity": "sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==", + "license": "MIT", + "dependencies": { + "@vue/compiler-ssr": "3.5.44", + "@vue/runtime-dom": "3.5.44", + "@vue/shared": "3.5.44" + } + }, + "node_modules/@vue/shared": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.44.tgz", + "integrity": "sha512-H82XLH0DjmSOdbEwO15x3QTo1f5PWEtv237eLpYKc0mqLu+B8hnq16lFWmuBmNurkeiG3wr+oM1FhOll/YVFRg==", + "license": "MIT" + }, + "node_modules/alien-signals": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.2.1.tgz", + "integrity": "sha512-I8FjmltrfnDFoZedi5CG8DghVYNhzb/Ijluz7tCSJH0xpd0484Kowhbb1XDYOxfJpU1p5wnM2X54dA+IfGyD1g==", + "dev": true, + "license": "MIT" + }, + "node_modules/birpc": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz", + "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/copy-anything": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.1.5.tgz", + "integrity": "sha512-vePst2VLTSqPglW7Q98VwFpGiGpOHTyXIo81MO5VyLecA5zMbZw/P/V1vmwD1jksa2iJpn/YkDrJ3XhTfzUyhQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/mesqueeb" + } + }, + "node_modules/csstype": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", + "license": "MIT" + }, + "node_modules/entities": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/esbuild": { + "version": "0.28.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz", + "integrity": "sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.2", + "@esbuild/android-arm": "0.28.2", + "@esbuild/android-arm64": "0.28.2", + "@esbuild/android-x64": "0.28.2", + "@esbuild/darwin-arm64": "0.28.2", + "@esbuild/darwin-x64": "0.28.2", + "@esbuild/freebsd-arm64": "0.28.2", + "@esbuild/freebsd-x64": "0.28.2", + "@esbuild/linux-arm": "0.28.2", + "@esbuild/linux-arm64": "0.28.2", + "@esbuild/linux-ia32": "0.28.2", + "@esbuild/linux-loong64": "0.28.2", + "@esbuild/linux-mips64el": "0.28.2", + "@esbuild/linux-ppc64": "0.28.2", + "@esbuild/linux-riscv64": "0.28.2", + "@esbuild/linux-s390x": "0.28.2", + "@esbuild/linux-x64": "0.28.2", + "@esbuild/netbsd-arm64": "0.28.2", + "@esbuild/netbsd-x64": "0.28.2", + "@esbuild/openbsd-arm64": "0.28.2", + "@esbuild/openbsd-x64": "0.28.2", + "@esbuild/openharmony-arm64": "0.28.2", + "@esbuild/sunos-x64": "0.28.2", + "@esbuild/win32-arm64": "0.28.2", + "@esbuild/win32-ia32": "0.28.2", + "@esbuild/win32-x64": "0.28.2" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/hookable": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", + "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", + "license": "MIT" + }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", + "license": "MIT" + }, + "node_modules/muggle-string": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", + "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nanoid": { + "version": "3.3.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz", + "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/path-browserify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", + "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", + "dev": true, + "license": "MIT" + }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pinia": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz", + "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==", + "license": "MIT", + "dependencies": { + "@vue/devtools-api": "^7.7.7" + }, + "funding": { + "url": "https://github.com/sponsors/posva" + }, + "peerDependencies": { + "typescript": ">=4.5.0", + "vue": "^3.5.11" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/postcss": { + "version": "8.5.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.32.tgz", + "integrity": "sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.20", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/rfdc": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "license": "MIT" + }, + "node_modules/rollup": { + "version": "4.67.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.67.2.tgz", + "integrity": "sha512-sFZk5BeRUQzkjmuClrJI41BowIP4yv/40d5gM9vtjxVLEt+8JG9FGlBps6cliTP2KhFiw22oqNGo0G9pVpPZlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.10" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.67.2", + "@rollup/rollup-android-arm64": "4.67.2", + "@rollup/rollup-android-x64": "4.67.2", + "@rollup/rollup-darwin-arm64": "4.67.2", + "@rollup/rollup-darwin-x64": "4.67.2", + "@rollup/rollup-freebsd-arm64": "4.67.2", + "@rollup/rollup-freebsd-x64": "4.67.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.67.2", + "@rollup/rollup-linux-arm-musleabihf": "4.67.2", + "@rollup/rollup-linux-arm64-gnu": "4.67.2", + "@rollup/rollup-linux-arm64-musl": "4.67.2", + "@rollup/rollup-linux-loong64-gnu": "4.67.2", + "@rollup/rollup-linux-loong64-musl": "4.67.2", + "@rollup/rollup-linux-ppc64-gnu": "4.67.2", + "@rollup/rollup-linux-ppc64-musl": "4.67.2", + "@rollup/rollup-linux-riscv64-gnu": "4.67.2", + "@rollup/rollup-linux-riscv64-musl": "4.67.2", + "@rollup/rollup-linux-s390x-gnu": "4.67.2", + "@rollup/rollup-linux-x64-gnu": "4.67.2", + "@rollup/rollup-linux-x64-musl": "4.67.2", + "@rollup/rollup-openbsd-x64": "4.67.2", + "@rollup/rollup-openharmony-arm64": "4.67.2", + "@rollup/rollup-win32-arm64-msvc": "4.67.2", + "@rollup/rollup-win32-ia32-msvc": "4.67.2", + "@rollup/rollup-win32-x64-gnu": "4.67.2", + "@rollup/rollup-win32-x64-msvc": "4.67.2", + "fsevents": "~2.3.2" + } + }, + "node_modules/source-map-js": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz", + "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/speakingurl": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", + "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/superjson": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz", + "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==", + "license": "MIT", + "dependencies": { + "copy-anything": "^4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/typescript": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "devOptional": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/vite": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.7.tgz", + "integrity": "sha512-AHEzTORMbi7/7aXp7w7KZ5+DCUdSeLsJz0grY8xHpc9DHdYb0vQu6DqJfm2tOw3gDExNgPgnJTXxM6syYFHaCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.27.0 || ^0.28.0", + "fdir": "^6.5.0", + "picomatch": "^4.0.3", + "postcss": "^8.5.6", + "rollup": "^4.43.0", + "tinyglobby": "^0.2.15" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^20.19.0 || >=22.12.0", + "jiti": ">=1.21.0", + "less": "^4.0.0", + "lightningcss": "^1.21.0", + "sass": "^1.70.0", + "sass-embedded": "^1.70.0", + "stylus": ">=0.54.8", + "sugarss": "^5.0.0", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/vscode-jsonrpc": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-10.0.0.tgz", + "integrity": "sha512-USSfxg0vDIpTQqlQBGxF3mBARyoS8cU7LHLpbYNh6dOJt32dlskxPWB0Irrh5TllTmyf7oNLAvqDqzklbwwnpA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.17.0" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.5.tgz", + "integrity": "sha512-FW4fBMzZ99N8xeob4py0l050wgCoRgTpEq5Xcsb9lM1bc29UKGR/wSV+4knaqFxssFHajy7OzNiKP/m3U1ZEuA==", + "dev": true, + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "10.0.0", + "vscode-languageserver-types": "3.18.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.16.tgz", + "integrity": "sha512-qeNEuOi9a3qkqRf7Gfez2WL2VwlBTLCNekHBGO9kxPVUp9XuY15yfTJ9jwvOwKI0I2MhUUfZq95NSp+LK1CLQg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.18.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.5.tgz", + "integrity": "sha512-kPd6+JQNz3HMJvjKlqUxERSlZHAntl/aGpsk7ImwIh0ewDKDcjgAEyVSYciPiOJD3ftbK9IrfiqUeTZLSbCizw==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-uri": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz", + "integrity": "sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==", + "dev": true, + "license": "MIT" + }, + "node_modules/vue": { + "version": "3.5.44", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.44.tgz", + "integrity": "sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==", + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.44", + "@vue/compiler-sfc": "3.5.44", + "@vue/runtime-dom": "3.5.44", + "@vue/server-renderer": "3.5.44", + "@vue/shared": "3.5.44" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/vue-router": { + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz", + "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==", + "license": "MIT", + "dependencies": { + "@vue/devtools-api": "^6.6.4" + }, + "funding": { + "url": "https://github.com/sponsors/posva" + }, + "peerDependencies": { + "vue": "^3.5.0" + } + }, + "node_modules/vue-router/node_modules/@vue/devtools-api": { + "version": "6.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==", + "license": "MIT" + }, + "node_modules/vue-tsc": { + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.14.tgz", + "integrity": "sha512-URAu2H9AuMZMg9GCgnqbaHHHd8pBZRAwNV2e2yYS8VDsoTVXHiOSo663OS6DkEvauQ2yixn5TPFJ9WV9QIspkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@volar/typescript": "2.4.30", + "@vue/language-core": "3.3.14" + }, + "bin": { + "vue-tsc": "bin/vue-tsc.js" + }, + "peerDependencies": { + "typescript": ">=5.0.0" + } + } + } +} diff --git a/web/ui/package.json b/web/ui/package.json new file mode 100644 index 00000000..bdeb9ae3 --- /dev/null +++ b/web/ui/package.json @@ -0,0 +1,22 @@ +{ + "name": "saveany-bot-web", + "private": true, + "version": "1.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "typecheck": "vue-tsc --noEmit" + }, + "dependencies": { + "pinia": "^3.0.0", + "vue": "^3.5.0", + "vue-router": "^4.5.0" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^6.0.0", + "typescript": "^5.8.0", + "vite": "^7.0.0", + "vue-tsc": "^3.0.0" + } +} diff --git a/web/ui/public/favicon.svg b/web/ui/public/favicon.svg new file mode 100644 index 00000000..685b50f2 --- /dev/null +++ b/web/ui/public/favicon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/web/ui/src/App.vue b/web/ui/src/App.vue new file mode 100644 index 00000000..46da588e --- /dev/null +++ b/web/ui/src/App.vue @@ -0,0 +1,8 @@ + + + diff --git a/web/ui/src/api.ts b/web/ui/src/api.ts new file mode 100644 index 00000000..ae8a5b3e --- /dev/null +++ b/web/ui/src/api.ts @@ -0,0 +1,285 @@ +import type { + CreateTaskRequest, + JsonObject, + CreateUserInput, + MeResponse, + SettingsMap, + SettingsUpdateResult, + StorageInput, + StorageRecord, + StorageTestResult, + SystemInfo, + TaskCreated, + TaskItem, + TaskListResponse, + TaskTypeInfo, + TelegramStatus, + UserItem, + UserPatch, +} from './types' + +export interface ApiErrorBody { + error?: string + message?: string + fields?: Record +} + +export class ApiError extends Error { + readonly status: number + readonly code: string + readonly fields: Record + + constructor(status: number, code: string, message: string, fields: Record = {}) { + super(message || code) + this.name = 'ApiError' + this.status = status + this.code = code + this.fields = fields + } +} + +type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' + +interface RequestOptions { + method?: Method + body?: unknown + skipAuthRedirect?: boolean +} + +let csrfProvider: () => string = () => '' +let unauthorizedHandler: () => void = () => {} + +export function configureApi(config: { + getCsrf?: () => string + onUnauthorized?: () => void +}): void { + if (config.getCsrf) { + csrfProvider = config.getCsrf + } + if (config.onUnauthorized) { + unauthorizedHandler = config.onUnauthorized + } +} + +async function request(path: string, options: RequestOptions = {}): Promise { + const method = options.method ?? 'GET' + const headers: Record = { Accept: 'application/json' } + let body: string | undefined + if (options.body !== undefined) { + headers['Content-Type'] = 'application/json' + body = JSON.stringify(options.body) + } + if (method !== 'GET') { + const token = csrfProvider() + if (token) { + headers['X-CSRF-Token'] = token + } + } + + let response: Response + try { + response = await fetch(`/api/v1${path}`, { + method, + headers, + body, + credentials: 'same-origin', + }) + } catch (err) { + throw new ApiError(0, 'network_error', err instanceof Error ? err.message : '网络请求失败') + } + + if (response.status === 401 && !options.skipAuthRedirect) { + unauthorizedHandler() + } + + if (!response.ok) { + let payload: ApiErrorBody = {} + try { + payload = (await response.json()) as ApiErrorBody + } catch { + payload = {} + } + throw new ApiError( + response.status, + payload.error ?? 'http_error', + payload.message ?? `请求失败 (HTTP ${response.status})`, + payload.fields ?? {}, + ) + } + + if (response.status === 204) { + return undefined as T + } + const text = await response.text() + if (!text) { + return undefined as T + } + return JSON.parse(text) as T +} + +function query(params: Record): string { + const search = new URLSearchParams() + for (const [key, value] of Object.entries(params)) { + if (value !== undefined && value !== null && value !== '') { + search.set(key, String(value)) + } + } + const encoded = search.toString() + return encoded ? `?${encoded}` : '' +} + +export function errorMessage(err: unknown): string { + if (err instanceof ApiError) { + const fieldMessages = Object.entries(err.fields).map(([key, value]) => `${key}: ${value}`) + if (fieldMessages.length > 0) { + return `${err.message}(${fieldMessages.join(';')})` + } + return err.message + } + if (err instanceof Error) { + return err.message + } + return String(err) +} + +export const authApi = { + login(password: string) { + return request<{ csrf_token: string }>('/auth/login', { + method: 'POST', + body: { password }, + skipAuthRedirect: true, + }) + }, + logout() { + return request('/auth/logout', { method: 'POST', skipAuthRedirect: true }) + }, + me() { + return request('/auth/me', { skipAuthRedirect: true }) + }, + changePassword(currentPassword: string, newPassword: string) { + return request<{ ok: boolean }>('/auth/password', { + method: 'POST', + body: { current_password: currentPassword, new_password: newPassword }, + }) + }, +} + +export const settingsApi = { + getAll() { + return request('/settings') + }, + updateGroup(group: string, patch: JsonObject) { + return request(`/settings/${group}`, { method: 'PUT', body: patch }) + }, +} + +export const storagesApi = { + async list(): Promise { + const data = await request<{ storages: StorageRecord[] }>('/storages') + return data.storages ?? [] + }, + create(input: StorageInput) { + return request('/storages', { method: 'POST', body: input }) + }, + update(id: number, input: StorageInput) { + return request(`/storages/${id}`, { method: 'PUT', body: input }) + }, + remove(id: number) { + return request(`/storages/${id}`, { method: 'DELETE' }) + }, + test(id: number) { + return request(`/storages/${id}/test`, { method: 'POST', body: {} }) + }, +} + +export const usersApi = { + async list(): Promise { + const data = await request<{ users: UserItem[] }>('/users') + return data.users ?? [] + }, + create(input: CreateUserInput) { + return request('/users', { method: 'POST', body: input }) + }, + update(id: number, patch: UserPatch) { + return request(`/users/${id}`, { method: 'PUT', body: patch }) + }, + remove(id: number) { + return request(`/users/${id}`, { method: 'DELETE' }) + }, +} + +export const telegramApi = { + status() { + return request('/telegram/status') + }, + startBot() { + return request<{ state: string }>('/telegram/bot/start', { method: 'POST', body: {} }) + }, + stopBot(force = false) { + return request('/telegram/bot/stop', { method: 'POST', body: { force } }) + }, + restartBot(force = false) { + return request<{ state: string }>('/telegram/bot/restart', { method: 'POST', body: { force } }) + }, + login(phone: string) { + return request<{ flow_id: string }>('/telegram/userbot/login', { + method: 'POST', + body: { phone }, + }) + }, + submitCode(flowId: string, code: string) { + return request<{ ok: boolean }>(`/telegram/userbot/login/${flowId}/code`, { + method: 'POST', + body: { code }, + }) + }, + submitPassword(flowId: string, password: string) { + return request<{ ok: boolean }>(`/telegram/userbot/login/${flowId}/password`, { + method: 'POST', + body: { password }, + }) + }, + cancelLogin(flowId: string) { + return request(`/telegram/userbot/login/${flowId}`, { method: 'DELETE' }) + }, + logout() { + return request('/telegram/userbot/logout', { method: 'POST', body: {} }) + }, +} + +export const tasksApi = { + list(params: { status?: string; type?: string; limit?: number; offset?: number }) { + return request(`/tasks${query(params)}`) + }, + get(taskId: string) { + return request(`/tasks/${encodeURIComponent(taskId)}`) + }, + create(input: CreateTaskRequest) { + return request('/tasks', { method: 'POST', body: input }) + }, + cancel(taskId: string) { + return request<{ task_id: string; status: string }>( + `/tasks/${encodeURIComponent(taskId)}/cancel`, + { method: 'POST', body: {} }, + ) + }, + remove(taskId: string) { + return request(`/tasks/${encodeURIComponent(taskId)}`, { method: 'DELETE' }) + }, + async types(): Promise { + const data = await request<{ types: TaskTypeInfo[] }>('/task-types') + return data.types ?? [] + }, +} + +export const systemApi = { + info() { + return request('/system/info') + }, + restart(force = false) { + return request<{ restarting: boolean }>('/system/restart', { + method: 'POST', + body: { force }, + }) + }, +} diff --git a/web/ui/src/assets/main.css b/web/ui/src/assets/main.css new file mode 100644 index 00000000..79d777d9 --- /dev/null +++ b/web/ui/src/assets/main.css @@ -0,0 +1,2390 @@ +:root { + color-scheme: light; + --font-sans: + 'Avenir Next', 'Segoe UI', 'Noto Sans SC', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', + sans-serif; + --font-mono: 'IBM Plex Mono', 'SFMono-Regular', 'Cascadia Mono', Menlo, Consolas, monospace; + + --paper: #eceff3; + --surface: #f9fafb; + --surface-strong: #ffffff; + --surface-muted: #e8ecf1; + --ink: #12161d; + --ink-raised: #1b2029; + --ink-line: rgba(234, 238, 243, 0.1); + --ink-text: #edf0f5; + --ink-muted: #98a2ae; + + --text: #1a1f27; + --text-2: #4d5663; + --text-3: #626c7a; + --line: #d7dde5; + --line-strong: #c2c9d2; + + --accent: #3d5a98; + --accent-strong: #2c4778; + --accent-soft: #e8edf5; + --success: #2c6a4f; + --success-soft: #e5f0ea; + --warning: #7d5c22; + --warning-soft: #f4eddf; + --danger: #9e3f4b; + --danger-soft: #f5e7e9; + --info: #355f86; + --info-soft: #e8eff5; + + --radius-sm: 6px; + --radius: 10px; + --radius-lg: 14px; + --shadow: 0 18px 48px rgba(18, 22, 29, 0.14); + --ease: cubic-bezier(0.22, 1, 0.36, 1); +} + +* { + box-sizing: border-box; +} + +html, +body, +#app { + min-height: 100%; +} + +html { + scroll-behavior: smooth; +} + +body { + margin: 0; + background: var(--paper); + color: var(--text); + font-family: var(--font-sans); + font-size: 14px; + line-height: 1.6; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; +} + +::selection { + background: var(--accent-soft); + color: var(--accent-strong); +} + +a { + color: inherit; + text-decoration: none; +} + +button, +input, +select, +textarea { + font: inherit; + color: inherit; +} + +button { + cursor: pointer; +} + +h1, +h2, +h3, +h4 { + margin: 0; + font-weight: 500; +} + +code { + font-family: var(--font-mono); + font-size: 0.92em; + font-variant-numeric: tabular-nums; +} + +.mono { + font-family: var(--font-mono); + font-size: inherit; + font-variant-numeric: tabular-nums; +} + +:focus-visible { + outline: 2px solid var(--accent); + outline-offset: 2px; +} + +.skip-link { + position: fixed; + top: 8px; + left: 8px; + z-index: 100; + padding: 10px 14px; + color: var(--ink-text); + background: var(--ink); + border-radius: 8px; + font-size: 13px; + transform: translateY(-160%); + transition: transform 160ms var(--ease); +} + +.skip-link:focus { + transform: translateY(0); +} + +/* Application shell */ + +.app-shell { + min-height: 100vh; + background: var(--paper); +} + +.layout { + display: flex; + min-height: 100vh; +} + +.sidebar { + position: fixed; + inset: 0 auto 0 0; + z-index: 40; + display: flex; + width: 256px; + flex-direction: column; + background: var(--ink); + color: var(--ink-text); + border-right: 1px solid rgba(18, 22, 29, 0.35); +} + +.brand { + display: flex; + align-items: center; + gap: 12px; + min-height: 72px; + padding: 18px 20px; + border-bottom: 1px solid var(--ink-line); +} + +.brand-mark { + display: grid; + place-items: center; + width: 36px; + height: 36px; + flex: none; + color: var(--ink-text); + background: var(--ink-raised); + border: 1px solid rgba(234, 238, 243, 0.12); + border-radius: 9px; +} + +.brand-copy { + display: flex; + min-width: 0; + flex-direction: column; + line-height: 1.25; +} + +.brand-copy strong { + color: #f2f4f8; + font-size: 16px; + font-weight: 600; + letter-spacing: -0.01em; +} + +.brand-copy span { + margin-top: 2px; + color: var(--ink-muted); + font-size: 12px; +} + +.sidebar-close { + display: none; + margin-left: auto; + padding: 4px; + color: var(--ink-muted); + background: transparent; + border: 0; + border-radius: var(--radius-sm); +} + +.sidebar-close:hover { + color: var(--ink-text); + background: rgba(255, 255, 255, 0.06); +} + +.nav { + display: flex; + flex: 1; + flex-direction: column; + gap: 22px; + overflow-y: auto; + padding: 20px 12px 24px; +} + +.nav-group { + display: flex; + flex-direction: column; + gap: 2px; +} + +.nav-label { + padding: 0 12px; + margin-bottom: 7px; + color: var(--ink-muted); + font-size: 12px; + letter-spacing: 0.02em; +} + +.nav a { + position: relative; + display: flex; + align-items: center; + gap: 10px; + height: 38px; + padding: 0 12px; + color: #c2cad4; + border-radius: 8px; + font-size: 13px; + transition: + color 160ms var(--ease), + background-color 160ms var(--ease); +} + +.nav a svg { + flex: none; + opacity: 0.85; +} + +.nav a:hover { + color: #f1f4f8; + background: rgba(255, 255, 255, 0.055); +} + +.nav a.is-active { + color: var(--ink); + background: #e7ebf0; + font-weight: 500; +} + +.nav a.is-active::before { + content: ''; + position: absolute; + left: -12px; + top: 10px; + width: 3px; + height: 18px; + background: var(--accent); + border-radius: 0 3px 3px 0; +} + +.nav a.is-active svg { + color: var(--accent-strong); + opacity: 1; +} + +.sidebar-foot { + display: flex; + flex-direction: column; + gap: 8px; + padding: 18px 20px 20px; + border-top: 1px solid var(--ink-line); +} + +.sidebar-status { + display: flex; + align-items: center; + gap: 8px; + color: #c4ccd6; + font-size: 12px; +} + +.sidebar-meta { + color: var(--ink-muted); + font-size: 12px; + line-height: 1.5; +} + +.live-dot { + width: 6px; + height: 6px; + flex: none; + background: #83b79b; + border-radius: 50%; + box-shadow: 0 0 0 3px rgba(131, 183, 155, 0.08); +} + +.live-dot.accent { + background: var(--accent); + box-shadow: 0 0 0 3px rgba(61, 90, 152, 0.16); +} + +.live-dot.running { + animation: breathe 2.4s ease-in-out infinite; +} + +.live-dot.idle { + background: #7b8490; + box-shadow: 0 0 0 3px rgba(123, 132, 144, 0.12); +} + +.live-dot.error { + background: #d79aa2; + box-shadow: 0 0 0 3px rgba(215, 154, 162, 0.12); +} + +.live-dot.warning { + background: #cbb27f; + box-shadow: 0 0 0 3px rgba(203, 178, 127, 0.12); +} + +@keyframes breathe { + 0%, + 100% { + opacity: 1; + } + 50% { + opacity: 0.4; + } +} + +.main { + display: flex; + min-width: 0; + min-height: 100vh; + flex: 1; + flex-direction: column; + margin-left: 256px; +} + +.topbar { + position: sticky; + top: 0; + z-index: 20; + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; + min-height: 64px; + padding: 0 32px; + background: rgba(236, 239, 243, 0.9); + border-bottom: 1px solid var(--line); + backdrop-filter: blur(10px); +} + +.topbar-actions { + display: flex; + margin-left: auto; + align-items: center; + gap: 6px; +} + +.btn.menu-button { + display: none; +} + +.topbar-mobile-title { + display: none; + color: var(--text-2); + font-size: 13px; + font-weight: 500; +} + +.content { + display: flex; + width: 100%; + max-width: 1440px; + flex-direction: column; + gap: 20px; + margin: 0 auto; + padding: 30px 32px 64px; +} + +/* Page structure */ + +.page-head { + display: flex; + align-items: flex-end; + justify-content: space-between; + gap: 24px; + padding-bottom: 6px; +} + +.page-head h1 { + color: var(--text); + font-size: 28px; + font-weight: 500; + letter-spacing: -0.025em; + line-height: 1.15; +} + +.page-head p { + max-width: 68ch; + margin: 8px 0 0; + color: var(--text-2); + font-size: 13px; + line-height: 1.65; +} + +.page-actions { + display: flex; + flex: none; + flex-wrap: wrap; + align-items: center; + gap: 8px; +} + +.stack { + display: flex; + flex-direction: column; + gap: 20px; +} + +.row { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 10px; +} + +.grow { + min-width: 0; + flex: 1; +} + +.muted { + color: var(--text-3); +} + +/* Surfaces */ + +.panel { + padding: 24px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: var(--radius-lg); +} + +.panel-head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 16px; + margin-bottom: 18px; +} + +.panel-title { + color: var(--text); + font-size: 16px; + font-weight: 500; + letter-spacing: -0.01em; +} + +.panel-sub { + margin: 4px 0 0; + color: var(--text-3); + font-size: 12px; +} + +.stat-label { + color: var(--text-3); + font-size: 12px; +} + +.stat-value { + margin-top: 6px; + color: var(--text); + font-size: 28px; + font-variant-numeric: tabular-nums; + font-weight: 500; + letter-spacing: -0.025em; + line-height: 1.15; +} + +.stat-sub { + margin-top: 6px; + color: var(--text-3); + font-size: 12px; +} + +/* Buttons */ + +.btn { + display: inline-flex; + align-items: center; + justify-content: center; + gap: 8px; + height: 38px; + padding: 0 14px; + color: var(--text); + background: var(--surface-strong); + border: 1px solid var(--line-strong); + border-radius: 8px; + font-size: 13px; + font-weight: 500; + line-height: 1; + white-space: nowrap; + transition: + background-color 160ms var(--ease), + border-color 160ms var(--ease), + color 160ms var(--ease), + transform 120ms var(--ease); +} + +.btn:hover:not(:disabled) { + background: var(--surface-muted); + border-color: var(--text-3); +} + +.btn:active:not(:disabled) { + transform: scale(0.98); +} + +.btn svg { + display: block; + flex: none; +} + +.btn.primary { + color: #f4f6f9; + background: var(--ink); + border-color: var(--ink); +} + +.btn.primary:hover:not(:disabled) { + background: var(--ink-raised); + border-color: var(--ink-raised); +} + +.btn.ghost { + color: var(--text-2); + background: transparent; + border-color: transparent; +} + +.btn.ghost:hover:not(:disabled) { + color: var(--text); + background: rgba(18, 22, 29, 0.05); + border-color: transparent; +} + +.btn.danger { + color: var(--danger); + background: transparent; + border-color: var(--line-strong); +} + +.btn.danger:hover:not(:disabled) { + background: var(--danger-soft); + border-color: rgba(158, 63, 75, 0.35); +} + +.btn.danger-solid { + color: #fff; + background: var(--danger); + border-color: var(--danger); +} + +.btn.danger-solid:hover:not(:disabled) { + background: #883540; + border-color: #883540; +} + +.btn.small { + height: 32px; + padding: 0 10px; + font-size: 13px; +} + +.btn.icon { + width: 36px; + padding: 0; +} + +.btn:disabled { + opacity: 0.48; + cursor: not-allowed; +} + +.btn.primary:disabled { + color: var(--text-2); + background: var(--line); + border-color: var(--line); + opacity: 1; +} + +.actions { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; +} + +/* Status and labels */ + +.badge { + display: inline-flex; + align-items: center; + gap: 6px; + height: 22px; + padding: 0 8px; + color: var(--text-2); + background: var(--surface-muted); + border: 1px solid transparent; + border-radius: var(--radius-sm); + font-size: 12px; + font-weight: 500; + line-height: 1; + white-space: nowrap; +} + +.badge.status::before { + content: ''; + width: 5px; + height: 5px; + flex: none; + background: currentColor; + border-radius: 50%; +} + +.badge.success { + color: var(--success); + background: var(--success-soft); +} + +.badge.warning { + color: var(--warning); + background: var(--warning-soft); +} + +.badge.danger { + color: var(--danger); + background: var(--danger-soft); +} + +.badge.info { + color: var(--info); + background: var(--info-soft); +} + +.badge.muted { + color: var(--text-3); + background: var(--surface-muted); +} + +.count { + color: var(--text-3); + font-size: 12px; + font-variant-numeric: tabular-nums; +} + +/* Forms */ + +.form-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); + gap: 16px 18px; +} + +.form-grid .span-2 { + grid-column: 1 / -1; +} + +.field { + display: flex; + min-width: 0; + flex-direction: column; + gap: 7px; +} + +.field > label { + color: var(--text-2); + font-size: 13px; + font-weight: 500; +} + +.field input, +.field textarea { + width: 100%; + color: var(--text); + background: var(--surface-strong); + border: 1px solid var(--line-strong); + border-radius: 8px; + outline: none; + transition: + border-color 160ms var(--ease), + box-shadow 160ms var(--ease), + background-color 160ms var(--ease); +} + +.field input { + height: 40px; + padding: 0 12px; +} + +.field textarea { + min-height: 108px; + padding: 10px 12px; + resize: vertical; + line-height: 1.55; +} + +.field input::placeholder, +.field textarea::placeholder { + color: #96a2b2; +} + +.field input:hover, +.field textarea:hover { + border-color: #a9b4c3; +} + +.field input:focus, +.field textarea:focus { + border-color: var(--accent); + box-shadow: 0 0 0 3px var(--accent-soft); +} + +.field input:disabled, +.field textarea:disabled { + color: var(--text-3); + background: var(--surface-muted); + opacity: 1; +} + +.field .hint, +.hint { + color: var(--text-3); + font-size: 12px; + line-height: 1.55; +} + +.checkbox { + display: flex; + min-height: 40px; + flex-direction: row; + align-items: center; + gap: 9px; + padding-top: 18px; + cursor: pointer; +} + +.checkbox input { + width: 16px; + height: 16px; + flex: none; + accent-color: var(--accent); +} + +.checkbox span { + color: var(--text-2); + font-size: 13px; +} + +.checkbox-list { + display: flex; + flex-wrap: wrap; + gap: 10px 18px; + padding: 8px 0 2px; +} + +.checkbox-list label { + display: inline-flex; + align-items: center; + gap: 7px; + color: var(--text-2); + font-size: 13px; + cursor: pointer; +} + +.checkbox-list input { + width: 15px; + height: 15px; + accent-color: var(--accent); +} + +.form-error, +.field-error { + color: var(--danger); + font-size: 12px; + line-height: 1.55; +} + +.form-error { + padding: 10px 12px; + background: var(--danger-soft); + border: 1px solid rgba(158, 63, 75, 0.22); + border-radius: 8px; +} + +.field-error { + padding: 0; +} + +/* Custom select */ + +.select { + position: relative; + width: 100%; + min-width: 0; +} + +.select-trigger { + display: flex; + width: 100%; + height: 40px; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 0 11px; + color: var(--text); + background: var(--surface-strong); + border: 1px solid var(--line-strong); + border-radius: 8px; + text-align: left; + transition: + border-color 160ms var(--ease), + box-shadow 160ms var(--ease); +} + +.select-trigger:hover:not(:disabled) { + border-color: #a9b4c3; +} + +.select-trigger[aria-expanded='true'] { + border-color: var(--accent); + box-shadow: 0 0 0 3px var(--accent-soft); +} + +.select-trigger:disabled { + color: var(--text-3); + background: var(--surface-muted); + cursor: not-allowed; +} + +.select-value { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 13px; +} + +.select-value.placeholder { + color: #96a2b2; +} + +.select-chevron { + flex: none; + color: var(--text-3); + transition: transform 160ms var(--ease); +} + +.select-trigger[aria-expanded='true'] .select-chevron { + transform: rotate(180deg); +} + +.select-menu { + position: fixed; + z-index: 90; + overflow-y: auto; + padding: 4px; + margin: 0; + list-style: none; + background: var(--surface-strong); + border: 1px solid var(--line); + border-radius: 9px; + box-shadow: 0 16px 40px rgba(18, 22, 29, 0.14); +} + +.select-option { + display: flex; + min-height: 34px; + align-items: center; + justify-content: space-between; + gap: 10px; + padding: 7px 9px; + color: var(--text-2); + border-radius: 6px; + font-size: 13px; + cursor: pointer; +} + +.select-option.active { + color: var(--text); + background: var(--surface-muted); +} + +.select-option.selected { + color: var(--text); +} + +.select-option > span { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.select-option.selected svg { + flex: none; + color: var(--accent-strong); +} + +.select-option.disabled { + color: var(--text-3); + cursor: not-allowed; + opacity: 0.6; +} + +.select-menu-enter-active, +.select-menu-leave-active { + transition: + opacity 140ms var(--ease), + transform 140ms var(--ease); +} + +.select-menu-enter-from, +.select-menu-leave-to { + opacity: 0; + transform: translateY(-4px); +} + +.filter-field .select-trigger { + height: 34px; + padding: 0 9px; + border-radius: 7px; +} + +.filter-field .select-value { + font-size: 12px; +} + +/* Tables */ + +.table-wrap { + overflow-x: auto; + background: var(--surface); + border: 1px solid var(--line); + border-radius: var(--radius-lg); +} + +table { + width: 100%; + min-width: 760px; + border-collapse: collapse; + font-size: 13px; +} + +th { + padding: 11px 18px; + color: var(--text-3); + background: var(--surface-muted); + border-bottom: 1px solid var(--line); + font-size: 12px; + font-weight: 500; + text-align: left; + white-space: nowrap; +} + +td { + padding: 14px 18px; + vertical-align: middle; + border-bottom: 1px solid var(--line); +} + +tbody tr:last-child td { + border-bottom: none; +} + +tbody tr { + transition: background-color 140ms var(--ease); +} + +tbody tr:hover { + background: rgba(18, 22, 29, 0.025); +} + +.filter-bar { + display: flex; + flex-wrap: wrap; + align-items: flex-end; + gap: 12px; + padding: 14px 16px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: 12px; +} + +.filter-field { + display: flex; + min-width: 150px; + flex-direction: column; + gap: 5px; +} + +.filter-field label { + color: var(--text-3); + font-size: 12px; +} + +.filter-spacer { + flex: 1; +} + +.task-cell-title { + color: var(--text); + font-size: 13px; + font-weight: 500; + overflow-wrap: anywhere; +} + +.task-cell-meta { + display: flex; + flex-wrap: wrap; + gap: 3px 7px; + margin-top: 3px; + color: var(--text-3); + font-size: 12px; + overflow-wrap: anywhere; +} + +.task-path { + color: var(--text-3); + font-family: var(--font-mono); + font-size: 12px; + overflow-wrap: anywhere; +} + +/* Feedback */ + +.banner { + display: flex; + align-items: center; + justify-content: space-between; + gap: 14px; + padding: 12px 16px; + border: 1px solid var(--line); + border-radius: var(--radius); + font-size: 13px; + line-height: 1.55; +} + +.banner.warning { + color: var(--warning); + background: var(--warning-soft); + border-color: rgba(125, 92, 34, 0.18); +} + +.banner.success { + color: var(--success); + background: var(--success-soft); + border-color: rgba(44, 106, 79, 0.18); +} + +.banner.error { + color: var(--danger); + background: var(--danger-soft); + border-color: rgba(158, 63, 75, 0.18); +} + +.banner code { + padding: 1px 5px; + background: rgba(18, 22, 29, 0.06); + border-radius: 4px; +} + +.empty { + padding: 36px 20px; + color: var(--text-3); + font-size: 13px; + text-align: center; +} + +.empty strong { + display: block; + margin-bottom: 4px; + color: var(--text-2); + font-size: 14px; + font-weight: 500; +} + +.empty-icon { + display: grid; + place-items: center; + width: 38px; + height: 38px; + margin: 0 auto 12px; + color: var(--text-3); + background: var(--surface-muted); + border-radius: 50%; +} + +.loading { + padding: 24px; + color: var(--text-3); + font-size: 13px; +} + +.progress { + height: 5px; + overflow: hidden; + background: var(--surface-muted); + border-radius: 999px; +} + +.progress-bar { + height: 100%; + background: var(--accent); + border-radius: inherit; + transition: width 360ms var(--ease); +} + +.kv { + display: grid; + grid-template-columns: 150px minmax(0, 1fr); + gap: 13px 20px; + margin: 0; +} + +.kv dt { + color: var(--text-3); + font-size: 13px; +} + +.kv dd { + margin: 0; + color: var(--text); + font-size: 13px; + overflow-wrap: anywhere; +} + +/* Transient notifications */ + +.toast-stack { + position: fixed; + right: 24px; + bottom: 24px; + z-index: 70; + display: flex; + width: min(380px, calc(100vw - 32px)); + flex-direction: column; + gap: 10px; + pointer-events: none; +} + +.toast { + display: flex; + align-items: flex-start; + gap: 10px; + padding: 13px 14px; + background: var(--surface-strong); + border: 1px solid var(--line); + border-radius: 10px; + box-shadow: 0 12px 32px rgba(18, 22, 29, 0.12); + pointer-events: auto; +} + +.toast-icon { + display: grid; + flex: none; + place-items: center; + width: 24px; + height: 24px; + border-radius: 6px; +} + +.toast.success .toast-icon { + color: var(--success); + background: var(--success-soft); +} + +.toast.error .toast-icon { + color: var(--danger); + background: var(--danger-soft); +} + +.toast.info .toast-icon { + color: var(--info); + background: var(--info-soft); +} + +.toast p { + flex: 1; + margin: 1px 0 0; + color: var(--text); + font-size: 13px; + line-height: 1.55; + overflow-wrap: anywhere; +} + +.toast-close { + display: grid; + flex: none; + place-items: center; + width: 24px; + height: 24px; + color: var(--text-3); + background: transparent; + border: 0; + border-radius: 5px; +} + +.toast-close:hover { + color: var(--text); + background: var(--surface-muted); +} + +.toast-enter-active, +.toast-leave-active { + transition: + opacity 180ms var(--ease), + transform 180ms var(--ease); +} + +.toast-enter-from, +.toast-leave-to { + opacity: 0; + transform: translateY(8px); +} + +.toast-move { + transition: transform 180ms var(--ease); +} + +/* Dialogs */ + +.modal-overlay { + position: fixed; + inset: 0; + z-index: 60; + display: flex; + align-items: center; + justify-content: center; + padding: 24px; + background: rgba(10, 14, 20, 0.58); + backdrop-filter: blur(3px); +} + +.modal { + display: flex; + width: 100%; + max-width: 620px; + max-height: 90vh; + flex-direction: column; + gap: 18px; + overflow-y: auto; + padding: 26px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: 16px; + box-shadow: var(--shadow); +} + +.modal.wide { + max-width: 860px; +} + +.modal-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +.modal-title { + color: var(--text); + font-size: 20px; + font-weight: 500; + letter-spacing: -0.015em; +} + +.modal .stack { + gap: 16px; +} + +.modal-actions { + display: flex; + justify-content: flex-end; + gap: 8px; + margin-top: 4px; +} + +/* Dashboard */ + +.relay-board { + display: flex; + flex-direction: column; + gap: 20px; + padding: 24px; + color: var(--ink-text); + background: var(--ink); + border-radius: 16px; +} + +.relay-status { + display: inline-flex; + align-items: center; + gap: 8px; + color: #c9d3de; + font-size: 13px; +} + +.relay-flow { + display: flex; + min-width: 0; + align-items: stretch; +} + +.relay-node { + display: flex; + min-width: 0; + flex: 1; + flex-direction: column; + padding: 16px 18px; + background: rgba(255, 255, 255, 0.04); + border: 1px solid rgba(234, 238, 243, 0.14); + border-radius: 10px; +} + +.relay-node-label { + display: flex; + align-items: center; + gap: 7px; + color: #b8c3cf; + font-size: 13px; +} + +.relay-node strong { + margin-top: 8px; + color: #f2f5f9; + font-size: 24px; + font-weight: 500; + letter-spacing: -0.02em; + line-height: 1.2; +} + +.relay-node small { + margin-top: 5px; + overflow: hidden; + color: #b6c0cb; + font-size: 13px; + text-overflow: ellipsis; + white-space: nowrap; +} + +.relay-link { + display: grid; + width: 42px; + flex: none; + place-items: center; + color: #8793a2; +} + +.relay-link.active { + color: var(--accent); +} + +.relay-metrics { + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 24px; + padding-top: 20px; + border-top: 1px solid rgba(234, 238, 243, 0.13); +} + +.relay-metric { + display: flex; + min-width: 0; + flex-direction: column; + gap: 4px; +} + +.relay-metric span { + color: #b8c3cf; + font-size: 13px; +} + +.relay-metric strong { + color: #eff3f8; + font-size: 24px; + font-variant-numeric: tabular-nums; + font-weight: 500; + letter-spacing: -0.04em; + line-height: 1.2; +} + +.relay-metric small { + color: #aab5c2; + font-size: 13px; +} + +.dashboard-split { + display: grid; + grid-template-columns: minmax(0, 1.55fr) minmax(280px, 0.85fr); + gap: 20px; + align-items: stretch; +} + +.dashboard-split > * { + min-width: 0; +} + +.activity-figure { + display: flex; + align-items: baseline; + gap: 8px; + margin-top: 12px; +} + +.activity-figure strong { + color: var(--text); + font-size: 28px; + font-variant-numeric: tabular-nums; + font-weight: 500; + letter-spacing: -0.05em; + line-height: 1; +} + +.activity-figure span { + color: var(--text-3); + font-size: 12px; +} + +.activity-chart { + position: relative; + display: flex; + height: 184px; + align-items: flex-end; + gap: 8px; + padding: 12px 4px 26px; + margin-top: 14px; + background-image: linear-gradient(to top, var(--line) 1px, transparent 1px); + background-size: 100% 25%; +} + +.chart-col { + position: relative; + display: flex; + min-width: 0; + flex: 1; + flex-direction: column; + align-items: center; + justify-content: flex-end; + height: 100%; +} + +.chart-bar { + width: min(34px, 68%); + min-height: 2px; + background: var(--line-strong); + border-radius: 4px 4px 0 0; + transition: background-color 160ms var(--ease); +} + +.chart-col.current .chart-bar { + background: var(--accent); +} + +.chart-col:hover .chart-bar { + background: var(--text-3); +} + +.chart-col.current:hover .chart-bar { + background: var(--accent-strong); +} + +.chart-count { + margin-bottom: 6px; + color: var(--text-3); + font-size: 12px; + font-variant-numeric: tabular-nums; +} + +.chart-label { + position: absolute; + bottom: -24px; + color: var(--text-3); + font-size: 12px; + white-space: nowrap; +} + +.chart-col.current .chart-label { + color: var(--accent-strong); +} + +.chart-empty { + display: grid; + height: 184px; + place-items: center; + margin-top: 14px; + color: var(--text-3); + font-size: 13px; + text-align: center; +} + +.storage-mini-list { + display: flex; + flex-direction: column; +} + +.storage-mini { + display: flex; + align-items: center; + gap: 11px; + padding: 12px 0; + border-bottom: 1px solid var(--line); +} + +.storage-mini:last-child { + border-bottom: none; +} + +.storage-mini-icon { + display: grid; + place-items: center; + width: 32px; + height: 32px; + flex: none; + color: var(--text-2); + background: var(--surface-muted); + border-radius: 8px; +} + +.storage-mini-main { + min-width: 0; + flex: 1; +} + +.storage-mini-main strong { + display: block; + overflow: hidden; + color: var(--text); + font-size: 13px; + font-weight: 500; + text-overflow: ellipsis; + white-space: nowrap; +} + +.storage-mini-main span { + display: block; + overflow: hidden; + margin-top: 1px; + color: var(--text-3); + font-size: 12px; + text-overflow: ellipsis; + white-space: nowrap; +} + +.recent-list { + display: flex; + flex-direction: column; +} + +.recent-task { + display: flex; + align-items: center; + gap: 16px; + padding: 13px 0; + border-bottom: 1px solid var(--line); +} + +.recent-task:last-child { + border-bottom: none; +} + +.recent-task-main { + min-width: 0; + flex: 1; +} + +.recent-task-title { + overflow: hidden; + color: var(--text); + font-size: 13px; + font-weight: 500; + text-overflow: ellipsis; + white-space: nowrap; +} + +.recent-task-meta { + display: flex; + flex-wrap: wrap; + gap: 6px; + margin-top: 3px; + color: var(--text-3); + font-size: 12px; +} + +.recent-task-side { + display: flex; + flex: none; + align-items: center; + gap: 12px; +} + +.recent-task-progress { + width: 90px; +} + +.link-quiet { + color: var(--accent-strong); + font-size: 13px; + font-weight: 500; +} + +.link-quiet:hover { + color: var(--accent); +} + +/* Storages */ + +.storage-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); + gap: 16px; +} + +.storage-card { + display: flex; + min-width: 0; + flex-direction: column; + gap: 18px; + padding: 22px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: var(--radius-lg); +} + +.storage-card-head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 12px; +} + +.storage-identity { + display: flex; + min-width: 0; + align-items: center; + gap: 11px; +} + +.storage-icon { + display: grid; + place-items: center; + width: 38px; + height: 38px; + flex: none; + color: var(--text-2); + background: var(--surface-muted); + border-radius: 9px; +} + +.storage-card h2 { + overflow: hidden; + color: var(--text); + font-size: 16px; + font-weight: 500; + letter-spacing: -0.01em; + text-overflow: ellipsis; + white-space: nowrap; +} + +.storage-kind { + margin-top: 2px; + color: var(--text-3); + font-size: 12px; +} + +.storage-detail { + min-height: 38px; + color: var(--text-2); + font-family: var(--font-mono); + font-size: 12px; + line-height: 1.6; + overflow-wrap: anywhere; +} + +.storage-card-error { + margin: -6px 0 0; + color: var(--danger); + font-size: 12px; +} + +.storage-card-foot { + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + padding-top: 16px; + margin-top: auto; + border-top: 1px solid var(--line); +} + +.storage-empty { + display: flex; + grid-column: 1 / -1; + min-height: 220px; + align-items: center; + justify-content: center; + flex-direction: column; + gap: 10px; + padding: 32px; + color: var(--text-3); + background: var(--surface); + border: 1px dashed var(--line-strong); + border-radius: var(--radius-lg); + font-size: 13px; + text-align: center; +} + +/* Settings */ + +.settings-layout { + display: grid; + grid-template-columns: 196px minmax(0, 1fr); + gap: 28px; + align-items: start; +} + +.settings-nav { + position: sticky; + top: 84px; + display: flex; + flex-direction: column; + gap: 2px; + padding-top: 2px; +} + +.settings-nav button { + display: flex; + align-items: center; + height: 34px; + padding: 0 10px; + color: var(--text-2); + background: transparent; + border: 1px solid transparent; + border-radius: 7px; + font-size: 13px; + text-align: left; + transition: + color 140ms var(--ease), + background-color 140ms var(--ease), + border-color 140ms var(--ease); +} + +.settings-nav button:hover { + color: var(--text); + background: rgba(18, 22, 29, 0.045); +} + +.settings-nav button.active { + color: var(--text); + background: var(--surface); + border-color: var(--line); + font-weight: 500; +} + +.settings-sections { + display: flex; + min-width: 0; + flex-direction: column; + gap: 18px; +} + +.settings-group { + scroll-margin-top: 84px; +} + +.settings-group-head { + padding-bottom: 16px; + margin-bottom: 20px; + border-bottom: 1px solid var(--line); +} + +.settings-group-head h2 { + color: var(--text); + font-size: 16px; + font-weight: 500; +} + +.settings-group-head p { + margin: 5px 0 0; + color: var(--text-3); + font-size: 12px; + line-height: 1.6; +} + +/* Telegram */ + +.connection-grid { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 16px; +} + +.connection-card { + display: flex; + min-width: 0; + flex-direction: column; + gap: 16px; + padding: 22px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: var(--radius-lg); +} + +.connection-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +.connection-title { + display: flex; + align-items: center; + gap: 9px; + color: var(--text); + font-size: 16px; + font-weight: 500; +} + +.connection-title svg { + color: var(--text-3); +} + +.connection-identity { + min-width: 0; + color: var(--text); + font-family: var(--font-mono); + font-size: 16px; + letter-spacing: -0.01em; + line-height: 1.35; + overflow-wrap: anywhere; +} + +.connection-meta { + margin-top: 5px; + color: var(--text-2); + font-size: 13px; + line-height: 1.5; +} + +.connection-actions { + display: flex; + flex-wrap: wrap; + gap: 8px; + padding-top: 2px; +} + +.telegram-columns { + display: grid; + grid-template-columns: minmax(0, 1.35fr) minmax(0, 0.85fr); + gap: 16px; + align-items: start; +} + +.flow-status { + display: flex; + align-items: center; + gap: 8px; + padding: 12px 0; + color: var(--text-3); + font-size: 12px; +} + +.flow-steps { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 8px; + padding: 4px 0 2px; +} + +.flow-step { + padding-top: 9px; + border-top: 2px solid var(--line); + color: var(--text-3); + font-size: 12px; +} + +.flow-step.active { + border-color: var(--accent); + color: var(--accent-strong); +} + +.flow-step.done { + border-color: var(--success); + color: var(--success); +} + +/* System */ + +.process-panel { + display: grid; + grid-template-columns: minmax(0, 1.2fr) minmax(0, 1fr); + gap: 28px; + padding: 26px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: var(--radius-lg); +} + +.process-version { + margin-top: 12px; + color: var(--text); + font-size: 28px; + font-variant-numeric: tabular-nums; + font-weight: 500; + letter-spacing: -0.05em; + line-height: 1.1; +} + +.process-meta { + margin-top: 6px; + color: var(--text-3); + font-family: var(--font-mono); + font-size: 12px; + overflow-wrap: anywhere; +} + +.process-metrics { + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 16px; +} + +.process-metrics .stat-value { + font-size: 24px; +} + +/* Login */ + +.login-shell { + display: grid; + grid-template-columns: minmax(0, 1.08fr) minmax(420px, 0.92fr); + min-height: 100vh; + background: var(--paper); +} + +.login-story { + display: flex; + min-height: 100vh; + flex-direction: column; + justify-content: space-between; + padding: 44px clamp(32px, 6vw, 88px); + color: var(--ink-text); + background: var(--ink); +} + +.login-brand { + display: flex; + align-items: center; + gap: 11px; + color: #f2f4f8; + font-size: 16px; + font-weight: 600; +} + +.login-brand .brand-mark { + color: var(--ink-text); +} + +.login-copy { + max-width: 560px; + margin: auto 0; + padding: 56px 0; +} + +.login-copy h1 { + max-width: none; + color: #f1f4f8; + font-size: clamp(28px, 3.4vw, 40px); + font-weight: 500; + letter-spacing: -0.035em; + line-height: 1.14; + white-space: nowrap; +} + +.login-copy p { + max-width: 46ch; + margin: 20px 0 0; + color: #a1acba; + font-size: 14px; + line-height: 1.75; +} + +.login-route { + display: flex; + max-width: 370px; + flex-direction: column; + margin-top: 42px; +} + +.route-item { + position: relative; + display: grid; + grid-template-columns: 14px minmax(0, 1fr); + gap: 14px; + padding-bottom: 22px; +} + +.route-item:last-child { + padding-bottom: 0; +} + +.route-item:not(:last-child)::before { + content: ''; + position: absolute; + left: 3px; + top: 13px; + bottom: 0; + width: 1px; + background: var(--ink-line); +} + +.route-node { + position: relative; + z-index: 1; + width: 7px; + height: 7px; + margin-top: 6px; + background: #727d8c; + border-radius: 50%; +} + +.route-item:first-child .route-node { + background: var(--accent); + box-shadow: 0 0 0 4px rgba(61, 90, 152, 0.16); +} + +.route-item strong { + display: block; + color: #e8edf3; + font-size: 13px; + font-weight: 500; +} + +.route-item span { + display: block; + margin-top: 1px; + color: #95a0ae; + font-size: 12px; +} + +.login-note { + color: #7f8997; + font-size: 12px; +} + +.login-panel { + display: flex; + align-items: center; + justify-content: center; + padding: 40px; +} + +.login-form { + display: flex; + width: 100%; + max-width: 390px; + flex-direction: column; + gap: 20px; +} + +.login-form-head h2 { + color: var(--text); + font-size: 20px; + font-weight: 500; + letter-spacing: -0.02em; +} + +.login-form-head p { + margin: 7px 0 0; + color: var(--text-2); + font-size: 13px; + line-height: 1.65; +} + +.login-form .btn { + height: 42px; +} + +.login-help { + padding-top: 4px; + color: var(--text-3); + font-size: 12px; + line-height: 1.65; +} + +.login-help code { + padding: 1px 4px; + background: var(--surface-muted); + border-radius: 4px; +} + +/* Utilities */ + +.fade-in { + animation: fade-in 360ms var(--ease) both; +} + +@keyframes fade-in { + from { + opacity: 0; + transform: translateY(6px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +@media (max-width: 1180px) { + .dashboard-split { + grid-template-columns: minmax(0, 1.3fr) minmax(260px, 0.7fr); + } + + .telegram-columns { + grid-template-columns: 1fr; + } +} + +@media (max-width: 960px) { + .sidebar { + transform: translateX(-100%); + transition: transform 260ms var(--ease); + } + + .sidebar.open { + transform: translateX(0); + } + + .sidebar-close { + display: inline-flex; + } + + .main { + margin-left: 0; + } + + .topbar { + padding: 0 20px; + } + + .btn.menu-button { + display: inline-flex; + } + + .topbar-mobile-title { + display: block; + } + + .content { + padding: 24px 20px 56px; + } + + .sidebar-backdrop { + position: fixed; + inset: 0; + z-index: 35; + background: rgba(10, 14, 20, 0.45); + } + + .settings-layout { + grid-template-columns: 1fr; + gap: 18px; + } + + .settings-nav { + position: static; + flex-direction: row; + overflow-x: auto; + padding-bottom: 4px; + } + + .settings-nav button { + flex: none; + white-space: nowrap; + } + + .page-head { + align-items: flex-start; + flex-direction: column; + gap: 16px; + } + + .page-actions { + width: 100%; + } + + .login-shell { + grid-template-columns: 1fr; + } + + .login-story { + min-height: auto; + padding: 28px 24px 30px; + } + + .login-copy { + padding: 34px 0 0; + } + + .login-copy h1 { + max-width: 12em; + font-size: clamp(28px, 6.5vw, 36px); + white-space: normal; + } + + .login-route { + display: none; + } + + .login-note { + margin-top: 26px; + } + + .login-panel { + align-items: flex-start; + padding: 32px 24px 56px; + } + + .login-form { + max-width: none; + } +} + +@media (max-width: 760px) { + .content { + gap: 16px; + } + + .page-head h1 { + font-size: 24px; + } + + .relay-board { + padding: 22px; + gap: 20px; + } + + .relay-flow { + flex-direction: column; + gap: 0; + } + + .relay-link { + width: auto; + height: 28px; + transform: rotate(90deg); + } + + .relay-metrics { + grid-template-columns: 1fr; + gap: 16px; + } + + .dashboard-split, + .connection-grid, + .process-panel { + grid-template-columns: 1fr; + } + + .process-metrics { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } + + .storage-grid { + grid-template-columns: 1fr; + } + + .form-grid { + grid-template-columns: 1fr; + } + + .modal { + padding: 22px 18px; + } + + .table-wrap { + border-radius: 12px; + } + + th, + td { + padding: 12px 14px; + } + + .kv { + grid-template-columns: 1fr; + gap: 2px; + } + + .kv dd { + margin-bottom: 10px; + } + + .btn .btn-label { + display: none; + } +} + +@media (max-width: 520px) { + .toast-stack { + right: 16px; + bottom: 16px; + left: 16px; + width: auto; + } + + .topbar { + padding: 0 16px; + } + + .content { + padding: 20px 16px 48px; + } + + .card, + .panel { + padding: 20px 18px; + } + + .page-head h1 { + font-size: 24px; + } + + .process-metrics { + grid-template-columns: 1fr; + gap: 14px; + } + + .recent-task { + align-items: flex-start; + flex-direction: column; + gap: 8px; + } + + .recent-task-side { + width: 100%; + justify-content: space-between; + } + + .recent-task-progress { + width: 120px; + } + + .chart-label { + font-size: 12px; + } +} + +@media (prefers-reduced-motion: reduce) { + *, + *::before, + *::after { + scroll-behavior: auto !important; + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + } +} diff --git a/web/ui/src/components/AppIcon.vue b/web/ui/src/components/AppIcon.vue new file mode 100644 index 00000000..e488e067 --- /dev/null +++ b/web/ui/src/components/AppIcon.vue @@ -0,0 +1,98 @@ + + + diff --git a/web/ui/src/components/AppLayout.vue b/web/ui/src/components/AppLayout.vue new file mode 100644 index 00000000..b485534e --- /dev/null +++ b/web/ui/src/components/AppLayout.vue @@ -0,0 +1,236 @@ + + + diff --git a/web/ui/src/components/AppSelect.vue b/web/ui/src/components/AppSelect.vue new file mode 100644 index 00000000..d7cc2992 --- /dev/null +++ b/web/ui/src/components/AppSelect.vue @@ -0,0 +1,249 @@ + + + diff --git a/web/ui/src/components/AppToaster.vue b/web/ui/src/components/AppToaster.vue new file mode 100644 index 00000000..af6ae8ee --- /dev/null +++ b/web/ui/src/components/AppToaster.vue @@ -0,0 +1,33 @@ + + + diff --git a/web/ui/src/components/BrandMark.vue b/web/ui/src/components/BrandMark.vue new file mode 100644 index 00000000..7435cec2 --- /dev/null +++ b/web/ui/src/components/BrandMark.vue @@ -0,0 +1,24 @@ + + + diff --git a/web/ui/src/components/ConfirmDialog.vue b/web/ui/src/components/ConfirmDialog.vue new file mode 100644 index 00000000..55200363 --- /dev/null +++ b/web/ui/src/components/ConfirmDialog.vue @@ -0,0 +1,50 @@ + + + diff --git a/web/ui/src/components/PageHeader.vue b/web/ui/src/components/PageHeader.vue new file mode 100644 index 00000000..b7e3da23 --- /dev/null +++ b/web/ui/src/components/PageHeader.vue @@ -0,0 +1,18 @@ + + + diff --git a/web/ui/src/components/StorageForm.vue b/web/ui/src/components/StorageForm.vue new file mode 100644 index 00000000..80d66dfa --- /dev/null +++ b/web/ui/src/components/StorageForm.vue @@ -0,0 +1,194 @@ + + + diff --git a/web/ui/src/components/TaskForm.vue b/web/ui/src/components/TaskForm.vue new file mode 100644 index 00000000..a32a3636 --- /dev/null +++ b/web/ui/src/components/TaskForm.vue @@ -0,0 +1,235 @@ + + + diff --git a/web/ui/src/components/TaskTable.vue b/web/ui/src/components/TaskTable.vue new file mode 100644 index 00000000..ccf1060c --- /dev/null +++ b/web/ui/src/components/TaskTable.vue @@ -0,0 +1,127 @@ + + + diff --git a/web/ui/src/env.d.ts b/web/ui/src/env.d.ts new file mode 100644 index 00000000..11f02fe2 --- /dev/null +++ b/web/ui/src/env.d.ts @@ -0,0 +1 @@ +/// diff --git a/web/ui/src/main.ts b/web/ui/src/main.ts new file mode 100644 index 00000000..f5415397 --- /dev/null +++ b/web/ui/src/main.ts @@ -0,0 +1,27 @@ +import { createApp } from 'vue' +import { createPinia } from 'pinia' +import App from './App.vue' +import router from './router' +import { configureApi } from './api' +import { useAuthStore } from './stores/auth' +import './assets/main.css' + +const app = createApp(App) +const pinia = createPinia() +app.use(pinia) + +const auth = useAuthStore() + +configureApi({ + getCsrf: () => auth.csrf, + onUnauthorized: () => { + auth.clear() + const current = router.currentRoute.value + if (current.name !== 'login') { + void router.replace({ path: '/login', query: { redirect: current.fullPath } }) + } + }, +}) + +app.use(router) +app.mount('#app') diff --git a/web/ui/src/router.ts b/web/ui/src/router.ts new file mode 100644 index 00000000..4c90e57a --- /dev/null +++ b/web/ui/src/router.ts @@ -0,0 +1,100 @@ +import { createRouter, createWebHistory } from 'vue-router' +import { useAuthStore } from './stores/auth' +import AppLayout from './components/AppLayout.vue' +import LoginView from './views/LoginView.vue' +import DashboardView from './views/DashboardView.vue' +import TasksView from './views/TasksView.vue' +import StoragesView from './views/StoragesView.vue' +import UsersView from './views/UsersView.vue' +import TelegramView from './views/TelegramView.vue' +import SettingsView from './views/SettingsView.vue' +import SystemView from './views/SystemView.vue' + +const router = createRouter({ + history: createWebHistory(), + routes: [ + { + path: '/login', + name: 'login', + component: LoginView, + meta: { title: '登录', public: true }, + }, + { + path: '/', + component: AppLayout, + children: [ + { + path: '', + name: 'dashboard', + component: DashboardView, + meta: { title: '运行概览' }, + }, + { + path: 'tasks', + name: 'tasks', + component: TasksView, + meta: { title: '任务' }, + }, + { + path: 'storages', + name: 'storages', + component: StoragesView, + meta: { title: '存储' }, + }, + { + path: 'users', + name: 'users', + component: UsersView, + meta: { title: '用户' }, + }, + { + path: 'telegram', + name: 'telegram', + component: TelegramView, + meta: { title: 'Telegram' }, + }, + { + path: 'settings', + name: 'settings', + component: SettingsView, + meta: { title: '设置' }, + }, + { + path: 'system', + name: 'system', + component: SystemView, + meta: { title: '系统' }, + }, + ], + }, + { + path: '/:pathMatch(.*)*', + redirect: '/', + }, + ], +}) + +router.beforeEach(async (to) => { + const auth = useAuthStore() + const isPublic = to.meta.public === true + if (!auth.checked) { + await auth.ensure() + } + if (isPublic) { + if (auth.authenticated && to.name === 'login') { + return { path: '/' } + } + return true + } + if (!auth.authenticated) { + return { path: '/login', query: { redirect: to.fullPath } } + } + return true +}) + +router.afterEach((to) => { + const title = typeof to.meta.title === 'string' ? to.meta.title : '' + document.title = title ? `${title} - SaveAny-Bot` : 'SaveAny-Bot' +}) + +export default router diff --git a/web/ui/src/settingsFields.ts b/web/ui/src/settingsFields.ts new file mode 100644 index 00000000..d2c6e7ef --- /dev/null +++ b/web/ui/src/settingsFields.ts @@ -0,0 +1,238 @@ +export type SettingsFieldKind = 'text' | 'number' | 'bool' | 'password' | 'select' | 'list' | 'json' + +export interface SettingsField { + path: string + label: string + kind: SettingsFieldKind + placeholder?: string + hint?: string + options?: { value: string; label: string }[] +} + +export interface SettingsGroupDef { + key: string + title: string + description: string + fields: SettingsField[] +} + +export const settingsGroups: SettingsGroupDef[] = [ + { + key: 'core', + title: '核心', + description: '语言、并发、重试与全局代理。修改 workers 或 proxy 后需要重启。', + fields: [ + { + path: 'lang', + label: '界面语言', + kind: 'select', + options: [ + { value: 'zh-Hans', label: '简体中文' }, + { value: 'en', label: 'English' }, + ], + }, + { path: 'workers', label: 'Worker 数量', kind: 'number', hint: '重启后生效' }, + { path: 'retry', label: '重试次数', kind: 'number' }, + { path: 'threads', label: '下载线程数', kind: 'number' }, + { path: 'stream', label: '流式下载', kind: 'bool' }, + { path: 'no_clean_cache', label: '保留缓存', kind: 'bool' }, + { + path: 'proxy', + label: '全局代理', + kind: 'text', + placeholder: 'socks5://127.0.0.1:1080', + hint: '重启后生效', + }, + ], + }, + { + key: 'log', + title: '日志', + description: '日志级别即时生效。', + fields: [ + { + path: 'level', + label: '日志级别', + kind: 'select', + options: [ + { value: 'debug', label: 'debug' }, + { value: 'info', label: 'info' }, + { value: 'warn', label: 'warn' }, + { value: 'error', label: 'error' }, + ], + }, + ], + }, + { + key: 'aria2', + title: 'Aria2', + description: 'Aria2 RPC 下载配置。', + fields: [ + { path: 'enable', label: '启用 Aria2', kind: 'bool' }, + { + path: 'url', + label: 'RPC 地址', + kind: 'text', + placeholder: 'http://127.0.0.1:6800/jsonrpc', + }, + { path: 'secret', label: 'RPC 密钥', kind: 'password' }, + { path: 'keep_file', label: '保留临时文件', kind: 'bool' }, + ], + }, + { + key: 'ytdlp', + title: 'yt-dlp', + description: '视频下载格式与命名规则。', + fields: [ + { path: 'max_height', label: '最大高度', kind: 'number', hint: '0 表示不限制' }, + { path: 'format', label: '格式选择', kind: 'text', placeholder: 'bestvideo+bestaudio/best' }, + { path: 'recode', label: '转码容器', kind: 'text', placeholder: 'mp4' }, + { + path: 'filename_template', + label: '文件名模板', + kind: 'text', + placeholder: '%(title)s.%(ext)s', + }, + { path: 'restrict_filenames', label: '限制文件名(仅 ASCII)', kind: 'bool' }, + ], + }, + { + key: 'parser', + title: '解析器', + description: '解析插件加载配置。插件开关与目录需要重启。', + fields: [ + { path: 'plugin_enable', label: '启用插件', kind: 'bool', hint: '重启后生效' }, + { + path: 'plugin_dirs', + label: '插件目录', + kind: 'list', + hint: '每行一个目录', + placeholder: 'plugins', + }, + { path: 'proxy', label: '解析代理', kind: 'text', placeholder: 'http://127.0.0.1:7890' }, + { + path: 'configs', + label: '插件配置 (JSON)', + kind: 'json', + placeholder: '{"example": {"key": "value"}}', + hint: '按插件名组织的 JSON 对象', + }, + ], + }, + { + key: 'cache', + title: '缓存', + description: '内存缓存参数,修改后需要重启。', + fields: [ + { path: 'ttl', label: 'TTL(秒)', kind: 'number' }, + { path: 'num_counters', label: '计数器数量', kind: 'number' }, + { path: 'max_cost', label: '最大开销', kind: 'number' }, + ], + }, + { + key: 'db', + title: '数据库', + description: 'Bot 会话数据库路径。修改后需要重启。', + fields: [ + { path: 'session', label: '会话数据库', kind: 'text', placeholder: 'data/session.db' }, + ], + }, + { + key: 'temp', + title: '临时目录', + description: '下载过程中的临时文件存放位置。', + fields: [{ path: 'base_path', label: '基础路径', kind: 'text', placeholder: 'cache/' }], + }, + { + key: 'hook', + title: '钩子', + description: '任务生命周期中执行的 Shell 命令。修改后需要重启。', + fields: [ + { + path: 'exec.task_before_start', + label: '任务开始前', + kind: 'text', + placeholder: '/path/to/hook.sh start', + }, + { path: 'exec.task_success', label: '任务成功', kind: 'text' }, + { path: 'exec.task_fail', label: '任务失败', kind: 'text' }, + { path: 'exec.task_cancel', label: '任务取消', kind: 'text' }, + ], + }, + { + key: 'web', + title: 'Web 服务', + description: '监听地址与 API Token。监听地址变更需要重启。', + fields: [ + { path: 'enable', label: '启用 Web 服务', kind: 'bool', hint: '重启后生效' }, + { + path: 'listen', + label: '监听地址', + kind: 'text', + placeholder: '0.0.0.0:8080', + hint: '重启后生效', + }, + { + path: 'api_token', + label: 'API Token', + kind: 'password', + hint: '用于 Bearer 认证,留空禁用', + }, + { path: 'secure_cookie', label: 'Secure Cookie', kind: 'bool', hint: '仅在 HTTPS 下启用' }, + ], + }, +] + +export const telegramGroup: SettingsGroupDef = { + key: 'telegram', + title: 'Telegram 凭据', + description: 'Bot Token 与 API 凭据。保存后会尝试立即应用。', + fields: [ + { path: 'token', label: 'Bot Token', kind: 'password', placeholder: '123456:ABC-DEF...' }, + { path: 'app_id', label: 'API ID', kind: 'number' }, + { path: 'app_hash', label: 'API Hash', kind: 'password' }, + { path: 'rpc_retry', label: 'RPC 重试次数', kind: 'number' }, + { path: 'media_group_timeout', label: '媒体组超时(秒)', kind: 'number' }, + { path: 'proxy.enable', label: '启用代理', kind: 'bool' }, + { path: 'proxy.url', label: '代理地址', kind: 'text', placeholder: 'socks5://127.0.0.1:1080' }, + { path: 'userbot.enable', label: '启用 Userbot', kind: 'bool' }, + { path: 'userbot.session', label: 'Userbot 会话文件', kind: 'text' }, + { path: 'userbot.phone', label: 'Userbot 手机号', kind: 'text', placeholder: '+8613800000000' }, + ], +} + +export function getByPath(source: Record, path: string): unknown { + let current: unknown = source + for (const key of path.split('.')) { + if (current === null || typeof current !== 'object') { + return undefined + } + current = (current as Record)[key] + } + return current +} + +export function setByPath(target: Record, path: string, value: unknown): void { + const keys = path.split('.') + let current: Record = target + for (let i = 0; i < keys.length - 1; i += 1) { + const key = keys[i] + const next = current[key] + if (next === null || typeof next !== 'object' || Array.isArray(next)) { + const created: Record = {} + current[key] = created + current = created + } else { + current = next as Record + } + } + current[keys[keys.length - 1]] = value +} + +export function cloneGroup(source: Record | undefined): Record { + if (!source) { + return {} + } + // Values originate from the server's JSON document, so the round-trip shape is preserved. + return JSON.parse(JSON.stringify(source)) as Record +} diff --git a/web/ui/src/storageFields.ts b/web/ui/src/storageFields.ts new file mode 100644 index 00000000..26f53c32 --- /dev/null +++ b/web/ui/src/storageFields.ts @@ -0,0 +1,160 @@ +export type StorageFieldKind = 'text' | 'number' | 'bool' | 'secret' | 'list' + +export interface StorageField { + name: string + label: string + kind: StorageFieldKind + placeholder?: string + hint?: string +} + +export interface StorageTypeDef { + type: string + label: string + fields: StorageField[] +} + +export const storageTypeDefs: StorageTypeDef[] = [ + { + type: 'local', + label: '本地磁盘', + fields: [ + { name: 'base_path', label: '基础路径', kind: 'text', placeholder: '/data/downloads' }, + ], + }, + { + type: 'webdav', + label: 'WebDAV', + fields: [ + { name: 'url', label: '服务器地址', kind: 'text', placeholder: 'https://dav.example.com' }, + { name: 'username', label: '用户名', kind: 'text' }, + { name: 'password', label: '密码', kind: 'secret' }, + { name: 'base_path', label: '基础路径', kind: 'text', placeholder: '/saveany' }, + ], + }, + { + type: 'alist', + label: 'AList', + fields: [ + { name: 'url', label: '服务器地址', kind: 'text', placeholder: 'https://alist.example.com' }, + { name: 'username', label: '用户名', kind: 'text' }, + { name: 'password', label: '密码', kind: 'secret' }, + { name: 'token', label: 'Token', kind: 'secret', hint: '可留空,登录后自动获取' }, + { name: 'base_path', label: '基础路径', kind: 'text', placeholder: '/saveany' }, + { + name: 'token_exp', + label: 'Token 过期时间', + kind: 'number', + hint: 'Unix 时间戳,可留空由服务端刷新', + }, + ], + }, + { + type: 's3', + label: 'S3 兼容存储', + fields: [ + { name: 'endpoint', label: 'Endpoint', kind: 'text', placeholder: 's3.example.com' }, + { name: 'access_key_id', label: 'Access Key ID', kind: 'secret' }, + { name: 'secret_access_key', label: 'Secret Access Key', kind: 'secret' }, + { name: 'bucket_name', label: 'Bucket', kind: 'text' }, + { name: 'base_path', label: '基础路径', kind: 'text' }, + { name: 'use_ssl', label: '使用 SSL', kind: 'bool' }, + { name: 'region', label: 'Region', kind: 'text', placeholder: 'us-east-1' }, + { name: 'virtual_host', label: 'Virtual Host 模式', kind: 'bool' }, + ], + }, + { + type: 'minio', + label: 'MinIO', + fields: [ + { name: 'endpoint', label: 'Endpoint', kind: 'text', placeholder: 'minio.example.com:9000' }, + { name: 'access_key_id', label: 'Access Key ID', kind: 'secret' }, + { name: 'secret_access_key', label: 'Secret Access Key', kind: 'secret' }, + { name: 'bucket_name', label: 'Bucket', kind: 'text' }, + { name: 'base_path', label: '基础路径', kind: 'text' }, + { name: 'use_ssl', label: '使用 SSL', kind: 'bool' }, + ], + }, + { + type: 'telegram', + label: 'Telegram', + fields: [ + { name: 'chat_id', label: 'Chat ID', kind: 'number', hint: '目标频道或群组的数字 ID' }, + { name: 'force_file', label: '强制以文件发送', kind: 'bool' }, + { name: 'rate_limit', label: '速率限制', kind: 'number', hint: '每秒请求数,0 表示默认' }, + { name: 'rate_burst', label: '突发数量', kind: 'number' }, + { name: 'skip_large', label: '跳过超限文件', kind: 'bool', hint: '跳过超过 2GB 的文件' }, + { name: 'split_large_video', label: '分割大视频', kind: 'bool' }, + { name: 'split_size_mb', label: '分割大小 (MB)', kind: 'number' }, + ], + }, + { + type: 'rclone', + label: 'rclone', + fields: [ + { name: 'remote', label: 'Remote 名称', kind: 'text', placeholder: 'myremote' }, + { name: 'base_path', label: '基础路径', kind: 'text' }, + { + name: 'config_path', + label: '配置文件路径', + kind: 'text', + hint: '留空使用默认 rclone 配置', + }, + { name: 'flags', label: '额外参数', kind: 'list', hint: '每行一个参数,例如 --transfers 4' }, + ], + }, +] + +export function storageTypeDef(type: string): StorageTypeDef | undefined { + return storageTypeDefs.find((item) => item.type === type) +} + +export function storageTypeLabel(type: string): string { + return storageTypeDef(type)?.label ?? type +} + +export function storageTypeIcon(type: string): string { + switch (type) { + case 'local': + return 'folder' + case 'webdav': + case 'alist': + case 's3': + return 'cloud' + case 'minio': + return 'server' + case 'telegram': + return 'send' + case 'rclone': + return 'hardDrive' + default: + return 'database' + } +} + +export function storageDefaults(type: string): Record { + const def = storageTypeDef(type) + const config: Record = {} + if (!def) { + return config + } + for (const field of def.fields) { + switch (field.kind) { + case 'bool': + config[field.name] = false + break + case 'number': + config[field.name] = 0 + break + case 'list': + config[field.name] = [] + break + default: + config[field.name] = '' + } + } + if (type === 's3' || type === 'minio') { + config.use_ssl = true + } + return config +} diff --git a/web/ui/src/stores/auth.ts b/web/ui/src/stores/auth.ts new file mode 100644 index 00000000..c9cbbfc1 --- /dev/null +++ b/web/ui/src/stores/auth.ts @@ -0,0 +1,65 @@ +import { defineStore } from 'pinia' +import { ApiError, authApi } from '../api' + +interface AuthState { + csrf: string + authenticated: boolean + checked: boolean +} + +export const useAuthStore = defineStore('auth', { + state: (): AuthState => ({ + csrf: '', + authenticated: false, + checked: false, + }), + actions: { + clear() { + this.csrf = '' + this.authenticated = false + this.checked = true + }, + async login(password: string) { + try { + const result = await authApi.login(password) + this.csrf = result.csrf_token + this.authenticated = true + this.checked = true + } catch (err) { + this.clear() + throw err + } + }, + async logout() { + try { + await authApi.logout() + } finally { + this.clear() + } + }, + async changePassword(currentPassword: string, newPassword: string) { + await authApi.changePassword(currentPassword, newPassword) + }, + async ensure(): Promise { + if (this.checked) { + return this.authenticated + } + try { + const me = await authApi.me() + this.authenticated = me.authenticated === true + this.csrf = this.authenticated ? (me.csrf_token ?? '') : '' + } catch (err) { + if (err instanceof ApiError && err.status === 401) { + this.authenticated = false + this.csrf = '' + } else { + this.authenticated = false + this.csrf = '' + } + } finally { + this.checked = true + } + return this.authenticated + }, + }, +}) diff --git a/web/ui/src/stores/toasts.ts b/web/ui/src/stores/toasts.ts new file mode 100644 index 00000000..ed064a9b --- /dev/null +++ b/web/ui/src/stores/toasts.ts @@ -0,0 +1,49 @@ +import { defineStore } from 'pinia' + +export type ToastTone = 'success' | 'error' | 'info' + +export interface ToastItem { + id: number + tone: ToastTone + message: string +} + +let nextId = 1 +const timers = new Map() + +export const useToastStore = defineStore('toasts', { + state: () => ({ + items: [] as ToastItem[], + }), + actions: { + push(message: string, tone: ToastTone = 'info', duration = 4200): number { + const id = nextId++ + this.items.push({ id, tone, message }) + if (this.items.length > 4) { + this.dismiss(this.items[0].id) + } + if (duration > 0) { + timers.set( + id, + window.setTimeout(() => this.dismiss(id), duration), + ) + } + return id + }, + dismiss(id: number) { + const timer = timers.get(id) + if (timer !== undefined) { + window.clearTimeout(timer) + timers.delete(id) + } + this.items = this.items.filter((item) => item.id !== id) + }, + clear() { + for (const timer of timers.values()) { + window.clearTimeout(timer) + } + timers.clear() + this.items = [] + }, + }, +}) diff --git a/web/ui/src/stores/ui.ts b/web/ui/src/stores/ui.ts new file mode 100644 index 00000000..062a979d --- /dev/null +++ b/web/ui/src/stores/ui.ts @@ -0,0 +1,24 @@ +import { defineStore } from 'pinia' + +interface UiState { + restartRequired: string[] + warnings: string[] +} + +export const useUiStore = defineStore('ui', { + state: (): UiState => ({ + restartRequired: [], + warnings: [], + }), + actions: { + setRestartRequired(fields: string[]) { + this.restartRequired = [...fields] + }, + setWarnings(fields: string[]) { + this.warnings = [...fields] + }, + clearRestartRequired() { + this.restartRequired = [] + }, + }, +}) diff --git a/web/ui/src/taskFields.ts b/web/ui/src/taskFields.ts new file mode 100644 index 00000000..4730bb0c --- /dev/null +++ b/web/ui/src/taskFields.ts @@ -0,0 +1,162 @@ +export type TaskFieldKind = 'text' | 'number' | 'bool' | 'list' | 'json' + +export interface TaskField { + name: string + label: string + kind: TaskFieldKind + placeholder?: string + required?: boolean + hint?: string + storageSelect?: boolean +} + +export interface TaskTypeDef { + type: string + label: string + description: string + fields: TaskField[] +} + +export const taskTypeDefs: TaskTypeDef[] = [ + { + type: 'directlinks', + label: '直链下载', + description: '从 HTTP/HTTPS 直链下载文件并上传到存储。', + fields: [ + { + name: 'urls', + label: '下载链接', + kind: 'list', + required: true, + placeholder: 'https://example.com/file.zip\nhttps://example.com/another.zip', + hint: '每行一个链接', + }, + ], + }, + { + type: 'ytdlp', + label: 'yt-dlp 视频', + description: '使用 yt-dlp 下载视频站点内容。', + fields: [ + { + name: 'urls', + label: '视频链接', + kind: 'list', + required: true, + placeholder: 'https://www.youtube.com/watch?v=...', + hint: '每行一个链接', + }, + { + name: 'flags', + label: '额外参数', + kind: 'list', + placeholder: '--cookies-from-browser chrome', + hint: '每行一个 yt-dlp 参数', + }, + ], + }, + { + type: 'aria2', + label: 'Aria2 下载', + description: '通过 Aria2 RPC 下载链接。', + fields: [ + { + name: 'urls', + label: '下载链接', + kind: 'list', + required: true, + placeholder: 'https://example.com/file.iso', + hint: '每行一个链接', + }, + { + name: 'options', + label: 'Aria2 选项 (JSON)', + kind: 'json', + placeholder: '{"split": "8", "max-connection-per-server": "8"}', + hint: 'JSON 对象,键值均为字符串(可选)', + }, + ], + }, + { + type: 'parseditem', + label: '解析链接', + description: '调用插件解析页面中的媒体并下载。', + fields: [ + { + name: 'url', + label: '页面链接', + kind: 'text', + required: true, + placeholder: 'https://example.com/post/123', + }, + ], + }, + { + type: 'tgfiles', + label: 'Telegram 文件', + description: '下载 Telegram 消息中的文件并上传到存储。', + fields: [ + { + name: 'message_links', + label: '消息链接', + kind: 'list', + required: true, + placeholder: 'https://t.me/c/123456789/42', + hint: '每行一个消息链接', + }, + ], + }, + { + type: 'tphpics', + label: 'Telegraph 图集', + description: '下载 Telegraph 页面中的图片。', + fields: [ + { + name: 'telegraph_url', + label: 'Telegraph 链接', + kind: 'text', + required: true, + placeholder: 'https://telegra.ph/...', + }, + ], + }, + { + type: 'transfer', + label: '存储迁移', + description: '在两个存储之间复制文件。', + fields: [ + { + name: 'source_storage', + label: '源存储', + kind: 'text', + required: true, + storageSelect: true, + }, + { + name: 'source_path', + label: '源路径', + kind: 'text', + required: true, + placeholder: 'folder/subfolder', + }, + { + name: 'target_storage', + label: '目标存储', + kind: 'text', + required: true, + storageSelect: true, + }, + { + name: 'target_path', + label: '目标路径', + kind: 'text', + required: true, + placeholder: 'backup', + }, + ], + }, +] + +export function taskTypeDef(type: string): TaskTypeDef | undefined { + return taskTypeDefs.find((item) => item.type === type) +} diff --git a/web/ui/src/types.ts b/web/ui/src/types.ts new file mode 100644 index 00000000..36fde62a --- /dev/null +++ b/web/ui/src/types.ts @@ -0,0 +1,184 @@ +export type JsonValue = + | string + | number + | boolean + | null + | JsonValue[] + | { [key: string]: JsonValue } + +export type JsonObject = { [key: string]: JsonValue } + +export type TaskStatus = 'queued' | 'running' | 'completed' | 'failed' | 'cancelled' + +export interface TaskProgress { + total_bytes?: number + downloaded_bytes?: number + total_files?: number + downloaded_files?: number + percent?: number + speed_mbps?: number +} + +export interface TaskItem { + task_id: string + type: string + title: string + status: TaskStatus + storage: string + path: string + source?: string + error?: string + created_at: string + started_at?: string + finished_at?: string + updated_at?: string + progress?: TaskProgress +} + +export interface TaskListResponse { + tasks: TaskItem[] + total: number +} + +export interface CreateTaskRequest { + type: string + storage: string + path: string + webhook?: string + params: JsonObject +} + +export interface TaskCreated { + task_id: string + type: string + status: TaskStatus + created_at: string +} + +export interface TaskTypeInfo { + type: string + label: string +} + +export interface StorageRecord { + id: number + name: string + type: string + enable: boolean + config: JsonObject + error?: string +} + +export interface StorageInput { + name: string + type: string + enable: boolean + config: JsonObject +} + +export interface StorageTestResult { + ok: boolean + error?: string +} + +export interface UserStorageFilter { + storages: string[] + blacklist: boolean +} + +export interface UserItem { + id: number + chat_id: number + enabled: boolean + silent: boolean + default_storage: string + default_dir: number + apply_rule: boolean + filename_strategy: string + filename_template: string + conflict_strategy: string + watch_notify: boolean + storage_filter: UserStorageFilter +} + +export interface UserPatch { + enabled?: boolean + silent?: boolean + default_storage?: string + default_dir?: number + apply_rule?: boolean + filename_strategy?: string + filename_template?: string + conflict_strategy?: string + watch_notify?: boolean + storage_filter?: UserStorageFilter +} + +export interface CreateUserInput extends UserPatch { + chat_id: number +} + +export interface BotStatus { + state: string + id?: number + username?: string + error?: string + started_at?: string +} + +export type LoginFlowState = + | 'starting' + | 'code_required' + | 'password_required' + | 'verifying' + | 'failed' + | 'done' + | 'cancelled' + +export interface LoginFlow { + flow_id: string + state: LoginFlowState + error?: string +} + +export interface UserbotStatus { + enabled: boolean + state: string + id?: number + username?: string + phone?: string + error?: string + login?: LoginFlow +} + +export interface TelegramStatus { + bot: BotStatus + userbot: UserbotStatus +} + +export interface SettingsMap { + [group: string]: JsonObject +} + +export interface SettingsUpdateResult { + restart_required: string[] + warnings?: string[] +} + +export interface SystemInfo { + version: string + commit: string + build_time: string + docker: boolean + uptime_seconds: number + data_dir: string + db_path: string + workers: number + queued_tasks: number + running_tasks: number +} + +export interface MeResponse { + authenticated: boolean + csrf_token?: string +} diff --git a/web/ui/src/utils.ts b/web/ui/src/utils.ts new file mode 100644 index 00000000..2d05380c --- /dev/null +++ b/web/ui/src/utils.ts @@ -0,0 +1,160 @@ +export function formatDateTime(value?: string | null): string { + if (!value) { + return '—' + } + const date = new Date(value) + if (Number.isNaN(date.getTime())) { + return value + } + const pad = (n: number) => String(n).padStart(2, '0') + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}` +} + +export function taskDisplayTitle(task: { title?: string; type?: string }): string { + const raw = (task.title ?? '').trim() + const markdown = raw.match(/^\[[^\]]+\]\((.*)\)$/) + const inner = (markdown?.[1] ?? raw).trim() + if (!inner) { + return '未命名任务' + } + const transfer = inner.match(/^(\d+)\s+files\/([\d.]+)MB$/) + if (transfer) { + return `${transfer[1]} 个文件,${transfer[2]} MB` + } + const arrow = inner.indexOf('->') + const display = (arrow >= 0 ? inner.slice(0, arrow) : inner).replace(/\.\.\.$/, '').trim() + if (display) { + return display + } + return task.type ? taskTypeLabel(task.type) : '未命名任务' +} + +export function storageLocation(config: Record): string { + const keys = ['url', 'endpoint', 'remote', 'chat_id', 'base_path', 'path', 'bucket_name'] + for (const key of keys) { + const value = config[key] + if (value !== undefined && value !== null && String(value).trim() !== '') { + return `${key} ${String(value)}` + } + } + return '未填写位置' +} + +export function formatRelativeTime(value?: string | null): string { + if (!value) { + return '—' + } + const date = new Date(value) + if (Number.isNaN(date.getTime())) { + return value + } + const seconds = Math.max(0, Math.floor((Date.now() - date.getTime()) / 1000)) + if (seconds < 60) return '刚刚' + if (seconds < 3600) return `${Math.floor(seconds / 60)} 分钟前` + if (seconds < 86400) return `${Math.floor(seconds / 3600)} 小时前` + if (seconds < 172800) return '昨天' + if (seconds < 604800) return `${Math.floor(seconds / 86400)} 天前` + const pad = (n: number) => String(n).padStart(2, '0') + return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}` +} + +export function formatUptime(seconds?: number): string { + if (!seconds || seconds < 0) { + return '—' + } + const total = Math.floor(seconds) + const days = Math.floor(total / 86400) + const hours = Math.floor((total % 86400) / 3600) + const minutes = Math.floor((total % 3600) / 60) + const secs = total % 60 + const parts: string[] = [] + if (days > 0) parts.push(`${days} 天`) + if (hours > 0) parts.push(`${hours} 小时`) + if (minutes > 0) parts.push(`${minutes} 分`) + if (parts.length === 0 || secs > 0) parts.push(`${secs} 秒`) + return parts.join(' ') +} + +export function formatBytes(bytes?: number): string { + if (!bytes || bytes <= 0) { + return '0 B' + } + const units = ['B', 'KB', 'MB', 'GB', 'TB'] + let value = bytes + let unit = 0 + while (value >= 1024 && unit < units.length - 1) { + value /= 1024 + unit += 1 + } + return `${value.toFixed(unit === 0 ? 0 : 2)} ${units[unit]}` +} + +const taskStatusLabels: Record = { + queued: '排队中', + running: '进行中', + completed: '已完成', + failed: '失败', + cancelled: '已取消', +} + +export function taskStatusLabel(status: string): string { + return taskStatusLabels[status] ?? status +} + +export function taskStatusTone(status: string): string { + switch (status) { + case 'running': + return 'info' + case 'completed': + return 'success' + case 'failed': + return 'danger' + case 'cancelled': + return 'muted' + default: + return 'warning' + } +} + +const telegramStateLabels: Record = { + stopped: '已停止', + starting: '启动中', + running: '运行中', + error: '错误', + login_required: '需要登录', +} + +export function telegramStateLabel(state?: string): string { + if (!state) { + return '未知' + } + return telegramStateLabels[state] ?? state +} + +export function telegramStateTone(state?: string): string { + switch (state) { + case 'running': + return 'success' + case 'starting': + return 'warning' + case 'error': + return 'danger' + case 'login_required': + return 'warning' + default: + return 'muted' + } +} + +export function taskTypeLabel(type: string): string { + const labels: Record = { + directlinks: '直链下载', + ytdlp: 'yt-dlp', + aria2: 'Aria2', + parseditem: '解析链接', + tgfiles: 'Telegram 文件', + tphpics: 'Telegraph 图集', + transfer: '存储迁移', + } + return labels[type] ?? type +} diff --git a/web/ui/src/views/DashboardView.vue b/web/ui/src/views/DashboardView.vue new file mode 100644 index 00000000..c1cca636 --- /dev/null +++ b/web/ui/src/views/DashboardView.vue @@ -0,0 +1,292 @@ + + + diff --git a/web/ui/src/views/LoginView.vue b/web/ui/src/views/LoginView.vue new file mode 100644 index 00000000..4b0c7715 --- /dev/null +++ b/web/ui/src/views/LoginView.vue @@ -0,0 +1,117 @@ + + + diff --git a/web/ui/src/views/SettingsView.vue b/web/ui/src/views/SettingsView.vue new file mode 100644 index 00000000..461e1f87 --- /dev/null +++ b/web/ui/src/views/SettingsView.vue @@ -0,0 +1,294 @@ + + + diff --git a/web/ui/src/views/StoragesView.vue b/web/ui/src/views/StoragesView.vue new file mode 100644 index 00000000..a6ccb4c1 --- /dev/null +++ b/web/ui/src/views/StoragesView.vue @@ -0,0 +1,175 @@ + + + diff --git a/web/ui/src/views/SystemView.vue b/web/ui/src/views/SystemView.vue new file mode 100644 index 00000000..c3f0defd --- /dev/null +++ b/web/ui/src/views/SystemView.vue @@ -0,0 +1,124 @@ + + + diff --git a/web/ui/src/views/TasksView.vue b/web/ui/src/views/TasksView.vue new file mode 100644 index 00000000..567c1f01 --- /dev/null +++ b/web/ui/src/views/TasksView.vue @@ -0,0 +1,162 @@ + + + diff --git a/web/ui/src/views/TelegramView.vue b/web/ui/src/views/TelegramView.vue new file mode 100644 index 00000000..34e32cbc --- /dev/null +++ b/web/ui/src/views/TelegramView.vue @@ -0,0 +1,468 @@ + + + diff --git a/web/ui/src/views/UsersView.vue b/web/ui/src/views/UsersView.vue new file mode 100644 index 00000000..35fa6669 --- /dev/null +++ b/web/ui/src/views/UsersView.vue @@ -0,0 +1,274 @@ + + + diff --git a/web/ui/tsconfig.json b/web/ui/tsconfig.json new file mode 100644 index 00000000..48945378 --- /dev/null +++ b/web/ui/tsconfig.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "target": "ES2022", + "useDefineForClassFields": true, + "module": "ESNext", + "lib": ["ES2022", "DOM", "DOM.Iterable"], + "skipLibCheck": true, + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "jsx": "preserve", + "baseUrl": ".", + "paths": { + "@/*": ["src/*"] + } + }, + "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue"] +} diff --git a/web/ui/vite.config.ts b/web/ui/vite.config.ts new file mode 100644 index 00000000..9b3344b4 --- /dev/null +++ b/web/ui/vite.config.ts @@ -0,0 +1,24 @@ +import { fileURLToPath, URL } from 'node:url' +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +export default defineConfig({ + plugins: [vue()], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)), + }, + }, + build: { + outDir: '../dist', + emptyOutDir: true, + }, + server: { + proxy: { + '/api': { + target: 'http://127.0.0.1:8080', + changeOrigin: true, + }, + }, + }, +}) From 47a6f8bc9a1670351a3786d201c6e898ea990b39 Mon Sep 17 00:00:00 2001 From: krau <71133316+krau@users.noreply.github.com> Date: Sat, 31 Oct 2026 16:59:39 +0800 Subject: [PATCH 002/118] feat(web): added mobile card layouts and refined admin UI --- web/ui/index.html | 2 +- web/ui/public/favicon.svg | 4 +- web/ui/src/assets/main.css | 482 +++++++++++++++++++--------- web/ui/src/components/AppLayout.vue | 25 +- web/ui/src/components/AppSelect.vue | 3 + web/ui/src/components/TaskTable.vue | 60 +++- web/ui/src/views/LoginView.vue | 26 +- web/ui/src/views/SettingsView.vue | 27 +- web/ui/src/views/SystemView.vue | 2 +- web/ui/src/views/UsersView.vue | 47 ++- 10 files changed, 484 insertions(+), 194 deletions(-) diff --git a/web/ui/index.html b/web/ui/index.html index c08382e2..d5f01555 100644 --- a/web/ui/index.html +++ b/web/ui/index.html @@ -4,7 +4,7 @@ - + SaveAny-Bot diff --git a/web/ui/public/favicon.svg b/web/ui/public/favicon.svg index 685b50f2..5afcd882 100644 --- a/web/ui/public/favicon.svg +++ b/web/ui/public/favicon.svg @@ -1,7 +1,7 @@ - + - + diff --git a/web/ui/src/assets/main.css b/web/ui/src/assets/main.css index 79d777d9..16f21b4a 100644 --- a/web/ui/src/assets/main.css +++ b/web/ui/src/assets/main.css @@ -1,29 +1,29 @@ :root { color-scheme: light; --font-sans: - 'Avenir Next', 'Segoe UI', 'Noto Sans SC', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', - sans-serif; - --font-mono: 'IBM Plex Mono', 'SFMono-Regular', 'Cascadia Mono', Menlo, Consolas, monospace; + -apple-system, BlinkMacSystemFont, 'Segoe UI Variable Text', 'Segoe UI', 'Noto Sans SC', + 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif; + --font-mono: 'SFMono-Regular', 'Cascadia Mono', 'Roboto Mono', Menlo, Consolas, monospace; - --paper: #eceff3; - --surface: #f9fafb; + --paper: #f5f6f8; + --surface: #ffffff; --surface-strong: #ffffff; - --surface-muted: #e8ecf1; - --ink: #12161d; - --ink-raised: #1b2029; - --ink-line: rgba(234, 238, 243, 0.1); - --ink-text: #edf0f5; + --surface-muted: #f1f2f5; + --ink: #121418; + --ink-raised: #1c1f24; + --ink-line: rgba(237, 240, 244, 0.1); + --ink-text: #edf0f4; --ink-muted: #98a2ae; - --text: #1a1f27; - --text-2: #4d5663; - --text-3: #626c7a; - --line: #d7dde5; - --line-strong: #c2c9d2; + --text: #17191f; + --text-2: #4f5560; + --text-3: #686f7a; + --line: #e4e7ec; + --line-strong: #d2d7df; - --accent: #3d5a98; - --accent-strong: #2c4778; - --accent-soft: #e8edf5; + --accent: #3f5f9e; + --accent-strong: #2f4a7f; + --accent-soft: #eef1f7; --success: #2c6a4f; --success-soft: #e5f0ea; --warning: #7d5c22; @@ -35,8 +35,8 @@ --radius-sm: 6px; --radius: 10px; - --radius-lg: 14px; - --shadow: 0 18px 48px rgba(18, 22, 29, 0.14); + --radius-lg: 16px; + --shadow: 0 18px 48px rgba(17, 19, 23, 0.14); --ease: cubic-bezier(0.22, 1, 0.36, 1); } @@ -121,7 +121,7 @@ code { color: var(--ink-text); background: var(--ink); border-radius: 8px; - font-size: 13px; + font-size: 14px; transform: translateY(-160%); transition: transform 160ms var(--ease); } @@ -151,7 +151,7 @@ code { flex-direction: column; background: var(--ink); color: var(--ink-text); - border-right: 1px solid rgba(18, 22, 29, 0.35); + border-right: 1px solid rgba(17, 19, 23, 0.35); } .brand { @@ -171,7 +171,7 @@ code { flex: none; color: var(--ink-text); background: var(--ink-raised); - border: 1px solid rgba(234, 238, 243, 0.12); + border: 1px solid rgba(237, 240, 244, 0.12); border-radius: 9px; } @@ -183,10 +183,9 @@ code { } .brand-copy strong { - color: #f2f4f8; + color: #f2f3f5; font-size: 16px; font-weight: 600; - letter-spacing: -0.01em; } .brand-copy span { @@ -230,7 +229,6 @@ code { margin-bottom: 7px; color: var(--ink-muted); font-size: 12px; - letter-spacing: 0.02em; } .nav a { @@ -242,7 +240,7 @@ code { padding: 0 12px; color: #c2cad4; border-radius: 8px; - font-size: 13px; + font-size: 14px; transition: color 160ms var(--ease), background-color 160ms var(--ease); @@ -254,13 +252,13 @@ code { } .nav a:hover { - color: #f1f4f8; + color: #f1f2f4; background: rgba(255, 255, 255, 0.055); } .nav a.is-active { color: var(--ink); - background: #e7ebf0; + background: #e9ebef; font-weight: 500; } @@ -292,10 +290,39 @@ code { display: flex; align-items: center; gap: 8px; - color: #c4ccd6; + color: #c7cbd2; font-size: 12px; } +.sidebar-account { + display: flex; + gap: 4px; + margin: 2px 0; +} + +.sidebar-action { + display: inline-flex; + flex: 1; + align-items: center; + gap: 6px; + height: 30px; + padding: 0 6px; + color: #aab0b9; + background: transparent; + border: 0; + border-radius: 6px; + font-size: 12px; + text-align: left; + transition: + color 140ms var(--ease), + background-color 140ms var(--ease); +} + +.sidebar-action:hover { + color: #f2f3f5; + background: rgba(255, 255, 255, 0.06); +} + .sidebar-meta { color: var(--ink-muted); font-size: 12px; @@ -313,7 +340,7 @@ code { .live-dot.accent { background: var(--accent); - box-shadow: 0 0 0 3px rgba(61, 90, 152, 0.16); + box-shadow: 0 0 0 3px rgba(63, 95, 158, 0.16); } .live-dot.running { @@ -358,24 +385,17 @@ code { position: sticky; top: 0; z-index: 20; - display: flex; + display: none; align-items: center; justify-content: space-between; gap: 16px; min-height: 64px; padding: 0 32px; - background: rgba(236, 239, 243, 0.9); + background: rgba(245, 246, 248, 0.94); border-bottom: 1px solid var(--line); backdrop-filter: blur(10px); } -.topbar-actions { - display: flex; - margin-left: auto; - align-items: center; - gap: 6px; -} - .btn.menu-button { display: none; } @@ -383,7 +403,7 @@ code { .topbar-mobile-title { display: none; color: var(--text-2); - font-size: 13px; + font-size: 14px; font-weight: 500; } @@ -419,7 +439,7 @@ code { max-width: 68ch; margin: 8px 0 0; color: var(--text-2); - font-size: 13px; + font-size: 14px; line-height: 1.65; } @@ -474,7 +494,6 @@ code { color: var(--text); font-size: 16px; font-weight: 500; - letter-spacing: -0.01em; } .panel-sub { @@ -517,7 +536,7 @@ code { background: var(--surface-strong); border: 1px solid var(--line-strong); border-radius: 8px; - font-size: 13px; + font-size: 14px; font-weight: 500; line-height: 1; white-space: nowrap; @@ -561,14 +580,14 @@ code { .btn.ghost:hover:not(:disabled) { color: var(--text); - background: rgba(18, 22, 29, 0.05); + background: rgba(17, 19, 23, 0.05); border-color: transparent; } .btn.danger { color: var(--danger); background: transparent; - border-color: var(--line-strong); + border-color: var(--line); } .btn.danger:hover:not(:disabled) { @@ -590,7 +609,7 @@ code { .btn.small { height: 32px; padding: 0 10px; - font-size: 13px; + font-size: 14px; } .btn.icon { @@ -696,7 +715,7 @@ code { .field > label { color: var(--text-2); - font-size: 13px; + font-size: 14px; font-weight: 500; } @@ -775,7 +794,7 @@ code { .checkbox span { color: var(--text-2); - font-size: 13px; + font-size: 14px; } .checkbox-list { @@ -790,7 +809,7 @@ code { align-items: center; gap: 7px; color: var(--text-2); - font-size: 13px; + font-size: 14px; cursor: pointer; } @@ -864,7 +883,7 @@ code { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-size: 13px; + font-size: 14px; } .select-value.placeholder { @@ -891,7 +910,7 @@ code { background: var(--surface-strong); border: 1px solid var(--line); border-radius: 9px; - box-shadow: 0 16px 40px rgba(18, 22, 29, 0.14); + box-shadow: 0 16px 40px rgba(17, 19, 23, 0.14); } .select-option { @@ -903,7 +922,7 @@ code { padding: 7px 9px; color: var(--text-2); border-radius: 6px; - font-size: 13px; + font-size: 14px; cursor: pointer; } @@ -970,7 +989,7 @@ table { width: 100%; min-width: 760px; border-collapse: collapse; - font-size: 13px; + font-size: 14px; } th { @@ -999,7 +1018,7 @@ tbody tr { } tbody tr:hover { - background: rgba(18, 22, 29, 0.025); + background: rgba(17, 19, 23, 0.025); } .filter-bar { @@ -1031,7 +1050,7 @@ tbody tr:hover { .task-cell-title { color: var(--text); - font-size: 13px; + font-size: 14px; font-weight: 500; overflow-wrap: anywhere; } @@ -1053,6 +1072,152 @@ tbody tr:hover { overflow-wrap: anywhere; } +/* Compact mobile lists */ + +.task-table, +.users-table { + min-width: 0; +} + +.task-mobile-list, +.user-mobile-list { + display: none; + flex-direction: column; + gap: 10px; +} + +.task-mobile-card, +.user-mobile-card { + min-width: 0; + padding: 16px; + background: var(--surface); + border: 1px solid var(--line); + border-radius: 14px; +} + +.task-mobile-head, +.user-mobile-head { + display: flex; + min-width: 0; + align-items: flex-start; + justify-content: space-between; + gap: 12px; +} + +.task-mobile-title { + min-width: 0; + flex: 1; + color: var(--text); + font-size: 14px; + font-weight: 500; + line-height: 1.45; + overflow-wrap: anywhere; +} + +.task-mobile-meta { + display: flex; + flex-wrap: wrap; + gap: 4px 8px; + margin-top: 4px; + color: var(--text-3); + font-size: 12px; + overflow-wrap: anywhere; +} + +.task-mobile-target { + display: flex; + flex-wrap: wrap; + align-items: baseline; + gap: 4px 8px; + margin-top: 12px; + color: var(--text-2); + font-size: 14px; + overflow-wrap: anywhere; +} + +.task-mobile-target .task-path { + font-size: 12px; +} + +.task-mobile-progress { + display: flex; + align-items: center; + gap: 10px; + margin-top: 12px; + color: var(--text-3); + font-size: 12px; +} + +.task-mobile-progress .progress { + min-width: 0; + flex: 1; +} + +.task-mobile-foot { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + padding-top: 12px; + margin-top: 12px; + border-top: 1px solid var(--line); +} + +.task-mobile-time { + color: var(--text-3); + font-size: 12px; +} + +.user-chat { + min-width: 0; + color: var(--text); + font-size: 14px; + overflow-wrap: anywhere; +} + +.user-mobile-head .actions { + flex: none; + flex-wrap: nowrap; +} + +.user-mobile-details { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 10px 16px; + margin: 14px 0 0; +} + +.user-mobile-details div { + min-width: 0; +} + +.user-mobile-details dt { + color: var(--text-3); + font-size: 12px; +} + +.user-mobile-details dd { + margin: 2px 0 0; + color: var(--text-2); + font-size: 14px; + overflow-wrap: anywhere; +} + +.user-mobile-actions { + display: flex; + gap: 8px; + padding-top: 12px; + margin-top: 14px; + border-top: 1px solid var(--line); +} + +.task-mobile-list > .empty, +.user-mobile-list > .empty { + background: var(--surface); + border: 1px solid var(--line); + border-radius: 14px; +} + /* Feedback */ .banner { @@ -1063,7 +1228,7 @@ tbody tr:hover { padding: 12px 16px; border: 1px solid var(--line); border-radius: var(--radius); - font-size: 13px; + font-size: 14px; line-height: 1.55; } @@ -1087,14 +1252,14 @@ tbody tr:hover { .banner code { padding: 1px 5px; - background: rgba(18, 22, 29, 0.06); + background: rgba(17, 19, 23, 0.06); border-radius: 4px; } .empty { padding: 36px 20px; color: var(--text-3); - font-size: 13px; + font-size: 14px; text-align: center; } @@ -1120,7 +1285,7 @@ tbody tr:hover { .loading { padding: 24px; color: var(--text-3); - font-size: 13px; + font-size: 14px; } .progress { @@ -1146,13 +1311,13 @@ tbody tr:hover { .kv dt { color: var(--text-3); - font-size: 13px; + font-size: 14px; } .kv dd { margin: 0; color: var(--text); - font-size: 13px; + font-size: 14px; overflow-wrap: anywhere; } @@ -1178,7 +1343,7 @@ tbody tr:hover { background: var(--surface-strong); border: 1px solid var(--line); border-radius: 10px; - box-shadow: 0 12px 32px rgba(18, 22, 29, 0.12); + box-shadow: 0 12px 32px rgba(17, 19, 23, 0.12); pointer-events: auto; } @@ -1210,7 +1375,7 @@ tbody tr:hover { flex: 1; margin: 1px 0 0; color: var(--text); - font-size: 13px; + font-size: 14px; line-height: 1.55; overflow-wrap: anywhere; } @@ -1259,7 +1424,7 @@ tbody tr:hover { align-items: center; justify-content: center; padding: 24px; - background: rgba(10, 14, 20, 0.58); + background: rgba(9, 11, 14, 0.58); backdrop-filter: blur(3px); } @@ -1323,8 +1488,8 @@ tbody tr:hover { display: inline-flex; align-items: center; gap: 8px; - color: #c9d3de; - font-size: 13px; + color: #c9ccd2; + font-size: 14px; } .relay-flow { @@ -1348,13 +1513,13 @@ tbody tr:hover { display: flex; align-items: center; gap: 7px; - color: #b8c3cf; - font-size: 13px; + color: #b8bdc5; + font-size: 14px; } .relay-node strong { margin-top: 8px; - color: #f2f5f9; + color: #f2f3f5; font-size: 24px; font-weight: 500; letter-spacing: -0.02em; @@ -1364,8 +1529,8 @@ tbody tr:hover { .relay-node small { margin-top: 5px; overflow: hidden; - color: #b6c0cb; - font-size: 13px; + color: #b6bbc3; + font-size: 14px; text-overflow: ellipsis; white-space: nowrap; } @@ -1375,7 +1540,7 @@ tbody tr:hover { width: 42px; flex: none; place-items: center; - color: #8793a2; + color: #878d97; } .relay-link.active { @@ -1398,12 +1563,12 @@ tbody tr:hover { } .relay-metric span { - color: #b8c3cf; - font-size: 13px; + color: #b8bdc5; + font-size: 14px; } .relay-metric strong { - color: #eff3f8; + color: #eef0f4; font-size: 24px; font-variant-numeric: tabular-nums; font-weight: 500; @@ -1412,8 +1577,8 @@ tbody tr:hover { } .relay-metric small { - color: #aab5c2; - font-size: 13px; + color: #aab0b9; + font-size: 14px; } .dashboard-split { @@ -1516,7 +1681,7 @@ tbody tr:hover { place-items: center; margin-top: 14px; color: var(--text-3); - font-size: 13px; + font-size: 14px; text-align: center; } @@ -1557,7 +1722,7 @@ tbody tr:hover { display: block; overflow: hidden; color: var(--text); - font-size: 13px; + font-size: 14px; font-weight: 500; text-overflow: ellipsis; white-space: nowrap; @@ -1598,7 +1763,7 @@ tbody tr:hover { .recent-task-title { overflow: hidden; color: var(--text); - font-size: 13px; + font-size: 14px; font-weight: 500; text-overflow: ellipsis; white-space: nowrap; @@ -1626,7 +1791,7 @@ tbody tr:hover { .link-quiet { color: var(--accent-strong); - font-size: 13px; + font-size: 14px; font-weight: 500; } @@ -1683,7 +1848,6 @@ tbody tr:hover { color: var(--text); font-size: 16px; font-weight: 500; - letter-spacing: -0.01em; text-overflow: ellipsis; white-space: nowrap; } @@ -1732,7 +1896,7 @@ tbody tr:hover { background: var(--surface); border: 1px dashed var(--line-strong); border-radius: var(--radius-lg); - font-size: 13px; + font-size: 14px; text-align: center; } @@ -1745,9 +1909,13 @@ tbody tr:hover { align-items: start; } +.settings-mobile-nav { + display: none; +} + .settings-nav { position: sticky; - top: 84px; + top: 24px; display: flex; flex-direction: column; gap: 2px; @@ -1763,7 +1931,7 @@ tbody tr:hover { background: transparent; border: 1px solid transparent; border-radius: 7px; - font-size: 13px; + font-size: 14px; text-align: left; transition: color 140ms var(--ease), @@ -1773,7 +1941,7 @@ tbody tr:hover { .settings-nav button:hover { color: var(--text); - background: rgba(18, 22, 29, 0.045); + background: rgba(17, 19, 23, 0.045); } .settings-nav button.active { @@ -1791,7 +1959,7 @@ tbody tr:hover { } .settings-group { - scroll-margin-top: 84px; + scroll-margin-top: 24px; } .settings-group-head { @@ -1857,7 +2025,6 @@ tbody tr:hover { color: var(--text); font-family: var(--font-mono); font-size: 16px; - letter-spacing: -0.01em; line-height: 1.35; overflow-wrap: anywhere; } @@ -1865,7 +2032,7 @@ tbody tr:hover { .connection-meta { margin-top: 5px; color: var(--text-2); - font-size: 13px; + font-size: 14px; line-height: 1.5; } @@ -1979,7 +2146,7 @@ tbody tr:hover { display: flex; align-items: center; gap: 11px; - color: #f2f4f8; + color: #f2f3f5; font-size: 16px; font-weight: 600; } @@ -1996,7 +2163,7 @@ tbody tr:hover { .login-copy h1 { max-width: none; - color: #f1f4f8; + color: #f1f2f4; font-size: clamp(28px, 3.4vw, 40px); font-weight: 500; letter-spacing: -0.035em; @@ -2007,71 +2174,62 @@ tbody tr:hover { .login-copy p { max-width: 46ch; margin: 20px 0 0; - color: #a1acba; + color: #a3a8b2; font-size: 14px; line-height: 1.75; } .login-route { display: flex; - max-width: 370px; - flex-direction: column; - margin-top: 42px; -} - -.route-item { - position: relative; - display: grid; - grid-template-columns: 14px minmax(0, 1fr); - gap: 14px; - padding-bottom: 22px; -} - -.route-item:last-child { - padding-bottom: 0; + max-width: 560px; + align-items: flex-start; + margin-top: 48px; } -.route-item:not(:last-child)::before { - content: ''; - position: absolute; - left: 3px; - top: 13px; - bottom: 0; - width: 1px; - background: var(--ink-line); +.route-step { + display: flex; + min-width: 0; + max-width: 150px; + flex-direction: column; + gap: 6px; } .route-node { - position: relative; - z-index: 1; - width: 7px; - height: 7px; - margin-top: 6px; - background: #727d8c; + width: 9px; + height: 9px; + background: #555b64; border-radius: 50%; + box-shadow: 0 0 0 4px rgba(237, 240, 244, 0.05); } -.route-item:first-child .route-node { +.route-step:last-child .route-node { background: var(--accent); - box-shadow: 0 0 0 4px rgba(61, 90, 152, 0.16); + box-shadow: 0 0 0 4px rgba(63, 95, 158, 0.18); } -.route-item strong { - display: block; - color: #e8edf3; - font-size: 13px; +.route-step strong { + color: #e9ebef; + font-size: 14px; font-weight: 500; } -.route-item span { - display: block; - margin-top: 1px; - color: #95a0ae; +.route-step > span:not(.route-node) { + max-width: 18ch; + color: #9aa0aa; font-size: 12px; + line-height: 1.55; +} + +.route-line { + min-width: 24px; + height: 1px; + flex: 1; + margin: 4px 14px 0; + background: var(--ink-line); } .login-note { - color: #7f8997; + color: #828892; font-size: 12px; } @@ -2100,7 +2258,7 @@ tbody tr:hover { .login-form-head p { margin: 7px 0 0; color: var(--text-2); - font-size: 13px; + font-size: 14px; line-height: 1.65; } @@ -2138,6 +2296,22 @@ tbody tr:hover { } } +@supports (corner-shape: squircle) { + .panel, + .storage-card, + .connection-card, + .process-panel, + .modal, + .toast, + .select-menu, + .select-trigger, + .btn, + .field input, + .field textarea { + corner-shape: squircle; + } +} + @media (max-width: 1180px) { .dashboard-split { grid-template-columns: minmax(0, 1.3fr) minmax(260px, 0.7fr); @@ -2148,6 +2322,18 @@ tbody tr:hover { } } +@media (max-width: 1080px) { + .task-table-wrap, + .users-table-wrap { + display: none; + } + + .task-mobile-list, + .user-mobile-list { + display: flex; + } +} + @media (max-width: 960px) { .sidebar { transform: translateX(-100%); @@ -2167,6 +2353,9 @@ tbody tr:hover { } .topbar { + display: flex; + justify-content: flex-start; + gap: 12px; padding: 0 20px; } @@ -2186,7 +2375,7 @@ tbody tr:hover { position: fixed; inset: 0; z-index: 35; - background: rgba(10, 14, 20, 0.45); + background: rgba(9, 11, 14, 0.45); } .settings-layout { @@ -2194,16 +2383,21 @@ tbody tr:hover { gap: 18px; } + .settings-mobile-nav { + position: sticky; + top: 64px; + z-index: 12; + display: block; + padding: 8px 0 10px; + background: var(--paper); + } + .settings-nav { - position: static; - flex-direction: row; - overflow-x: auto; - padding-bottom: 4px; + display: none; } - .settings-nav button { - flex: none; - white-space: nowrap; + .settings-group { + scroll-margin-top: 132px; } .page-head { @@ -2322,10 +2516,6 @@ tbody tr:hover { .kv dd { margin-bottom: 10px; } - - .btn .btn-label { - display: none; - } } @media (max-width: 520px) { diff --git a/web/ui/src/components/AppLayout.vue b/web/ui/src/components/AppLayout.vue index b485534e..5864566c 100644 --- a/web/ui/src/components/AppLayout.vue +++ b/web/ui/src/components/AppLayout.vue @@ -1,5 +1,5 @@ diff --git a/web/ui/src/views/LoginView.vue b/web/ui/src/views/LoginView.vue index 4b0c7715..a7b6b72e 100644 --- a/web/ui/src/views/LoginView.vue +++ b/web/ui/src/views/LoginView.vue @@ -54,26 +54,22 @@ async function submit() {

-
+
-
+
- + 至少 8 个字符
-
+
- +
-
{{ passwordError }}
-
diff --git a/web/ui/src/components/ConfirmDialog.vue b/web/ui/src/components/ConfirmDialog.vue index 55200363..ee0d697b 100644 --- a/web/ui/src/components/ConfirmDialog.vue +++ b/web/ui/src/components/ConfirmDialog.vue @@ -1,4 +1,7 @@ diff --git a/web/ui/src/composables/useFormFeedback.ts b/web/ui/src/composables/useFormFeedback.ts new file mode 100644 index 00000000..d896577a --- /dev/null +++ b/web/ui/src/composables/useFormFeedback.ts @@ -0,0 +1,30 @@ +import { ref } from 'vue' +import { useToastStore } from '../stores/toasts' + +export function useFormFeedback() { + const toast = useToastStore() + const invalidField = ref('') + + function fail(message: string, fieldId = '') { + invalidField.value = fieldId + toast.push(message, 'error', 5000) + if (!fieldId) return + window.requestAnimationFrame(() => { + const element = document.getElementById(fieldId) + element?.scrollIntoView({ block: 'nearest' }) + element?.focus() + }) + } + + function clear(fieldId = '') { + if (!fieldId || invalidField.value === fieldId) { + invalidField.value = '' + } + } + + function success(message: string) { + toast.push(message, 'success') + } + + return { invalidField, fail, clear, success } +} diff --git a/web/ui/src/stores/confirm.ts b/web/ui/src/stores/confirm.ts new file mode 100644 index 00000000..d3a5be7f --- /dev/null +++ b/web/ui/src/stores/confirm.ts @@ -0,0 +1,50 @@ +import { defineStore } from 'pinia' + +export interface ConfirmOptions { + title: string + message: string + confirmText?: string + cancelText?: string + danger?: boolean +} + +interface ConfirmState { + open: boolean + options: Required +} + +let resolveCurrent: ((confirmed: boolean) => void) | null = null + +export const useConfirmStore = defineStore('confirm', { + state: (): ConfirmState => ({ + open: false, + options: { + title: '确认操作', + message: '', + confirmText: '确认', + cancelText: '取消', + danger: false, + }, + }), + actions: { + ask(options: ConfirmOptions): Promise { + resolveCurrent?.(false) + this.options = { + title: options.title, + message: options.message, + confirmText: options.confirmText ?? '确认', + cancelText: options.cancelText ?? '取消', + danger: options.danger ?? false, + } + this.open = true + const { promise, resolve } = Promise.withResolvers() + resolveCurrent = resolve + return promise + }, + respond(confirmed: boolean) { + this.open = false + resolveCurrent?.(confirmed) + resolveCurrent = null + }, + }, +}) diff --git a/web/ui/src/stores/toasts.ts b/web/ui/src/stores/toasts.ts index ed064a9b..e0d25ba0 100644 --- a/web/ui/src/stores/toasts.ts +++ b/web/ui/src/stores/toasts.ts @@ -17,6 +17,8 @@ export const useToastStore = defineStore('toasts', { }), actions: { push(message: string, tone: ToastTone = 'info', duration = 4200): number { + const existing = this.items.find((item) => item.message === message && item.tone === tone) + if (existing) return existing.id const id = nextId++ this.items.push({ id, tone, message }) if (this.items.length > 4) { diff --git a/web/ui/src/stores/ui.ts b/web/ui/src/stores/ui.ts deleted file mode 100644 index 062a979d..00000000 --- a/web/ui/src/stores/ui.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { defineStore } from 'pinia' - -interface UiState { - restartRequired: string[] - warnings: string[] -} - -export const useUiStore = defineStore('ui', { - state: (): UiState => ({ - restartRequired: [], - warnings: [], - }), - actions: { - setRestartRequired(fields: string[]) { - this.restartRequired = [...fields] - }, - setWarnings(fields: string[]) { - this.warnings = [...fields] - }, - clearRestartRequired() { - this.restartRequired = [] - }, - }, -}) diff --git a/web/ui/src/views/DashboardView.vue b/web/ui/src/views/DashboardView.vue index c1cca636..fa80156b 100644 --- a/web/ui/src/views/DashboardView.vue +++ b/web/ui/src/views/DashboardView.vue @@ -4,6 +4,7 @@ import { RouterLink } from 'vue-router' import { errorMessage, storagesApi, tasksApi, telegramApi } from '../api' import AppIcon from '../components/AppIcon.vue' import PageHeader from '../components/PageHeader.vue' +import { useToastStore } from '../stores/toasts' import { storageTypeIcon, storageTypeLabel } from '../storageFields' import type { StorageRecord, TaskItem, TelegramStatus } from '../types' import { @@ -16,10 +17,10 @@ import { telegramStateLabel, } from '../utils' +const toast = useToastStore() const status = ref(null) const tasks = ref([]) const storages = ref([]) -const error = ref('') let timer: number | undefined const activeTasks = computed( @@ -73,10 +74,6 @@ const statusLine = computed(() => { if (!status.value) return '正在读取连接状态' return `Bot ${telegramStateLabel(status.value.bot.state)},Userbot ${telegramStateLabel(status.value.userbot.state)}` }) -const statusErrors = computed(() => - [status.value?.bot.error, status.value?.userbot.error].filter((item): item is string => Boolean(item)), -) - async function load() { try { const [statusData, taskData, storageData] = await Promise.all([ @@ -87,9 +84,11 @@ async function load() { status.value = statusData tasks.value = taskData.tasks ?? [] storages.value = storageData - error.value = '' + for (const message of [statusData.bot.error, statusData.userbot.error]) { + if (message) toast.push(message, 'error', 6000) + } } catch (err) { - error.value = errorMessage(err) + toast.push(errorMessage(err), 'error', 6000) } } @@ -110,16 +109,13 @@ onUnmounted(() => { 刷新 - + 新建任务 - - -
diff --git a/web/ui/src/views/LoginView.vue b/web/ui/src/views/LoginView.vue index a7b6b72e..5cee1697 100644 --- a/web/ui/src/views/LoginView.vue +++ b/web/ui/src/views/LoginView.vue @@ -3,9 +3,12 @@ import { ref } from 'vue' import { useRoute, useRouter } from 'vue-router' import { ApiError } from '../api' import { useAuthStore } from '../stores/auth' +import { useToastStore } from '../stores/toasts' import BrandMark from '../components/BrandMark.vue' +import LoadingButton from '../components/LoadingButton.vue' const auth = useAuthStore() +const toast = useToastStore() const route = useRoute() const router = useRouter() @@ -32,6 +35,7 @@ async function submit() { } else { error.value = err instanceof Error ? err.message : String(err) } + toast.push(error.value, 'error', 5000) } finally { busy.value = false } @@ -39,51 +43,27 @@ async function submit() { diff --git a/web/ui/src/views/SettingsView.vue b/web/ui/src/views/SettingsView.vue index f903e9a0..50dd924d 100644 --- a/web/ui/src/views/SettingsView.vue +++ b/web/ui/src/views/SettingsView.vue @@ -3,16 +3,15 @@ import { nextTick, onMounted, onUnmounted, reactive, ref } from 'vue' import { errorMessage, settingsApi } from '../api' import AppIcon from '../components/AppIcon.vue' import AppSelect from '../components/AppSelect.vue' +import LoadingButton from '../components/LoadingButton.vue' import PageHeader from '../components/PageHeader.vue' import { settingsGroups } from '../settingsFields' import type { SettingsField } from '../settingsFields' -import { useUiStore } from '../stores/ui' +import { useToastStore } from '../stores/toasts' import type { JsonObject } from '../types' -const ui = useUiStore() +const toast = useToastStore() const values = reactive>>({}) -const error = ref('') -const notice = ref('') const busyGroup = ref('') const loaded = ref(false) const activeGroup = ref(settingsGroups[0]?.key ?? '') @@ -39,9 +38,8 @@ async function load() { } } loaded.value = true - error.value = '' } catch (err) { - error.value = errorMessage(err) + toast.push(errorMessage(err), 'error', 6000) } } @@ -153,25 +151,23 @@ function setTextField(group: string, field: SettingsField, raw: string) { delete invalid[fieldKey(group, field.path)] } catch { invalid[fieldKey(group, field.path)] = `${field.label} 不是合法的 JSON` - error.value = invalid[fieldKey(group, field.path)] + toast.push(invalid[fieldKey(group, field.path)], 'error') return } } } - error.value = '' writePath(values[group], field.path, value) } async function save(group: string) { busyGroup.value = group - notice.value = '' - error.value = '' try { const def = settingsGroups.find((item) => item.key === group) if (!def) return for (const field of def.fields) { if (invalid[fieldKey(group, field.path)]) { - throw new Error(invalid[fieldKey(group, field.path)]) + toast.push(invalid[fieldKey(group, field.path)], 'error') + return } } const patch: JsonObject = {} @@ -183,12 +179,16 @@ async function save(group: string) { writePath(patch, field.path, (value ?? (field.kind === 'bool' ? false : field.kind === 'number' ? 0 : '')) as never) } const result = await settingsApi.updateGroup(group, patch) - ui.setRestartRequired(result.restart_required ?? []) - ui.setWarnings(result.warnings ?? []) - notice.value = `${def.title}设置已保存` + toast.push(`${def.title}设置已保存`, 'success') + if (result.restart_required?.length) { + toast.push(`重启后生效:${result.restart_required.join('、')}`, 'info', 8000) + } + if (result.warnings?.length) { + toast.push(result.warnings.join(';'), 'error', 8000) + } await load() } catch (err) { - error.value = errorMessage(err) + toast.push(errorMessage(err), 'error', 6000) } finally { busyGroup.value = '' } @@ -206,8 +206,6 @@ async function save(group: string) { - -
正在加载设置…
@@ -235,6 +233,7 @@ async function save(group: string) {
{{ field.label }} -
+
{{ field.hint }} @@ -284,9 +289,9 @@ async function save(group: string) {
diff --git a/web/ui/src/views/StoragesView.vue b/web/ui/src/views/StoragesView.vue index a6ccb4c1..6a57507e 100644 --- a/web/ui/src/views/StoragesView.vue +++ b/web/ui/src/views/StoragesView.vue @@ -2,16 +2,18 @@ import { onMounted, ref } from 'vue' import { errorMessage, storagesApi } from '../api' import AppIcon from '../components/AppIcon.vue' +import LoadingButton from '../components/LoadingButton.vue' import PageHeader from '../components/PageHeader.vue' import StorageForm from '../components/StorageForm.vue' import { storageTypeIcon, storageTypeLabel } from '../storageFields' +import { useConfirmStore } from '../stores/confirm' import { useToastStore } from '../stores/toasts' import type { StorageInput, StorageRecord } from '../types' import { storageLocation } from '../utils' const toast = useToastStore() +const confirm = useConfirmStore() const storages = ref([]) -const error = ref('') const busy = ref(false) const testingId = ref(0) const removingId = ref(0) @@ -21,9 +23,8 @@ const formOpen = ref(false) async function load() { try { storages.value = await storagesApi.list() - error.value = '' } catch (err) { - error.value = errorMessage(err) + toast.push(errorMessage(err), 'error', 6000) } } @@ -59,7 +60,13 @@ async function save(payload: StorageInput) { } async function remove(storage: StorageRecord) { - if (!window.confirm(`删除存储 ${storage.name}?`)) return + const confirmed = await confirm.ask({ + title: '删除存储', + message: `删除存储 ${storage.name}?已有的文件不会被删除。`, + confirmText: '删除存储', + danger: true, + }) + if (!confirmed) return removingId.value = storage.id try { await storagesApi.remove(storage.id) @@ -104,8 +111,6 @@ async function test(storage: StorageRecord) { - -
@@ -130,10 +135,15 @@ async function test(storage: StorageRecord) { 编辑 - + 测试 +
- + 重启进程 + - - -
进程运行中 diff --git a/web/ui/src/views/TasksView.vue b/web/ui/src/views/TasksView.vue index 567c1f01..4d7827c3 100644 --- a/web/ui/src/views/TasksView.vue +++ b/web/ui/src/views/TasksView.vue @@ -1,22 +1,26 @@ @@ -156,9 +172,6 @@ async function remove(user: UserItem) { - - -
{{ users.length }} 个用户,{{ enabledUsers }} 个启用
@@ -252,11 +265,19 @@ async function remove(user: UserItem) {
-
+
-
+
- +
@@ -307,7 +328,7 @@ async function remove(user: UserItem) {
diff --git a/web/ui/tsconfig.json b/web/ui/tsconfig.json index 61dcbce1..13613c04 100644 --- a/web/ui/tsconfig.json +++ b/web/ui/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "target": "ES2022", + "target": "ES2024", "useDefineForClassFields": true, "module": "ESNext", - "lib": ["ES2022", "DOM", "DOM.Iterable"], + "lib": ["ES2024", "DOM", "DOM.Iterable"], "skipLibCheck": true, "moduleResolution": "bundler", "allowImportingTsExtensions": true, From dfbad7c9ed4d9e69aa3bdbad5e311cdaa9bebe16 Mon Sep 17 00:00:00 2001 From: krau <71133316+krau@users.noreply.github.com> Date: Sat, 31 Oct 2026 20:10:52 +0800 Subject: [PATCH 007/118] feat(web): added coordinated motion across the console --- web/ui/AGENTS.md | 1 + web/ui/src/App.vue | 6 +- web/ui/src/assets/main.css | 351 ++++++++++++++++++++++-- web/ui/src/components/AppLayout.vue | 14 +- web/ui/src/components/AppSelect.vue | 4 + web/ui/src/components/ConfirmDialog.vue | 72 +++-- web/ui/src/components/ConfirmHost.vue | 22 +- web/ui/src/views/DashboardView.vue | 5 +- web/ui/src/views/LoginView.vue | 4 +- web/ui/src/views/SettingsView.vue | 2 +- web/ui/src/views/StoragesView.vue | 22 +- web/ui/src/views/SystemView.vue | 2 +- web/ui/src/views/TasksView.vue | 22 +- web/ui/src/views/TelegramView.vue | 2 +- web/ui/src/views/UsersView.vue | 4 +- 15 files changed, 430 insertions(+), 103 deletions(-) diff --git a/web/ui/AGENTS.md b/web/ui/AGENTS.md index ddfcaf98..00dba844 100644 --- a/web/ui/AGENTS.md +++ b/web/ui/AGENTS.md @@ -5,4 +5,5 @@ - Persistent domain state such as a task's stored error or a connection failure may remain inline. - Async buttons MUST use `LoadingButton`; keep the normal label and let the component overlay a spinner. Never replace labels with longer "saving..." text or animate button width. - Destructive or irreversible actions MUST use `useConfirmStore`; never call `window.confirm`. +- Motion MUST use the tokens in `src/assets/main.css`, animate only transform/opacity/filter where possible, and keep the global `prefers-reduced-motion` fallback intact. - Use `pnpm` for every install and script. Do not add npm lockfiles. diff --git a/web/ui/src/App.vue b/web/ui/src/App.vue index e4d66a87..0643c2f6 100644 --- a/web/ui/src/App.vue +++ b/web/ui/src/App.vue @@ -4,7 +4,11 @@ import ConfirmHost from './components/ConfirmHost.vue' diff --git a/web/ui/src/assets/main.css b/web/ui/src/assets/main.css index 37cef4b0..bb0dc235 100644 --- a/web/ui/src/assets/main.css +++ b/web/ui/src/assets/main.css @@ -37,7 +37,26 @@ --radius: 10px; --radius-lg: 16px; --shadow: 0 18px 48px rgba(17, 19, 23, 0.14); + + /* Motion scale */ + --duration-stagger: 40ms; + --duration-micro: 80ms; + --duration-quick: 150ms; + --duration-fast: 250ms; + --duration-medium: 350ms; + --duration-slow: 400ms; + --duration-very-slow: 500ms; --ease: cubic-bezier(0.22, 1, 0.36, 1); + --ease-smooth-out: cubic-bezier(0.22, 1, 0.36, 1); + --ease-in-out: ease-in-out; + --ease-out: ease-out; + --ease-linear: linear; + --distance-base: 8px; + --distance-medium: 12px; + --scale-large: 0.96; + --scale-medium: 0.97; + --blur-small: 2px; + --blur-medium: 3px; } * { @@ -262,7 +281,7 @@ code { font-weight: 500; } -.nav a.is-active::before { +.nav a::before { content: ''; position: absolute; left: -12px; @@ -271,6 +290,16 @@ code { height: 18px; background: var(--accent); border-radius: 0 3px 3px 0; + opacity: 0; + transform: scaleY(0.35); + transition: + opacity var(--duration-quick) var(--ease-smooth-out), + transform var(--duration-fast) var(--ease-smooth-out); +} + +.nav a.is-active::before { + opacity: 1; + transform: scaleY(1); } .nav a.is-active svg { @@ -813,6 +842,29 @@ code { .field.is-invalid textarea, .field.is-invalid .select-trigger { border-color: var(--danger); + animation: field-shake 280ms linear; +} + +@keyframes field-shake { + 0% { + transform: translateX(0); + animation-timing-function: cubic-bezier(0.22, 1, 0.36, 1); + } + 28% { + transform: translateX(5px); + animation-timing-function: cubic-bezier(0.22, 1, 0.36, 1); + } + 57% { + transform: translateX(-5px); + animation-timing-function: cubic-bezier(0.22, 1, 0.36, 1); + } + 78% { + transform: translateX(3px); + animation-timing-function: cubic-bezier(0.22, 1, 0.36, 1); + } + 100% { + transform: translateX(0); + } } .field.is-invalid input:focus, @@ -1002,17 +1054,38 @@ code { opacity: 0.6; } -.select-menu-enter-active, +.select-menu { + transform-origin: top center; +} + +.select-menu[data-placement='top'] { + transform-origin: bottom center; +} + +.select-menu-enter-active { + transition: + opacity var(--duration-fast) var(--ease-smooth-out), + transform var(--duration-fast) var(--ease-smooth-out), + filter var(--duration-fast) var(--ease-smooth-out); +} + .select-menu-leave-active { transition: - opacity 140ms var(--ease), - transform 140ms var(--ease); + opacity var(--duration-quick) var(--ease-smooth-out), + transform var(--duration-quick) var(--ease-smooth-out), + filter var(--duration-quick) var(--ease-smooth-out); } .select-menu-enter-from, .select-menu-leave-to { opacity: 0; - transform: translateY(-4px); + transform: translateY(-4px) scale(0.97); + filter: blur(var(--blur-small)); +} + +.select-menu[data-placement='top'].select-menu-enter-from, +.select-menu[data-placement='top'].select-menu-leave-to { + transform: translateY(4px) scale(0.97); } .filter-field .select-trigger { @@ -1297,8 +1370,32 @@ tbody tr:hover { .loading { padding: 24px; - color: var(--text-3); + color: transparent; + background-image: linear-gradient(90deg, var(--text-3) 20%, var(--text-2) 50%, var(--text-3) 80%); + background-size: 250% 100%; + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; font-size: 14px; + animation: loading-shimmer 1.8s var(--ease-linear) infinite; +} + +@keyframes loading-shimmer { + from { + background-position: 100% 0; + } + to { + background-position: 0 0; + } +} + +@supports not (background-clip: text) { + .loading { + color: var(--text-3); + -webkit-text-fill-color: currentColor; + background: none; + animation: none; + } } .progress { @@ -1357,6 +1454,7 @@ tbody tr:hover { border: 1px solid var(--line); border-radius: 10px; box-shadow: 0 12px 32px rgba(17, 19, 23, 0.12); + transform-origin: bottom right; pointer-events: auto; } @@ -1410,26 +1508,36 @@ tbody tr:hover { background: var(--surface-muted); } -.toast-enter-active, +.toast-enter-active { + transition: + opacity var(--duration-medium) var(--ease-smooth-out), + transform var(--duration-medium) var(--ease-smooth-out), + filter var(--duration-medium) var(--ease-smooth-out); +} + .toast-leave-active { + position: absolute; + width: 100%; transition: - opacity 180ms var(--ease), - transform 180ms var(--ease); + opacity var(--duration-fast) var(--ease-smooth-out), + transform var(--duration-fast) var(--ease-smooth-out), + filter var(--duration-fast) var(--ease-smooth-out); } .toast-enter-from, .toast-leave-to { opacity: 0; - transform: translateY(8px); + transform: translateY(16px) scale(0.97); + filter: blur(var(--blur-small)); } .toast-move { - transition: transform 180ms var(--ease); + transition: transform var(--duration-fast) var(--ease-smooth-out); } /* Dialogs */ -.confirm-overlay { +.modal-overlay.confirm-overlay { z-index: 80; } @@ -1498,6 +1606,54 @@ tbody tr:hover { max-width: 860px; } +.modal-enter-active, +.modal-leave-active { + transition: opacity var(--duration-fast) var(--ease-smooth-out); +} + +.modal-enter-from, +.modal-leave-to { + opacity: 0; +} + +.modal-enter-active .modal { + animation: modal-in var(--duration-fast) var(--ease-smooth-out) backwards; +} + +.modal-leave-active { + transition-duration: var(--duration-quick); +} + +.modal-leave-active .modal { + animation: modal-out var(--duration-quick) var(--ease-smooth-out) forwards; +} + +@keyframes modal-in { + from { + opacity: 0; + transform: translateY(var(--distance-base)) scale(var(--scale-large)); + filter: blur(var(--blur-small)); + } + to { + opacity: 1; + transform: none; + filter: blur(0); + } +} + +@keyframes modal-out { + from { + opacity: 1; + transform: none; + filter: blur(0); + } + to { + opacity: 0; + transform: translateY(4px) scale(0.98); + filter: blur(1px); + } +} + .modal-head { display: flex; align-items: center; @@ -1692,9 +1848,21 @@ tbody tr:hover { min-height: 2px; background: var(--line-strong); border-radius: 4px 4px 0 0; + transform-origin: bottom; + animation: chart-rise var(--duration-very-slow) var(--ease-smooth-out) backwards; + animation-delay: calc(var(--bar-index, 0) * var(--duration-stagger)); transition: background-color 160ms var(--ease); } +@keyframes chart-rise { + from { + transform: scaleY(0); + } + to { + transform: scaleY(1); + } +} + .chart-col.current .chart-bar { background: var(--accent); } @@ -2199,6 +2367,25 @@ tbody tr:hover { pointer-events: none; } +.login-trace path { + stroke-dasharray: 1; + stroke-dashoffset: 1; + animation: login-trace-draw 900ms var(--ease-smooth-out) 80ms forwards; +} + +.login-trace circle { + opacity: 0; + animation: login-dot-in 300ms var(--ease-out) 620ms forwards; +} + +.login-trace circle:nth-of-type(2) { + animation-delay: 760ms; +} + +.login-trace circle:nth-of-type(3) { + animation-delay: 900ms; +} + .login-card { position: relative; z-index: 1; @@ -2209,6 +2396,77 @@ tbody tr:hover { border: 1px solid rgba(255, 255, 255, 0.08); border-radius: 18px; box-shadow: 0 30px 80px rgba(0, 0, 0, 0.34); + animation: login-card-in var(--duration-slow) var(--ease-smooth-out) backwards; +} + +.login-brand, +.login-heading, +.login-form, +.login-help { + animation: login-item-in 360ms var(--ease-smooth-out) backwards; +} + +.login-brand { + animation-delay: 60ms; +} + +.login-heading { + animation-delay: 100ms; +} + +.login-form { + animation-delay: 150ms; +} + +.login-help { + animation-delay: 220ms; +} + +@keyframes login-card-in { + from { + opacity: 0; + transform: translateY(var(--distance-medium)) scale(0.99); + } + to { + opacity: 1; + transform: none; + } +} + +@keyframes login-item-in { + from { + opacity: 0; + transform: translateY(var(--distance-base)); + filter: blur(var(--blur-small)); + } + to { + opacity: 1; + transform: none; + filter: blur(0); + } +} + +@keyframes login-footer-in { + from { + opacity: 0; + transform: translateY(4px); + } + to { + opacity: 1; + transform: none; + } +} + +@keyframes login-trace-draw { + to { + stroke-dashoffset: 0; + } +} + +@keyframes login-dot-in { + to { + opacity: 1; + } } .login-brand { @@ -2259,6 +2517,7 @@ tbody tr:hover { .login-form .field input[aria-invalid='true'] { border-color: var(--danger); + animation: field-shake 280ms linear; } .login-form .field input[aria-invalid='true']:focus { @@ -2287,25 +2546,58 @@ tbody tr:hover { color: #8d96a3; font-size: 12px; text-align: center; + animation: login-footer-in var(--duration-slow) var(--ease-smooth-out) 280ms backwards; } -/* Utilities */ +/* Route transitions */ -.fade-in { - animation: fade-in 360ms var(--ease) both; +.route-enter-active { + transition: + opacity var(--duration-fast) var(--ease-smooth-out), + transform var(--duration-fast) var(--ease-smooth-out), + filter var(--duration-fast) var(--ease-smooth-out); + will-change: opacity, transform, filter; } -@keyframes fade-in { - from { - opacity: 0; - transform: translateY(6px); - } - to { - opacity: 1; - transform: translateY(0); - } +.route-leave-active { + transition: + opacity 120ms var(--ease-smooth-out), + transform 120ms var(--ease-smooth-out), + filter 120ms var(--ease-smooth-out); + will-change: opacity, transform, filter; +} + +.route-enter-from { + opacity: 0; + transform: translateY(var(--distance-base)); + filter: blur(var(--blur-small)); } +.route-leave-to { + opacity: 0; + transform: translateY(-3px); + filter: blur(1px); +} + +.shell-enter-active { + transition: opacity var(--duration-fast) var(--ease-smooth-out); +} + +.shell-leave-active { + position: fixed; + inset: 0; + z-index: 5; + pointer-events: none; + transition: opacity 120ms var(--ease-smooth-out); +} + +.shell-enter-from, +.shell-leave-to { + opacity: 0; +} + +/* Utilities */ + @supports (corner-shape: squircle) { .panel, .storage-card, @@ -2388,6 +2680,16 @@ tbody tr:hover { background: rgba(9, 11, 14, 0.45); } + .backdrop-enter-active, + .backdrop-leave-active { + transition: opacity var(--duration-fast) var(--ease-smooth-out); + } + + .backdrop-enter-from, + .backdrop-leave-to { + opacity: 0; + } + .settings-layout { grid-template-columns: 1fr; gap: 18px; @@ -2572,6 +2874,7 @@ tbody tr:hover { *::before, *::after { scroll-behavior: auto !important; + animation-delay: 0ms !important; animation-duration: 0.01ms !important; animation-iteration-count: 1 !important; transition-duration: 0.01ms !important; diff --git a/web/ui/src/components/AppLayout.vue b/web/ui/src/components/AppLayout.vue index b4b89359..561f5b84 100644 --- a/web/ui/src/components/AppLayout.vue +++ b/web/ui/src/components/AppLayout.vue @@ -112,7 +112,9 @@ onUnmounted(() => window.removeEventListener('keydown', handleKeydown)) diff --git a/web/ui/src/components/AppSelect.vue b/web/ui/src/components/AppSelect.vue index 4e825253..e6ecf8ec 100644 --- a/web/ui/src/components/AppSelect.vue +++ b/web/ui/src/components/AppSelect.vue @@ -39,6 +39,7 @@ const menu = ref(null) const open = ref(false) const activeIndex = ref(-1) const menuStyle = ref>({}) +const menuPlacement = ref<'top' | 'bottom'>('bottom') const selectedIndex = computed(() => props.options.findIndex((option) => option.value === props.modelValue)) const selected = computed(() => (selectedIndex.value >= 0 ? props.options[selectedIndex.value] : null)) @@ -67,8 +68,10 @@ function updatePosition() { } if (spaceBelow < estimatedHeight && spaceAbove > spaceBelow) { style.bottom = `${window.innerHeight - rect.top + 6}px` + menuPlacement.value = 'top' } else { style.top = `${rect.bottom + 6}px` + menuPlacement.value = 'bottom' } menuStyle.value = style } @@ -227,6 +230,7 @@ onUnmounted(() => { class="select-menu" role="listbox" :aria-labelledby="triggerId" + :data-placement="menuPlacement" :style="menuStyle" @mousedown.prevent > diff --git a/web/ui/src/components/ConfirmDialog.vue b/web/ui/src/components/ConfirmDialog.vue index ee0d697b..6436584b 100644 --- a/web/ui/src/components/ConfirmDialog.vue +++ b/web/ui/src/components/ConfirmDialog.vue @@ -43,44 +43,42 @@ onUnmounted(() => window.removeEventListener('keydown', onKeydown)) diff --git a/web/ui/src/components/ConfirmHost.vue b/web/ui/src/components/ConfirmHost.vue index ff1e4e89..964734e5 100644 --- a/web/ui/src/components/ConfirmHost.vue +++ b/web/ui/src/components/ConfirmHost.vue @@ -6,14 +6,16 @@ const confirm = useConfirmStore() diff --git a/web/ui/src/views/DashboardView.vue b/web/ui/src/views/DashboardView.vue index fa80156b..a7eafb62 100644 --- a/web/ui/src/views/DashboardView.vue +++ b/web/ui/src/views/DashboardView.vue @@ -102,7 +102,7 @@ onUnmounted(() => {