luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(core): remove abort event error on init (#9465)

Browse Source 
Following error always throw on Affine init, which is actually an `Event` from abort controller that can be handled in upstream.

![image](https://github.com/user-attachments/assets/50c25e5e-4a9c-45e0-b756-6b0f47390733)
This commit is contained in:
doodlewind
2025-01-01 01:22:29 +00:00
parent d97c4b5632
commit 8227d68953
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/frontend/core/src/desktop/pages/root/index.tsx
View File

@@ -19,15 +19,9 @@ export const RootWrapper = () => {
const abortController = new AbortController(); const abortController = new AbortController();
defaultServerService.server defaultServerService.server
.waitForConfigRevalidation(abortController.signal) .waitForConfigRevalidation(abortController.signal)
.then(() => { .then(() => setIsServerReady(true))
setIsServerReady(true); .catch(console.error);
}) return () => abortController.abort();
.catch(error => {
console.error(error);
});
return () => {
abortController.abort();
};
}, [defaultServerService, isServerReady]); }, [defaultServerService, isServerReady]);
return ( return (

12
packages/frontend/core/src/mobile/pages/root/index.tsx
View File

@@ -17,15 +17,9 @@ export const RootWrapper = () => {
const abortController = new AbortController(); const abortController = new AbortController();
defaultServerService.server defaultServerService.server
.waitForConfigRevalidation(abortController.signal) .waitForConfigRevalidation(abortController.signal)
.then(() => { .then(() => setIsServerReady(true))
setIsServerReady(true); .catch(console.error);
}) return () => abortController.abort();
.catch(error => {
console.error(error);
});
return () => {
abortController.abort();
};
}, [defaultServerService, isServerReady]); }, [defaultServerService, isServerReady]);
return ( return (

15
packages/frontend/core/src/modules/cloud/entities/server.ts
View File

@@ -100,11 +100,16 @@ export class Server extends Entity<{
); );
async waitForConfigRevalidation(signal?: AbortSignal) { async waitForConfigRevalidation(signal?: AbortSignal) {
this.revalidateConfig(); try {
await this.isConfigRevalidating$.waitFor( this.revalidateConfig();
isRevalidating => !isRevalidating, await this.isConfigRevalidating$.waitFor(
signal isRevalidating => !isRevalidating,
); signal
);
} catch (error) {
if (error instanceof Event && error.type === 'abort') return;
console.error('Config revalidation failed:', error);
}
} }
override dispose(): void { override dispose(): void {