GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-01-29 01:51:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactor: update library implementation

Browse Source
This commit is contained in:
SukkaW
2024-01-09 14:59:36 +08:00
parent 62ee184921
commit f5436b7763
4 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Build/lib/fetch-text-by-line.ts
View File

@@ -1,60 +1,47 @@
import type { BunFile } from 'bun';
import { fetchWithRetry, defaultRequestInit } from './fetch-retry';
// import { TextLineStream } from './text-line-transform-stream';
// import { PolyfillTextDecoderStream } from './text-decoder-stream';
// export function readFileByLine(file: string | BunFile) {
// if (typeof file === 'string') {
// file = Bun.file(file);
// }
// return file.stream().pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream());
// }
// export function createReadlineInterfaceFromResponse(resp: Response) {
// if (!resp.body) {
// throw new Error('Failed to fetch remote text');
// }
// if (resp.bodyUsed) {
// throw new Error('Body has already been consumed.');
// }
// return (resp.body as ReadableStream<Uint8Array>).pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream());
// }
const decoder = new TextDecoder('utf-8');
async function *createTextLineAsyncGeneratorFromStreamSource(stream: ReadableStream<Uint8Array>): AsyncGenerator<string> {
let buf = '';
for await (const chunk of stream) {
const chunkStr = decoder.decode(chunk).replaceAll('\r\n', '\n');
for (let i = 0, len = chunkStr.length; i < len; i++) {
const char = chunkStr[i];
if (char === '\n') {
yield buf;
buf = '';
} else {
buf += char;
}
}
}
if (buf) {
yield buf;
}
import { TextLineStream } from './text-line-transform-stream';
import { PolyfillTextDecoderStream } from './text-decoder-stream';
function createTextLineStreamFromStreamSource(stream: ReadableStream<Uint8Array>) {
return stream
.pipeThrough(new PolyfillTextDecoderStream())
.pipeThrough(new TextLineStream());
}
export function readFileByLine(file: string | URL | BunFile): AsyncGenerator<string> {
// const decoder = new TextDecoder('utf-8');
// async function *createTextLineAsyncGeneratorFromStreamSource(stream: ReadableStream<Uint8Array>): AsyncGenerator<string> {
// let buf = '';
// for await (const chunk of stream) {
// const chunkStr = decoder.decode(chunk).replaceAll('\r\n', '\n');
// for (let i = 0, len = chunkStr.length; i < len; i++) {
// const char = chunkStr[i];
// if (char === '\n') {
// yield buf;
// buf = '';
// } else {
// buf += char;
// }
// }
// }
// if (buf) {
// yield buf;
// }
// }
export function readFileByLine(file: string | URL | BunFile) {
if (typeof file === 'string') {
file = Bun.file(file);
} else if (!('writer' in file)) {
file = Bun.file(file);
}
return createTextLineAsyncGeneratorFromStreamSource(file.stream());
return createTextLineStreamFromStreamSource(file.stream());
}
export function createReadlineInterfaceFromResponse(resp: Response): AsyncGenerator<string> {
export function createReadlineInterfaceFromResponse(resp: Response) {
if (!resp.body) {
throw new Error('Failed to fetch remote text');
}
@@ -62,7 +49,7 @@ export function createReadlineInterfaceFromResponse(resp: Response): AsyncGenera
throw new Error('Body has already been consumed.');
}
return createTextLineAsyncGeneratorFromStreamSource(resp.body);
return createTextLineStreamFromStreamSource(resp.body);
}
export function fetchRemoteTextByLine(url: string | URL) {