@neuralinnovations/dataisland-sdk 0.0.1-dev26 → 0.0.1-dev28

package/src/internal/app.impl.ts

@@ -7,7 +7,11 @@ import { DisposableContainer, type Lifetime } from "../disposable"
 import { type Service, ServiceContext } from "../services/service"
 import { CredentialService } from "../services/credentialService"
 import { MiddlewareService } from "../services/middlewareService"
-import { type CredentialBase } from "../credentials"
+import {
+  DefaultCredential,
+  type CredentialBase,
+  AnonymousCredential
+} from "../credentials"
 import { DataIslandApp } from "../dataIslandApp"
 import { RpcService } from "../services/rpcService"
 import { CommandService } from "../services/commandService"
@@ -24,6 +28,8 @@ import {
   DeleteUserFullCommand,
   DeleteUserFullCommandHandler
 } from "../commands/deleteUserFullCommandHandler"
+import { CookieService } from "../services/cookieService"
+import { AnonymousService } from "../services/anonymousService"
 
 export class DataIslandAppImpl extends DataIslandApp {
   readonly name: string
@@ -38,7 +44,7 @@ export class DataIslandAppImpl extends DataIslandApp {
     this.name = name
     this._registry = new Registry()
     this._disposable = new DisposableContainer()
-    this._context = new Context(this._registry, this._disposable.lifetime, name)
+    this._context = new Context(this._registry, this._disposable.lifetime, this)
 
     this._registry.map(Context).asValue(this._context)
   }
@@ -92,6 +98,9 @@ export class DataIslandAppImpl extends DataIslandApp {
     })
 
     // register services
+    builder.registerService(CookieService, (context: ServiceContext) => {
+      return new CookieService(context)
+    })
     builder.registerService(CredentialService, (context: ServiceContext) => {
       return new CredentialService(context)
     })
@@ -110,6 +119,9 @@ export class DataIslandAppImpl extends DataIslandApp {
     builder.registerService(OrganizationService, (context: ServiceContext) => {
       return new OrganizationService(context)
     })
+    builder.registerService(AnonymousService, (context: ServiceContext) => {
+      return new AnonymousService(context)
+    })
 
     // call customer setup
     if (setup !== undefined) {
@@ -146,8 +158,6 @@ export class DataIslandAppImpl extends DataIslandApp {
       this.resolve(CommandService)?.register(command[0], command[1])
     })
 
-    this.credential = builder.credential
-
     //-------------------------------------------------------------------------
     // register services
     //-------------------------------------------------------------------------
@@ -178,6 +188,22 @@ export class DataIslandAppImpl extends DataIslandApp {
     await Promise.all(waitList)
     //-------------------------------------------------------------------------
 
+    // set credential
+    this.credential = builder.credential
+
+    // Check anonymous authorization
+    if (!isUnitTest(UnitTest.DO_NOT_START) && builder.credential instanceof DefaultCredential) {
+      const anonymous = this.resolve(AnonymousService)!
+      const {
+        token,
+        isValid
+      } = await anonymous.getToken()
+
+      if (isValid) {
+        this.credential = new AnonymousCredential(token)
+      }
+    }
+
     // start app, execute start command
     if (!isUnitTest(UnitTest.DO_NOT_START)) {
       await this.context.execute(new StartCommand())

package/src/middleware.ts

@@ -1,3 +1,6 @@
+// import { Request } from "./services/request"
+import { Request } from "node-fetch"
+import { Response } from "node-fetch"
 /**
  * DataIsland App request middleware.
  */

package/src/services/anonymousService.ts

@@ -0,0 +1,43 @@
+import { Service } from "./service"
+import { CookieService } from "./cookieService"
+import { createFingerprint } from "../utils/browserUtils"
+import { RpcService } from "./rpcService"
+import { ResponseUtils } from "./responseUtils"
+
+export class AnonymousService extends Service {
+
+  async getToken(): Promise<{ token: string, isValid: boolean }> {
+    const cookie = this.resolve(CookieService)!
+    let token = cookie.anonymousToken
+    if (token === undefined || token === null || token.length === 0) {
+      const fingerprint = createFingerprint()
+      const response = await this.context
+        .resolve(RpcService)
+        ?.requestBuilder("api/v1/Users/anonymous")
+        .sendPutJson({
+          info: {
+            fingerprint: JSON.stringify({
+              userAgent: fingerprint.get("userAgent"),
+              language: fingerprint.get("language"),
+              hardwareConcurrency: fingerprint.get("hardware_concurrency"),
+              cookieEnabled: fingerprint.get("cookie_enabled"),
+              pixelRatio: fingerprint.get("pixel_ratio")
+            })
+          }
+        })
+
+      if (ResponseUtils.isFail(response)) {
+        await ResponseUtils.throwError("Failed to create anonymous token", response)
+      }
+
+      token = (await response!.json() as { token: string }).token
+
+      cookie.anonymousToken = token!
+    }
+
+    return {
+      token: token!,
+      isValid: token !== undefined && token !== null && token.length > 0
+    }
+  }
+}

package/src/services/commandService.ts

@@ -3,7 +3,8 @@ import { Context } from "../context"
 import { Constructor } from "../internal/registry"
 
 export abstract class CommandHandler<T> {
-  constructor(protected readonly context: Context) {}
+  constructor(protected readonly context: Context) {
+  }
 
   resolve<T>(type: Constructor<T>): T | undefined {
     return this.context.resolve<T>(type)
@@ -12,7 +13,8 @@ export abstract class CommandHandler<T> {
   abstract execute(message: T): Promise<void>
 }
 
-export abstract class Command {}
+export abstract class Command {
+}
 
 export class CommandService extends Service {
   private readonly _registry: Map<

package/src/services/cookieService.ts

@@ -0,0 +1,16 @@
+import { Service } from "./service"
+import { getCookie, setCookie } from "../utils/browserUtils"
+
+export class CookieService extends Service {
+  get anonymousToken(): string | undefined {
+    return getCookie("anonymous-token")
+  }
+
+  get anonymousTokenIsValid(): boolean {
+    return this.anonymousToken !== undefined && this.anonymousToken !== null && this.anonymousToken.length > 0
+  }
+
+  set anonymousToken(value: string | undefined) {
+    setCookie("anonymous-token", value)
+  }
+}

package/src/services/httpMethod.ts

@@ -0,0 +1 @@
+export type HttpMethod = "POST" | "GET" | "PUT" | "DELETE" | "PATCH"

package/src/services/middlewareService.ts

@@ -1,6 +1,8 @@
 import { Service } from "./service"
 import { type Middleware } from "../middleware"
 import { type Disposable } from "../disposable"
+import { Request } from "node-fetch"
+import { Response } from "node-fetch"
 
 export class MiddlewareService extends Service {
   private _middlewares: Middleware[] = []

package/src/services/requestBuilder.ts

@@ -1,3 +1,6 @@
+import { Request, Response, Headers } from "node-fetch"
+import FormData from "form-data"
+
 export class RequestBuilder {
   private readonly _headers: Headers
   private readonly _searchParams: URLSearchParams
@@ -58,7 +61,7 @@ export class RequestBuilder {
     const req = new Request(url, {
       method: "POST",
       headers: this._headers,
-      body
+      body: body
     })
 
     // discard content type
@@ -73,7 +76,7 @@ export class RequestBuilder {
   public async sendPostJson(body: object | null | undefined): Promise<Response> {
     const url = this._url
     url.search = this._searchParams.toString()
-    let json: string | null | undefined = null
+    let json: string | undefined = undefined
     if (body !== undefined && body !== null && typeof body === "object") {
       json = JSON.stringify(body)
     }
@@ -112,7 +115,7 @@ export class RequestBuilder {
   public async sendPutJson(body: object | null | undefined): Promise<Response> {
     const url = this._url
     url.search = this._searchParams.toString()
-    let json: string | null | undefined = null
+    let json: string | undefined = undefined
     if (body !== undefined && body !== null && typeof body === "object") {
       json = JSON.stringify(body)
     }

package/src/services/responseUtils.ts

@@ -1,3 +1,5 @@
+import { Response } from "node-fetch"
+
 export class ResponseUtils {
   public static isOk(response?: Response | null): boolean {
     return response !== undefined && response !== null && response.ok

package/src/services/rpcService.ts

@@ -1,6 +1,8 @@
 import { Service, type ServiceContext } from "./service"
 import { MiddlewareService } from "./middlewareService"
 import { RequestBuilder } from "./requestBuilder"
+import { Request, Response, Headers } from "node-fetch"
+import fetch from "node-fetch"
 
 /**
  * Options for the RpcService.

package/src/services/userProfileService.ts

@@ -13,6 +13,20 @@ export class UserProfileService extends Service {
     return this.impl
   }
 
+  async merge(anonymous_token: string) {
+    const rpc = this.resolve(RpcService) as RpcService
+    const response = await rpc.requestBuilder("api/v1/Users/anonymous/merge")
+      .sendPostJson({
+        anonymousToken: anonymous_token
+      })
+
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError("Failed to merge anonymous user", response)
+    }
+
+    await this.fetch()
+  }
+
   async fetch() {
     const rpc = this.resolve(RpcService) as RpcService
     const response = await rpc.requestBuilder("api/v1/Users/self2").sendGet()

package/src/storages/chats/answer.impl.ts

@@ -20,6 +20,7 @@ export class AnswerImpl extends Answer {
   private _question?: string
   private _sources?: SourceDto[]
   private _answer?: string
+  private _timestamp?: number
 
   constructor(
     private readonly chat: Chat,
@@ -32,6 +33,7 @@ export class AnswerImpl extends Answer {
     this._question = answer.question
     this._answer = answer.context
     this._sources = answer.sources
+    this._timestamp = answer.timestamp
 
     return this
   }
@@ -66,6 +68,10 @@ export class AnswerImpl extends Answer {
     return <string>this._answer
   }
 
+  get timestamp(): number {
+    return <number>this._timestamp
+  }
+
   public fetchAfter() {
     if (this._status === undefined || this._status === AnswerStatus.RUNNING) {
       setTimeout(async () => await this.fetch(), 300)
@@ -102,18 +108,31 @@ export class AnswerImpl extends Answer {
 
     if (this.getStep(StepType.GENERATE_ANSWER) !== undefined) {
       const step = this.getStep(StepType.GENERATE_ANSWER)
-      this._answer = step?.tokens.join("")
+      const step_tokens = step?.tokens.join("")
+      if (this._answer !== step_tokens) {
+        this._answer = step_tokens
+
+        this.dispatch({
+          type: AnswerEvent.UPDATED,
+          data: this
+        })
+      }
     }
 
-    if (this.getStep(StepType.SOURCES) !== undefined) {
+    if (this.getStep(StepType.SOURCES) !== undefined && this._sources === undefined) {
       const sources_step = this.getStep(StepType.SOURCES)
       this._sources = sources_step?.sources
+
+      this.dispatch({
+        type: AnswerEvent.UPDATED,
+        data: this
+      })
     }
 
-    this.dispatch({
-      type: AnswerEvent.UPDATED,
-      data: this
-    })
+    if (this.getStep(StepType.DONE) !== undefined) {
+      const step = this.getStep(StepType.DONE)
+      this._timestamp = Date.parse(step!.end_at)
+    }
 
     this.fetchAfter()
   }

package/src/storages/chats/answer.ts

@@ -41,6 +41,11 @@ export abstract class Answer extends EventDispatcher<AnswerEvent, Answer> {
    */
   abstract get sources(): SourceDto[]
 
+  /**
+   * Answer time.
+   */
+  abstract get timestamp(): number
+
   /**
    * Cancel answer
    */

package/src/storages/chats/chat.impl.ts

@@ -77,7 +77,7 @@ export class ChatImpl extends Chat implements Disposable {
     }
 
     // parse answer id from the server's response
-    const id = (await response!.json()).id
+    const id = (await response!.json() as { id: string }).id
 
     // create answer implementation
     const answer = await new AnswerImpl(this, this.context).initNew(id, message)

package/src/storages/chats/chats.impl.ts

@@ -84,7 +84,9 @@ export class ChatsImpl extends Chats {
     }
 
     // parse workspace from the server's response
-    const content = (await response!.json()).chat as ChatDto
+    const content = (await response!.json() as {
+      chat: ChatDto
+    }).chat as ChatDto
 
     // create workspace implementation
     const chat = new ChatImpl(this.context, this.organization)

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

@@ -3,22 +3,23 @@ import { Disposable } from "../../disposable"
 import { FileDto, FileProgressDto } from "../../dto/workspacesResponse"
 import { RpcService } from "../../services/rpcService"
 import { ResponseUtils } from "../../services/responseUtils"
-import { File } from "./file"
+import { File, FileStatus } from "./file"
 import { FilesEvent } from "./files"
 
 export class FileImpl extends File implements Disposable {
   private _isDisposed: boolean = false
   private _content?: FileDto
-  private _status?: FileProgressDto
-
+  private _progress?: FileProgressDto
 
   constructor(private readonly context: Context) {
     super()
   }
 
-  public initFrom(file: FileDto): File {
+  async initFrom(file: FileDto): Promise<File> {
     this._content = file
 
+    await this.updateStatus()
+
     return this
   }
 
@@ -42,8 +43,19 @@ export class FileImpl extends File implements Disposable {
     return <number>this._content?.createdAt
   }
 
-  get status(): FileProgressDto {
-    return <FileProgressDto>this._status
+  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> {
@@ -60,7 +72,13 @@ export class FileImpl extends File implements Disposable {
       )
     }
 
-    return (await response!.json()).url
+    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> {
@@ -74,14 +92,22 @@ export class FileImpl extends File implements Disposable {
       await ResponseUtils.throwError(`Failed to get file ${this.id}`, response)
     }
 
-    this._status = (await response!.json()).progress as FileProgressDto
-
-
-    // dispatch event, file updated
-    this.dispatch({
-      type: FilesEvent.UPDATED,
-      data: this
-    })
+    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

@@ -4,12 +4,18 @@ 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
+  FilesEvent,
+  File
 > {
   /**
    * File id.
@@ -26,15 +32,18 @@ File
    */
   abstract get createdAt(): number
 
-  abstract get status(): FileProgressDto
+  /**
+   * File uploading progress
+   */
+  abstract get progress(): FileProgressDto
 
   /**
-   * Get temporary url.
+   * File uploading status
    */
-  abstract url(): Promise<string>
+  abstract get status(): FileStatus
 
   /**
-   * Get file status.
+   * Get temporary url.
    */
-  abstract updateStatus(): Promise<void>
+  abstract url(): Promise<string>
 }

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

@@ -8,6 +8,7 @@ import { ResponseUtils } from "../../services/responseUtils"
 import { File } from "./file"
 import { FilesPage } from "./filesPage"
 import { FilesPageImpl } from "./filesPage.impl"
+import FormData from "form-data"
 
 export class FilesImpl extends Files {
   constructor(
@@ -20,16 +21,16 @@ export class FilesImpl extends Files {
   // Object used as files page data, returned by "query"
   public filesList?: FilesPage
 
-  async upload(files: any[]): Promise<File[]> {
+  async upload(files: UploadFile[]): Promise<File[]> {
     const loaded_files = []
-    for ( const file of files ){
+    for (const file of files) {
       loaded_files.push(await this.internalUpload(file))
     }
     return loaded_files
   }
 
   async delete(ids: string[]): Promise<void> {
-    for ( const id of ids ){
+    for (const id of ids) {
       await this.internalDeleteFile(id)
     }
   }
@@ -135,7 +136,7 @@ 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)
@@ -158,7 +159,7 @@ export class FilesImpl extends Files {
     form.append("organizationId", this.workspace.organization.id)
     form.append("workspaceId", this.workspace.id)
     form.append("name", file.name)
-    form.append("file", file, file.name)
+    form.append("file", file.stream, file.name)
 
     // send request to the server
     const response = await this.context
@@ -172,10 +173,12 @@ export class FilesImpl extends Files {
     }
 
     // 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)
+
+    await fileImpl.initFrom(result)
 
     // TODO: why is this here?
     this.filesList?.files.push(fileImpl)

package/src/storages/files/files.ts

@@ -14,7 +14,11 @@ export enum FilesEvent {
 /**
  * Upload file.
  */
-export type UploadFile = globalThis.File
+export type UploadFile = {
+  name: string
+  type: "application/pdf"
+  stream: ReadableStream
+}
 
 /**
  * Files storage.

package/src/storages/groups/group.impl.ts

@@ -38,7 +38,7 @@ export class GroupImpl extends Group implements Disposable {
 
     // wait for all promises
     await Promise.all([groupPromise, workspacePromise])
-    
+
     return this
   }
 

package/src/storages/organizations/organization.impl.ts

@@ -94,7 +94,9 @@ export class OrganizationImpl extends Organization implements Disposable {
       )
     }
 
-    return (await response!.json()).members as UserDto[]
+    return (await response!.json() as {
+      members: UserDto[]
+    }).members as UserDto[]
   }
 
   async change(name: string, description: string): Promise<void> {
@@ -143,7 +145,7 @@ export class OrganizationImpl extends Organization implements Disposable {
       data: this
     })
   }
-  
+
   async createInviteLink(emails: string[], accessGroups: string[]): Promise<void> {
     const response = await this.context
       .resolve(RpcService)

package/src/storages/organizations/organization.ts

@@ -6,7 +6,6 @@ import { EventDispatcher } from "../../events"
 import { UserDto } from "../../dto/userInfoResponse"
 import { GroupId } from "../groups/group"
 
-
 /**
  * Organization event.
  */
@@ -18,9 +17,9 @@ export enum OrganizationEvent {
  * Organization.
  */
 export abstract class Organization extends EventDispatcher<
-OrganizationEvent,
-Organization
->  {
+  OrganizationEvent,
+  Organization
+> {
   /**
    * Organization id.
    */

package/src/storages/organizations/organizations.impl.ts

@@ -147,7 +147,9 @@ export class OrganizationsImpl extends Organizations {
         response
       )
     }
-    const content = (await response!.json()).organization as OrganizationDto
+    const content = (await response!.json() as {
+      organization: OrganizationDto
+    }).organization as OrganizationDto
 
     // create organization and init from content
     const org = await new OrganizationImpl(this.context).initFrom(content, true)

package/src/storages/user/userProfile.impl.ts

@@ -32,6 +32,13 @@ export class UserProfileImpl extends UserProfile {
     throw new Error("The profile is not loaded.")
   }
 
+  get isAnonymous(): boolean {
+    if (this.content) {
+      return this.content.user.isAnonymousMode
+    }
+    throw new Error("The profile is not loaded.")
+  }
+
   get createdAt(): Date {
     if (this.content) {
       return new Date(this.content.user.created_at)

package/src/storages/user/userProfile.ts

@@ -30,6 +30,11 @@ export abstract class UserProfile extends EventDispatcher<
    */
   abstract get isDeleted(): boolean
 
+  /**
+   * Is user anonymous
+   */
+  abstract get isAnonymous(): boolean
+
   /**
    * Created at.
    */

package/src/storages/workspaces/workspace.impl.ts

@@ -63,7 +63,7 @@ export class WorkspaceImpl extends Workspace {
       )
     }
 
-    return (await response!.json()).count
+    return ((await response!.json()) as { count: number }).count
   }
 
   async change(name: string, description: string): Promise<void> {