Skip to content

[v1.3] 修正 Subscribe 的 Script 的 静默更新 #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyfung1031 wants to merge 2 commits into
base: release/v1.3
Choose a base branch
from
+15 −2
Open

[v1.3] 修正 Subscribe 的 Script 的 静默更新 #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
319d8e2
修正 Subscribe 的 Script 的 静默更新
cyfung1031 Feb 5, 2026
630088a
lint
cyfung1031 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/app/service/service_worker/script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import { getSimilarityScore, ScriptUpdateCheck } from "./script_update_check";
import { LocalStorageDAO } from "@App/app/repo/localStorage";
import { CompiledResourceDAO } from "@App/app/repo/resource";
import { initRegularUpdateCheck } from "./regular_updatecheck";
import { SubscribeDAO } from "@App/app/repo/subscribe";

export type TCheckScriptUpdateOption = Partial<
{ checkType: "user"; noUpdateCheck?: number } | ({ checkType: "system" } & Record<string, any>)
Expand All @@ -58,6 +59,7 @@ export type TOpenBatchUpdatePageOption = { q: string; dontCheckNow: boolean };
export class ScriptService {
logger: Logger;
scriptCodeDAO: ScriptCodeDAO = new ScriptCodeDAO();
subscribeDAO: SubscribeDAO = new SubscribeDAO();
localStorageDAO: LocalStorageDAO = new LocalStorageDAO();
compiledResourceDAO: CompiledResourceDAO = new CompiledResourceDAO();
private readonly scriptUpdateCheck;
Expand Down Expand Up @@ -841,7 +843,12 @@ export class ScriptService {
if (update && (await this.systemConfig.getSilenceUpdateScript())) {
try {
const { oldScript, script } = await prepareScriptByCode(code, url, uuid);
if (checkSilenceUpdate(oldScript!.metadata, script.metadata)) {
let subscribeMetadata: SCMetadata | undefined;
if (oldScript?.subscribeUrl && oldScript.origin) {
const subscribe = await this.subscribeDAO.get(oldScript.subscribeUrl);
subscribeMetadata = subscribe?.metadata;
}
if (checkSilenceUpdate(oldScript!.metadata, script.metadata, subscribeMetadata)) {
logger?.info("silence update script");
await this.installScript({
script,
Expand Down
8 changes: 7 additions & 1 deletion src/pkg/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,18 @@ export async function openInCurrentTab(url: string, tabId?: number) {
}

// 检查订阅规则是否改变,是否能够静默更新
export function checkSilenceUpdate(oldMeta: SCMetadata, newMeta: SCMetadata): boolean {
export function checkSilenceUpdate(
oldMeta: SCMetadata,
newMeta: SCMetadata,
subscribeMetadata?: SCMetadata | undefined
): boolean {
// 判断connect是否改变
const oldConnect = new Set<string>(oldMeta.connect || []);
const newConnect = new Set<string>(newMeta.connect || []);
const subsConnect = subscribeMetadata ? new Set<string>(subscribeMetadata?.connect || []) : null;
// 老的里面没有新的就需要用户确认了
for (const key of newConnect) {
if (subsConnect?.has(key)) continue; // 如果有 Subscribe 而且它的 @connect 包含新的Script @connect, 则不用理会是否新增。
if (!oldConnect.has(key)) {
return false;
}
Expand Down
Loading