eiac/CSAPP
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

故障上报时向调试控制台输出日志

Browse Source
This commit is contained in:
Allen 2025-05-18 13:06:58 +08:00
parent 89ee08789d
commit d1f0d2e719
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/IpcMainHandler.ts
View File

@ -40,7 +40,7 @@ export function initialize(): void {
return helperDescrip ? helperDescrip.Descrip : null; return helperDescrip ? helperDescrip.Descrip : null;
}); });
// Get zoom factor // Get zoom factor by url
ipcMain.handle('get-zoom-factor-by-url', async (event, url: string): Promise<number> => { ipcMain.handle('get-zoom-factor-by-url', async (event, url: string): Promise<number> => {
const display: Electron.Display = screen.getPrimaryDisplay(); const display: Electron.Display = screen.getPrimaryDisplay();
const physicalSize: Electron.Size = { const physicalSize: Electron.Size = {
@ -153,7 +153,7 @@ export function initialize(): void {
} }
}); });
// Set webview‘s cookie // Set webview's cookie
ipcMain.handle('set-webview-cookie', async (event, url: string, cookie: string): Promise<boolean> => { ipcMain.handle('set-webview-cookie', async (event, url: string, cookie: string): Promise<boolean> => {
try { try {
const parsedUrl = new URL(url); const parsedUrl = new URL(url);
@ -188,12 +188,24 @@ export function initialize(): void {
} }
const base64 = await captureWindowAsBase64(win); const base64 = await captureWindowAsBase64(win);
console.log('base64:', base64); console.debug('base64:', base64);
const account: string = memoryCache.get('Account');
if (!account) {
throw new Error('Not found account');
}
console.log('account:', account);
const ip: string = getLocalIPAddress();
if (!ip) {
throw new Error('Not found ip');
}
console.log('ip:', ip);
try { try {
const response: ApiResponse<FaultReportingResponse> = await EIACDesktopApi.Help.FaultReportingAsync({ const response: ApiResponse<FaultReportingResponse> = await EIACDesktopApi.Help.FaultReportingAsync({
Account: memoryCache.get('Account'), Account: account,
IP: getLocalIPAddress(), IP: ip,
Url: url, Url: url,
ImgBase64: base64, ImgBase64: base64,
Explain: `message: ${message}, status: ${status}` Explain: `message: ${message}, status: ${status}`

3
src/index.ts
View File

@ -124,13 +124,14 @@ async function addTabAsync(tabGroup: TabGroup, menuItem: MenuItem): Promise<Tab
if (result.ok && result.status >= 200 && result.status < 400) { if (result.ok && result.status >= 200 && result.status < 400) {
console.log(`✅ URL ${url} 可访问:`, result.status); console.log(`✅ URL ${url} 可访问:`, result.status);
lastInvalidUrlResult = null; lastInvalidUrlResult = null;
const cookies: string = window.electronAPI.getSessionStorage('cookies'); const cookies: string = window.electronAPI.getSessionStorage('cookies');
await window.electronAPI.setWebviewCookie(url, cookies); await window.electronAPI.setWebviewCookie(url, cookies);
} else { } else {
console.warn(`❌ URL ${url} 不可访问:`, result.message ?? `status ${result.status}`); console.warn(`❌ URL ${url} 不可访问:`, result.message ?? `status ${result.status}`);
lastInvalidUrlResult = { url, message: result.message, status: result.status }; lastInvalidUrlResult = { url, message: result.message, status: result.status };
const helpDescrip: string = await window.electronAPI.getHelperDescripAsync(result.status.toString()) ?? `无法访问 {URL}\r\n异常原因：${result.message ?? `status ${result.status}`}\r\n${helpDescrip ?? ''}`; const helpDescrip: string = await window.electronAPI.getHelperDescripAsync(result.status.toString()) ?? `无法访问{URL}\r\n异常原因：${result.message ?? `status ${result.status}`}\r\n请联系技术支持。`;
showErrorModal(helpDescrip.replace('{URL}', url)); showErrorModal(helpDescrip.replace('{URL}', url));
return null; return null;
} }