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

Chore: improve types & performance

Browse Source
This commit is contained in:
SukkaW
2024-04-16 22:54:22 +08:00
parent 7750a0291d
commit e68b064fe5
5 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Build/build-public.ts
View File

@@ -22,7 +22,8 @@ export const buildPublic = task(import.meta.path, async (span) => {
.traceChild('copy public files')
.traceAsyncFn(async () => {
const filesToBeCopied = (await listDir(
rootPath, {
rootPath,
{
ignoreHidden: true,
ignorePattern: /node_modules|Build|public/
}

4
Build/index.ts
View File

@@ -64,9 +64,7 @@ console.log('Bun version:', Bun.version, Bun.revision);
const buildMicrosoftCdnPromise = downloadPreviousBuildPromise.then(() => buildMicrosoftCdn(rootSpan));
const buildSSPanelUIMAppProfilePromise = Promise.all([
downloadPreviousBuildPromise
]).then(() => buildSSPanelUIMAppProfile(rootSpan));
const buildSSPanelUIMAppProfilePromise = downloadPreviousBuildPromise.then(() => buildSSPanelUIMAppProfile(rootSpan));
const downloadMockAssetsPromise = downloadMockAssets(rootSpan);

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

@@ -7,15 +7,12 @@ import { processLine } from './process-line';
const enableTextLineStream = !!process.env.ENABLE_TEXT_LINE_STREAM;
interface TextLineStreamLike {
[Symbol.asyncIterator](): AsyncIterableIterator<string>
}
const decoder = new TextDecoder('utf-8');
async function *createTextLineAsyncGeneratorFromStreamSource(stream: ReadableStream<Uint8Array>): AsyncGenerator<string> {
async function *createTextLineAsyncIterableFromStreamSource(stream: ReadableStream<Uint8Array>): AsyncIterable<string> {
let buf = '';
for await (const chunk of stream as any) {
// @ts-expect-error -- ReadableStream<Uint8Array> should be AsyncIterable<Uint8Array>
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];
@@ -33,45 +30,34 @@ async function *createTextLineAsyncGeneratorFromStreamSource(stream: ReadableStr
}
}
export const readFileByLine: ((file: string | URL | BunFile) => TextLineStreamLike) = enableTextLineStream
? (file: string | URL | BunFile) => {
if (typeof file === 'string') {
file = Bun.file(file);
} else if (!('writer' in file)) {
file = Bun.file(file);
}
return file.stream().pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream());
const getBunBlob = (file: string | URL | BunFile) => {
if (typeof file === 'string') {
return Bun.file(file);
} if (!('writer' in file)) {
return Bun.file(file);
}
: (file: string | URL | BunFile) => {
if (typeof file === 'string') {
file = Bun.file(file);
} else if (!('writer' in file)) {
file = Bun.file(file);
}
return file;
};
return createTextLineAsyncGeneratorFromStreamSource(file.stream()) as any;
};
// @ts-expect-error -- ReadableStream<string> should be AsyncIterable<string>
export const readFileByLine: ((file: string | URL | BunFile) => AsyncIterable<string>) = enableTextLineStream
? (file: string | URL | BunFile) => getBunBlob(file).stream().pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream())
: (file: string | URL | BunFile) => createTextLineAsyncIterableFromStreamSource(getBunBlob(file).stream());
export const createReadlineInterfaceFromResponse: ((resp: Response) => TextLineStreamLike) = enableTextLineStream
? (resp) => {
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.pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream());
const ensureResponseBody = (resp: Response) => {
if (!resp.body) {
throw new Error('Failed to fetch remote text');
}
: (resp) => {
if (!resp.body) {
throw new Error('Failed to fetch remote text');
}
if (resp.bodyUsed) {
throw new Error('Body has already been consumed.');
}
return createTextLineAsyncGeneratorFromStreamSource(resp.body) as any;
};
if (resp.bodyUsed) {
throw new Error('Body has already been consumed.');
}
return resp.body;
};
// @ts-expect-error -- ReadableStream<string> should be AsyncIterable<string>
export const createReadlineInterfaceFromResponse: ((resp: Response) => AsyncIterable<string>) = enableTextLineStream
? (resp) => ensureResponseBody(resp).pipeThrough(new PolyfillTextDecoderStream()).pipeThrough(new TextLineStream())
: (resp) => createTextLineAsyncIterableFromStreamSource(ensureResponseBody(resp));
export function fetchRemoteTextByLine(url: string | URL) {
return fetchWithRetry(url, defaultRequestInit).then(createReadlineInterfaceFromResponse);

2
Build/lib/process-line.ts
View File

@@ -23,7 +23,7 @@ export const processLine = (line: string): string | null => {
return trimmed;
};
export const processLineFromReadline = async (rl: AsyncGenerator<string> | ReadableStream<string>): Promise<string[]> => {
export const processLineFromReadline = async (rl: AsyncIterable<string>): Promise<string[]> => {
const res: string[] = [];
for await (const line of rl) {
const l: string | null = processLine(line);

2
Build/lib/text-decoder-stream.ts
View File

@@ -21,7 +21,7 @@ export class PolyfillTextDecoderStream extends TransformStream<Uint8Array, strin
readonly ignoreBOM: boolean;
constructor(
encoding: Encoding = 'utf-8',
encoding: Bun.Encoding = 'utf-8',
{ fatal = false, ignoreBOM = false }: ConstructorParameters<typeof TextDecoder>[1] = {}
) {
const decoder = new TextDecoder(encoding, { fatal, ignoreBOM });