Rewritten WS handling, file selections. Minor UI fixes.

cista-front/src/repositories/Document.ts

@@ -1,6 +1,3 @@
-import { useDocumentStore } from '@/stores/documents'
-import createWebSocket from './WS'
-
 export type FUID = string
 
 export type Document = {
@@ -13,7 +10,7 @@ export type Document = {
   mtime: number
   modified: string
   haystack: string
-  dir?: DirList
+  dir: boolean
 }
 
 export type errorEvent = {
@@ -52,111 +49,8 @@ export type UpdateEntry = {
 
 // Helper structure for selections
 export interface SelectedItems {
-  selected: Set<FUID>
+  keys: FUID[]
+  docs: Record<FUID, Document>
+  recursive: Array<[string, string, Document]>
   missing: Set<FUID>
-  rootdir: DirList
-  entries: Record<FUID, FileEntry | DirEntry>
-  fullpath: Record<FUID, string>
-  relpath: Record<FUID, string>
-  url: Record<FUID, string>
-  ids: FUID[]
-}
-
-export const url_document_watch_ws = '/api/watch'
-export const url_document_upload_ws = '/api/upload'
-export const url_document_get = '/files'
-
-export class DocumentHandler {
-  constructor(private store = useDocumentStore()) {
-    this.handleWebSocketMessage = this.handleWebSocketMessage.bind(this)
-  }
-
-  handleWebSocketMessage(event: MessageEvent) {
-    const msg = JSON.parse(event.data)
-    if ('error' in msg) {
-      if (msg.error.code === 401) {
-        this.store.user.isLoggedIn = false
-        this.store.user.isOpenLoginModal = true
-      } else {
-        this.store.error = msg.error.message
-      }
-      // The server closes the websocket after errors, so we need to reopen it
-      setTimeout(() => {
-        this.store.wsWatch = createWebSocket(
-          url_document_watch_ws,
-          this.handleWebSocketMessage
-        )
-      }, 1000)
-    }
-    switch (true) {
-      case !!msg.root:
-        this.handleRootMessage(msg)
-        break
-      case !!msg.update:
-        this.handleUpdateMessage(msg)
-        break
-      case !!msg.space:
-        console.log('Watch space', msg.space)
-        break
-      case !!msg.error:
-        this.handleError(msg)
-        break
-      default:
-    }
-  }
-
-  private handleRootMessage({ root }: { root: DirEntry }) {
-    console.log('Watch root', root)
-    if (this.store) {
-      this.store.user.isLoggedIn = true
-      this.store.updateRoot(root)
-    }
-  }
-  private handleUpdateMessage(updateData: { update: UpdateEntry[] }) {
-    console.log('Watch update', updateData.update)
-    let node: DirEntry = this.store.root
-    for (const elem of updateData.update) {
-      if (elem.deleted) {
-        delete node.dir[elem.name]
-        break // Deleted elements can't have further children
-      }
-      if (elem.name !== undefined) {
-        // @ts-ignore
-        node = node.dir[elem.name] ||= {}
-      }
-      if (elem.key !== undefined) node.key = elem.key
-      if (elem.size !== undefined) node.size = elem.size
-      if (elem.mtime !== undefined) node.mtime = elem.mtime
-      if (elem.dir !== undefined) node.dir = elem.dir
-    }
-    this.store.updateRoot()
-  }
-  private handleError(msg: errorEvent) {
-    if (msg.error.code === 401) {
-      this.store.user.isOpenLoginModal = true
-      this.store.user.isLoggedIn = false
-      return
-    }
-  }
-}
-
-export class DocumentUploadHandler {
-  constructor(private store = useDocumentStore()) {
-    this.handleWebSocketMessage = this.handleWebSocketMessage.bind(this)
-  }
-
-  handleWebSocketMessage(event: MessageEvent) {
-    const msg = JSON.parse(event.data)
-    switch (true) {
-      case !!msg.written:
-        this.handleWrittenMessage(msg)
-        break
-      default:
-    }
-  }
-
-  private handleWrittenMessage(msg: { written: number }) {
-    // if (this.store && this.store.root) this.store.root = root;
-    console.log('Written message', msg.written)
-  }
 }