@neuralinnovations/dataisland-sdk 0.0.1-dev4 → 0.0.1-dev40

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

@@ -0,0 +1,111 @@
+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"
+import { isNullOrUndefined } from "../../utils/utils"
+
+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 modifiedAt(): number {
+    return <number>this._content?.modifiedAt
+  }
+  
+  get url(): string {
+    return <string>this._content?.url
+  }
+
+  get previewUrl(): string {
+    return <string>this._content?.previewUrl
+  }
+
+  get progress(): FileProgressDto {
+    return <FileProgressDto>this._progress
+  }
+
+  get status(): FileStatus {
+
+    if (
+      isNullOrUndefined(this._progress) || isNullOrUndefined(this._progress.success)
+      || (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
+    }
+  }
+
+  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 (isNullOrUndefined(prev_progress) ||
+      (!isNullOrUndefined(this.progress.success) && 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,58 @@
+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 date modified.
+   */
+  abstract get modifiedAt(): number
+  /**
+   * File uploading progress
+   */
+  abstract get progress(): FileProgressDto
+
+  /**
+   * File uploading status
+   */
+  abstract get status(): FileStatus
+
+  /**
+   * Get temporary url.
+   */
+  abstract get url(): string
+
+  /**
+   * Get temporary url.
+   */
+  abstract get previewUrl(): string
+}

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

@@ -1,34 +1,14 @@
-import { Context } from "../context"
-import { Disposable } from "../disposable"
-import { FileDto, FileListResponse } from "../dto/workspacesResponse"
-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 { Files, FilesEvent, UploadFile } from "./files"
-import { WorkspaceImpl } from "./workspace.impl"
-import { ResponseUtils } from "../services/responseUtils"
+import { WorkspaceImpl } from "../workspaces/workspace.impl"
+import { ResponseUtils } from "../../services/responseUtils"
 import { File } from "./file"
 import { FilesPage } from "./filesPage"
-
-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 { FilesPageImpl } from "./filesPage.impl"
+// import { FormData } from "../../utils/request"
 
 export class FilesImpl extends Files {
   constructor(
@@ -41,12 +21,25 @@ 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) {
+      const loaded_file = await this.internalUpload(file)
+      if (loaded_file != undefined){
+        loaded_files.push(loaded_file)
+      }
+    }
+    return loaded_files
+  }
+
+  async get(fileId: string): Promise<File>{
+    return await this.internalGetFile(fileId)
   }
 
-  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,8 +50,39 @@ export class FilesImpl extends Files {
   // INTERNALS
   //----------------------------------------------------------------------------
 
+
+  async internalGetFile(id: string): Promise<File>{
+    if (id === undefined || id === null) {
+      throw new Error("File get, id is undefined or null")
+    }
+    if (id.length === 0 || id.trim().length === 0) {
+      throw new Error("File get, id is empty")
+    }
+
+    const response = await this.context
+      .resolve(RpcService)
+      ?.requestBuilder("api/v1/Files")
+      .searchParam("id", id)
+      .sendGet()
+
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError(
+        `Failed to get file ${id}`,
+        response
+      )
+    }
+
+    // parse file from the server's response
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
+
+    // create file implementation
+    const fileImpl = new FileImpl(this.context)
+
+    return await fileImpl.initFrom(result)
+  }
+
   /**
-   * Delete organization.
+   * Delete file.
    * @param id
    */
   async internalDeleteFile(id: string): Promise<void> {
@@ -74,13 +98,14 @@ export class FilesImpl extends Files {
       ?.requestBuilder("/api/v1/Files")
       .searchParam("id", id)
       .sendDelete()
+      
     if (ResponseUtils.isFail(response)) {
       await ResponseUtils.throwError(`File ${id} delete, failed`, response)
     }
     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
@@ -122,7 +147,6 @@ export class FilesImpl extends Files {
     const response = await this.context
       .resolve(RpcService)
       ?.requestBuilder("api/v1/Files/list")
-
       .searchParam("workspaceId", this.workspace.id)
       .searchParam("organizationId", this.workspace.organization.id)
       .searchParam("query", query)
@@ -151,16 +175,10 @@ export class FilesImpl extends Files {
     for (const fl of files.files) {
 
       // create file implementation
-      const file = new FileImpl(this.context).initFrom(fl)
+      const file = await new FileImpl(this.context).initFrom(fl)
 
       // add file to the collection
       filesList.files.push(file)
-
-      // dispatch event, file added
-      this.dispatch({
-        type: FilesEvent.ADDED,
-        data: file
-      })
     }
 
     // set files list
@@ -169,7 +187,7 @@ export class FilesImpl extends Files {
     return filesList
   }
 
-  async internalUpload(file: UploadFile): Promise<File> {
+  async internalUpload(file: UploadFile): Promise<File | undefined> {
     // check file
     if (file === undefined || file === null) {
       throw new Error("File upload, file is undefined or null")
@@ -190,17 +208,20 @@ export class FilesImpl extends Files {
 
     // check response status
     if (ResponseUtils.isFail(response)) {
+      if (await ResponseUtils.isLimitReached()){
+        return undefined
+      }
+      
       await ResponseUtils.throwError(`File upload ${file.name}`, response)
     }
 
     // parse file from the server's response
-    const result = (await response!.json()).file as FileDto
+    const result = (await response!.json() as { file: FileDto }).file as FileDto
 
     // create file implementation
-    const fileImpl = new FileImpl(this.context).initFrom(result)
+    const fileImpl = new FileImpl(this.context)
 
-    // TODO: why is this here?
-    this.filesList?.files.push(fileImpl)
+    await fileImpl.initFrom(result)
 
     // dispatch event, file added
     this.dispatch({

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

@@ -1,4 +1,4 @@
-import { EventDispatcher } from "../events"
+import { EventDispatcher } from "../../events"
 import { File, FileId } from "./file"
 import { FilesPage } from "./filesPage"
 
@@ -7,7 +7,8 @@ import { FilesPage } from "./filesPage"
  */
 export enum FilesEvent {
   ADDED = "added",
-  REMOVED = "removed"
+  REMOVED = "removed",
+  UPDATED = "updated"
 }
 
 /**
@@ -20,15 +21,21 @@ export type UploadFile = globalThis.File
  */
 export abstract class Files extends EventDispatcher<FilesEvent, File> {
   /**
-   * Get file by id.
+   * Upload file.
    */
-  abstract upload(file: UploadFile): Promise<File>
+  abstract upload(files: UploadFile[]): Promise<File[]>
 
   /**
-   * Delete file.
-   * @param id
+   * Get file by ID
+   * @param fileId 
    */
-  abstract delete(id: FileId): Promise<void>
+  abstract get(fileId: FileId): Promise<File>
+
+  /**
+   * Delete files.
+   * @param ids
+   */
+  abstract delete(ids: FileId[]): Promise<void>
 
   /**
    * Query files.

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/{filesPage.ts → files/filesPage.ts}

@@ -24,4 +24,10 @@ export abstract class FilesPage {
    * Get current page.
    */
   abstract get page(): number
+
+  /**
+   * Equals.
+   * @param other
+   */
+  abstract equals(other?: FilesPage | null): boolean
 }