Send telemetry (#1702)

* restart on auth Signed-off-by: Jess Frazelle <[email protected]> * fix deps Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * fix Signed-off-by: Jess Frazelle <[email protected]> * hash the iuser Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * add comment; Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * zip up the contents Signed-off-by: Jess Frazelle <[email protected]> * fix logic Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * add tests Signed-off-by: Jess Frazelle <[email protected]> * more code coverage Signed-off-by: Jess Frazelle <[email protected]> * u[dates Signed-off-by: Jess Frazelle <[email protected]> * u[dates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * fixes Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * up[dates Signed-off-by: Jess Frazelle <[email protected]> * more tests Signed-off-by: Jess Frazelle <[email protected]> * more coverage Signed-off-by: Jess Frazelle <[email protected]> * more coverage Signed-off-by: Jess Frazelle <[email protected]> * add tests Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * more tests Signed-off-by: Jess Frazelle <[email protected]> * cleanup dead code Signed-off-by: Jess Frazelle <[email protected]> * start of accept / reject Signed-off-by: Jess Frazelle <[email protected]> * accept/reject Signed-off-by: Jess Frazelle <[email protected]> * cleanup Signed-off-by: Jess Frazelle <[email protected]> --------- Signed-off-by: Jess Frazelle <[email protected]>
KittyCAD · Mar 13, 2024 · 2d979b5 · 2d979b5
1 parent dfc51e6
commit 2d979b5
Show file tree

Hide file tree

Showing 17 changed files with 1,723 additions and 152 deletions.
diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml
@@ -62,8 +62,16 @@ jobs:
         shell: bash
         run: |-
           cd "${{ matrix.dir }}"
-          cargo nextest run --workspace --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --all --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          fail_ci_if_error: true
+          flags: wasm-lib
+          verbose: true
+          files: lcov.info
 
diff --git a/src/App.tsx b/src/App.tsx
@@ -40,9 +40,11 @@ export function App() {
   const filePath = useAbsoluteFilePath()
   const { onProjectOpen } = useLspContext()
 
+  const projectName = project?.name || null
+  const projectPath = project?.path || null
   useEffect(() => {
-    onProjectOpen(project || null, file || null)
-  }, [])
+    onProjectOpen({ name: projectName, path: projectPath }, file || null)
+  }, [projectName, projectPath])
 
   useHotKeyListener()
   const {

diff --git a/src/components/LspProvider.tsx b/src/components/LspProvider.tsx
@@ -14,7 +14,6 @@ import { LanguageSupport } from '@codemirror/language'
 import { useNavigate } from 'react-router-dom'
 import { paths } from 'lib/paths'
 import { FileEntry } from '@tauri-apps/api/fs'
-import { ProjectWithEntryPointMetadata } from 'lib/types'
 
 const DEFAULT_FILE_NAME: string = 'main.kcl'
 
@@ -40,7 +39,7 @@ type LspContext = {
     redirect: boolean
   ) => void
   onProjectOpen: (
-    project: ProjectWithEntryPointMetadata | null,
+    project: { name: string | null; path: string | null } | null,
     file: FileEntry | null
   ) => void
   onFileOpen: (filePath: string | null, projectPath: string | null) => void
@@ -69,6 +68,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   }))
 
   const { auth } = useSettingsAuthContext()
+  const token = auth?.context?.token
   const navigate = useNavigate()
 
   // So this is a bit weird, we need to initialize the lsp server and client.
@@ -80,15 +80,14 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
     const client = new Client(fromServer, intoServer)
     if (!TEST) {
       Server.initialize(intoServer, fromServer).then((lspServer) => {
-        const token = auth?.context?.token
         lspServer.start('kcl', token)
         setIsKclLspServerReady(true)
       })
     }
 
     const lspClient = new LanguageServerClient({ client, name: 'kcl' })
     return { lspClient }
-  }, [setIsKclLspServerReady])
+  }, [setIsKclLspServerReady, token])
 
   // Here we initialize the plugin which will start the client.
   // Now that we have multi-file support the name of the file is a dep of
@@ -116,15 +115,14 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
     const client = new Client(fromServer, intoServer)
     if (!TEST) {
       Server.initialize(intoServer, fromServer).then((lspServer) => {
-        const token = auth?.context?.token
         lspServer.start('copilot', token)
         setIsCopilotLspServerReady(true)
       })
     }
 
     const lspClient = new LanguageServerClient({ client, name: 'copilot' })
     return { lspClient }
-  }, [setIsCopilotLspServerReady])
+  }, [setIsCopilotLspServerReady, token])
 
   // Here we initialize the plugin which will start the client.
   // When we have multi-file support the name of the file will be a dep of
@@ -172,7 +170,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   }
 
   const onProjectOpen = (
-    project: ProjectWithEntryPointMetadata | null,
+    project: { name: string | null; path: string | null } | null,
     file: FileEntry | null
   ) => {
     const projectName = project?.name || 'ProjectRoot'

diff --git a/src/editor/plugins/lsp/index.ts b/src/editor/plugins/lsp/index.ts
@@ -2,67 +2,10 @@ import type * as LSP from 'vscode-languageserver-protocol'
 import Client from './client'
 import { SemanticToken, deserializeTokens } from './kcl/semantic_tokens'
 import { LanguageServerPlugin } from 'editor/plugins/lsp/plugin'
-
-export interface CopilotGetCompletionsParams {
-  doc: {
-    source: string
-    tabSize: number
-    indentSize: number
-    insertSpaces: boolean
-    path: string
-    uri: string
-    relativePath: string
-    languageId: string
-    position: {
-      line: number
-      character: number
-    }
-  }
-}
-
-interface CopilotGetCompletionsResult {
-  completions: {
-    text: string
-    position: {
-      line: number
-      character: number
-    }
-    uuid: string
-    range: {
-      start: {
-        line: number
-        character: number
-      }
-      end: {
-        line: number
-        character: number
-      }
-    }
-    displayText: string
-    point: {
-      line: number
-      character: number
-    }
-    region: {
-      start: {
-        line: number
-        character: number
-      }
-      end: {
-        line: number
-        character: number
-      }
-    }
-  }[]
-}
-
-interface CopilotAcceptCompletionParams {
-  uuid: string
-}
-
-interface CopilotRejectCompletionParams {
-  uuids: string[]
-}
+import { CopilotLspCompletionParams } from 'wasm-lib/kcl/bindings/CopilotLspCompletionParams'
+import { CopilotCompletionResponse } from 'wasm-lib/kcl/bindings/CopilotCompletionResponse'
+import { CopilotAcceptCompletionParams } from 'wasm-lib/kcl/bindings/CopilotAcceptCompletionParams'
+import { CopilotRejectCompletionParams } from 'wasm-lib/kcl/bindings/CopilotRejectCompletionParams'
 
 // https://microsoft.github.io/language-server-protocol/specifications/specification-current/
 
@@ -78,7 +21,7 @@ interface LSPRequestMap {
     LSP.SemanticTokensParams,
     LSP.SemanticTokens
   ]
-  getCompletions: [CopilotGetCompletionsParams, CopilotGetCompletionsResult]
+  getCompletions: [CopilotLspCompletionParams, CopilotCompletionResponse]
   notifyAccepted: [CopilotAcceptCompletionParams, any]
   notifyRejected: [CopilotRejectCompletionParams, any]
 }
@@ -271,7 +214,7 @@ export class LanguageServerClient {
     return this.client.notify(method, params)
   }
 
-  async getCompletion(params: CopilotGetCompletionsParams) {
+  async getCompletion(params: CopilotLspCompletionParams) {
     const response = await this.request('getCompletions', params)
     //
     this.queuedUids = [...response.completions.map((c) => c.uuid)]

diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx
@@ -37,6 +37,7 @@ import { homeCommandBarConfig } from 'lib/commandBarConfigs/homeCommandConfig'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { isTauri } from 'lib/isTauri'
 import { kclManager } from 'lang/KclSingleton'
+import { useLspContext } from 'components/LspProvider'
 
 // This route only opens in the Tauri desktop context for now,
 // as defined in Router.tsx, so we can use the Tauri APIs and types.
@@ -51,6 +52,7 @@ const Home = () => {
       send: sendToSettings,
     },
   } = useSettingsAuthContext()
+  const { onProjectOpen } = useLspContext()
 
   // Set the default directory if it's been updated
   // during the loading of the home page. This is wrapped
@@ -84,12 +86,16 @@ const Home = () => {
         event: EventFrom<typeof homeMachine>
       ) => {
         if (event.data && 'name' in event.data) {
-          commandBarSend({ type: 'Close' })
-          navigate(
-            `${paths.FILE}/${encodeURIComponent(
-              context.defaultDirectory + sep + event.data.name
-            )}`
+          let projectPath = context.defaultDirectory + sep + event.data.name
+          onProjectOpen(
+            {
+              name: event.data.name,
+              path: projectPath,
+            },
+            null
           )
+          commandBarSend({ type: 'Close' })
+          navigate(`${paths.FILE}/${encodeURIComponent(projectPath)}`)
         }
       },
       toastSuccess: (_, event) => toast.success((event.data || '') + ''),

diff --git a/src/wasm-lib/Cargo.lock b/src/wasm-lib/Cargo.lock
diff --git a/src/wasm-lib/Cargo.toml b/src/wasm-lib/Cargo.toml
@@ -59,7 +59,7 @@ members = [
 ]
 
 [workspace.dependencies]
-kittycad = { version = "0.2.59", default-features = false, features = ["js", "requests"] }
+kittycad = { version = "0.2.60", default-features = false, features = ["js", "requests"] }
 kittycad-execution-plan = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }
 kittycad-execution-plan-macros = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }
 kittycad-execution-plan-traits = { git = "https://github.com/KittyCAD/modeling-api", branch = "main" }