fix: worker un exit (#624)

labring · Dec 18, 2023 · b14a1db · b14a1db
1 parent 703583f
commit b14a1db
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 130 deletions.
diff --git a/packages/global/common/string/textSplitter.ts b/packages/global/common/string/textSplitter.ts
@@ -232,7 +232,7 @@ export const splitText2Chunks = (props: {
       step: 0,
       lastText: '',
       mdTitle: ''
-    }).map((chunk) => chunk.replaceAll(codeBlockMarker, '\n')); // restore code block
+    }).map((chunk) => chunk?.replaceAll(codeBlockMarker, '\n') || ''); // restore code block
 
     const tokens = countTokens
       ? chunks.reduce((sum, chunk) => sum + countPromptTokens(chunk, 'system'), 0)

diff --git a/packages/service/common/string/markdown.ts b/packages/service/common/string/markdown.ts
@@ -13,9 +13,12 @@ export const htmlToMarkdown = (html?: string | null) =>
     const worker = new Worker(getWorkerPath('html2md'));
 
     worker.on('message', (md: string) => {
+      worker.terminate();
+
       resolve(simpleMarkdownText(md));
     });
     worker.on('error', (err) => {
+      worker.terminate();
       reject(err);
     });
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/app/src/components/Markdown/chat/Guide.tsx b/projects/app/src/components/Markdown/chat/Guide.tsx
@@ -23,7 +23,7 @@ function MyLink(e: any) {
     <Box as={'li'} mb={1}>
       <Box
         as={'span'}
-        color={'blue.500'}
+        color={'blue.700'}
         textDecoration={'underline'}
         cursor={'pointer'}
         onClick={() => {

diff --git a/projects/app/src/components/SideTabs/index.tsx b/projects/app/src/components/SideTabs/index.tsx
@@ -44,7 +44,7 @@ const SideTabs = ({ list, size = 'md', activeId, onChange, ...props }: Props) =>
           alignItems={'center'}
           {...(activeId === item.id
             ? {
-                bg: ' blue.200 !important',
+                bg: ' blue.100 !important',
                 fontWeight: 'bold',
                 color: 'blue.600 ',
                 cursor: 'default'

diff --git a/projects/app/src/components/core/module/Flow/components/modules/ButtonEdge.tsx b/projects/app/src/components/core/module/Flow/components/modules/ButtonEdge.tsx
@@ -1,11 +1,5 @@
 import React from 'react';
-import {
-  SmoothStepEdge,
-  EdgeLabelRenderer,
-  EdgeProps,
-  getSmoothStepPath,
-  MarkerType
-} from 'reactflow';
+import { SmoothStepEdge, EdgeLabelRenderer, EdgeProps, getSmoothStepPath } from 'reactflow';
 import { Flex } from '@chakra-ui/react';
 import MyIcon from '@/components/Icon';
 

diff --git a/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx b/projects/app/src/pages/dataset/detail/components/Import/Provider.tsx
@@ -289,28 +289,30 @@ export const PreviewFileOrChunk = () => {
             overflow={'overlay'}
             px={[4, 8]}
             my={4}
-            contentEditable
-            dangerouslySetInnerHTML={{ __html: previewFile.rawText }}
+            // contentEditable
+            // dangerouslySetInnerHTML={{ __html: previewFile.rawText }}
             fontSize={'sm'}
             whiteSpace={'pre-wrap'}
             wordBreak={'break-all'}
-            onBlur={(e) => {
-              // @ts-ignore
-              const val = e.target.innerText;
-              setReShowRePreview(true);
+            // onBlur={(e) => {
+            //   // @ts-ignore
+            //   const val = e.target.innerText;
+            //   setReShowRePreview(true);
 
-              setFiles((state) =>
-                state.map((file) =>
-                  file.id === previewFile.id
-                    ? {
-                        ...file,
-                        text: val
-                      }
-                    : file
-                )
-              );
-            }}
-          />
+            //   setFiles((state) =>
+            //     state.map((file) =>
+            //       file.id === previewFile.id
+            //         ? {
+            //             ...file,
+            //             text: val
+            //           }
+            //         : file
+            //     )
+            //   );
+            // }}
+          >
+            {previewFile.rawText}
+          </Box>
         </Box>
       ) : (
         <Box pt={[3, 6]}>
@@ -365,49 +367,9 @@ export const PreviewFileOrChunk = () => {
                       }}
                     />
                   </Flex>
-                  <Box
-                    px={4}
-                    fontSize={'sm'}
-                    whiteSpace={'pre-wrap'}
-                    wordBreak={'break-all'}
-                    contentEditable={!chunk.a}
-                    dangerouslySetInnerHTML={{
-                      __html: chunk.a ? `q:${chunk.q}\na:${chunk.a}` : chunk.q
-                    }}
-                    onBlur={(e) => {
-                      // @ts-ignore
-                      const val = e.target.innerText;
-
-                      /* delete file */
-                      if (val === '') {
-                        setFiles((state) =>
-                          state.map((stateFile) =>
-                            stateFile.id === file.id
-                              ? {
-                                  ...file,
-                                  chunks: [...file.chunks.slice(0, i), ...file.chunks.slice(i + 1)]
-                                }
-                              : stateFile
-                          )
-                        );
-                      } else {
-                        // update chunk
-                        setFiles((stateFiles) =>
-                          stateFiles.map((stateFile) =>
-                            file.id === stateFile.id
-                              ? {
-                                  ...stateFile,
-                                  chunks: stateFile.chunks.map((chunk, index) => ({
-                                    ...chunk,
-                                    index: i === index ? val : chunk.q
-                                  }))
-                                }
-                              : stateFile
-                          )
-                        );
-                      }
-                    }}
-                  />
+                  <Box px={4} fontSize={'sm'} whiteSpace={'pre-wrap'} wordBreak={'break-all'}>
+                    {chunk.a ? `q:${chunk.q}\na:${chunk.a}` : chunk.q}
+                  </Box>
                 </Box>
               ))
             )}

diff --git a/projects/app/src/web/styles/theme.ts b/projects/app/src/web/styles/theme.ts
@@ -284,16 +284,16 @@ export const theme = extendTheme({
       1000: '#121416'
     },
     blue: {
-      50: '#f0f7ff',
-      100: '#EBF7FD',
-      200: '#d6e8ff',
-      300: '#adceff',
-      400: '#85b1ff',
-      500: '#4e83fd',
-      600: '#3370ff',
-      700: '#2152d9',
-      800: '#1237b3',
-      900: '#07228c'
+      50: '#F0F4FF',
+      100: '#E1EAFF',
+      200: '#C5D7FF',
+      300: '#94B5FF',
+      400: '#5E8FFF',
+      500: '#487FFF',
+      600: '#3370FF',
+      700: '#2B5FD9',
+      800: '#2450B5',
+      900: '#1D4091'
     },
     myRead: {
       600: '#ff4d4f'

diff --git a/worker/html2md.js b/worker/html2md.js
@@ -20,22 +20,26 @@ parentPort?.on('message', (html) => {
 });
 
 const html2md = (html) => {
-  const window = domino.createWindow(html);
-  const document = window.document;
+  try {
+    const window = domino.createWindow(html);
+    const document = window.document;
 
-  turndownService.remove(['i', 'script', 'iframe']);
-  turndownService.addRule('codeBlock', {
-    filter: 'pre',
-    replacement(_, node) {
-      const content = node.textContent?.trim() || '';
-      // @ts-ignore
-      const codeName = node?._attrsByQName?.class?.data?.trim() || '';
+    turndownService.remove(['i', 'script', 'iframe']);
+    turndownService.addRule('codeBlock', {
+      filter: 'pre',
+      replacement(_, node) {
+        const content = node.textContent?.trim() || '';
+        // @ts-ignore
+        const codeName = node?._attrsByQName?.class?.data?.trim() || '';
 
-      return `\n\`\`\`${codeName}\n${content}\n\`\`\`\n`;
-    }
-  });
+        return `\n\`\`\`${codeName}\n${content}\n\`\`\`\n`;
+      }
+    });
 
-  turndownService.use(turndownPluginGfm.gfm);
+    turndownService.use(turndownPluginGfm.gfm);
 
-  return turndownService.turndown(document);
+    return turndownService.turndown(document);
+  } catch (error) {
+    return '';
+  }
 };