wip: scm

Author: kermanx

src/rpc/host.ts

@@ -1,22 +1,16 @@
-import type { useHostFs } from '../fs/host'
 import type { Connection } from '../sync/connection'
-import type { useHostTerminals } from '../terminal/host'
 import type { ClientFunctions, HostFunctions } from './types'
 import { createBirpc } from 'birpc'
 import { deserialize, serialize } from './serialize'
 
 export function useHostRpc(
   connection: Connection,
-  fs: ReturnType<typeof useHostFs>,
-  terminals: ReturnType<typeof useHostTerminals>,
+  functions: HostFunctions,
 ) {
   const [sendRpcData, recvRpcData] = connection.makeAction('rpc')
 
   const rpc = createBirpc<ClientFunctions, HostFunctions>(
-    {
-      ...fs,
-      ...terminals,
-    },
+    functions,
     {
       post: (data, peerId) => sendRpcData(data, peerId),
       on: fn => recvRpcData((data, peerId) => fn(data, peerId)),

src/rpc/types.ts

@@ -1,8 +1,10 @@
 import type { useHostFs } from '../fs/host'
+import type { useHostScm } from '../scm/host'
 import type { useHostTerminals } from '../terminal/host'
 
 export type HostFunctions
   = & ReturnType<typeof useHostFs>
     & ReturnType<typeof useHostTerminals>
+    & ReturnType<typeof useHostScm>
 
 export interface ClientFunctions {}

src/scm/client.ts

@@ -1,5 +1,7 @@
+import type { BirpcReturn } from 'birpc'
 import type { SourceControlResourceGroup, SourceControlResourceState } from 'vscode'
 import type * as Y from 'yjs'
+import type { ClientFunctions, HostFunctions } from '../rpc/types'
 import type { GitExtension } from './git'
 import type { ScmChange, ScmGroupMeta, ScmRepo } from './types'
 import { basename } from 'pathe'
@@ -9,15 +11,10 @@ import { useShallowYArray, useShallowYMapScopes } from '../sync/doc'
 import { lazy } from '../utils'
 import { Status } from './git'
 
-export function useClientScm(doc: Y.Doc) {
+export function useClientScm(doc: Y.Doc, rpc: BirpcReturn<HostFunctions, ClientFunctions>) {
   const map = doc.getMap<ScmRepo>('scm')
 
-  useShallowYMapScopes(
-    () => map,
-    (id, data) => {
-      useScmRepo(data)
-    },
-  )
+  useShallowYMapScopes(() => map, useScmRepo)
 
   useCommands({
     'p2p-live-share.scm.cleanAll': async (group: SourceControlResourceGroup) => {
@@ -57,15 +54,17 @@ export function useClientScm(doc: Y.Doc) {
         }
       }
       if ((await window.showWarningMessage(message, { modal: true }, action)) === action) {
-        // await this.service.cleanResourcesAsync(
-        //   states.map(e => e.ResourceIdentity),
-        // )
+        await rpc.scmClean(
+          states[0].repoUri,
+          states[0].groupMeta.groupId,
+          states.map(({ resourceUri }) => resourceUri.toString()),
+        )
       }
     },
   })
 }
 
-function useScmRepo(repo: ScmRepo) {
+function useScmRepo(uri: string, repo: ScmRepo) {
   const [groups, meta] = repo.toArray()
   const sc = useDisposable(scm.createSourceControl('p2p-live-share-scm', meta.label, Uri.parse(meta.rootUri)))
   sc.inputBox.visible = false
@@ -79,7 +78,7 @@ function useScmRepo(repo: ScmRepo) {
 
       const states = useShallowYArray(() => changes)
       watchEffect(() => {
-        group.resourceStates = states.value.map(state => createResourceState(state, meta))
+        group.resourceStates = states.value.map(state => createResourceState(state, meta, uri))
       })
     },
   )
@@ -90,7 +89,7 @@ function useScmRepo(repo: ScmRepo) {
   // }
 }
 
-function createResourceState({ uri, status }: ScmChange, meta: ScmGroupMeta) {
+function createResourceState({ uri, status }: ScmChange, meta: ScmGroupMeta, repoUri: string) {
   const useIcons = areGitDecorationsEnabled()
   return {
     resourceUri: Uri.parse(uri),
@@ -115,6 +114,7 @@ function createResourceState({ uri, status }: ScmChange, meta: ScmGroupMeta) {
     priority: getPriority(status),
     // resourceDecoration
 
+    repoUri,
     status,
     groupMeta: meta,
   } satisfies SourceControlResourceState & Record<string, unknown>

src/scm/host.ts

@@ -4,11 +4,12 @@ import type { API, Change, GitExtension, Repository, RepositoryState } from './g
 import type { ScmChange, ScmGroup, ScmGroupMeta, ScmRepo, ScmRepoMeta } from './types'
 import { basename } from 'pathe'
 import { effectScope, getCurrentScope, useDisposable } from 'reactive-vscode'
-import { extensions } from 'vscode'
+import { extensions, Uri } from 'vscode'
 import * as Y from 'yjs'
 import { YTuple } from '../sync/y-tuple'
 
 export function useHostScm(connection: Connection, doc: Y.Doc) {
+  const { toHostUri } = connection
   const scope = getCurrentScope()!
   const _git = (async () => {
     const gitExtension = extensions.getExtension<GitExtension>('vscode.git')
@@ -18,6 +19,21 @@ export function useHostScm(connection: Connection, doc: Y.Doc) {
     const gitApi = gitExtension.exports.getAPI(1)
     return scope.run(() => useHostGitScm(gitApi, connection, doc))
   })()
+
+  return {
+    async scmClean(repoUri: string, groupId: string, resourceUris: string[]) {
+      const git = await _git
+      if (!git)
+        return
+      const repo = git.repositories.get(repoUri)
+      if (!repo)
+        return
+      await repo.repo.clean(resourceUris.map((uri_) => {
+        const uri = toHostUri(Uri.parse(uri_))
+        return uri.fsPath
+      }))
+    },
+  }
 }
 
 function useHostGitScm(api: API, connection: Connection, doc: Y.Doc) {
@@ -29,13 +45,19 @@ function useHostGitScm(api: API, connection: Connection, doc: Y.Doc) {
   // const changedInstances = new Set()
   // const resourceCache = new Map()
 
-  const repoScopes = new Map<string, EffectScope>()
+  const repositories = new Map<string, {
+    scope: EffectScope
+    repo: Repository
+  }>()
   const openRepository = (repo: Repository) => {
     const uri = toTrackUri(repo.rootUri)?.toString()
     if (!uri)
       return
     const scope = effectScope(true)
-    repoScopes.set(uri, scope)
+    repositories.set(uri, {
+      scope,
+      repo,
+    })
     map.set(uri, scope.run(() => useScmRepo(repo, {
       rootUri: uri,
       label: 'Git',
@@ -50,26 +72,19 @@ function useHostGitScm(api: API, connection: Connection, doc: Y.Doc) {
     if (!uri)
       return
     map.delete(uri)
-    const scope = repoScopes.get(uri)
-    if (scope) {
-      scope.stop()
-      repoScopes.delete(uri)
+    const repository = repositories.get(uri)
+    if (repository) {
+      repository.scope.stop()
+      repositories.delete(uri)
     }
   }))
 
   // const documentUriCacheCleanupTimer = setInterval(cleanupDocumentUriCache, 300000)
   // onScopeDispose(() => clearInterval(documentUriCacheCleanupTimer))
 
   return {
-    // getRecentVersions,
-    // getRecentVersionsTillMergeVersion,
-    // getCurrentVersionName,
-    // getRemoteVersionsNames,
-    // getMergeVersion,
-    // getDiffsForVersion,
-    // getDiffForResource,
-    // getResource,
-    // cleanResources,
+    api,
+    repositories,
   }
 
   // function getInstanceId(repo: Repository) {

src/session/client.ts

@@ -74,7 +74,7 @@ export async function createClientSession(config: ConnectionConfig) {
     const { shadowTerminals } = useClientTerminals(doc, rpc)
     useClientLs(connection, hostId)
     useClientDiagnostics(doc)
-    useClientScm(doc)
+    useClientScm(doc, rpc)
     const tunnels = useTunnels(connection, doc)
     useWebview().useChat(connection)
     useCurrentUser()

src/session/host.ts

@@ -34,10 +34,14 @@ export async function createHostSession(config: ConnectionConfig) {
 
     const fs = useHostFs(connection, doc)
     const terminals = useHostTerminals(doc)
-    useHostRpc(connection, fs, terminals)
+    const scm = useHostScm(connection, doc)
+    useHostRpc(connection, {
+      ...fs,
+      ...terminals,
+      ...scm,
+    })
     useHostLs(connection)
     useHostDiagnostics(connection, doc)
-    useHostScm(connection, doc)
     const tunnels = useTunnels(connection, doc)
     useWebview().useChat(connection)
     useCurrentUser()