@neuralinnovations/dataisland-sdk 0.0.1-dev2 → 0.0.1-dev21

package/src/services/middlewareService.ts

@@ -1,9 +1,9 @@
-import { Service } from './service'
-import { type Middleware } from '../middleware'
-import { type Disposable } from '../disposable'
+import { Service } from "./service"
+import { type Middleware } from "../middleware"
+import { type Disposable } from "../disposable"
 
 export class MiddlewareService extends Service {
-  _middlewares: Middleware[] = []
+  private _middlewares: Middleware[] = []
 
   public useMiddleware(middleware: Middleware): Disposable {
     this._middlewares.push(middleware)

package/src/services/organizationService.ts

@@ -1,126 +1,28 @@
-import { Service } from './service'
-import {
-  OrganizationEvent,
-  OrganizationId,
-  Organizations
-} from '../storages/organizations'
-import { OrganizationDto, UserSettings } from '../dto/userInfoResponse'
-import { RpcService } from './rpcService'
-import { OrganizationImpl } from './organizationImpl'
-import { OrganizationsImpl } from './organizationsImpl'
+import { Service } from "./service"
+import { Organizations } from "../storages/organizations/organizations"
+import { OrganizationDto, UserSettings } from "../dto/userInfoResponse"
+import { OrganizationsImpl } from "../storages/organizations/organizations.impl"
 
 export class OrganizationService extends Service {
-  private impl: OrganizationsImpl = new OrganizationsImpl(this)
+  private _impl?: OrganizationsImpl
+
+  private get impl(): OrganizationsImpl {
+    return this._impl ?? (this._impl = new OrganizationsImpl(this.context))
+  }
 
   get organizations(): Organizations {
     return this.impl
   }
 
-  initFrom(
-    settings: UserSettings,
+  async initFrom(
     adminInOrganization: string[],
-    organizations: OrganizationDto[]
-  ) {
-    this.impl.currentOrganizationId = settings.activeOrganizationId
-    for (const organization of organizations) {
-      const org = new OrganizationImpl(this, this.impl).initFrom(
-        organization,
-        adminInOrganization.includes(organization.id)
-      )
-      // add organization to collection
-      this.impl.organizations.push(org)
-
-      // dispatch event, organization added
-      this.impl.dispatch({
-        type: OrganizationEvent.ADDED,
-        data: org
-      })
-    }
-  }
-
-  async deleteOrganization(id: OrganizationId): Promise<void> {
-    if (id === undefined || id === null) {
-      throw new Error('Organization delete, id is undefined or null')
-    }
-    if (id.length === 0 || id.trim().length === 0) {
-      throw new Error('Organization delete, id is empty')
-    }
-    if (!this.impl.contains(id)) {
-      throw new Error(`Organization delete, id: ${id} is not found`)
-    }
-    const response = await this.resolve(RpcService)
-      ?.requestBuilder('/api/v1/Organizations')
-      .searchParam('id', id)
-      .sendDelete()
-    if (!response?.ok) {
-      let text: string = ''
-      try {
-        text = (await response?.text()) ?? ''
-      } catch (e) {
-        console.error(e)
-      }
-
-      throw new Error(
-        `Organization delete, response is not ok, status: ${response?.status},${response?.statusText} ${text}`
-      )
-    }
-    const org = <OrganizationImpl>this.impl.get(id)
-    const index = this.impl.organizations.indexOf(org)
-    if (index < 0) {
-      throw new Error('Organization delete, index is not found')
-    }
-
-    // remove organization from collection
-    this.impl.organizations.splice(index, 1)
-
-    // dispatch event, organization removed
-    this.impl.dispatch({
-      type: OrganizationEvent.REMOVED,
-      data: org
-    })
-
-    // dispose organization
-    org.dispose()
-  }
-
-  async createOrganization(
-    name: string,
-    description: string
-  ): Promise<OrganizationImpl> {
-    if (name === undefined || name === null) {
-      throw new Error('Organization create, name is undefined or null')
-    }
-    if (description === undefined || description === null) {
-      throw new Error('Organization create, description is undefined or null')
-    }
-    if (name.length === 0 || name.trim().length === 0) {
-      throw new Error('Organization create, name is empty')
-    }
-    const response = await this.resolve(RpcService)
-      ?.requestBuilder('api/v1/Organizations')
-      .sendPost({
-        profile: {
-          name: name,
-          description: description
-        }
-      })
-    if (!response?.ok) {
-      throw new Error('Organization create, response is not ok')
-    }
-    const content = (await response.json())['organization'] as OrganizationDto
-
-    // create organization and init from content
-    const org = new OrganizationImpl(this, this.impl).initFrom(content, true)
-
-    // add organization to collection
-    this.impl.organizations.push(org)
-
-    // dispatch event, organization added
-    this.impl.dispatch({
-      type: OrganizationEvent.ADDED,
-      data: org
-    })
-
-    return org
+    organizations: OrganizationDto[],
+    settings?: UserSettings | null
+  ): Promise<void> {
+    await this.impl.internalInitFrom(
+      adminInOrganization,
+      organizations,
+      settings
+    )
   }
 }

package/src/services/requestBuilder.ts

@@ -48,18 +48,42 @@ export class RequestBuilder {
     return this
   }
 
-  public async sendPost(body?: BodyInit | null | object): Promise<Response> {
+  public async sendPostFormData(body: FormData): Promise<Response> {
     const url = this._url
+
+    // set search params
     url.search = this._searchParams.toString()
-    if (body !== undefined && body !== null && typeof body === 'object') {
-      body = JSON.stringify(body)
+
+    // create request
+    const req = new Request(url, {
+      method: "POST",
+      headers: this._headers,
+      body
+    })
+
+    // discard content type
+    const reqAny = req as any
+    reqAny.discardContentType = true
+
+    return await this._request(
+      req
+    )
+  }
+
+  public async sendPostJson(body: object | null | undefined): Promise<Response> {
+    const url = this._url
+    url.search = this._searchParams.toString()
+    let json: string | null | undefined = null
+    if (body !== undefined && body !== null && typeof body === "object") {
+      json = JSON.stringify(body)
     }
+    const request = new Request(url, {
+      method: "POST",
+      headers: this._headers,
+      body: json
+    })
     return await this._request(
-      new Request(url, {
-        method: 'POST',
-        headers: this._headers,
-        body
-      })
+      request
     )
   }
 
@@ -68,7 +92,7 @@ export class RequestBuilder {
     url.search = this._searchParams.toString()
     return await this._request(
       new Request(url, {
-        method: 'GET',
+        method: "GET",
         headers: this._headers
       })
     )
@@ -79,23 +103,24 @@ export class RequestBuilder {
     url.search = this._searchParams.toString()
     return await this._request(
       new Request(url, {
-        method: 'DELETE',
+        method: "DELETE",
         headers: this._headers
       })
     )
   }
 
-  public async sendPut(body?: BodyInit | null | object): Promise<Response> {
+  public async sendPutJson(body: object | null | undefined): Promise<Response> {
     const url = this._url
     url.search = this._searchParams.toString()
-    if (body !== undefined && body !== null && typeof body === 'object') {
-      body = JSON.stringify(body)
+    let json: string | null | undefined = null
+    if (body !== undefined && body !== null && typeof body === "object") {
+      json = JSON.stringify(body)
     }
     return await this._request(
       new Request(url, {
-        method: 'PUT',
+        method: "PUT",
         headers: this._headers,
-        body
+        body: json
       })
     )
   }

package/src/services/responseUtils.ts

@@ -0,0 +1,32 @@
+export class ResponseUtils {
+  public static isOk(response?: Response | null): boolean {
+    return response !== undefined && response !== null && response.ok
+  }
+
+  public static isFail(response?: Response | null): boolean {
+    return !ResponseUtils.isOk(response)
+  }
+
+  public static async throwError(
+    message: string,
+    response: Response | undefined | null
+  ): Promise<void> {
+    if (response === undefined) {
+      throw new Error(`${message}. Response is undefined`)
+    }
+    if (response === null) {
+      throw new Error(`${message}. Response is null`)
+    }
+    let errorBody: string = ""
+    if (response) {
+      try {
+        errorBody = (await response.text()) ?? ""
+      } catch (e) {
+        console.error(e)
+      }
+    }
+    throw new Error(
+      `${message}. Response fail. Status: ${response?.status},${response?.statusText}, body: ${errorBody}`
+    )
+  }
+}

package/src/services/rpcService.ts

@@ -1,6 +1,6 @@
-import { Service, type ServiceContext } from './service'
-import { MiddlewareService } from './middlewareService'
-import { RequestBuilder } from './requestBuilder'
+import { Service, type ServiceContext } from "./service"
+import { MiddlewareService } from "./middlewareService"
+import { RequestBuilder } from "./requestBuilder"
 
 /**
  * Options for the RpcService.
@@ -14,6 +14,7 @@ export interface RequestOptions {
  * RPC service.
  */
 export class RpcService extends Service {
+
   constructor(
     serviceContext: ServiceContext,
     /**
@@ -32,6 +33,22 @@ export class RpcService extends Service {
     }
   ) {
     super(serviceContext)
+
+    serviceContext.onRegister = async () => {
+      serviceContext.resolve(MiddlewareService)?.useMiddleware((req, next) => {
+        if (!req.headers.has("accept")) {
+          req.headers.set("accept", "text/plain")
+        }
+
+        if ((req as any).discardContentType) {
+          delete (req as any).discardContentType
+        } else {
+          req.headers.set("content-type", "application/json")
+        }
+
+        return next(req)
+      })
+    }
   }
 
   /**
@@ -55,10 +72,10 @@ export class RpcService extends Service {
     if (this.options !== undefined && this.options.urlBuilder !== undefined) {
       return this.options.urlBuilder(path)
     }
-    if (this.host.endsWith('/') && path.startsWith('/')) {
+    if (this.host.endsWith("/") && path.startsWith("/")) {
       return new URL(`${this.host}${path.slice(1)}`)
     }
-    if (!this.host.endsWith('/') && !path.startsWith('/')) {
+    if (!this.host.endsWith("/") && !path.startsWith("/")) {
       return new URL(`${this.host}/${path}`)
     }
     return new URL(`${this.host}${path}`)
@@ -87,35 +104,35 @@ export class RpcService extends Service {
   /**
    * Send a POST request.
    * @param path
-   * @param body
+   * @param body JSON object
    * @param options
    */
   async post(
     path: string,
-    body?: BodyInit | null,
+    body: object | null | undefined,
     options?: RequestOptions
   ): Promise<Response> {
     return this.requestBuilder(path)
       .searchParams(options?.searchParams)
       .headers(options?.headers)
-      .sendPost(body)
+      .sendPostJson(body)
   }
 
   /**
    * Send a PUT request.
    * @param path
-   * @param body
+   * @param body JSON object
    * @param options
    */
   async put(
     path: string,
-    body?: BodyInit | null,
+    body: object | null | undefined,
     options?: RequestOptions
   ): Promise<Response> {
     return this.requestBuilder(path)
       .searchParams(options?.searchParams)
       .headers(options?.headers)
-      .sendPut(body)
+      .sendPutJson(body)
   }
 
   /**

package/src/services/service.ts

@@ -1,12 +1,13 @@
-import { type Context } from '../context'
-import { type Constructor } from '../internal/registry'
-import { type DisposableContainer, type Lifetime } from '../disposable'
+import { type Context } from "../context"
+import { type Constructor } from "../internal/registry"
+import { type DisposableContainer, type Lifetime } from "../disposable"
 
 export class ServiceContext {
   constructor(
     public readonly context: Context,
     private readonly disposableContainer: DisposableContainer
-  ) {}
+  ) {
+  }
 
   public get lifetime(): Lifetime {
     return this.disposableContainer.lifetime
@@ -16,15 +17,15 @@ export class ServiceContext {
     return this.context.resolve(type)
   }
 
-  public async onRegister(): Promise<void> {
+  public onRegister: () => Promise<void> = async (): Promise<void> => {
     await Promise.resolve()
   }
 
-  public async onStart(): Promise<void> {
+  public onStart: () => Promise<void> = async (): Promise<void> => {
     await Promise.resolve()
   }
 
-  public onUnregister(): void {
+  public onUnregister: () => void = (): void => {
     // do nothing
   }
 }
@@ -42,5 +43,6 @@ export abstract class Service {
     return this.serviceContext.context
   }
 
-  public constructor(private readonly serviceContext: ServiceContext) {}
+  public constructor(private readonly serviceContext: ServiceContext) {
+  }
 }

package/src/services/userProfileService.ts

@@ -1,62 +1,10 @@
-import { Service } from './service'
-import { RpcService } from './rpcService'
-import { UserEvent, UserProfile } from '../storages/userProfile'
-import { UserInfoResponse } from '../dto/userInfoResponse'
-import { OrganizationService } from './organizationService'
-
-class UserProfileImpl extends UserProfile {
-  private content?: UserInfoResponse
-
-  get id(): string {
-    if (this.content) {
-      return this.content.user.id
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  get name(): string {
-    if (this.content) {
-      return this.content.user.profile.name
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  get email(): string {
-    if (this.content) {
-      return this.content.user.profile.email
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  get isDeleted(): boolean {
-    if (this.content) {
-      return this.content.user.isDeleted
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  get createdAt(): Date {
-    if (this.content) {
-      return new Date(this.content.user.created_at)
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  get modifiedAt(): Date {
-    if (this.content) {
-      return new Date(this.content.user.modified_at)
-    }
-    throw new Error('The profile is not loaded.')
-  }
-
-  initFrom(content: UserInfoResponse) {
-    this.content = content
-    this.dispatch({
-      type: UserEvent.CHANGED,
-      data: this
-    })
-  }
-}
+import { Service } from "./service"
+import { RpcService } from "./rpcService"
+import { UserProfile } from "../storages/user/userProfile"
+import { UserInfoResponse } from "../dto/userInfoResponse"
+import { OrganizationService } from "./organizationService"
+import { UserProfileImpl } from "../storages/user/userProfile.impl"
+import { ResponseUtils } from "./responseUtils"
 
 export class UserProfileService extends Service {
   private readonly impl: UserProfileImpl = new UserProfileImpl()
@@ -65,22 +13,26 @@ export class UserProfileService extends Service {
     return this.impl
   }
 
-  async fetch(fireError: boolean = true) {
+  async fetch() {
     const rpc = this.resolve(RpcService) as RpcService
-    const response = await rpc.requestBuilder('api/v1/Users/self2').sendGet()
-    if (fireError && !response.ok) {
-      throw new Error('Failed to fetch user profile.')
+    const response = await rpc.requestBuilder("api/v1/Users/self2").sendGet()
+    if (ResponseUtils.isFail(response)) {
+      await ResponseUtils.throwError("Failed to fetch user profile", response)
     }
     const content = (await response.json()) as UserInfoResponse
+
+    // init user profile from the server's response
     this.impl.initFrom(content)
 
     const organizationService = this.resolve(
       OrganizationService
     ) as OrganizationService
-    organizationService.initFrom(
-      content.user.settings,
+
+    // init organization service from user profile
+    await organizationService.initFrom(
       content.adminInOrganization,
-      content.organizations
+      content.organizations,
+      content.user.settings
     )
   }
 }