michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better response.arrayBuffer() handling in Node (#3860)

Browse source 
* Better response.arrayBuffer() handling in Node

* Adds a changeset
This commit is contained in:
Matthew Phillips 2022-07-08 11:38:06 -04:00 committed by GitHub
parent ed8161f3d9
commit c2c4e5c238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 125 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/great-pants-chew.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes response.arrayBuffer() handling in large pages

14
packages/astro/src/runtime/server/response.ts
View file

@ -34,11 +34,19 @@ function createResponseClass() {
async arrayBuffer(): Promise<ArrayBuffer> {
if (this.#isStream && isNodeJS) {
let body = this.#body as AsyncIterable<Uint8Array>;
let chunks: number[] = [];
let chunks: Uint8Array[] = [];
let len = 0;
for await (let chunk of body) {
chunks.push(...chunk);
chunks.push(chunk);
len += chunk.length;
}
return Uint8Array.from(chunks);
let ab = new Uint8Array(len);
let offset = 0;
for(const chunk of chunks) {
ab.set(chunk, offset);
offset += chunk.length;
}
return ab;
}
return super.arrayBuffer();
}

7
packages/astro/test/fixtures/large-array/astro.config.mjs vendored Normal file
View file

@ -0,0 +1,7 @@
import { defineConfig } from 'astro/config';
import solid from '@astrojs/solid-js';
// https://astro.build/config
export default defineConfig({
integrations: [solid()],
});

9
packages/astro/test/fixtures/large-array/package.json vendored Normal file
View file

@ -0,0 +1,9 @@
{
"name": "@test/large-array-solid",
"version": "0.0.0",
"private": true,
"dependencies": {
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*"
}
}

18
packages/astro/test/fixtures/large-array/src/components/Counter.jsx vendored Normal file
View file

@ -0,0 +1,18 @@
import { createSignal } from 'solid-js';
export default function Counter({ children, largeProp }) {
const [count, setCount] = createSignal(0);
const add = () => setCount(count() + 1);
const subtract = () => setCount(count() - 1);
return (
<>
<div class="counter">
<button onClick={subtract}>-</button>
<pre>{count()}</pre>
<button onClick={add}>+</button>
</div>
<div class="counter-message">{children}</div>
</>
);
}

32
packages/astro/test/fixtures/large-array/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,32 @@
---
import Counter from '../components/Counter.jsx';
const largeArray = []
for (let i = 0; i < 600; i++) {
largeArray.push({ a: 'abc', b: 'abc', c: 'abc', d: 'abc', e: 'abc', foo: 'bar' })
}
---
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<style>
html,
body {
font-family: system-ui;
margin: 0;
}
body {
padding: 2rem;
}
</style>
</head>
<body>
<main>
<Counter client:visible largeProp={largeArray}>
<h1>Hello, Solid!</h1>
</Counter>
</main>
</body>
</html>

35
packages/astro/test/ssr-large-array.test.js Normal file
View file

@ -0,0 +1,35 @@
import { expect } from 'chai';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import testAdapter from './test-adapter.js';
describe('SSR with Large Array and client rendering', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
before(async () => {
fixture = await loadFixture({
root: './fixtures/large-array/',
experimental: {
ssr: true,
},
adapter: testAdapter(),
});
await fixture.build();
});
it('Using response.arrayBuffer() gets the right HTML', async () => {
const app = await fixture.loadTestAdapterApp();
const request = new Request('http://example.com/');
const response = await app.render(request);
const data = await response.arrayBuffer();
const html = new TextDecoder().decode(data);
const $ = cheerio.load(html);
expect($('head meta[name="viewport"]')).to.have.a.lengthOf(1);
expect($('head link[rel="icon"]')).to.have.a.lengthOf(1);
expect($('main')).to.have.a.lengthOf(1);
expect($('astro-island')).to.have.a.lengthOf(1);
expect($('h1').text()).to.equal('Hello, Solid!');
});
});

8
pnpm-lock.yaml
View file

@ -1538,6 +1538,14 @@ importers:
'@astrojs/vue': link:../../../../integrations/vue
astro: link:../../..
packages/astro/test/fixtures/large-array:
specifiers:
'@astrojs/solid-js': workspace:*
astro: workspace:*
dependencies:
'@astrojs/solid-js': link:../../../../integrations/solid
astro: link:../../..
packages/astro/test/fixtures/legacy-build:
specifiers:
'@astrojs/vue': workspace:*