@serifpersia/dango 3.4.3 → 3.4.5

package/server/dist/trpc/routers/tv.js

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import { protectedProcedure, router } from '../index.js';
-import { defineSchema, optStr, reqObj, reqStr } from '../validation.js';
+import { defineSchema, failed, optStr, readCount, reqId, reqObj, reqStr } from '../validation.js';
 import { getTmdbKey, TMDB_BASE, TMDB_IMAGE } from '../../lib/tmdb.js';
 import { parseJsonBody } from '../../utils/http.utils.js';
 async function resolveTvMeta(mediaType, numericTmdbId, partial) {
@@ -43,22 +43,6 @@ function toSearchResult(item, type) {
         genre_ids: item.genre_ids || [],
     };
 }
-function failed(message) {
-    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
-}
-function optNum(obj, name, fallback) {
-    const value = obj[name];
-    if (value === undefined || value === null || value === '')
-        return fallback;
-    return parseInt(String(value), 10) || fallback;
-}
-function reqId(obj, name) {
-    const value = obj[name];
-    if ((typeof value !== 'string' && typeof value !== 'number') || String(value).length === 0) {
-        throw new Error(`${name} must be a string`);
-    }
-    return String(value);
-}
 const tvSearchInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const out = {};
@@ -66,7 +50,7 @@ const tvSearchInput = () => defineSchema((value) => {
     if (q !== undefined)
         out.q = q;
     if (obj.page !== undefined)
-        out.page = optNum(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     const type = optStr(obj, 'type');
     if (type !== undefined)
         out.type = type;
@@ -91,7 +75,7 @@ const tvTrendingInput = () => defineSchema((value) => {
     if (timeWindow !== undefined)
         out.timeWindow = timeWindow;
     if (obj.page !== undefined)
-        out.page = optNum(obj, 'page', 1);
+        out.page = readCount(obj, 'page', 1);
     return out;
 });
 const tvDetailsInput = () => defineSchema((value) => {
@@ -132,9 +116,9 @@ const tvSourcesInput = () => defineSchema((value) => {
         tmdbId: reqId(obj, 'tmdbId'),
     };
     if (obj.season !== undefined)
-        out.season = optNum(obj, 'season', 1);
+        out.season = readCount(obj, 'season', 1);
     if (obj.episode !== undefined)
-        out.episode = optNum(obj, 'episode', 1);
+        out.episode = readCount(obj, 'episode', 1);
     const server = optStr(obj, 'server');
     if (server !== undefined)
         out.server = server;

package/server/dist/trpc/routers/watchlist.js

@@ -11,7 +11,7 @@ import { isAnilistRateLimited, searchAnilist, searchAnilistByTitle, getAnilistEp
 import { kitsuSearchAnime } from '../../lib/kitsu.js';
 import { offlineDb } from '../../lib/offline-db.js';
 import { dbAll } from '../../utils/db-utils.js';
-import { defineSchema, idInput, idsInput, optStr, reqObj, showIdInput, watchlistAddInput, watchlistBatchStatusInput, watchlistStatusInput, } from '../validation.js';
+import { defineSchema, idInput, idsInput, optNum, optStr, reqObj, showIdInput, watchlistAddInput, watchlistBatchStatusInput, watchlistStatusInput, } from '../validation.js';
 const watchlistListInput = () => defineSchema((value) => {
     const obj = reqObj(value);
     const out = { ...readFilterFields(obj) };
@@ -255,13 +255,6 @@ export const watchlistRouter = router({
         return { showId, episodes: remaining };
     }),
 });
-function optNum(obj, name) {
-    const value = obj[name];
-    if (value === undefined || value === null || value === '')
-        return undefined;
-    const num = Number(value);
-    return Number.isFinite(num) ? num : undefined;
-}
 function readFilterFields(obj) {
     const out = {};
     const query = optStr(obj, 'query');

package/server/dist/trpc/validation.js

@@ -1,3 +1,4 @@
+import { TRPCError } from '@trpc/server';
 export function defineSchema(parse) {
     return {
         '~standard': {
@@ -49,6 +50,40 @@ export function optBool(obj, name) {
         return undefined;
     return value;
 }
+export function badRequest(message) {
+    return new TRPCError({ code: 'BAD_REQUEST', message });
+}
+export function failed(message) {
+    return new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message });
+}
+export function reqId(obj, name) {
+    const value = obj[name];
+    if ((typeof value !== 'string' && typeof value !== 'number') || String(value).length === 0) {
+        throw new Error(`${name} must be a string`);
+    }
+    return String(value);
+}
+export function readCount(obj, name, fallback) {
+    const raw = obj[name];
+    if (raw === undefined || raw === null || raw === '')
+        return fallback;
+    const n = Math.floor(Number(raw));
+    return Number.isFinite(n) ? n : fallback;
+}
+export function strOrNull(obj, name) {
+    const value = obj[name];
+    return typeof value === 'string' ? value : null;
+}
+export function readPageLimit(obj) {
+    const out = {};
+    const page = optNum(obj, 'page');
+    if (page !== undefined)
+        out.page = page;
+    const limit = optNum(obj, 'limit');
+    if (limit !== undefined)
+        out.limit = limit;
+    return out;
+}
 function reqEpNum(obj, name) {
     const value = obj[name];
     if ((typeof value !== 'string' && typeof value !== 'number') || String(value).length === 0) {

package/server/dist/utils/db-utils.js

@@ -7,3 +7,11 @@ export const dbGet = (db, sql, params = []) => {
 export const dbRun = (db, sql, params = []) => {
     db.run(sql, params);
 };
+export async function adultNonListIds(db, progressTable, libraryTable, keyCol, adultPred) {
+    const rows = await dbAll(db, `SELECT DISTINCT p."${keyCol}" as id
+       FROM "${progressTable}" p
+       LEFT JOIN "${libraryTable}" l ON l.id = p."${keyCol}"
+       WHERE ${adultPred}
+         AND l.id IS NULL`);
+    return rows.map((r) => r.id);
+}

package/server/dist/utils/http.utils.js

@@ -31,6 +31,18 @@ export async function parseJsonBody(res) {
         throw err;
     }
 }
+export function linkAbort(signal, abort) {
+    signal.addEventListener('abort', () => abort.abort(), { once: true });
+}
+export function setProxyHeaders(out, get) {
+    for (const name of ['content-length', 'content-range', 'accept-ranges']) {
+        const raw = get(name);
+        const value = Array.isArray(raw) ? raw[0] : raw;
+        if (value)
+            out.set(name, value);
+    }
+    out.set('Access-Control-Allow-Origin', '*');
+}
 export function isAbortError(err) {
     if (!err || typeof err !== 'object')
         return false;

package/server/dist/utils/machine-id.js

@@ -29,8 +29,7 @@ export function getMachineId() {
         const interfaces = os.networkInterfaces();
         const macs = Object.values(interfaces)
             .flat()
-            .filter((iface) => iface && !iface.internal && iface.mac !== '00:00:00:00:00:00')
-            .map((iface) => iface.mac)
+            .flatMap((iface) => iface && !iface.internal && iface.mac !== '00:00:00:00:00:00' ? [iface.mac] : [])
             .sort();
         hardwareId = macs.length > 0 ? macs.join('-') : os.hostname();
     }

package/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dango-server",
   "private": true,
-  "version": "3.4.3",
+  "version": "3.4.5",
   "type": "module",
   "engines": {
     "node": ">=22.12.0"
@@ -19,18 +19,21 @@
     "@octokit/rest": "^22.0.1",
     "@trpc/server": "11.19.0",
     "@xhayper/discord-rpc": "^1.3.4",
+    "bgutils-js": "^4.0.3",
     "cheerio": "^1.2.0",
     "dotenv": "^17.4.2",
     "drizzle-orm": "1.0.0-rc.4",
     "fast-xml-parser": "^5.11.1",
     "got-scraping": "^3.2.9",
     "hono": "^4.13.9",
+    "jsdom": "^30.1.0",
     "lru-cache": "^11.5.2",
     "pino": "^10.3.1",
     "ws": "^8.18.0",
     "youtubei.js": "^18.1.0"
   },
   "devDependencies": {
+    "@types/jsdom": "^30.0.0",
     "@types/node": "^22.5.0",
     "@types/ws": "^8.5.10",
     "pino-pretty": "^13.1.1",