mirrors/movie-web
1
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-12-29 15:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse source
This commit is contained in:
RyloRiz 2024-01-25 16:54:09 -08:00 committed by GitHub
parent c96c61e085 a3adba968b
commit ccaa772e1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/extension/compatibility.ts
View file

@ -1,6 +1,6 @@
import { satisfies } from "semver";
const allowedExtensionRange = "~1.0.0";
const allowedExtensionRange = "~1.0.2";
export function isAllowedExtensionVersion(version: string): boolean {
return satisfies(version, allowedExtensionRange);

12
src/backend/helpers/report.ts
View file

@ -3,7 +3,9 @@ import { nanoid } from "nanoid";
import { ofetch } from "ofetch";
import { useCallback } from "react";
import { isExtensionActiveCached } from "@/backend/extension/messaging";
import { ScrapingItems, ScrapingSegment } from "@/hooks/useProviderScrape";
import { useAuthStore } from "@/stores/auth";
import { PlayerMeta } from "@/stores/player/slices/source";
// for anybody who cares - these are anonymous metrics.
@ -25,6 +27,15 @@ export type ProviderMetric = {
fullError?: string;
};
export type ScrapeTool = "default" | "custom-proxy" | "extension";
export function getScrapeTool(): ScrapeTool {
if (isExtensionActiveCached()) return "extension";
const hasProxySet = !!useAuthStore.getState().proxySet;
if (hasProxySet) return "custom-proxy";
return "default";
}
function getStackTrace(error: Error, lines: number) {
const topMessage = error.toString();
const stackTraceLines = (error.stack ?? "").split("\n", lines + 1);
@ -37,6 +48,7 @@ export async function reportProviders(items: ProviderMetric[]): Promise<void> {
method: "POST",
body: {
items,
tool: getScrapeTool(),
batchId: batchId(),
},
});