Basic chat support done

Author: perki

js/appTemplates/CollectorClient.d.ts

@@ -27,6 +27,10 @@ export declare class CollectorClient {
     /** @property {Object} - full content of the request */
     get requestData(): any;
     get hasChatFeature(): boolean;
+    get chatSettings(): {
+        chatStreamIncoming: string;
+        chatStreamMain: string;
+    };
     /** @property {string} - one of 'Incoming', 'Active', 'Deactivated', 'Refused' */
     get status(): string;
     constructor(app: any, eventData: any, accessData?: any);
@@ -65,5 +69,8 @@ export declare class CollectorClient {
      */
     static keyFromInfo(info: any): string;
     getSections(): Array<CollectorSectionInterface>;
+    chatEventInfos(event: pryv.Event): {
+        source: 'me' | 'requester' | 'unkown';
+    };
 }
 //# sourceMappingURL=CollectorClient.d.ts.map

js/appTemplates/CollectorClient.d.ts.map

@@ -23,6 +23,9 @@ export declare class CollectorInvite {
         streamRead: string;
         streamWrite: string;
     };
+    chatEventInfos(event: pryv.Event): {
+        source: 'me' | 'user' | 'unkown';
+    };
     /**
      * Check if connection is valid. (only if active)
      * If result is "forbidden" update and set as revoked

js/appTemplates/CollectorClient.js

@@ -57,6 +57,14 @@ export class CollectorClient {
     return this.requestData.features.chat != null;
   }
 
+  get chatSettings (): {chatStreamIncoming: string, chatStreamMain: string} {
+    if (!this.hasChatFeature) return null;
+    return {
+      chatStreamIncoming: `chat-${this.requesterUsername}-in`,
+      chatStreamMain: `chat-${this.requesterUsername}`
+    };
+  }
+
   /** @property {string} - one of 'Incoming', 'Active', 'Deactivated', 'Refused' */
   get status (): string {
     const eventStatus = this.eventData.content.status;
@@ -191,12 +199,11 @@ export class CollectorClient {
         // user supported mode - might me moved to a lib
 
         // 2. create streams
-        const chatStreamRead = `chat-${this.requesterUsername}`;
-        const chatStreamWrite = `${chatStreamRead}-in`;
+        const { chatStreamIncoming, chatStreamMain } = this.chatSettings;
         const chatStreamsCreateApiCalls = [
           { method: 'streams.create', params: { name: 'Chats', id: 'chats' } },
-          { method: 'streams.create', params: { name: `Chat ${this.requesterUsername}`, parentId: 'chats', id: chatStreamRead } },
-          { method: 'streams.create', params: { name: `Chat ${this.requesterUsername}`, parentId: chatStreamRead, id: chatStreamWrite } }
+          { method: 'streams.create', params: { name: `Chat ${this.requesterUsername}`, parentId: 'chats', id: chatStreamMain } },
+          { method: 'streams.create', params: { name: `Chat ${this.requesterUsername}`, parentId: chatStreamMain, id: chatStreamIncoming } }
         ];
         const streamCreateResults = await this.app.connection.api(chatStreamsCreateApiCalls);
         streamCreateResults.forEach((r) => {
@@ -205,13 +212,13 @@ export class CollectorClient {
         });
         // 3. add streams to permissions
         cleanedPermissions.push(...[
-          { streamId: chatStreamRead, level: 'read' },
-          { streamId: chatStreamWrite, level: 'manage' }
+          { streamId: chatStreamMain, level: 'read' },
+          { streamId: chatStreamIncoming, level: 'manage' }
         ]);
         responseContent.chat = {
           type: 'user',
-          streamRead: chatStreamRead,
-          streamWrite: chatStreamWrite
+          streamRead: chatStreamMain,
+          streamWrite: chatStreamIncoming
         };
         // ---------- end chat ---------- //
       }
@@ -340,4 +347,11 @@ export class CollectorClient {
   getSections (): Array<CollectorSectionInterface> {
     return this.request?.sections;
   }
+
+  // -------------------- chat methods ----------------- //
+  chatEventInfos (event: pryv.Event): {source: 'me' | 'requester' | 'unkown' } {
+    if (event.streamIds.includes(this.chatSettings.chatStreamIncoming)) return { source: 'requester' };
+    if (event.streamIds.includes(this.chatSettings.chatStreamMain)) return { source: 'me' };
+    return { source: 'unkown' };
+  }
 }

js/appTemplates/CollectorClient.js.map

@@ -57,6 +57,13 @@ export class CollectorInvite {
     return this.eventData.content.chat;
   }
 
+  // -------------------- chat methods ----------------- //
+  chatEventInfos (event: pryv.Event): {source: 'me' | 'user' | 'unkown' } {
+    if (event.streamIds.includes(this.chatSettings.streamWrite)) return { source: 'me' };
+    if (event.streamIds.includes(this.chatSettings.streamRead)) return { source: 'user' };
+    return { source: 'unkown' };
+  }
+
   /**
    * Check if connection is valid. (only if active)
    * If result is "forbidden" update and set as revoked