Update packages and fix code editor view insertion index out of bound…

… bug
Shellishack · Dec 16, 2024 · c10627e · c10627e
1 parent 3f86a85
commit c10627e
Show file tree

Hide file tree

Showing 11 changed files with 472 additions and 478 deletions.
diff --git a/app/page.tsx b/app/page.tsx
@@ -19,11 +19,9 @@ export default function Home() {
   const isProcessingRef = useRef(false);
   const vad = useMicVAD({
     startOnLoad: false,
-    ortConfig(ort) {
-      ort.env.wasm.wasmPaths = "/vad/";
-    },
-    workletURL: "/vad/vad.worklet.bundle.min.js",
-    modelURL: "/vad/silero_vad.onnx",
+    baseAssetPath: "/vad/",
+    onnxWASMBasePath: "/vad/",
+    positiveSpeechThreshold: 0.75,
     onSpeechStart: () => {
       if (!isProcessingRef.current) {
         const sttModel = editorContext?.aiModelConfig.getSTTModel();

diff --git a/components/views/code-editor-view.tsx b/components/views/code-editor-view.tsx
@@ -79,16 +79,30 @@ const CodeEditorView = forwardRef(
         // Apply changes to the editor
         for (const change of changes) {
           if (change.status === "added") {
-            const from = cmView.state.doc.line(change.index + 1).from;
-
-            transactions.push({
-              changes: {
-                from: from,
-                insert: change.content + "\n",
-              },
-            });
+            // If the addition is in the middle of document, insert it
+            if (change.index <= cmView.state.doc.lines) {
+              // The start of inserted line
+              const location = cmView.state.doc.line(change.index).from;
+              transactions.push({
+                changes: {
+                  from: location,
+                  insert: change.content + "\n",
+                },
+              });
+            }
+            // Else the addition is at the end of document, append it
+            else {
+              transactions.push({
+                changes: {
+                  from: cmView.state.doc.length,
+                  insert: "\n" + change.content,
+                },
+              });
+            }
           } else if (change.status === "deleted") {
+            // The start of deleted line
             const from = cmView.state.doc.line(change.index).from;
+            // The start of next line
             const to = cmView.state.doc.line(change.index + 1).from;
 
             transactions.push({
@@ -99,7 +113,9 @@ const CodeEditorView = forwardRef(
               },
             });
           } else if (change.status === "modified") {
+            // The start of modified line
             const from = cmView.state.doc.line(change.index).from;
+            // The end of modified line
             const to = cmView.state.doc.line(change.index).to;
 
             transactions.push({

diff --git a/lib/hooks/use-mic-vad.ts b/lib/hooks/use-mic-vad.ts
@@ -4,7 +4,7 @@
 */
 
 import type { RealTimeVADOptions } from "@ricky0123/vad-web";
-import { MicVAD, defaultRealTimeVADOptions } from "@ricky0123/vad-web";
+import { MicVAD, getDefaultRealTimeVADOptions } from "@ricky0123/vad-web";
 import React, { useEffect, useReducer, useState } from "react";
 
 export { utils } from "@ricky0123/vad-web";
@@ -23,12 +23,12 @@ const defaultReactOptions: ReactOptions = {
 };
 
 export const defaultReactRealTimeVADOptions = {
-  ...defaultRealTimeVADOptions,
+  ...getDefaultRealTimeVADOptions("v5"),
   ...defaultReactOptions,
 };
 
 const reactOptionKeys = Object.keys(defaultReactOptions);
-const vadOptionKeys = Object.keys(defaultRealTimeVADOptions);
+const vadOptionKeys = Object.keys(getDefaultRealTimeVADOptions("v5"));
 
 const _filter = (keys: string[], obj: any) => {
   return keys.reduce(