foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-07 03:42:40 -05:00
Code Issues Packages1 Wiki Activity

chore: update std in test util (#27892)

Browse source
This commit is contained in:
Yoshiya Hinosawa 2025-01-31 22:52:32 +09:00 • committed by GitHub
parent 1cbaee9f52
commit 7643bb71a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 1247 additions and 351 deletions

170
tests/specs/run/tls_connecttls/textproto.ts
View file

@ -1,170 +0,0 @@
// Copyright 2018-2025 the Deno authors. MIT license.
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
/** **Deprecated**. Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
*
* A reader for dealing with low level text based protocols.
*
* Based on
* [net/textproto](https://github.com/golang/go/tree/master/src/net/textproto).
*
* @deprecated (will be removed after 0.159.0) Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
* @module
*/
import type { BufReader, ReadLineResult } from "@std/io/buf-reader";
import { concat } from "@std/bytes/concat";
// Constants created for DRY
const CHAR_SPACE: number = " ".charCodeAt(0);
const CHAR_TAB: number = "\t".charCodeAt(0);
const CHAR_COLON: number = ":".charCodeAt(0);
const WHITESPACES: Array<number> = [CHAR_SPACE, CHAR_TAB];
const decoder = new TextDecoder();
// FROM https://github.com/denoland/deno/blob/b34628a26ab0187a827aa4ebe256e23178e25d39/cli/js/web/headers.ts#L9
const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/g;
function str(buf: Uint8Array | null | undefined): string {
return !buf ? "" : decoder.decode(buf);
}
/**
* @deprecated (will be removed after 0.159.0) Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
*/
export class TextProtoReader {
constructor(readonly r: BufReader) {}
/** readLine() reads a single line from the TextProtoReader,
* eliding the final \n or \r\n from the returned string.
*/
async readLine(): Promise<string | null> {
const s = await this.readLineSlice();
return s === null ? null : str(s);
}
/** ReadMimeHeader reads a MIME-style header from r.
* The header is a sequence of possibly continued Key: Value lines
* ending in a blank line.
* The returned map m maps CanonicalMIMEHeaderKey(key) to a
* sequence of values in the same order encountered in the input.
*
* For example, consider this input:
*
* My-Key: Value 1
* Long-Key: Even
* Longer Value
* My-Key: Value 2
*
* Given that input, ReadMIMEHeader returns the map:
*
* map[string][]string{
* "My-Key": {"Value 1", "Value 2"},
* "Long-Key": {"Even Longer Value"},
* }
*/
async readMimeHeader(): Promise<Headers | null> {
const m = new Headers();
let line: Uint8Array | undefined;
// The first line cannot start with a leading space.
let buf = await this.r.peek(1);
if (buf === null) {
return null;
} else if (WHITESPACES.includes(buf[0])) {
line = (await this.readLineSlice()) as Uint8Array;
}
buf = await this.r.peek(1);
if (buf === null) {
throw new Deno.errors.UnexpectedEof();
} else if (WHITESPACES.includes(buf[0])) {
throw new Deno.errors.InvalidData(
`malformed MIME header initial line: ${str(line)}`,
);
}
while (true) {
const kv = await this.readLineSlice(); // readContinuedLineSlice
if (kv === null) throw new Deno.errors.UnexpectedEof();
if (kv.byteLength === 0) return m;
// Key ends at first colon
let i = kv.indexOf(CHAR_COLON);
if (i < 0) {
throw new Deno.errors.InvalidData(
`malformed MIME header line: ${str(kv)}`,
);
}
//let key = canonicalMIMEHeaderKey(kv.subarray(0, endKey));
const key = str(kv.subarray(0, i));
// As per RFC 7230 field-name is a token,
// tokens consist of one or more chars.
// We could throw `Deno.errors.InvalidData` here,
// but better to be liberal in what we
// accept, so if we get an empty key, skip it.
if (key == "") {
continue;
}
// Skip initial spaces in value.
i++; // skip colon
while (
i < kv.byteLength &&
(WHITESPACES.includes(kv[i]))
) {
i++;
}
const value = str(kv.subarray(i)).replace(
invalidHeaderCharRegex,
encodeURI,
);
// In case of invalid header we swallow the error
// example: "Audio Mode" => invalid due to space in the key
try {
m.append(key, value);
} catch {
// Pass
}
}
}
async readLineSlice(): Promise<Uint8Array | null> {
let line = new Uint8Array(0);
let r: ReadLineResult | null = null;
do {
r = await this.r.readLine();
// TODO(ry):
// This skipSpace() is definitely misplaced, but I don't know where it
// comes from nor how to fix it.
//TODO(SmashingQuasar): Kept skipSpace to preserve behavior but it should be looked into to check if it makes sense when this is used.
if (r !== null && this.skipSpace(r.line) !== 0) {
line = concat([line, r.line]);
}
} while (r !== null && r.more);
return r === null ? null : line;
}
skipSpace(l: Uint8Array): number {
let n = 0;
for (const val of l) {
if (!WHITESPACES.includes(val)) {
n++;
}
}
return n;
}
}

4
tests/specs/run/tls_connecttls/tls_connecttls.js
View file

@ -1,6 +1,6 @@
import { assert, assertEquals } from "@std/assert";
import { BufReader, BufWriter } from "@std/io";
import { TextProtoReader } from "./textproto.ts";
import { BufReader, BufWriter } from "../../../unit/test_util.ts";
import { TextProtoReader } from "../../../testdata/run/textproto.ts";
const encoder = new TextEncoder();
const decoder = new TextDecoder();

170
tests/specs/run/tls_starttls/textproto.ts
View file

@ -1,170 +0,0 @@
// Copyright 2018-2025 the Deno authors. MIT license.
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
/** **Deprecated**. Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
*
* A reader for dealing with low level text based protocols.
*
* Based on
* [net/textproto](https://github.com/golang/go/tree/master/src/net/textproto).
*
* @deprecated (will be removed after 0.159.0) Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
* @module
*/
import type { BufReader, ReadLineResult } from "@std/io/buf-reader";
import { concat } from "@std/bytes/concat";
// Constants created for DRY
const CHAR_SPACE: number = " ".charCodeAt(0);
const CHAR_TAB: number = "\t".charCodeAt(0);
const CHAR_COLON: number = ":".charCodeAt(0);
const WHITESPACES: Array<number> = [CHAR_SPACE, CHAR_TAB];
const decoder = new TextDecoder();
// FROM https://github.com/denoland/deno/blob/b34628a26ab0187a827aa4ebe256e23178e25d39/cli/js/web/headers.ts#L9
const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/g;
function str(buf: Uint8Array | null | undefined): string {
return !buf ? "" : decoder.decode(buf);
}
/**
* @deprecated (will be removed after 0.159.0) Use `TextLineStream` from `std/steams` for line-by-line text reading instead.
*/
export class TextProtoReader {
constructor(readonly r: BufReader) {}
/** readLine() reads a single line from the TextProtoReader,
* eliding the final \n or \r\n from the returned string.
*/
async readLine(): Promise<string | null> {
const s = await this.readLineSlice();
return s === null ? null : str(s);
}
/** ReadMimeHeader reads a MIME-style header from r.
* The header is a sequence of possibly continued Key: Value lines
* ending in a blank line.
* The returned map m maps CanonicalMIMEHeaderKey(key) to a
* sequence of values in the same order encountered in the input.
*
* For example, consider this input:
*
* My-Key: Value 1
* Long-Key: Even
* Longer Value
* My-Key: Value 2
*
* Given that input, ReadMIMEHeader returns the map:
*
* map[string][]string{
* "My-Key": {"Value 1", "Value 2"},
* "Long-Key": {"Even Longer Value"},
* }
*/
async readMimeHeader(): Promise<Headers | null> {
const m = new Headers();
let line: Uint8Array | undefined;
// The first line cannot start with a leading space.
let buf = await this.r.peek(1);
if (buf === null) {
return null;
} else if (WHITESPACES.includes(buf[0])) {
line = (await this.readLineSlice()) as Uint8Array;
}
buf = await this.r.peek(1);
if (buf === null) {
throw new Deno.errors.UnexpectedEof();
} else if (WHITESPACES.includes(buf[0])) {
throw new Deno.errors.InvalidData(
`malformed MIME header initial line: ${str(line)}`,
);
}
while (true) {
const kv = await this.readLineSlice(); // readContinuedLineSlice
if (kv === null) throw new Deno.errors.UnexpectedEof();
if (kv.byteLength === 0) return m;
// Key ends at first colon
let i = kv.indexOf(CHAR_COLON);
if (i < 0) {
throw new Deno.errors.InvalidData(
`malformed MIME header line: ${str(kv)}`,
);
}
//let key = canonicalMIMEHeaderKey(kv.subarray(0, endKey));
const key = str(kv.subarray(0, i));
// As per RFC 7230 field-name is a token,
// tokens consist of one or more chars.
// We could throw `Deno.errors.InvalidData` here,
// but better to be liberal in what we
// accept, so if we get an empty key, skip it.
if (key == "") {
continue;
}
// Skip initial spaces in value.
i++; // skip colon
while (
i < kv.byteLength &&
(WHITESPACES.includes(kv[i]))
) {
i++;
}
const value = str(kv.subarray(i)).replace(
invalidHeaderCharRegex,
encodeURI,
);
// In case of invalid header we swallow the error
// example: "Audio Mode" => invalid due to space in the key
try {
m.append(key, value);
} catch {
// Pass
}
}
}
async readLineSlice(): Promise<Uint8Array | null> {
let line = new Uint8Array(0);
let r: ReadLineResult | null = null;
do {
r = await this.r.readLine();
// TODO(ry):
// This skipSpace() is definitely misplaced, but I don't know where it
// comes from nor how to fix it.
//TODO(SmashingQuasar): Kept skipSpace to preserve behavior but it should be looked into to check if it makes sense when this is used.
if (r !== null && this.skipSpace(r.line) !== 0) {
line = concat([line, r.line]);
}
} while (r !== null && r.more);
return r === null ? null : line;
}
skipSpace(l: Uint8Array): number {
let n = 0;
for (const val of l) {
if (!WHITESPACES.includes(val)) {
n++;
}
}
return n;
}
}

5
tests/specs/run/tls_starttls/tls_starttls.js
View file

@ -1,7 +1,6 @@
import { assert, assertEquals } from "@std/assert";
import { BufReader } from "@std/io/buf-reader";
import { BufWriter } from "@std/io/buf-writer";
import { TextProtoReader } from "./textproto.ts";
import { BufReader, BufWriter } from "../../../unit/test_util.ts";
import { TextProtoReader } from "../../../testdata/run/textproto.ts";
const encoder = new TextEncoder();
const decoder = new TextDecoder();

2
tests/testdata/run/textproto.ts vendored
View file

@ -14,7 +14,7 @@
* @module
*/
import type { BufReader, ReadLineResult } from "@std/io/buf-reader";
import type { BufReader, ReadLineResult } from "../../unit/test_util.ts";
import { concat } from "@std/bytes/concat";
// Constants created for DRY

4
tests/unit/http_test.ts
View file

@ -3,7 +3,7 @@
// deno-lint-ignore-file no-deprecated-deno-api
import { Buffer, BufReader, BufWriter, type Reader } from "@std/io";
import { Buffer, type Reader } from "@std/io";
import { TextProtoReader } from "../testdata/run/textproto.ts";
import {
assert,
@ -11,6 +11,8 @@ import {
assertRejects,
assertStrictEquals,
assertThrows,
BufReader,
BufWriter,
delay,
fail,
} from "./test_util.ts";

4
tests/unit/serve_test.ts
View file

@ -3,13 +3,15 @@
// deno-lint-ignore-file no-console
import { assertIsError, assertMatch, assertRejects } from "@std/assert";
import { Buffer, BufReader, BufWriter, type Reader } from "@std/io";
import { Buffer, type Reader } from "@std/io";
import { TextProtoReader } from "../testdata/run/textproto.ts";
import {
assert,
assertEquals,
assertStringIncludes,
assertThrows,
BufReader,
BufWriter,
curlRequest,
curlRequestWithStdErr,
execCode,

1234
tests/unit/test_util.ts
View file

File diff suppressed because it is too large Load diff

3
tests/unit/tls_test.ts
View file

@ -6,8 +6,9 @@ import {
assertRejects,
assertStrictEquals,
assertThrows,
BufReader,
BufWriter,
} from "./test_util.ts";
import { BufReader, BufWriter } from "@std/io";
import { readAll } from "@std/io/read-all";
import { writeAll } from "@std/io/write-all";
import { TextProtoReader } from "../testdata/run/textproto.ts";

2
tests/util/std

@ -1 +1 @@
Subproject commit c5d7930d5700dbbbedea607f9cf3e50acdc33e2d
Subproject commit 1f032bb7e112ea572ce9df5d83675220d331079e