fix: miscellaneous fixes

- Use nodejs `https` module instead of shelling out to `src api`
- Display GitHub stars next to notebook results
- Make `didFocus()` for the tree view cancelable

Author: olafurpg

package.json

@@ -71,7 +71,7 @@
     "viewsWelcome": [
       {
         "view": "sourcegraph.commands",
-        "contents": "[New Search Notebook](command:extension.newNotebook)\n[Go to File](command:extension.goToFile)\n[Go to Repository](command:extension.goToRepository)"
+        "contents": "[New Search Notebook](command:extension.newNotebook)\n[Go to Repository](command:extension.goToRepository)\n[Go to File](command:extension.goToFile)"
       },
       {
         "view": "sourcegraph.files",

src/file-system/SourcegraphTreeDataProvider.ts

@@ -13,6 +13,7 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
     private isExpandedNode = new Set<string>()
     private treeView: vscode.TreeView<string> | undefined
     private activeUri: vscode.Uri | undefined
+    private didFocusToken = new vscode.CancellationTokenSource()
     private readonly didChangeTreeData = new vscode.EventEmitter<string | undefined>()
     public readonly onDidChangeTreeData: vscode.Event<string | undefined> = this.didChangeTreeData.event
 
@@ -65,11 +66,13 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
     }
 
     public async didFocus(vscodeUri: vscode.Uri | undefined): Promise<void> {
+        this.didFocusToken.cancel()
+        this.didFocusToken = new vscode.CancellationTokenSource()
         this.activeUri = vscodeUri
         if (vscodeUri && vscodeUri.scheme === 'sourcegraph' && this.treeView && this.isTreeViewVisible) {
             const uri = this.fs.sourcegraphUri(vscodeUri)
             await this.fs.downloadFiles(uri, uri.revision || '')
-            await this.didFocusString(uri, true)
+            await this.didFocusString(uri, true, this.didFocusToken.token)
         }
     }
 
@@ -101,12 +104,19 @@ export class SourcegraphTreeDataProvider implements vscode.TreeDataProvider<stri
         }
     }
 
-    private async didFocusString(uri: SourcegraphUri, isDestinationNode: boolean): Promise<void> {
+    private async didFocusString(
+        uri: SourcegraphUri,
+        isDestinationNode: boolean,
+        token: vscode.CancellationToken
+    ): Promise<void> {
         try {
             if (this.treeView) {
                 const parent = uri.parentUri()
                 if (parent && !this.isExpandedNode.has(parent)) {
-                    await this.didFocusString(SourcegraphUri.parse(parent), false)
+                    await this.didFocusString(SourcegraphUri.parse(parent), false, token)
+                }
+                if (token.isCancellationRequested) {
+                    return
                 }
                 await this.treeView.reveal(uri.uri, {
                     focus: true,

src/queries/graphqlQuery.ts

@@ -1,48 +1,65 @@
-import { spawn } from 'child_process'
+import { request, RequestOptions } from 'https'
 import { CancellationToken } from 'vscode'
 import { log } from '../log'
 import { debugEnabledSetting } from '../settings/debugEnabledSetting'
+import { endpointHostnameSetting } from '../settings/endpointSetting'
 
 export function graphqlQuery<A, B>(query: string, variables: A, token: CancellationToken): Promise<B | undefined> {
     return new Promise<B | undefined>((resolve, reject) => {
-        const stdoutBuffer: string[] = []
-        const onExit = (exit: number) => {
-            if (exit === 0) {
-                const json = stdoutBuffer.join('')
-                try {
-                    const parsed: B = JSON.parse(json)
-                    resolve(parsed) // wrap in promise because this method will be async in the future
-                } catch (error) {
-                    reject(error)
+        const data = JSON.stringify({
+            query,
+            variables,
+        })
+        const accessToken = process.env.SRC_ACCESS_TOKEN || ''
+        const options: RequestOptions = {
+            hostname: endpointHostnameSetting(),
+            port: 443,
+            path: '/.api/graphql',
+            method: 'POST',
+            headers: {
+                Authorization: `token ${accessToken}`,
+                'Content-Length': data.length,
+            },
+        }
+        const req = request(options, res => {
+            const body: Uint8Array[] = []
+            res.on('data', json => {
+                body.push(json)
+            })
+            res.on('error', reject)
+            const onClose = () => {
+                if (res.statusCode === 200) {
+                    try {
+                        const json = Buffer.concat(body).toString()
+                        const parsed: B = JSON.parse(json)
+                        resolve(parsed)
+                    } catch (error) {
+                        log.error(`graphql(${data})`, error)
+                        reject(error)
+                    }
+                } else {
+                    log.error(`graphql(${data}), statusCode=${res.statusCode}`, body)
+                    reject(body.join(''))
                 }
-            } else {
-                reject({ exit })
             }
-        }
-        const onData = (chunk: string) => {
-            stdoutBuffer.push(chunk)
-        }
-        const command: string[] = [
-            'api',
-            '-query',
-            query.trim().replace(/\n/g, ' ').replace(/ +/g, ' '),
-            '-vars',
-            JSON.stringify(variables),
-        ]
+            res.on('close', onClose)
+            res.on('end', onClose)
+        })
+        req.on('error', reject)
+        req.write(data)
+        req.end()
         if (debugEnabledSetting()) {
+            const command: string[] = [
+                'api',
+                '-query',
+                query.trim().replace(/\n/g, ' ').replace(/ +/g, ' '),
+                '-vars',
+                JSON.stringify(variables),
+            ]
             log.appendLine('src ' + command.map(part => `'${part}'`).join(' '))
         }
-        const proc = spawn('src', command)
-        proc.stdout.on('data', onData)
-        proc.on('close', onExit)
-        proc.on('disconnect', onExit)
-        proc.on('error', onExit)
-        proc.on('exit', onExit)
         token.onCancellationRequested(() => {
-            if (!proc.killed) {
-                proc.kill()
-                reject()
-            }
+            req.destroy()
         })
     })
 }

src/queries/repositoryMetadataQuery.ts

@@ -16,7 +16,7 @@ export async function repositoryMetadataQuery(
 ): Promise<RepositoryMetadata> {
     const response = await graphqlQuery<RevisionParameters, RevisionResult>(
         gql`
-            query Revision($repositoryName: String!) {
+            query RepositoryMetadata($repositoryName: String!) {
                 repositoryRedirect(name: $repositoryName) {
                     ... on Repository {
                         id

src/queries/searchQuery.ts

@@ -29,6 +29,9 @@ export function searchQueryResult(
                 file {
                     url
                 }
+                repository {
+                    stars
+                }
                 lineMatches {
                     lineNumber
                     offsetAndLengths
@@ -90,6 +93,9 @@ interface SearchResultNode {
     file?: {
         url?: string
     }
+    repository?: {
+        stars?: number
+    }
     lineMatches?: LineMatch[]
 }
 

src/search/searchHtml.ts

@@ -16,6 +16,8 @@ export async function searchHtml(
         if (!url) {
             continue
         }
+        const starCount = node?.repository?.stars
+        const stars = starCount ? ` ⭐ ${formatStarCount(starCount)}` : ''
         const lineMatches = node.lineMatches || []
         if (lineMatches.length === 0) {
             continue
@@ -55,7 +57,7 @@ export async function searchHtml(
             if (first) {
                 first = false
                 html.push('<p>')
-                html.push(`<code>${url}</code>`)
+                html.push(`<code>${url}${stars}</code>`)
                 html.push('<pre>')
             }
             const uri = `sourcegraph://${host}${url}?L${line + 1}:${character}`
@@ -73,6 +75,13 @@ export async function searchHtml(
     return html.join('')
 }
 
+function formatStarCount(starCount: number): string {
+    if (starCount > 1000) {
+        return `${Math.round(starCount / 1000)}k`
+    }
+    return starCount.toLocaleString()
+}
+
 // FIXME: this method is copy pasted from Stackoverflow and should be replaced with a proper implementation
 // https://stackoverflow.com/a/6234804
 export function escapeHtml(unescapedHtml: string): string {