浏览代码

Chore: enable TextLineStream with env

SukkaW 2 年之前
父节点
当前提交
0b0dda6cc2
共有 3 个文件被更改,包括 45 次插入28 次删除
  1. 0 5
      Build/build-deprecate-files.ts
  2. 44 23
      Build/lib/fetch-text-by-line.ts
  3. 1 0
      package.json

+ 0 - 5
Build/build-deprecate-files.ts

@@ -18,11 +18,6 @@ export const buildDeprecateFiles = task(import.meta.path, (span) => span.traceCh
     const surgeFile = path.resolve(outputSurgeDir, `${filePath}.conf`);
     const clashFile = path.resolve(outputClashDir, `${filePath}.txt`);
 
-    console.log({
-      surgeFile,
-      clashFile
-    });
-
     const content = [
       '#########################################',
       '# Sukka\'s Ruleset - Deprecated',

+ 44 - 23
Build/lib/fetch-text-by-line.ts

@@ -1,20 +1,21 @@
 import type { BunFile } from 'bun';
 import { fetchWithRetry, defaultRequestInit } from './fetch-retry';
 
-// import { TextLineStream } from './text-line-transform-stream';
-// import { PolyfillTextDecoderStream } from './text-decoder-stream';
+import { TextLineStream } from './text-line-transform-stream';
+import { PolyfillTextDecoderStream } from './text-decoder-stream';
 import { processLine } from './process-line';
-// function createTextLineStreamFromStreamSource(stream: ReadableStream<Uint8Array>) {
-//   return stream
-//     .pipeThrough(new PolyfillTextDecoderStream())
-//     .pipeThrough(new TextLineStream());
-// }
+
+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> {
   let buf = '';
 
-  for await (const chunk of stream) {
+  for await (const chunk of stream as any) {
     const chunkStr = decoder.decode(chunk).replaceAll('\r\n', '\n');
     for (let i = 0, len = chunkStr.length; i < len; i++) {
       const char = chunkStr[i];
@@ -32,25 +33,45 @@ async function *createTextLineAsyncGeneratorFromStreamSource(stream: ReadableStr
   }
 }
 
-export function readFileByLine(file: string | URL | BunFile) {
-  if (typeof file === 'string') {
-    file = Bun.file(file);
-  } else if (!('writer' in file)) {
-    file = Bun.file(file);
+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());
   }
+  : (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 createTextLineAsyncGeneratorFromStreamSource(file.stream()) as any;
+  };
 
-export function createReadlineInterfaceFromResponse(this: void, resp: Response) {
-  if (!resp.body) {
-    throw new Error('Failed to fetch remote text');
-  }
-  if (resp.bodyUsed) {
-    throw new Error('Body has already been consumed.');
+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());
   }
-  return createTextLineAsyncGeneratorFromStreamSource(resp.body);
-}
+  : (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;
+  };
 
 export function fetchRemoteTextByLine(url: string | URL) {
   return fetchWithRetry(url, defaultRequestInit).then(createReadlineInterfaceFromResponse);

+ 1 - 0
package.json

@@ -9,6 +9,7 @@
   },
   "scripts": {
     "build": "bun ./Build/index.ts",
+    "build-stream": "ENABLE_TEXT_LINE_STREAM=true bun ./Build/index.ts",
     "lint": "eslint --format=sukka ."
   },
   "author": "",