Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions packages/chrome-extension-mock/action.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default class Action {
getBadgeText() {
// 简单返回key作为测试值
return "";
}
}
2 changes: 2 additions & 0 deletions packages/chrome-extension-mock/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import DeclarativeNetRequest from "./declarativ_net_request";
import Permissions from "./permissions";
import Extension from "./extension";
import MockUserScripts from "./user_scripts";
import Action from "./action";

const chromeMock = {
tabs: new MockTab(),
Expand All @@ -24,6 +25,7 @@ const chromeMock = {
permissions: new Permissions(),
extension: new Extension(),
userScripts: new MockUserScripts(),
action: new Action(),
init() {},
};

Expand Down
2 changes: 2 additions & 0 deletions src/app/service/service_worker/runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ export class RuntimeService {
try {
const res = await chrome.userScripts?.getScripts({ ids: ["scriptcat-content", "scriptcat-inject"] });
registered = res?.length === 2;
} catch {
// 该错误为预期内情况,无需记录 debug 日志
} finally {
// 考虑 UserScripts API 不可使用等情况
runtimeGlobal.registered = registered;
Expand Down
14 changes: 11 additions & 3 deletions src/pages/components/PopupWarnings/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,28 @@ interface PopupWarningsProps {

function PopupWarnings({ isBlacklist }: PopupWarningsProps) {
const { t } = useTranslation();
const [isUserScriptsAvailableState, setIsUserScriptsAvailableState] = useState(false);
const [isUserScriptsAvailableState, setIsUserScriptsAvailableState] = useState<boolean | null>(null);
const [showRequestButton, setShowRequestButton] = useState(false);
const [permissionReqResult, setPermissionReqResult] = useState("");

const updateIsUserScriptsAvailableState = async () => {
const flag = await checkUserScriptsAvailable();
setIsUserScriptsAvailableState(flag);
const badgeText = await chrome.action.getBadgeText({});
let displayState;
if (badgeText === "!") {
// 要求用户重启扩展/浏览器,会重置badge状态的
displayState = false;
} else {
displayState = await checkUserScriptsAvailable();
}
setIsUserScriptsAvailableState(displayState);
};

useEffect(() => {
updateIsUserScriptsAvailableState();
}, []);

const warningMessageHTML = useMemo(() => {
if (isUserScriptsAvailableState === null) return "";
// 可使用UserScript的话,不查browserType
const browserType = !isUserScriptsAvailableState ? getBrowserType() : null;

Expand Down
1 change: 1 addition & 0 deletions tests/pages/popup/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ beforeEach(() => {
callback?.(mockTabs);
return Promise.resolve(mockTabs);
});
vi.spyOn(chrome.action, "getBadgeText").mockImplementation(() => Promise.resolve(""));
});

afterEach(() => {
Expand Down
Loading