ed8956e9ed
* feat(koplugin/library): data layer + busted harness + design doc - LibraryStore: per-user SQLite index merging cloud + local books by partial-md5 hash. listBooks/listBookshelfBooks/listBookshelfGroups, upsertBook with cloud_present/local_present OR-merge + _force/clear sentinels, parseSyncRow, getChangedBooks for tombstone push. - EXTS table mirroring web's document.ts. - busted harness with KOReader stubs (G_reader_settings, DataStorage, lua-ljsqlite3 against :memory:); spec_helper, exts_spec, smoke_spec, librarystore_spec covering schema, sort, group nesting, dedupe. - Library design doc + spec README. - pnpm test:lua wired through root + app package.json; lint-koplugin recurses into library/ + spec/. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): cloud sync — push, pull, upload, delete, downloads - Spore methods: pullBooks (incremental /sync), getDownloadUrl, getUploadUrl, listFiles, deleteFile. - syncbooks.lua: pushBook + pushChangedBooks (advances watermark to max(updated_at, deleted_at)), syncBooks(opts, mode) for push/pull/both, downloadBook + downloadCover (sync socket.http with file sink; cover download via fork+poll with single-slot queue + visible-page filter + coalesced refresh), uploadBook (presigned-PUT flow + best-effort cover), deleteCloudFiles (list-then-delete-each, mirrors cloudService.deleteBook). - SyncAuth.withFreshToken wrapper resolves the ensureClient race; 401/403 unified across syncconfig + syncannotations. - Cloud + local book covers shared by partial-md5 hash; cover.png cached at <settings>/readest_covers/<hash>.png with sentinel for known 404s. - syncbooks_spec covers row-to-wire conversion + file_key shape. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): local discovery — sidecar scanner + cover provider - localscanner.lightScan iterates ReadHistory entries, reads partial_md5_checksum from .sdr sidecars, and upserts local rows. Slow filesystem walks deferred to fullSidecarWalk (24h-gated). - coverprovider wraps BookInfoManager:getBookInfo for local books with graceful FakeCover fallback when coverbrowser is absent. - localscanner_spec + coverprovider_spec. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat(koplugin/library): UI — widget, item, view menu, FileManager hooks - librarywidget: full-screen Menu mixed in with CoverMenu + Mosaic/List per zen_ui's group_view pattern. Title-bar tap → view menu, search via left icon, drill-in/back for grouping. Async cloud sync deferred via scheduleIn so the menu paints before HTTP fires. - libraryitem: BIM patch for cloud-only (readest-cloud://) and group (readest-group://) URIs; group-cover composer (2x2 mosaic for grid, same in list) with cache key derived from the actual first-N hashes for content-based invalidation; ListMenuItem update + paintTo patches for wider list-mode cover strip and cloud-up/down icon overlay. - libraryviewmenu: ButtonDialog with View/Group by/Sort by/Actions. Default Group by = Groups (parity with web), values authors/groups. - librarypaint: partial-page e-ink repaint shim adapted from zen_ui. - main.lua: Library menu entry, dispatcher actions (Open Library / Push / Pull as general; progress + annotations as reader-only), "Add to Readest" button in FileManager's long-press file dialog (dedupe by partial_md5; bumps updated_at when present, inserts a fresh local-only row otherwise; un-tombstones via _clear_fields). Push books on Library open when auto_sync is on, pull-only otherwise. - Long-press action sheet with Readest BookDetailView parity: Remove from Cloud & Device / Cloud Only / Device Only, Upload to Cloud, Download Book / Cover / All. - Cloud-down + cloud-up SVG icons (LiaCloudDownloadAltSolid / LiaCloudUploadAltSolid) painted in the right-side wpageinfo slot. - i18n catalog updated for new strings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(koplugin/library): split libraryitem into focused modules libraryitem.lua had grown to 1018 lines mixing five unrelated concerns. Split along the natural seams: cloud_covers — readest-cloud:// URI scheme, on-disk <hash>.png cache, single-slot async download queue, visible-page filter group_covers — readest-group:// URI scheme, 2x2 mosaic composer with content-derived cache key (first-N hashes), cell layout table cloud_icons — bundled cloud-up/cloud-down SVG loader, IconWidget cache, paint-overlay positioning list_strip — list-mode group row builder (4-cover wider strip replacing ListMenu's square cover slot) bim_patch — BookInfoManager:getBookInfo router (cloud / group / local) + ListMenuItem update + paintTo patches; owns the _library_local_paths set and orig BIM reference libraryitem.lua is now 141 lines: just the entry-table constructors (entry_from_row, entry_from_group, entry_back) plus thin install / set_visible_hashes delegates. Each new module is 88-216 lines. No behavior change — same 113 specs pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore(koplugin): co-locate dev tooling, ship-zip exclusions, CI job split - apps/readest.koplugin/scripts/build-koplugin.mjs: local sideloading build with the same exclusions the release workflow uses. - Move lint-koplugin + test-koplugin from apps/readest-app/scripts/ to apps/readest.koplugin/scripts/. All koplugin dev tooling now lives with the koplugin and is excluded from the published release zip. - Rename to .mjs so Node treats them as ESM without the reparse warning (the i18n CommonJS scripts stay .js). - Release workflow: zip -r exclusions for scripts/, docs/, spec/, .busted so dev artifacts don't ship to end users. - PR workflow: split build_web_app into build_web_app + test_web_app for parallelism. The test job installs luarocks + busted + lsqlite3complete and runs pnpm test:lua. test-koplugin.mjs now hard-fails (instead of soft-skipping) when CI=true and a tool is missing — a broken CI toolchain previously exited 0 silently. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
221 lines
7.4 KiB
Lua
221 lines
7.4 KiB
Lua
local Device = require("device")
|
|
local InfoMessage = require("ui/widget/infomessage")
|
|
local MultiInputDialog = require("ui/widget/multiinputdialog")
|
|
local NetworkMgr = require("ui/network/manager")
|
|
local UIManager = require("ui/uimanager")
|
|
local logger = require("logger")
|
|
local util = require("util")
|
|
local T = require("ffi/util").template
|
|
local _ = require("i18n")
|
|
|
|
local SyncAuth = {}
|
|
|
|
function SyncAuth:needsLogin(settings)
|
|
return not settings.access_token or not settings.expires_at
|
|
or settings.expires_at < os.time() + 60
|
|
end
|
|
|
|
function SyncAuth:tryRefreshToken(settings, path)
|
|
if settings.refresh_token and settings.expires_at
|
|
and settings.expires_at < os.time() + settings.expires_in / 2 then
|
|
local client = self:getSupabaseAuthClient(settings, path)
|
|
client:refresh_token(settings.refresh_token, function(success, response)
|
|
if success then
|
|
settings.access_token = response.access_token
|
|
settings.refresh_token = response.refresh_token
|
|
settings.expires_at = response.expires_at
|
|
settings.expires_in = response.expires_in
|
|
G_reader_settings:saveSetting("readest_sync", settings)
|
|
else
|
|
logger.err("ReadestSync: Token refresh failed:", response or "Unknown error")
|
|
end
|
|
end)
|
|
end
|
|
end
|
|
|
|
-- Block-style wrapper around tryRefreshToken: runs the refresh (if needed)
|
|
-- and invokes `callback(ok, err)` after the new token is committed to
|
|
-- settings, OR immediately with ok=true if the token is still fresh.
|
|
--
|
|
-- Codex round 1 finding 14: ensureClient() in main.lua kicks off a refresh
|
|
-- and immediately builds a Spore client with whatever token was already in
|
|
-- settings — racy. New library API calls (pullBooks, getDownloadUrl) MUST go
|
|
-- through this wrapper so the request body never carries a stale Bearer
|
|
-- header.
|
|
function SyncAuth:withFreshToken(settings, path, callback)
|
|
-- Token still has > 50% TTL remaining: nothing to do.
|
|
if not settings.refresh_token or not settings.expires_at
|
|
or settings.expires_at >= os.time() + (settings.expires_in or 0) / 2 then
|
|
if callback then callback(true) end
|
|
return
|
|
end
|
|
|
|
local client = self:getSupabaseAuthClient(settings, path)
|
|
if not client then
|
|
if callback then callback(false, "no auth client") end
|
|
return
|
|
end
|
|
|
|
client:refresh_token(settings.refresh_token, function(success, response)
|
|
if success then
|
|
settings.access_token = response.access_token
|
|
settings.refresh_token = response.refresh_token
|
|
settings.expires_at = response.expires_at
|
|
settings.expires_in = response.expires_in
|
|
G_reader_settings:saveSetting("readest_sync", settings)
|
|
if callback then callback(true) end
|
|
else
|
|
logger.err("ReadestSync: Token refresh failed:", response or "Unknown error")
|
|
if callback then callback(false, response and response.msg or "refresh failed") end
|
|
end
|
|
end)
|
|
end
|
|
|
|
function SyncAuth:getSupabaseAuthClient(settings, path)
|
|
if not settings.supabase_url or not settings.supabase_anon_key then
|
|
return nil
|
|
end
|
|
|
|
local SupabaseAuthClient = require("supabaseauth")
|
|
return SupabaseAuthClient:new{
|
|
service_spec = path .. "/supabase-auth-api.json",
|
|
custom_url = settings.supabase_url .. "/auth/v1/",
|
|
api_key = settings.supabase_anon_key,
|
|
}
|
|
end
|
|
|
|
function SyncAuth:getReadestSyncClient(settings, path)
|
|
if not settings.access_token or not settings.expires_at or settings.expires_at < os.time() then
|
|
return nil
|
|
end
|
|
|
|
local ReadestSyncClient = require("readestsync")
|
|
return ReadestSyncClient:new{
|
|
service_spec = path .. "/readest-sync-api.json",
|
|
access_token = settings.access_token,
|
|
}
|
|
end
|
|
|
|
function SyncAuth:login(settings, path, title, menu)
|
|
if NetworkMgr:willRerunWhenOnline(function() self:login(settings, path, title, menu) end) then
|
|
return
|
|
end
|
|
|
|
local dialog
|
|
dialog = MultiInputDialog:new{
|
|
title = title,
|
|
fields = {
|
|
{
|
|
text = settings.user_email,
|
|
hint = "email@example.com",
|
|
},
|
|
{
|
|
hint = "password",
|
|
text_type = "password",
|
|
},
|
|
},
|
|
buttons = {
|
|
{
|
|
{
|
|
text = _("Cancel"),
|
|
id = "close",
|
|
callback = function()
|
|
UIManager:close(dialog)
|
|
end,
|
|
},
|
|
{
|
|
text = _("Login"),
|
|
callback = function()
|
|
local email, password = unpack(dialog:getFields())
|
|
email = util.trim(email)
|
|
if email == "" or password == "" then
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Please enter both email and password"),
|
|
timeout = 2,
|
|
})
|
|
return
|
|
end
|
|
UIManager:close(dialog)
|
|
self:doLogin(settings, path, email, password, menu)
|
|
end,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
UIManager:show(dialog)
|
|
dialog:onShowKeyboard()
|
|
end
|
|
|
|
function SyncAuth:doLogin(settings, path, email, password, menu)
|
|
local client = self:getSupabaseAuthClient(settings, path)
|
|
if not client then
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Please configure Supabase URL and API key first"),
|
|
timeout = 3,
|
|
})
|
|
return
|
|
end
|
|
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Logging in..."),
|
|
timeout = 1,
|
|
})
|
|
|
|
Device:setIgnoreInput(true)
|
|
local success, response = client:sign_in_password(email, password)
|
|
Device:setIgnoreInput(false)
|
|
|
|
if success then
|
|
settings.user_email = email
|
|
settings.user_id = response.user.id
|
|
settings.user_name = response.user.user_metadata.user_name or email
|
|
settings.access_token = response.access_token
|
|
settings.refresh_token = response.refresh_token
|
|
settings.expires_at = response.expires_at
|
|
settings.expires_in = response.expires_in
|
|
G_reader_settings:saveSetting("readest_sync", settings)
|
|
|
|
if menu then
|
|
menu:updateItems()
|
|
end
|
|
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Successfully logged in to Readest"),
|
|
timeout = 3,
|
|
})
|
|
else
|
|
UIManager:show(InfoMessage:new{
|
|
text = T(_("Login failed: %1"), response.msg or _("unknown error")),
|
|
timeout = 3,
|
|
})
|
|
end
|
|
end
|
|
|
|
function SyncAuth:logout(settings, path, menu)
|
|
if settings.access_token then
|
|
local client = self:getSupabaseAuthClient(settings, path)
|
|
if client then
|
|
client:sign_out(settings.access_token, function(success, _response)
|
|
logger.dbg("ReadestSync: Sign out result:", success)
|
|
end)
|
|
end
|
|
end
|
|
|
|
settings.access_token = nil
|
|
settings.refresh_token = nil
|
|
settings.expires_at = nil
|
|
settings.expires_in = nil
|
|
G_reader_settings:saveSetting("readest_sync", settings)
|
|
|
|
if menu then
|
|
menu:updateItems()
|
|
end
|
|
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Logged out from Readest"),
|
|
timeout = 2,
|
|
})
|
|
end
|
|
|
|
return SyncAuth
|