@serifpersia/dango 3.4.4 → 3.4.6

package/server/dist/lib/ump.js

@@ -0,0 +1,106 @@
+const MEDIA_HEADER = 20;
+const MEDIA = 21;
+const STREAM_PROTECTION_STATUS = 58;
+function readVarint(buf, pos) {
+    if (pos >= buf.length)
+        return null;
+    const prefix = buf[pos];
+    let size = 0;
+    for (let shift = 1; shift <= 5; shift++) {
+        if ((prefix & (128 >> (shift - 1))) === 0) {
+            size = shift;
+            break;
+        }
+    }
+    if (size < 1 || pos + size > buf.length)
+        return null;
+    if (size === 1)
+        return [prefix, pos + 1];
+    if (size === 5) {
+        const value = buf[pos + 1] + buf[pos + 2] * 256 + buf[pos + 3] * 65536 + buf[pos + 4] * 16777216;
+        return [value >>> 0, pos + 5];
+    }
+    const lowBits = 8 - size;
+    let value = prefix & ((1 << lowBits) - 1);
+    for (let i = 1; i < size; i++) {
+        value += buf[pos + i] * 2 ** (lowBits + 8 * (i - 1));
+    }
+    return [value, pos + size];
+}
+function readStatusField(payload) {
+    let pos = 0;
+    while (pos < payload.length) {
+        const key = payload[pos++];
+        const field = key >> 3;
+        const wire = key & 7;
+        if (wire !== 0)
+            break;
+        const decoded = readVarint(payload, pos);
+        if (!decoded)
+            break;
+        if (field === 1)
+            return decoded[0];
+        pos = decoded[1];
+    }
+    return 1;
+}
+export function parseUmpResponse(buf, carry) {
+    const mediaChunks = [];
+    let status = 1;
+    let nextCarry = carry;
+    let pos = 0;
+    if (nextCarry) {
+        const t = readVarint(buf, pos);
+        const s = t && readVarint(buf, t[1]);
+        if (t && s && t[0] === MEDIA_HEADER) {
+            pos = s[1] + s[0];
+        }
+        const ct = readVarint(buf, pos);
+        const cs = ct && readVarint(buf, ct[1]);
+        if (ct && cs && ct[0] === nextCarry.pendingType) {
+            pos = cs[1];
+            const take = Math.min(cs[0], buf.length - pos);
+            nextCarry.chunks.push(buf.subarray(pos, pos + take));
+            nextCarry.remaining = cs[0] - take;
+            pos += take;
+            if (nextCarry.remaining <= 0) {
+                const full = Buffer.concat(nextCarry.chunks);
+                nextCarry = null;
+                if (ct[0] === MEDIA && full.length > 1)
+                    mediaChunks.push(full.subarray(1));
+            }
+        }
+        else {
+            nextCarry = null;
+        }
+    }
+    while (pos < buf.length) {
+        const t = readVarint(buf, pos);
+        if (!t)
+            break;
+        const s = readVarint(buf, t[1]);
+        if (!s)
+            break;
+        const [type, size] = [t[0], s[0]];
+        pos = s[1];
+        const available = buf.length - pos;
+        if (size > available) {
+            nextCarry = {
+                pendingType: type,
+                remaining: size - available,
+                chunks: [buf.subarray(pos)],
+            };
+            break;
+        }
+        const payload = buf.subarray(pos, pos + size);
+        pos += size;
+        if (type === MEDIA) {
+            if (payload.length > 1)
+                mediaChunks.push(payload.subarray(1));
+        }
+        else if (type === STREAM_PROTECTION_STATUS) {
+            status = readStatusField(payload);
+        }
+    }
+    return { media: Buffer.concat(mediaChunks), status, carry: nextCarry };
+}

package/server/dist/providers/remote-loader.js

@@ -9,6 +9,7 @@ import logger from '../logger.js';
 import { CONFIG } from '../config.js';
 import { requestContext } from '../utils/request-context.js';
 import { sanitizeCfClearance, buildCfClearanceCookie } from '../utils/cookie.utils.js';
+import { base64UrlEncode } from '../utils/megaplay.utils.js';
 import { decodeMaybeGzip, parseJsonBody } from '../utils/http.utils.js';
 import { buildQueryVariants, pickBestMatch } from './title-matching.js';
 import { anilistRequest, parseMalId, searchAnilistByTitle } from '../lib/anilist.js';
@@ -71,13 +72,6 @@ function resolveEntryUrl(entry, registryUrl) {
 function sha256Hex(data) {
     return crypto.createHash('sha256').update(data).digest('hex');
 }
-function base64UrlEncode(input) {
-    return Buffer.from(input)
-        .toString('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=+$/, '');
-}
 function aes256CbcDecryptJson(b64url, keyUtf8, ivUtf8) {
     let encrypted;
     try {
@@ -238,7 +232,8 @@ function createCtx(cache) {
                     ? { url: urlOrOptions, ...(maybeOptions ?? {}) }
                     : urlOrOptions);
                 const { url, ...rest } = opts;
-                const res = await gotScraping(url, {
+                const res = await gotScraping({
+                    url: url,
                     method: 'GET',
                     responseType: 'text',
                     throwHttpErrors: false,
@@ -271,31 +266,26 @@ function createCtx(cache) {
         },
     };
 }
-function isValidVideoProvider(p) {
+function shapeOf(p) {
     if (!p || typeof p !== 'object')
-        return false;
+        return null;
     const o = p;
-    return (typeof o.name === 'string' &&
-        typeof o.search === 'function' &&
-        typeof o.getEpisodes === 'function' &&
-        typeof o.getStreamUrls === 'function');
+    return typeof o.name === 'string' ? o : null;
+}
+function hasFns(o, fns) {
+    return fns.every((f) => typeof o[f] === 'function');
+}
+function isValidVideoProvider(p) {
+    const o = shapeOf(p);
+    return !!o && hasFns(o, ['search', 'getEpisodes', 'getStreamUrls']);
 }
 function isValidMangaProvider(p) {
-    if (!p || typeof p !== 'object')
-        return false;
-    const o = p;
-    return (typeof o.name === 'string' &&
-        typeof o.search === 'function' &&
-        typeof o.getDetail === 'function' &&
-        typeof o.getChapters === 'function' &&
-        typeof o.getPages === 'function');
+    const o = shapeOf(p);
+    return !!o && hasFns(o, ['search', 'getDetail', 'getChapters', 'getPages']);
 }
 function isValidTvProvider(p) {
-    if (!p || typeof p !== 'object')
-        return false;
-    const o = p;
-    return (typeof o.name === 'string' &&
-        (typeof o.getSources === 'function' || typeof o.getEmbedUrl === 'function'));
+    const o = shapeOf(p);
+    return !!o && (typeof o.getSources === 'function' || typeof o.getEmbedUrl === 'function');
 }
 function makeEmbedProvider(id, base) {
     const root = base.trim().replace(/\/+$/, '');

package/server/dist/providers/title-matching.js

@@ -1,14 +1,14 @@
-export function normalizeCompact(s) {
+function normalizeCompact(s) {
     return s.toLowerCase().replace(/[^a-z0-9]/g, '');
 }
-export function tokenize(s) {
+function tokenize(s) {
     return s
         .toLowerCase()
         .replace(/[^\p{L}\p{N}\s]/gu, ' ')
         .split(/\s+/)
         .filter((w) => w.length >= 2);
 }
-export function bigramDice(a, b) {
+function bigramDice(a, b) {
     if (a.length < 2 || b.length < 2)
         return a === b ? 1 : 0;
     const grams = (s) => {
@@ -129,10 +129,10 @@ function detectSeasonMarker(s) {
         return trailingNum[1];
     return '';
 }
-export function distinctiveTokens(s) {
+function distinctiveTokens(s) {
     return [...new Set(tokenize(s).filter((w) => !STOPWORDS.has(w)))];
 }
-export function titleSimilarity(query, candidate) {
+function titleSimilarity(query, candidate) {
     const q = normalizeCompact(query);
     const c = normalizeCompact(candidate);
     if (!q || !c)

package/server/dist/repositories/asmr.repository.js

@@ -1,48 +1,13 @@
 import { eq, inArray, sql } from 'drizzle-orm';
 import { getDrizzle } from '../db/drizzle.js';
-import { asmrLibrary, asmrProgress } from '../db/schema-asmr.js';
-export const ASMR_STATUSES = [
-    'Listening',
-    'Completed',
-    'On-Hold',
-    'Dropped',
-    'Planned',
-];
+import { asmrProgress } from '../db/schema-asmr.js';
+import { makeLibraryRepo } from './library.repository.js';
+export const ASMR_STATUSES = ['Listening', 'Completed', 'On-Hold', 'Dropped', 'Planned'];
 export function buildAsmrId(rjCode) {
     return String(rjCode).trim().toUpperCase();
 }
 export const AsmrLibraryRepository = {
-    getById: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT * FROM asmr_library WHERE id = ${id}`);
-        return rows[0];
-    },
-    exists: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT EXISTS(SELECT 1 FROM asmr_library WHERE id = ${id}) as inLibrary`);
-        return !!(rows[0] && rows[0].inLibrary);
-    },
-    getAll: (db, status, limit, offset) => {
-        const q = sql `SELECT * FROM asmr_library`;
-        if (status && status !== 'All') {
-            q.append(sql ` WHERE status = ${status}`);
-        }
-        q.append(sql ` ORDER BY updatedAt DESC`);
-        if (limit !== undefined && offset !== undefined) {
-            q.append(sql ` LIMIT ${limit} OFFSET ${offset}`);
-        }
-        return getDrizzle(db).all(q);
-    },
-    getCount: async (db, status) => {
-        if (status && status !== 'All') {
-            const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM asmr_library WHERE status = ${status}`);
-            return rows[0]?.total || 0;
-        }
-        const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM asmr_library`);
-        return rows[0]?.total || 0;
-    },
-    getIds: async (db) => {
-        const rows = await getDrizzle(db).all(sql `SELECT id FROM asmr_library`);
-        return rows.map((r) => r.id);
-    },
+    ...makeLibraryRepo('asmr_library'),
     upsert: (db, data) => getDrizzle(db).run(sql `
       INSERT INTO asmr_library (id, rjCode, title, thumbnail, status, isAdult, updatedAt)
       VALUES (${data.id}, ${data.rjCode}, ${data.title}, ${data.thumbnail}, ${data.status}, ${data.isAdult ? 1 : 0}, strftime('%s', 'now'))
@@ -53,22 +18,8 @@ export const AsmrLibraryRepository = {
          status = COALESCE(NULLIF(EXCLUDED.status, ''), asmr_library.status),
          isAdult = COALESCE(EXCLUDED.isAdult, asmr_library.isAdult),
          updatedAt = strftime('%s', 'now')`),
-    updateStatus: (db, id, status) => getDrizzle(db).run(sql `
-      UPDATE asmr_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    updateStatusMany: (db, ids, status) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).run(sql `
-      UPDATE asmr_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id IN (${sql.join(ids.map((id) => sql `${id}`), sql `, `)})`);
-    },
     touchProgress: (db, id, progress) => getDrizzle(db).run(sql `
       UPDATE asmr_library SET lastTrackIndex = ${progress.trackIndex}, lastTrackLabel = ${progress.trackLabel}, lastPosition = ${progress.position}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    delete: (db, id) => getDrizzle(db).delete(asmrLibrary).where(eq(asmrLibrary.id, id)),
-    deleteMany: (db, ids) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).delete(asmrLibrary).where(inArray(asmrLibrary.id, ids));
-    },
 };
 export const AsmrProgressRepository = {
     getByWork: (db, workId) => getDrizzle(db).all(sql `

package/server/dist/repositories/library.repository.js

@@ -36,6 +36,52 @@ async function clearTables(db, tables) {
         }
     }
 }
+export function makeLibraryRepo(table) {
+    const t = sql.raw(`"${table}"`);
+    return {
+        getById: async (db, id) => {
+            const rows = await getDrizzle(db).all(sql `SELECT * FROM ${t} WHERE id = ${id}`);
+            return rows[0];
+        },
+        getAll: (db, status, limit, offset) => {
+            const q = sql `SELECT * FROM ${t}`;
+            if (status && status !== 'All') {
+                q.append(sql ` WHERE status = ${status}`);
+            }
+            q.append(sql ` ORDER BY updatedAt DESC`);
+            if (limit !== undefined && offset !== undefined) {
+                q.append(sql ` LIMIT ${limit} OFFSET ${offset}`);
+            }
+            return getDrizzle(db).all(q);
+        },
+        getCount: async (db, status) => {
+            if (status && status !== 'All') {
+                const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM ${t} WHERE status = ${status}`);
+                return rows[0]?.total || 0;
+            }
+            const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM ${t}`);
+            return rows[0]?.total || 0;
+        },
+        getIds: async (db) => {
+            const rows = await getDrizzle(db).all(sql `SELECT id FROM ${t}`);
+            return rows.map((r) => r.id);
+        },
+        updateStatus: (db, id, status) => getDrizzle(db).run(sql `
+      UPDATE ${t} SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
+        updateStatusMany: (db, ids, status) => {
+            if (ids.length === 0)
+                return Promise.resolve();
+            return getDrizzle(db).run(sql `
+      UPDATE ${t} SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id IN (${sql.join(ids.map((id) => sql `${id}`), sql `, `)})`);
+        },
+        delete: (db, id) => getDrizzle(db).run(sql `DELETE FROM ${t} WHERE id = ${id}`),
+        deleteMany: (db, ids) => {
+            if (ids.length === 0)
+                return Promise.resolve();
+            return getDrizzle(db).run(sql `DELETE FROM ${t} WHERE id IN (${sql.join(ids.map((id) => sql `${id}`), sql `, `)})`);
+        },
+    };
+}
 export const LibraryRepository = {
     countAll: (db) => countTables(db, LIBRARY_TABLES),
     clearAll: (db) => clearTables(db, LIBRARY_TABLES),

package/server/dist/repositories/manga.repository.js

@@ -1,48 +1,13 @@
 import { eq, inArray, sql } from 'drizzle-orm';
 import { getDrizzle } from '../db/drizzle.js';
 import { mangaLibrary, mangaProgress } from '../db/schema-manga.js';
-export const MANGA_STATUSES = [
-    'Reading',
-    'Completed',
-    'On-Hold',
-    'Dropped',
-    'Planned',
-];
+import { makeLibraryRepo } from './library.repository.js';
+export const MANGA_STATUSES = ['Reading', 'Completed', 'On-Hold', 'Dropped', 'Planned'];
 export function buildMangaId(provider, mangaId) {
     return `${provider.toLowerCase()}:${mangaId}`;
 }
 export const MangaLibraryRepository = {
-    getById: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT * FROM manga_library WHERE id = ${id}`);
-        return rows[0];
-    },
-    exists: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT EXISTS(SELECT 1 FROM manga_library WHERE id = ${id}) as inLibrary`);
-        return !!(rows[0] && rows[0].inLibrary);
-    },
-    getAll: (db, status, limit, offset) => {
-        const q = sql `SELECT * FROM manga_library`;
-        if (status && status !== 'All') {
-            q.append(sql ` WHERE status = ${status}`);
-        }
-        q.append(sql ` ORDER BY updatedAt DESC`);
-        if (limit !== undefined && offset !== undefined) {
-            q.append(sql ` LIMIT ${limit} OFFSET ${offset}`);
-        }
-        return getDrizzle(db).all(q);
-    },
-    getCount: async (db, status) => {
-        if (status && status !== 'All') {
-            const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM manga_library WHERE status = ${status}`);
-            return rows[0]?.total || 0;
-        }
-        const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM manga_library`);
-        return rows[0]?.total || 0;
-    },
-    getIds: async (db) => {
-        const rows = await getDrizzle(db).all(sql `SELECT id FROM manga_library`);
-        return rows.map((r) => r.id);
-    },
+    ...makeLibraryRepo('manga_library'),
     upsert: (db, data) => getDrizzle(db).run(sql `
       INSERT INTO manga_library (id, provider, mangaId, title, cover, status, author, altTitle, contentRating, anilistId, anilistIdSource, updatedAt)
       VALUES (${data.id}, ${data.provider}, ${data.mangaId}, ${data.title}, ${data.cover}, ${data.status}, ${data.author || null}, ${data.altTitle || null}, ${data.contentRating || null}, ${data.anilistId ?? null}, ${data.anilistIdSource ?? null}, strftime('%s', 'now'))
@@ -63,25 +28,10 @@ export const MangaLibraryRepository = {
             .set({ anilistId, anilistIdSource: source })
             .where(eq(mangaLibrary.id, id))
         : getDrizzle(db).update(mangaLibrary).set({ anilistId }).where(eq(mangaLibrary.id, id)),
-    getByAnilistId: (db, anilistId) => getDrizzle(db).all(sql `SELECT * FROM manga_library WHERE anilistId = ${anilistId}`),
-    updateStatus: (db, id, status) => getDrizzle(db).run(sql `
-      UPDATE manga_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    updateStatusMany: (db, ids, status) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).run(sql `
-      UPDATE manga_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id IN (${sql.join(ids.map((id) => sql `${id}`), sql `, `)})`);
-    },
     touchProgress: (db, id, progress) => getDrizzle(db).run(sql `
       UPDATE manga_library SET lastChapterId = ${progress.chapterId}, lastChapterNumber = ${progress.chapterNumber}, lastPage = ${progress.page}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
     setProgressPointer: (db, id, chapterNumber) => getDrizzle(db).run(sql `
       UPDATE manga_library SET lastChapterNumber = ${chapterNumber}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    delete: (db, id) => getDrizzle(db).delete(mangaLibrary).where(eq(mangaLibrary.id, id)),
-    deleteMany: (db, ids) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).delete(mangaLibrary).where(inArray(mangaLibrary.id, ids));
-    },
 };
 export const MangaProgressRepository = {
     getByManga: (db, mangaId) => getDrizzle(db).all(sql `

package/server/dist/repositories/settings.repository.js

@@ -11,6 +11,14 @@ export const SettingsRepository = {
         .values({ key, value })
         .onConflictDoUpdate({ target: settings.key, set: { value } }),
     deleteByKey: (db, key) => getDrizzle(db).delete(settings).where(eq(settings.key, key)),
+    readContinueFlags: async (db, ignoreKey, listOnlyKey) => {
+        const ignoreRow = await SettingsRepository.getByKey(db, ignoreKey);
+        const listOnlyRow = await SettingsRepository.getByKey(db, listOnlyKey);
+        return {
+            ignoreAdult: ignoreRow ? ignoreRow.value !== 'false' : true,
+            listOnly: listOnlyRow ? listOnlyRow.value === 'true' || listOnlyRow.value === '1' : false,
+        };
+    },
     clearWatchlist: (db) => getDrizzle(db).delete(watchlist),
     upsertWatchlistBatch: (db, shows) => {
         if (shows.length === 0)

package/server/dist/repositories/tv.repository.js

@@ -1,6 +1,7 @@
 import { eq, inArray, sql } from 'drizzle-orm';
 import { getDrizzle } from '../db/drizzle.js';
-import { tvLibrary, tvProgress } from '../db/schema-tv.js';
+import { tvProgress } from '../db/schema-tv.js';
+import { makeLibraryRepo } from './library.repository.js';
 export const TV_STATUSES = ['Watching', 'Completed', 'On-Hold', 'Dropped', 'Planned'];
 export function buildTvId(mediaType, tmdbId) {
     const t = String(mediaType).toLowerCase() === 'movie' ? 'movie' : 'tv';
@@ -14,37 +15,7 @@ export function normalizeTvMediaId(raw) {
     return s;
 }
 export const TvLibraryRepository = {
-    getById: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT * FROM tv_library WHERE id = ${id}`);
-        return rows[0];
-    },
-    exists: async (db, id) => {
-        const rows = await getDrizzle(db).all(sql `SELECT EXISTS(SELECT 1 FROM tv_library WHERE id = ${id}) as inLibrary`);
-        return !!(rows[0] && rows[0].inLibrary);
-    },
-    getAll: (db, status, limit, offset) => {
-        const q = sql `SELECT * FROM tv_library`;
-        if (status && status !== 'All') {
-            q.append(sql ` WHERE status = ${status}`);
-        }
-        q.append(sql ` ORDER BY updatedAt DESC`);
-        if (limit !== undefined && offset !== undefined) {
-            q.append(sql ` LIMIT ${limit} OFFSET ${offset}`);
-        }
-        return getDrizzle(db).all(q);
-    },
-    getCount: async (db, status) => {
-        if (status && status !== 'All') {
-            const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM tv_library WHERE status = ${status}`);
-            return rows[0]?.total || 0;
-        }
-        const rows = await getDrizzle(db).all(sql `SELECT COUNT(*) as total FROM tv_library`);
-        return rows[0]?.total || 0;
-    },
-    getIds: async (db) => {
-        const rows = await getDrizzle(db).all(sql `SELECT id FROM tv_library`);
-        return rows.map((r) => r.id);
-    },
+    ...makeLibraryRepo('tv_library'),
     upsert: (db, data) => getDrizzle(db).run(sql `
       INSERT INTO tv_library (id, tmdbId, mediaType, title, poster, backdrop, year, overview, status, adult, updatedAt)
       VALUES (${data.id}, ${data.tmdbId}, ${data.mediaType}, ${data.title}, ${data.poster}, ${data.backdrop || null}, ${data.year || null}, ${data.overview || null}, ${data.status}, ${data.adult ? 1 : 0}, strftime('%s', 'now'))
@@ -59,22 +30,8 @@ export const TvLibraryRepository = {
          status = COALESCE(NULLIF(EXCLUDED.status, ''), tv_library.status),
          adult = COALESCE(EXCLUDED.adult, tv_library.adult),
          updatedAt = strftime('%s', 'now')`),
-    updateStatus: (db, id, status) => getDrizzle(db).run(sql `
-      UPDATE tv_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    updateStatusMany: (db, ids, status) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).run(sql `
-      UPDATE tv_library SET status = ${status}, updatedAt = strftime('%s', 'now') WHERE id IN (${sql.join(ids.map((id) => sql `${id}`), sql `, `)})`);
-    },
     touchProgress: (db, id, progress) => getDrizzle(db).run(sql `
       UPDATE tv_library SET lastSeason = ${progress.season}, lastEpisode = ${progress.episode}, updatedAt = strftime('%s', 'now') WHERE id = ${id}`),
-    delete: (db, id) => getDrizzle(db).delete(tvLibrary).where(eq(tvLibrary.id, id)),
-    deleteMany: (db, ids) => {
-        if (ids.length === 0)
-            return Promise.resolve();
-        return getDrizzle(db).delete(tvLibrary).where(inArray(tvLibrary.id, ids));
-    },
 };
 export const TvProgressRepository = {
     getByMedia: (db, mediaId) => getDrizzle(db).all(sql `

package/server/dist/repositories/watched-episodes.repository.js

@@ -79,6 +79,4 @@ export const WatchedEpisodesRepository = {
       ORDER BY we.watchedAt DESC
       ${sql.raw(limitClause)}`);
     },
-    getEpisodesForShows: (db, showIds) => getDrizzle(db).all(sql `
-      SELECT showId, episodeNumber, currentTime, duration, watchedAt FROM watched_episodes WHERE showId IN (${sql.join(showIds.map((id) => sql `${id}`), sql `, `)})`),
 };

package/server/dist/server.js

@@ -12,6 +12,7 @@ import logger from './logger.js';
 import { notifyServerExit } from './lib/ipc.js';
 import { CONFIG } from './config.js';
 import { initializeDatabase, initializeMangaDatabase, initializeTvDatabase, initializeAsmrDatabase, runFullSyncSequence, syncUp, waitForSync, KIND_SYNC, } from './sync.js';
+import { isJasmrApi } from './hono/asmr.js';
 import { loadRemoteProviders } from './providers/remote-loader.js';
 import { discordRPCService } from './discord-rpc.js';
 import { discordGatewayService } from './discord-gateway.js';
@@ -38,7 +39,10 @@ const app = createHonoApp(() => ({ shuttingDown: isShuttingDown, dbReady: !!db }
     getProviders: () => providers,
     getMangaProvider: (name) => mangaProviders[name],
     getTvProvider: (name) => tvProviders[name],
-    getJasmr: () => providers['jasmr'],
+    getJasmr: () => {
+        const mod = providers['jasmr'];
+        return isJasmrApi(mod) ? mod : undefined;
+    },
 });
 const apiCache = new AppCache({ ttlSeconds: 3600, maxKeys: 5000 });
 const providers = {};

package/server/dist/sync.js

@@ -151,13 +151,11 @@ class Mutex {
         });
     }
     unlock() {
-        if (this._waiting.length > 0) {
-            const resolve = this._waiting.shift();
+        const resolve = this._waiting.shift();
+        if (resolve)
             resolve();
-        }
-        else {
+        else
             this._locked = false;
-        }
     }
 }
 const syncMutex = new Mutex();

package/server/dist/trpc/routers/asmr-library.js

@@ -2,23 +2,13 @@ import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
 import { performAsmrWriteTransactionAsync } from '../../sync.js';
 import { buildAsmrId, ASMR_STATUSES, AsmrLibraryRepository, AsmrProgressRepository, } from '../../repositories/asmr.repository.js';
-import { defineSchema, reqObj, reqStr, optStr, reqStrArray } from '../validation.js';
+import { defineSchema, reqObj, reqStr, optStr, reqStrArray, readPageLimit } from '../validation.js';
 const asmrLibraryListInput = () => defineSchema((value) => {
     const obj = reqObj(value);
-    const out = {};
+    const out = { ...readPageLimit(obj) };
     const status = optStr(obj, 'status');
     if (status !== undefined)
         out.status = status;
-    if (obj.page !== undefined && obj.page !== null && obj.page !== '') {
-        const page = Number(obj.page);
-        if (Number.isFinite(page))
-            out.page = page;
-    }
-    if (obj.limit !== undefined && obj.limit !== null && obj.limit !== '') {
-        const limit = Number(obj.limit);
-        if (Number.isFinite(limit))
-            out.limit = limit;
-    }
     return out;
 });
 const asmrLibraryIdInput = () => defineSchema((value) => ({

package/server/dist/trpc/routers/asmr-progress.js

@@ -1,17 +1,10 @@
 import { protectedProcedure, router } from '../index.js';
 import { performAsmrWriteTransactionAsync } from '../../sync.js';
-import { dbAll } from '../../utils/db-utils.js';
+import { adultNonListIds } from '../../utils/db-utils.js';
 import { SettingsRepository } from '../../repositories/settings.repository.js';
 import { AsmrLibraryRepository, AsmrProgressRepository, } from '../../repositories/asmr.repository.js';
-import { defineSchema, reqObj, reqStr, reqStrArray } from '../validation.js';
-async function getAdultNonListWorkIds(db) {
-    const rows = await dbAll(db, `SELECT DISTINCT p.workId as workId
-       FROM asmr_progress p
-       LEFT JOIN asmr_library l ON l.id = p.workId
-       WHERE COALESCE(l.isAdult, p.isAdult) = 1
-         AND l.id IS NULL`);
-    return rows.map((r) => r.workId);
-}
+import { defineSchema, reqObj, reqStr, reqStrArray, strOrNull } from '../validation.js';
+const getAdultNonListWorkIds = (db) => adultNonListIds(db, 'asmr_progress', 'asmr_library', 'workId', 'COALESCE(l.isAdult, p.isAdult) = 1');
 const asmrProgressIdsInput = () => defineSchema((value) => ({
     ids: reqStrArray(reqObj(value), 'ids', true),
 }));
@@ -26,9 +19,9 @@ const asmrProgressSaveInput = () => defineSchema((value) => {
         trackLabel: obj.trackLabel,
         currentTime: obj.currentTime,
         duration: obj.duration,
-        title: obj.title ?? null,
-        thumbnail: obj.thumbnail ?? null,
-        rjCode: obj.rjCode ?? null,
+        title: strOrNull(obj, 'title'),
+        thumbnail: strOrNull(obj, 'thumbnail'),
+        rjCode: strOrNull(obj, 'rjCode'),
         isAdult: obj.isAdult ?? null,
     };
 });
@@ -66,9 +59,9 @@ export const asmrProgressRouter = router({
                 trackLabel: String(input.trackLabel || ''),
                 currentTime: timeNum,
                 duration: durationNum,
-                title: (input.title ?? null),
-                thumbnail: (input.thumbnail ?? null),
-                rjCode: (input.rjCode ?? null),
+                title: input.title ?? null,
+                thumbnail: input.thumbnail ?? null,
+                rjCode: input.rjCode ?? null,
                 isAdult: input.isAdult != null ? Number(input.isAdult) : null,
             });
             await AsmrLibraryRepository.touchProgress(tx, String(input.workId), {
@@ -101,12 +94,7 @@ export const asmrProgressRouter = router({
         .input(asmrContinueListeningInput())
         .query(async ({ ctx, input }) => {
         const limit = Math.min(Math.max(parseInt(String(input.limit ?? 24)) || 24, 1), 100);
-        const ignoreAdultRow = await SettingsRepository.getByKey(ctx.db, 'asmrIgnoreAdultContent');
-        const ignoreAdult = ignoreAdultRow ? ignoreAdultRow.value !== 'false' : true;
-        const listOnlyRow = await SettingsRepository.getByKey(ctx.db, 'asmrCwWatchlistOnly');
-        const listOnly = listOnlyRow
-            ? listOnlyRow.value === 'true' || listOnlyRow.value === '1'
-            : false;
+        const { ignoreAdult, listOnly } = await SettingsRepository.readContinueFlags(ctx.db, 'asmrIgnoreAdultContent', 'asmrCwWatchlistOnly');
         const rows = (await AsmrProgressRepository.getContinueListening(ctx.asmrDb, limit)).filter((row) => {
             if (ignoreAdult && row.isAdult === 1)
                 return false;