-
Notifications
You must be signed in to change notification settings - Fork 367
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: ssr cache should return response header (#5543)
- Loading branch information
1 parent
a6a3159
commit deec647
Showing
10 changed files
with
207 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,4 +12,5 @@ export { | |
registerMockHandlers, | ||
injectServerManifest, | ||
injectTemplates, | ||
getHtmlTemplates, | ||
} from './middlewares'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
packages/server/core/tests/base/middlewares/ssrCache.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
import { Container, CacheControl } from '@modern-js/types'; | ||
import { CacheManager } from '../../../src/base/middlewares/renderHandler/ssrCache'; | ||
import type { SSRServerContext } from '../../../src/core/server'; | ||
|
||
function sleep(timeout: number) { | ||
return new Promise(resolve => { | ||
setTimeout(() => { | ||
resolve(null); | ||
}, timeout); | ||
}); | ||
} | ||
|
||
class MyContainer implements Container { | ||
cache: Map<string, string> = new Map(); | ||
|
||
async get(key: string) { | ||
return this.cache.get(key); | ||
} | ||
|
||
async set(key: string, value: string) { | ||
this.cache.set(key, value); | ||
|
||
return this; | ||
} | ||
|
||
async has(key: string) { | ||
return this.cache.has(key); | ||
} | ||
|
||
async delete(key: string) { | ||
return this.cache.delete(key); | ||
} | ||
} | ||
|
||
const container = new MyContainer(); | ||
|
||
const cacheManager = new CacheManager(container); | ||
|
||
const ssrContext: SSRServerContext = {} as any; | ||
|
||
describe('test cacheManager', () => { | ||
it('should return cache', async () => { | ||
let counter = 0; | ||
const cacheControl: CacheControl = { | ||
maxAge: 120, | ||
staleWhileRevalidate: 100, | ||
}; | ||
const req = new Request('http://localhost:8080/a', { | ||
headers: { ua: 'mock_ua' }, | ||
}); | ||
|
||
const render = async () => `Hello_${counter++}`; | ||
|
||
const result1 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
|
||
expect(result1.data).toEqual(`Hello_0`); | ||
|
||
await sleep(50); | ||
const result2 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result2.data).toEqual(`Hello_0`); | ||
|
||
await sleep(100); | ||
const result3 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result3.data).toEqual(`Hello_0`); | ||
}); | ||
|
||
it('should revalidate the cache', async () => { | ||
let counter = 0; | ||
const cacheControl: CacheControl = { | ||
maxAge: 100, | ||
staleWhileRevalidate: 100, | ||
}; | ||
const req = new Request('http://localhost:8080/b', { | ||
headers: { ua: 'mock_ua' }, | ||
}); | ||
const render = async () => `Hello_${counter++}`; | ||
|
||
const result1 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result1.data).toEqual(`Hello_0`); | ||
|
||
await sleep(150); | ||
const result2 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result2.data).toEqual(`Hello_0`); | ||
|
||
await sleep(50); | ||
const result3 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result3.data).toEqual(`Hello_1`); | ||
}); | ||
|
||
it('should invalidate the ssr, then render on next req', async () => { | ||
let counter = 0; | ||
const cacheControl: CacheControl = { | ||
maxAge: 500, | ||
staleWhileRevalidate: 20, | ||
}; | ||
const req = new Request('http://localhost:8080/c', { | ||
headers: { ua: 'mock_ua' }, | ||
}); | ||
const render = async () => `Hello_${counter++}`; | ||
|
||
const result1 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result1.data).toEqual(`Hello_0`); | ||
|
||
await sleep(600); | ||
const result2 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result2.data).toEqual(`Hello_1`); | ||
|
||
await sleep(600); | ||
const result3 = await cacheManager.getCacheResult( | ||
req, | ||
cacheControl, | ||
render, | ||
ssrContext, | ||
); | ||
expect(result3.data).toEqual(`Hello_2`); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
import { installGlobals } from '../src/base/adapters/node'; | ||
import { installGlobals } from '../src/base/adapters/node/polyfills'; | ||
|
||
installGlobals(); |