nebel/websri
1
0
Fork 0
mirror of https://github.com/kou029w/websri.git synced 2025-01-18 16:08:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename PrioritizedHash to PrioritizedHashAlgorithm

Browse source
This commit is contained in:
Nebel 2024-09-09 17:21:04 +09:00
parent 7b57a930e1
commit 9561fb23dc
Signed by: nebel
GPG key ID: 79807D08C6EF6460
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/index.ts
View file

@ -13,12 +13,12 @@ export const supportedHashAlgorithmName = {
sha512: "SHA-512", sha512: "SHA-512",
} satisfies Record<HashAlgorithm, string>; } satisfies Record<HashAlgorithm, string>;
export type PrioritizedHash = "" | HashAlgorithm; export type PrioritizedHashAlgorithm = "" | HashAlgorithm;
export function getPrioritizedHash( export function getPrioritizedHashAlgorithm(
a: HashAlgorithm, a: HashAlgorithm,
b: HashAlgorithm, b: HashAlgorithm,
): PrioritizedHash { ): PrioritizedHashAlgorithm {
if (a === b) return ""; if (a === b) return "";
if (!supportedHashAlgorithm.includes(a)) return ""; if (!supportedHashAlgorithm.includes(a)) return "";
if (!supportedHashAlgorithm.includes(b)) return ""; if (!supportedHashAlgorithm.includes(b)) return "";
@ -32,7 +32,7 @@ export const SeparatorRegex = /[^\x21-\x7e]+/;
/** Integrity Metadata */ /** Integrity Metadata */
export class IntegrityMetadata { export class IntegrityMetadata {
alg: PrioritizedHash; alg: PrioritizedHashAlgorithm;
val: string; val: string;
opt: string[]; opt: string[];
@ -50,7 +50,7 @@ export class IntegrityMetadata {
}); });
} }
match(integrity: { alg: PrioritizedHash; val: string }): boolean { match(integrity: { alg: PrioritizedHashAlgorithm; val: string }): boolean {
return integrity.alg === this.alg && integrity.val === this.val; return integrity.alg === this.alg && integrity.val === this.val;
} }
@ -63,7 +63,7 @@ export class IntegrityMetadata {
} }
static stringify(integrity: { static stringify(integrity: {
alg: PrioritizedHash; alg: PrioritizedHashAlgorithm;
val: string; val: string;
opt: string[]; opt: string[];
}): string { }): string {
@ -102,9 +102,12 @@ export class IntegrityMetadataSet extends Map<
HashAlgorithm, HashAlgorithm,
IntegrityMetadata IntegrityMetadata
> { > {
getPrioritizedHash: (a: HashAlgorithm, b: HashAlgorithm) => PrioritizedHash; getPrioritizedHashAlgorithm: (
a: HashAlgorithm,
b: HashAlgorithm,
) => PrioritizedHashAlgorithm;
constructor(integrity: string, options = { getPrioritizedHash }) { constructor(integrity: string, options = { getPrioritizedHashAlgorithm }) {
super(); super();
const integrityMetadata = integrity.split(SeparatorRegex); const integrityMetadata = integrity.split(SeparatorRegex);
@ -117,14 +120,14 @@ export class IntegrityMetadataSet extends Map<
} }
} }
this.getPrioritizedHash = options.getPrioritizedHash; this.getPrioritizedHashAlgorithm = options.getPrioritizedHashAlgorithm;
} }
get strongest(): IntegrityMetadata { get strongest(): IntegrityMetadata {
const [hashAlgorithm = supportedHashAlgorithm[0]]: HashAlgorithm[] = [ const [hashAlgorithm = supportedHashAlgorithm[0]]: HashAlgorithm[] = [
...this.keys(), ...this.keys(),
].sort((a, b) => { ].sort((a, b) => {
switch (this.getPrioritizedHash(a, b)) { switch (this.getPrioritizedHashAlgorithm(a, b)) {
default: default:
case "": case "":
return 0; return 0;
@ -138,7 +141,7 @@ export class IntegrityMetadataSet extends Map<
return this.get(hashAlgorithm) ?? new IntegrityMetadata(""); return this.get(hashAlgorithm) ?? new IntegrityMetadata("");
} }
match(integrity: { alg: PrioritizedHash; val: string }): boolean { match(integrity: { alg: PrioritizedHashAlgorithm; val: string }): boolean {
return this.strongest.match(integrity); return this.strongest.match(integrity);
} }