@neuralinnovations/dataisland-sdk 0.0.1-dev3 → 0.0.1-dev31

package/src/storages/files/file.impl.ts

@@ -0,0 +1,113 @@
+import { Context } from "../../context"
+import { Disposable } from "../../disposable"
+import { FileDto, FileProgressDto } from "../../dto/workspacesResponse"
+import { RpcService } from "../../services/rpcService"
+import { ResponseUtils } from "../../services/responseUtils"
+import { File, FileStatus } from "./file"
+import { FilesEvent } from "./files"
+
+export class FileImpl extends File implements Disposable {
+  private _isDisposed: boolean = false
+  private _content?: FileDto
+  private _progress?: FileProgressDto
+
+  constructor(private readonly context: Context) {
+    super()
+  }
+
+  async initFrom(file: FileDto): Promise<File> {
+    this._content = file
+
+    await this.updateStatus()
+
+    return this
+  }
+
+  get isDisposed(): boolean {
+    return this._isDisposed
+  }
+
+  dispose(): void {
+    this._isDisposed = true
+  }
+
+  get id(): string {
+    return <string>this._content?.id
+  }
+
+  get name(): string {
+    return <string>this._content?.name
+  }
+
+  get createdAt(): number {
+    return <number>this._content?.createdAt
+  }
+
+  get progress(): FileProgressDto {
+    return <FileProgressDto>this._progress
+  }
+
+  get status(): FileStatus {
+    if (this._progress === undefined || this._progress.success === null ||
+      (this._progress.success && this._progress.completed_parts_count !== this._progress.file_parts_count)) {
+      return FileStatus.UPLOADING
+    } else if (this._progress.success) {
+      return FileStatus.SUCCESS
+    } else {
+      return FileStatus.FAILED
+    }
+  }
+
+  async url(): Promise<string> {
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("api/v1/Files/url")
+      .searchParam("id", this.id)
+      .sendGet()
+
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(
+        `Failed to get file ${this.id} url`,
+        response
+      )
+    }
+
+    return (await response!.json() as { url: string }).url
+  }
+
+  public fetchAfter() {
+    if (this.status === FileStatus.UPLOADING) {
+      setTimeout(async () => await this.updateStatus(), 500)
+    }
+  }
+
+  async updateStatus(): Promise<void> {
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("api/v1/Files/fetch")
+      .searchParam("id", this.id)
+      .sendGet()
+
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(`Failed to get file ${this.id}`, response)
+    }
+
+    const prev_progress = this._progress
+    this._progress = (await response!.json() as {
+      progress: FileProgressDto
+    }).progress as FileProgressDto
+
+    if (prev_progress === undefined ||
+      (this.progress.success !== null && this.progress.completed_parts_count > prev_progress.completed_parts_count) ||
+      this.status === FileStatus.SUCCESS ||
+      this.status === FileStatus.FAILED) {
+      // dispatch event, file updated
+      this.dispatch({
+        type: FilesEvent.UPDATED,
+        data: this
+      })
+    }
+
+    this.fetchAfter()
+  }
+}

package/src/storages/files/file.ts

@@ -0,0 +1,49 @@
+import { FileProgressDto } from "../../dto/workspacesResponse"
+import { EventDispatcher } from "../../events"
+import { FilesEvent } from "./files"
+
+export type FileId = string
+
+export enum FileStatus {
+  UPLOADING = "uploading",
+  SUCCESS = "success",
+  FAILED = "failed"
+}
+
+/**
+ * File.
+ */
+export abstract class File extends EventDispatcher<
+  FilesEvent,
+  File
+> {
+  /**
+   * File id.
+   */
+  abstract get id(): FileId
+
+  /**
+   * File name.
+   */
+  abstract get name(): string
+
+  /**
+   * File date added.
+   */
+  abstract get createdAt(): number
+
+  /**
+   * File uploading progress
+   */
+  abstract get progress(): FileProgressDto
+
+  /**
+   * File uploading status
+   */
+  abstract get status(): FileStatus
+
+  /**
+   * Get temporary url.
+   */
+  abstract url(): Promise<string>
+}

package/src/storages/{files.impl.ts → files/files.impl.ts}

@@ -1,33 +1,14 @@
-import { Context } from "../context"
-import { Disposable } from "../disposable"
-import { FileDto, FileListResponse } from "../dto/workspacesResponse"
-import { OrganizationService } from "../services/organizationService"
-import { RpcService } from "../services/rpcService"
+import { Context } from "../../context"
+import { FileDto, FileListResponse } from "../../dto/workspacesResponse"
+import { RpcService } from "../../services/rpcService"
 import { FileImpl } from "./file.impl"
-import { File, Files, FilesEvent, FilesList as FilesPage } from "./files"
-import { WorkspaceImpl } from "./workspace.impl"
-import { ResponseUtils } from "../services/responseUtils"
-
-export class FilesPageImpl extends FilesPage implements Disposable {
-  private _isDisposed: boolean = false
-
-  public files: File[] = []
-  public total: number = 0
-  public filesPerPage: number = 0
-  public page: number = 0
-
-  get pages(): number {
-    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
-  }
-
-  get isDisposed(): boolean {
-    return this._isDisposed
-  }
-
-  dispose(): void {
-    this._isDisposed = true
-  }
-}
+import { Files, FilesEvent, UploadFile } from "./files"
+import { WorkspaceImpl } from "../workspaces/workspace.impl"
+import { ResponseUtils } from "../../services/responseUtils"
+import { File } from "./file"
+import { FilesPage } from "./filesPage"
+import { FilesPageImpl } from "./filesPage.impl"
+// import { FormData } from "../../utils/request"
 
 export class FilesImpl extends Files {
   constructor(
@@ -40,12 +21,18 @@ export class FilesImpl extends Files {
   // Object used as files page data, returned by "query"
   public filesList?: FilesPage
 
-  async upload(file: any): Promise<File> {
-    return await this.internalUpload(file)
+  async upload(files: UploadFile[]): Promise<File[]> {
+    const loaded_files = []
+    for (const file of files) {
+      loaded_files.push(await this.internalUpload(file))
+    }
+    return loaded_files
   }
 
-  async delete(id: string): Promise<void> {
-    return await this.internalDeleteFile(id)
+  async delete(ids: string[]): Promise<void> {
+    for (const id of ids) {
+      await this.internalDeleteFile(id)
+    }
   }
 
   async query(query: string, page: number, limit: number): Promise<FilesPage> {
@@ -57,7 +44,7 @@ export class FilesImpl extends Files {
   //----------------------------------------------------------------------------
 
   /**
-   * Delete organization.
+   * Delete file.
    * @param id
    */
   async internalDeleteFile(id: string): Promise<void> {
@@ -79,7 +66,7 @@ export class FilesImpl extends Files {
     const file = <FileImpl>this.filesList!.files.find(f => f.id === id)
     const index = this.filesList!.files.indexOf(file)
     if (index < 0) {
-      throw new Error("Organization delete, index is not found")
+      throw new Error("File delete, index is not found")
     }
 
     // remove file from collection
@@ -100,9 +87,16 @@ export class FilesImpl extends Files {
     page: number,
     limit: number
   ): Promise<FilesPage> {
+
+    // check page
     if (page === undefined || page === null) {
       throw new Error("File fetch, page is undefined or null")
     }
+    if (page < 0) {
+      throw new Error("File fetch, page is negative")
+    }
+
+    // check limit
     if (limit === undefined || limit === null) {
       throw new Error("File fetch, limit is undefined or null")
     }
@@ -110,23 +104,18 @@ export class FilesImpl extends Files {
       throw new Error("File fetch, limit is 0")
     }
 
-    const orgService = this.context.resolve(OrganizationService)
-
-    if (orgService === undefined) {
-      throw new Error("File fetch, organization service undefined")
-    }
-
+    // send request to the server
     const response = await this.context
       .resolve(RpcService)
       ?.requestBuilder("api/v1/Files/list")
-
       .searchParam("workspaceId", this.workspace.id)
-      .searchParam("organizationId", orgService.organizations.current)
+      .searchParam("organizationId", this.workspace.organization.id)
       .searchParam("query", query)
       .searchParam("page", page.toString())
       .searchParam("limit", limit.toString())
       .sendGet()
 
+    // check response status
     if (ResponseUtils.isFail(response)) {
       await ResponseUtils.throwError(
         `Files fetch query:${query}, page:${page}, limit:${limit}, failed`,
@@ -134,57 +123,70 @@ export class FilesImpl extends Files {
       )
     }
 
+    // parse files from the server's response
     const files = (await response!.json()) as FileListResponse
 
+    // create files list
     const filesList = new FilesPageImpl()
     filesList.total = files.totalFilesCount
     filesList.filesPerPage = files.filesPerPage
     filesList.page = page
+
+    // init files from the server's response
     for (const fl of files.files) {
-      const file = new FileImpl(this.context).initFrom(fl)
 
-      filesList.files.push(file)
+      // create file implementation
+      const file = await new FileImpl(this.context).initFrom(fl)
 
-      this.dispatch({
-        type: FilesEvent.ADDED,
-        data: file
-      })
+      // add file to the collection
+      filesList.files.push(file)
     }
 
+    // set files list
     this.filesList = filesList
 
     return filesList
   }
 
-  async internalUpload(file: any): Promise<File> {
-    const orgService = this.context.resolve(OrganizationService)
-
-    if (orgService === undefined) {
-      throw new Error("File load, organization service undefined")
+  async internalUpload(file: UploadFile): Promise<File> {
+    // check file
+    if (file === undefined || file === null) {
+      throw new Error("File upload, file is undefined or null")
     }
 
+    // form data to send
     const form = new FormData()
-    form.append("organizationId", orgService.organizations.current)
+    form.append("organizationId", this.workspace.organization.id)
     form.append("workspaceId", this.workspace.id)
     form.append("name", file.name)
     form.append("file", file, file.name)
 
+    // send request to the server
     const response = await this.context
       .resolve(RpcService)
       ?.requestBuilder("api/v1/Files")
-      .sendPost(form)
+      .sendPostFormData(form)
+
+    // check response status
     if (ResponseUtils.isFail(response)) {
-      await ResponseUtils.throwError(`File upload ${file}`, response)
+      await ResponseUtils.throwError(`File upload ${file.name}`, response)
     }
-    const result = (await response!.json()).file as FileDto
 
-    const fileImpl = new FileImpl(this.context).initFrom(result)
+    // parse file from the server's response
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
 
-    this.filesList!.files.push(file)
+    // create file implementation
+    const fileImpl = new FileImpl(this.context)
 
+    await fileImpl.initFrom(result)
+
+    // TODO: why is this here?
+    this.filesList?.files.push(fileImpl)
+
+    // dispatch event, file added
     this.dispatch({
       type: FilesEvent.ADDED,
-      data: file
+      data: fileImpl
     })
 
     return fileImpl

package/src/storages/files/files.ts

@@ -0,0 +1,39 @@
+import { EventDispatcher } from "../../events"
+import { File, FileId } from "./file"
+import { FilesPage } from "./filesPage"
+
+/**
+ * Files event.
+ */
+export enum FilesEvent {
+  ADDED = "added",
+  REMOVED = "removed",
+  UPDATED = "updated"
+}
+
+/**
+ * Upload file.
+ */
+export type UploadFile = globalThis.File
+
+/**
+ * Files storage.
+ */
+export abstract class Files extends EventDispatcher<FilesEvent, File> {
+  /**
+   * Upload file.
+   */
+  abstract upload(files: UploadFile[]): Promise<File[]>
+
+  /**
+   * Delete files.
+   * @param ids
+   */
+  abstract delete(ids: FileId[]): Promise<void>
+
+  /**
+   * Query files.
+   */
+  abstract query(query: string, page: number, limit: number): Promise<FilesPage>
+}
+

package/src/storages/files/filesPage.impl.ts

@@ -0,0 +1,37 @@
+import { FilesPage } from "./filesPage"
+import { Disposable } from "../../disposable"
+import { File } from "./file"
+
+export class FilesPageImpl extends FilesPage implements Disposable {
+  private _isDisposed: boolean = false
+
+  public files: File[] = []
+  public total: number = 0
+  public filesPerPage: number = 0
+  public page: number = 0
+
+  get pages(): number {
+    return Math.ceil(Math.max(this.total / this.filesPerPage, 1.0))
+  }
+
+  get isDisposed(): boolean {
+    return this._isDisposed
+  }
+
+  dispose(): void {
+    this._isDisposed = true
+  }
+
+  equals(other?: FilesPage | null): boolean {
+    if (other === undefined) return false
+    if (other === null) return false
+    if (other === this) return true
+    return (
+      other.pages === this.pages &&
+      other.total === this.total &&
+      other.page === this.page &&
+      (other.files === this.files ||
+        other.files.every((file, index) => file.id === this.files[index].id))
+    )
+  }
+}

package/src/storages/files/filesPage.ts

@@ -0,0 +1,33 @@
+import { File } from "./file"
+
+/**
+ * Files page.
+ */
+export abstract class FilesPage {
+
+  /**
+   * Get files.
+   */
+  abstract get files(): File[]
+
+  /**
+   * Get pages count.
+   */
+  abstract get pages(): number
+
+  /**
+   * Get total count.
+   */
+  abstract get total(): number
+
+  /**
+   * Get current page.
+   */
+  abstract get page(): number
+
+  /**
+   * Equals.
+   * @param other
+   */
+  abstract equals(other?: FilesPage | null): boolean
+}