9090626839

Committed 15 May 2024 05:46AM UTC coverage: 31.931%. Remained the same

Build # 9090626839

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #9287 from ForumMagnum/brotli-compress-stylesheets

Brotli-compress allStyles (and refactor brotli-compression of bundle.js)

Run Details

4784 of 39058 branches covered (12.25%)

Branch coverage included in aggregate %.

6 of 32 new or added lines in 3 files covered. (18.75%)

4 existing lines in 2 files now uncovered.

27828 of 63075 relevant lines covered (44.12%)

179.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

25.64

/packages/lesswrong/server/utils/bundleUtils.ts

import fs from 'fs';
import crypto from 'crypto';
import path from 'path'
import { zlib } from 'mz';
import { isProduction } from '../../lib/executionEnvironment';

export type CompressedCacheResource = {
  content: Buffer
  brotli: Buffer|null
  brotliPromise: Promise<Buffer>|null
  hash: string
}

type CachedClientBundle = {
  resource: CompressedCacheResource
  bundlePath: string
  lastModified: number
};

/**
 * Given a resource (a buffer), start a job to brotli-compress it. The
 * resulting CompressedCacheResource object contains the original
 * (uncompressed) buffer, a reference to the brotli-compressed version which
 * will be filled in later, and a promise (if the compression is in progress).
 * Compression is slow, but takes place on a node worker thread, not the main
 * thread.
 *
 * Note that the brotli field will be filled in later, when compression is
 * done, so you shouldn't copy this object (the copy won't get filled in).
 *
 * This will be skipped if not in production mode (since it would slow down
 * the development-refresh cycle).
 * ). 
 */
export const brotliCompressResource = (content: Buffer): CompressedCacheResource => {
  const resource: CompressedCacheResource = {
    content,
    hash: crypto.createHash('sha256').update(content).digest('hex'),
    brotli: null,
    brotliPromise: null,
  };

  if (isProduction) {
    resource.brotliPromise = new Promise((resolve: (result: Buffer) => void) => {
      zlib.brotliCompress(content, {
        params: {
          [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
        }
      }, (_err, result) => {
        resource.brotli = result;
        resource.brotliPromise = null;
        resolve(result);
      });
    });
  } else {
    resource.brotliPromise = null;
  }
  
  return resource;
}

const loadClientBundle = (): CachedClientBundle => {
  const bundlePath = path.join(__dirname, "../../client/js/bundle.js");
  const lastModified = fs.statSync(bundlePath).mtimeMs;

  const bundleText = fs.readFileSync(bundlePath, 'utf8');
  const bundleBuffer = Buffer.from(bundleText, 'utf8');

  return {
    resource: brotliCompressResource(bundleBuffer),
    bundlePath, lastModified
  };
}

let clientBundle: CachedClientBundle|null;

export const getClientBundle = () => {
  if (!clientBundle) {
    clientBundle = loadClientBundle();
  }
  return clientBundle;
}

let serverBundleHash: string|null = null;
export const getServerBundleHash = (): string => {
  if (!serverBundleHash) {
    const serverBundlePath = path.join(__dirname, "../../server/js/serverBundle.js");
    const serverBundleText = fs.readFileSync(serverBundlePath, 'utf8');
    const serverBundleBuffer = Buffer.from(serverBundleText, 'utf8');
    serverBundleHash = crypto.createHash('sha256').update(serverBundleBuffer).digest('hex');
  }
  return serverBundleHash;
}

1	import fs from 'fs';	57✔
2	import crypto from 'crypto';	19✔
3	import path from 'path'	19✔
4	import { zlib } from 'mz';	19✔
5	import { isProduction } from '../../lib/executionEnvironment';	19✔
6
7	export type CompressedCacheResource = {
8	content: Buffer
9	brotli: Buffer\|null
10	brotliPromise: Promise<Buffer>\|null
11	hash: string
12	}
13
14	type CachedClientBundle = {
15	resource: CompressedCacheResource
16	bundlePath: string
17	lastModified: number
18	};
19
20	/**
21	* Given a resource (a buffer), start a job to brotli-compress it. The
22	* resulting CompressedCacheResource object contains the original
23	* (uncompressed) buffer, a reference to the brotli-compressed version which
24	* will be filled in later, and a promise (if the compression is in progress).
25	* Compression is slow, but takes place on a node worker thread, not the main
26	* thread.
27	*
28	* Note that the brotli field will be filled in later, when compression is
29	* done, so you shouldn't copy this object (the copy won't get filled in).
30	*
31	* This will be skipped if not in production mode (since it would slow down
32	* the development-refresh cycle).
33	* ).
34	*/
35	export const brotliCompressResource = (content: Buffer): CompressedCacheResource => {	19✔
NEW 36	const resource: CompressedCacheResource = {	×
37	content,
38	hash: crypto.createHash('sha256').update(content).digest('hex'),
39	brotli: null,
40	brotliPromise: null,
41	};
42
NEW 43	if (isProduction) {	×
NEW 44	resource.brotliPromise = new Promise((resolve: (result: Buffer) => void) => {	×
NEW 45	zlib.brotliCompress(content, {	×
46	params: {
47	[zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
48	}
49	}, (_err, result) => {
NEW 50	resource.brotli = result;	×
NEW 51	resource.brotliPromise = null;	×
NEW 52	resolve(result);	×
53	});
54	});
55	} else {
NEW 56	resource.brotliPromise = null;	×
57	}
58
NEW 59	return resource;	×
60	}
61
62	const loadClientBundle = (): CachedClientBundle => {	19✔
NEW 63	const bundlePath = path.join(__dirname, "../../client/js/bundle.js");	×
UNCOV 64	const lastModified = fs.statSync(bundlePath).mtimeMs;	×
65
66	const bundleText = fs.readFileSync(bundlePath, 'utf8');	×
67	const bundleBuffer = Buffer.from(bundleText, 'utf8');	×
68
UNCOV 69	return {	×
70	resource: brotliCompressResource(bundleBuffer),
71	bundlePath, lastModified
72	};
73	}
74
75	let clientBundle: CachedClientBundle\|null;
76
77	export const getClientBundle = () => {	19✔
78	if (!clientBundle) {	×
79	clientBundle = loadClientBundle();	×
80	}
UNCOV 81	return clientBundle;	×
82	}
83
84	let serverBundleHash: string\|null = null;	19✔
85	export const getServerBundleHash = (): string => {	19✔
86	if (!serverBundleHash) {	×
87	const serverBundlePath = path.join(__dirname, "../../server/js/serverBundle.js");	×
88	const serverBundleText = fs.readFileSync(serverBundlePath, 'utf8');	×
89	const serverBundleBuffer = Buffer.from(serverBundleText, 'utf8');	×
90	serverBundleHash = crypto.createHash('sha256').update(serverBundleBuffer).digest('hex');	×
91	}
92	return serverBundleHash;	×
93	}

ForumMagnum / ForumMagnum / 9090626839

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous