polfan-server-js-client 0.1.99906 → 0.1.99908

package/build/types/AbstractRestClient.d.ts

@@ -13,7 +13,9 @@ export declare abstract class AbstractRestClient {
     protected abstract defaultUrl: string;
     constructor(options: RestClientOptions);
     protected send<ResponseT = any>(method: HttpMethod, uri: string, data?: any): Promise<RestClientResponse<ResponseT>>;
+    protected getHeaders(): any;
     protected getUrl(uri: string): string;
+    protected convertFetchResponse<T>(result: Response): Promise<RestClientResponse<T>>;
     private removeStartingSlash;
     private removeEndingSlash;
 }

package/build/types/FilesClient.d.ts

@@ -0,0 +1,13 @@
+import { AbstractRestClient, RestClientResponse } from "./AbstractRestClient";
+export interface File {
+    id: string;
+    url: string;
+    original_name: string;
+    mime_type: string;
+    size: number;
+}
+export declare class FilesClient extends AbstractRestClient {
+    protected defaultUrl: string;
+    uploadFile(file: Parameters<typeof FormData.prototype.append>[1]): Promise<RestClientResponse<File>>;
+    getFileMetadata(id: string): Promise<RestClientResponse<File>>;
+}

package/build/types/index.d.ts

@@ -1,8 +1,9 @@
 import { WebSocketChatClient } from "./WebSocketChatClient";
 import { WebApiChatClient } from "./WebApiChatClient";
 import { IndexedCollection, IndexedObjectCollection, ObservableIndexedCollection, ObservableIndexedObjectCollection } from "./IndexedObjectCollection";
-import { AuthClient } from "./AuthClient";
+import { AuthClient, MyAccountInterface, TokenInterface } from "./AuthClient";
+import { FilesClient, File } from "./FilesClient";
 import { Permissions, PermissionDefinition, Layer } from "./Permissions";
 import * as ChatTypes from './types/src';
-export { IndexedCollection, ObservableIndexedCollection, IndexedObjectCollection, ObservableIndexedObjectCollection, Permissions, PermissionDefinition, Layer, WebSocketChatClient, WebApiChatClient, AuthClient, };
+export { IndexedCollection, ObservableIndexedCollection, IndexedObjectCollection, ObservableIndexedObjectCollection, Permissions, PermissionDefinition, Layer, WebSocketChatClient, WebApiChatClient, AuthClient, MyAccountInterface, TokenInterface, FilesClient, File };
 export type { ChatTypes };

package/build/types/state-tracker/MessagesManager.d.ts

@@ -18,7 +18,7 @@ export declare class MessagesManager {
      * Then you can get them using getRoomFollowedTopics().
      * @see getRoomFollowedTopics
      */
-    cacheSpaceFollowedTopics(spaceId: string): Promise<void>;
+    cacheSpaceFollowedTopics(spaceId: string | null): Promise<void>;
     /**
      * Get followed topics for the given room.
      * @return Undefined if you are not in the room, collection otherwise.

package/build/types/types/src/schemes/Message.d.ts

@@ -11,4 +11,5 @@ export interface Message {
     user: User;
     content?: string;
     topicRef: string | null;
+    attachments: string[] | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.1.99906",
+  "version": "0.1.99908",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",

package/src/AbstractRestClient.ts

@@ -23,15 +23,6 @@ export abstract class AbstractRestClient {
         uri: string,
         data: any = undefined
     ): Promise<RestClientResponse<ResponseT>> {
-        const headers: any = {
-            'Content-Type': 'application/json',
-            Accept: 'application/json'
-        };
-
-        if (this.options.token) {
-            headers.Authorization = `Bearer ${this.options.token}`;
-        }
-
         let url = this.getUrl(uri);
         let body = undefined;
 
@@ -43,19 +34,36 @@ export abstract class AbstractRestClient {
             }
         }
 
-        const result = await fetch(url, {method, body, headers});
+        const result = await fetch(url, {method, body, headers: this.getHeaders()});
 
-        return {
-            ok: result.ok,
-            status: result.status,
-            data: result.headers.get('content-type')?.includes('json') ? await result.json() : await result.text(),
+        return this.convertFetchResponse(result);
+    }
+
+    protected getHeaders(): any {
+        const headers: any = {
+            'Content-Type': 'application/json',
+            Accept: 'application/json'
         };
+
+        if (this.options.token) {
+            headers.Authorization = `Bearer ${this.options.token}`;
+        }
+
+        return headers;
     }
 
     protected getUrl(uri: string): string {
         return this.removeEndingSlash(this.options.url ?? this.defaultUrl) + '/' + this.removeStartingSlash(uri);
     }
 
+    protected async convertFetchResponse<T>(result: Response): Promise<RestClientResponse<T>> {
+        return {
+            ok: result.ok,
+            status: result.status,
+            data: result.headers.get('content-type')?.includes('json') ? await result.json() : await result.text(),
+        };
+    }
+
     private removeStartingSlash(text: string): string {
         return text.replace(/^\/+/, '');
     }

package/src/FilesClient.ts

@@ -0,0 +1,29 @@
+import {AbstractRestClient, RestClientResponse} from "./AbstractRestClient";
+
+export interface File {
+    id: string;
+    url: string;
+    original_name: string;
+    mime_type: string;
+    size: number;
+}
+
+export class FilesClient extends AbstractRestClient {
+    protected defaultUrl: string = 'https://polfan.pl/webservice/api/files';
+
+    public async uploadFile(file: Parameters<typeof FormData.prototype.append>[1]): Promise<RestClientResponse<File>> {
+        const formData = new FormData();
+        formData.append('file', file);
+
+        let headers = this.getHeaders();
+        headers['Content-Type'] = 'multipart/form-data';
+
+        const response = await fetch(this.defaultUrl, {method: 'POST', body: formData, headers});
+
+        return this.convertFetchResponse<File>(response);
+    }
+
+    public async getFileMetadata(id: string): Promise<RestClientResponse<File>> {
+        return this.send('GET', '/' + id);
+    }
+}

package/src/index.ts

@@ -6,7 +6,8 @@ import {
     ObservableIndexedCollection,
     ObservableIndexedObjectCollection
 } from "./IndexedObjectCollection";
-import { AuthClient } from "./AuthClient";
+import { AuthClient, MyAccountInterface, TokenInterface } from "./AuthClient";
+import {FilesClient, File} from "./FilesClient";
 import { Permissions, PermissionDefinition, Layer } from "./Permissions";
 import * as ChatTypes from './types/src';
 
@@ -15,7 +16,8 @@ export {
     IndexedObjectCollection, ObservableIndexedObjectCollection,
     Permissions, PermissionDefinition, Layer,
     WebSocketChatClient, WebApiChatClient,
-    AuthClient,
+    AuthClient, MyAccountInterface, TokenInterface,
+    FilesClient, File
 };
 
 export type {ChatTypes};

package/src/state-tracker/MessagesManager.ts

@@ -49,8 +49,8 @@ export class MessagesManager {
      * Then you can get them using getRoomFollowedTopics().
      * @see getRoomFollowedTopics
      */
-    public async cacheSpaceFollowedTopics(spaceId: string): Promise<void> {
-        if (! (await this.tracker.spaces.get()).has(spaceId)) {
+    public async cacheSpaceFollowedTopics(spaceId: string | null): Promise<void> {
+        if (spaceId && ! (await this.tracker.spaces.get()).has(spaceId)) {
             throw new Error(`You are not in space ${spaceId}`);
         }
 
@@ -61,8 +61,11 @@ export class MessagesManager {
             return;
         }
 
-        // If we don't have ack reports for all rooms in space, fetch them
-        const result = await this.tracker.client.send('GetFollowedTopics', {location: {spaceId}});
+        const resultPromise = this.tracker.client.send('GetFollowedTopics', {location: {spaceId}});
+
+        roomIds.forEach(roomId => this.followedTopicsPromises.register(resultPromise, roomId));
+
+        const result = await resultPromise;
 
         if (result.error) {
             throw result.error;

package/src/types/src/schemes/Message.ts

@@ -13,4 +13,5 @@ export interface Message {
     user: User;
     content?: string;
     topicRef: string | null;
+    attachments: string[] | null;
 }