Skip to content

improve codebase, fix QDTEXT lookup table#682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Uzlopak merged 16 commits into from
Aug 5, 2025
Merged

improve codebase, fix QDTEXT lookup table #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2e20379
use as const instead of IntDict
Uzlopak May 31, 2025
ed61969
more const
Uzlopak May 31, 2025
945ebe1
use Uppercase and Lowercase
Uzlopak May 31, 2025
bb38e56
make entries in IntDict readonly
Uzlopak May 31, 2025
bd68341
reduce use of enumToMap
Uzlopak May 31, 2025
df5395f
well, we just need the HEAD method... let typescript take care of ens…
Uzlopak May 31, 2025
fa578aa
implement createNumberRange
Uzlopak May 31, 2025
bb1f3c5
simplify
Uzlopak May 31, 2025
cbb07f9
precompute
Uzlopak May 31, 2025
b78e1b5
remove STATUSES_HTTP
Uzlopak May 31, 2025
e09b4ce
restructure and remove enumToMapm simplify
Uzlopak Jun 1, 2025
7b4f472
fix wasm build
Uzlopak Jun 1, 2025
11143b9
delete llhttp.c
Uzlopak Jun 1, 2025
d39ebf0
simplify
Uzlopak Jun 1, 2025
26f4403
simplify
Uzlopak Jun 1, 2025
84ee1e4
Merge branch 'main' into better-types
Uzlopak Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions bin/build_wasm.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,9 +88,6 @@ execSync(
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'constants.js'), join(WASM_OUT, 'constants.js'));
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'constants.js.map'), join(WASM_OUT, 'constants.js.map'));
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'constants.d.ts'), join(WASM_OUT, 'constants.d.ts'));
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'utils.js'), join(WASM_OUT, 'utils.js'));
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'utils.js.map'), join(WASM_OUT, 'utils.js.map'));
copyFileSync(join(WASM_SRC, 'lib', 'llhttp', 'utils.d.ts'), join(WASM_OUT, 'utils.d.ts'));

function isErrorWithCode(error: unknown): error is Error & { code: string } {
return typeof error === 'object' && error !== null && 'code' in error;
Expand Down
66 changes: 24 additions & 42 deletions src/llhttp/c-headers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import constants from './constants';
import type { IntDict } from './constants';
import { enumToMap } from './utils';

type Encoding = 'none' | 'hex';

Expand All@@ -17,43 +16,33 @@ export class CHeaders {

res += '\n';

const errorMap = enumToMap(constants.ERROR);
const methodMap = enumToMap(constants.METHODS);
const httpMethodMap = enumToMap(constants.METHODS, constants.METHODS_HTTP, [
constants.METHODS.PRI,
]);
const rtspMethodMap = enumToMap(constants.METHODS, constants.METHODS_RTSP);
const statusMap = enumToMap(constants.STATUSES, constants.STATUSES_HTTP);

res += this.buildEnum('llhttp_errno', 'HPE', errorMap);
res += this.buildEnum('llhttp_errno', 'HPE', constants.ERROR);
res += '\n';
res += this.buildEnum('llhttp_flags', 'F', enumToMap(constants.FLAGS),
res += this.buildEnum('llhttp_flags', 'F', constants.FLAGS,
'hex');
res += '\n';
res += this.buildEnum('llhttp_lenient_flags', 'LENIENT',
enumToMap(constants.LENIENT_FLAGS), 'hex');
constants.LENIENT_FLAGS, 'hex');
res += '\n';
res += this.buildEnum('llhttp_type', 'HTTP',
enumToMap(constants.TYPE));
res += this.buildEnum('llhttp_type', 'HTTP', constants.TYPE);
res += '\n';
res += this.buildEnum('llhttp_finish', 'HTTP_FINISH',
enumToMap(constants.FINISH));
res += this.buildEnum('llhttp_finish', 'HTTP_FINISH', constants.FINISH);
res += '\n';
res += this.buildEnum('llhttp_method', 'HTTP', methodMap);
res += this.buildEnum('llhttp_method', 'HTTP', constants.METHODS);
res += '\n';
res += this.buildEnum('llhttp_status', 'HTTP_STATUS', statusMap);
res += this.buildEnum('llhttp_status', 'HTTP_STATUS', constants.STATUSES);

res += '\n';

res += this.buildMap('HTTP_ERRNO', errorMap);
res += this.buildMap('HTTP_ERRNO', constants.ERROR);
res += '\n';
res += this.buildMap('HTTP_METHOD', httpMethodMap);
res += this.buildMap('HTTP_METHOD', constants.METHODS_HTTP1);
res += '\n';
res += this.buildMap('RTSP_METHOD', rtspMethodMap);
res += this.buildMap('RTSP_METHOD', constants.METHODS_RTSP);
res += '\n';
res += this.buildMap('HTTP_ALL_METHOD', methodMap);
res += this.buildMap('HTTP_ALL_METHOD', constants.METHODS);
res += '\n';
res += this.buildMap('HTTP_STATUS', statusMap);
res += this.buildMap('HTTP_STATUS', constants.STATUSES);

res += '\n';

Expand All@@ -65,39 +54,32 @@ export class CHeaders {
return res;
}

private buildEnum(name: string, prefix: string, map: IntDict,
private buildEnum(name: Lowercase<string>, prefix: string, map: IntDict,
encoding: Encoding = 'none'): string {
let res = '';

res += `enum ${name} {\n`;
const keys = Object.keys(map);
const keysLength = keys.length;
for (let i = 0; i < keysLength; i++) {
const key = keys[i];
const isLast = i === keysLength - 1;
for (const [ key, value ] of Object.entries(map).sort((a,b) => a[1] - b[1])) {
if (res !== "") {
res += ',\n';
}

let value: number | string = map[key];
res += ` ${prefix}_${key.replace(/-/g, '')} = `

if (encoding === 'hex') {
value = `0x${value.toString(16)}`;
}

res += ` ${prefix}_${key.replace(/-/g, '')} = ${value}`;
if (!isLast) {
res += ',\n';
res += `0x${value.toString(16)}`;
} else {
res += value;
}
}
res += '\n};\n';
res += `typedef enum ${name} ${name}_t;\n`;

return res;
return `enum ${name} {\n${res}\n};\ntypedef enum ${name} ${name}_t;\n`;
}

private buildMap(name: string, map: IntDict): string {
private buildMap(name: Uppercase<string>, map: IntDict): string {
let res = '';

res += `#define ${name}_MAP(XX) \\\n`;
for (const [ key, value ] of Object.entries(map)) {
for (const [ key, value ] of Object.entries(map).sort((a,b) => a[1] - b[1])) {
res += ` XX(${value}, ${key.replace(/-/g, '')}, ${key}) \\\n`;
}
res += '\n';
Expand Down
Loading