changes due tu to first implementation

Author: perki

docs/hds-lib.js

@@ -28,6 +28,9 @@ class AppClientAccount extends Application {
    * @param {string} [incomingEventId] - Information for the recipient
    */
   async handleIncomingRequest (apiEndpoint, incomingEventId) {
+    // make sure that collectorClientsMap is initialized
+    // await this.getCollectorClients();
+
     const requesterConnection = new pryv.Connection(apiEndpoint);
     const accessInfo = await requesterConnection.accessInfo();
     // check if request is known

docs/hds-lib.js.map

@@ -39,17 +39,26 @@ class AppManagingAccount extends Application {
   }
 
   async getCollectors (forceRefresh) {
-    if (!forceRefresh && this.cache.collectorsMap) return Object.values(this.cache.collectorsMap);
-    // Collectors are materialized by streams
+    await this.#updateCollectorsIfNeeded(forceRefresh);
+    return Object.values(this.cache.collectorsMap);
+  }
+
+  async getCollectorById (id) {
+    await this.#updateCollectorsIfNeeded();
+    return this.cache.collectorsMap[id];
+  }
+
+  async #updateCollectorsIfNeeded (forceRefresh = false) {
+    if (!forceRefresh && this.cache.collectorsMap) return;
     if (forceRefresh) await this.loadStreamData();
+    // TODO do not replace the map, but update collectors if streamData has changed and add new collectors
     const streams = this.streamData.children || [];
     const collectorsMap = {};
     for (const stream of streams) {
       const collector = new Collector(this, stream);
-      collectorsMap[collector.streamId] = collector;
+      collectorsMap[collector.id] = collector;
     }
     this.cache.collectorsMap = collectorsMap;
-    return Object.values(this.cache.collectorsMap);
   }
 
   /**

src/appTemplates/AppClientAccount.js

@@ -129,7 +129,7 @@ async function createAppStreams (app) {
     const streamData = await app.loadStreamData();
     if (streamData) found = true;
   } catch (e) {
-    if (e.innerObject?.id !== 'unknown-referenced-resource' || e.innerObject?.data?.id !== 'test-app-template-client') {
+    if (e.innerObject?.id !== 'unknown-referenced-resource' || e.innerObject?.data?.id !== app.baseStreamId) {
       throw e;
     }
   }

src/appTemplates/AppManagingAccount.js

@@ -48,36 +48,26 @@ class Collector {
   }
 
   /**
-   * @property {string} one of 'draft', 'active', 'deactivated'
+   * @property {string} id - shortcut for steamid
    */
-  get statusCode () {
-    if (this.#cache.status == null) throw new Error('Init Collector first');
-    return this.#cache.status.content.status;
+  get id () {
+    return this.streamId;
   }
 
-  /**
-   * @typedef {RequestContent}
-   * @property {number} version
-   * @property {Localizable} description
-   * @property {Localizable} consent
-   * @property {Array<Permission>} permissions - Like Pryv permission request
-   * @property {Object} app
-   * @property {String} app.id
-   * @property {String} app.url
-   * @property {Object} app.data - to be finalized
-   */
-
-  /**
-   * @typedef {StatusData}
-   * @property {RequestContent} requestContent
-   */
-
   /** @type {StatusData} */
   get statusData () {
     if (this.#cache.status == null) throw new Error('Init Collector first');
     return this.#cache.status.content.data;
   }
 
+  /**
+   * @property {string} one of 'draft', 'active', 'deactivated'
+   */
+  get statusCode () {
+    if (this.#cache.status == null) throw new Error('Init Collector first');
+    return this.#cache.status.content.status;
+  }
+
   /**
    * Fetch online data
    */
@@ -159,6 +149,11 @@ class Collector {
     return this.#cache.invites[key];
   }
 
+  /**
+   * Retreive all invites
+   * @param {boolean} [forceRefresh]
+   * @returns {Array<CollectorInvite>}
+   */
   async getInvites (forceRefresh = false) {
     while (this.#cache.invitesInitializing) (await new Promise((resolve) => { setTimeout(resolve, 100); }));
     this.#cache.invitesInitializing = true;
@@ -352,3 +347,20 @@ class Collector {
 }
 
 module.exports = Collector;
+
+/**
+   * @typedef {RequestContent}
+   * @property {number} version
+   * @property {Localizable} description
+   * @property {Localizable} consent
+   * @property {Array<Permission>} permissions - Like Pryv permission request
+   * @property {Object} app
+   * @property {String} app.id
+   * @property {String} app.url
+   * @property {Object} app.data - to be finalized
+   */
+
+/**
+   * @typedef {StatusData}
+   * @property {RequestContent} requestContent
+   */

src/appTemplates/Application.js

@@ -35,6 +35,10 @@ class CollectorInvite {
     return this.eventData.content.apiEndpoint;
   }
 
+  get dateCreation () {
+    return new Date(this.eventData.created * 1000);
+  }
+
   get connection () {
     if (this.#connection == null) {
       this.#connection = new pryv.Connection(this.apiEndpoint);

src/appTemplates/Collector.js

@@ -1,5 +1,7 @@
 const AppManagingAccount = require('./AppManagingAccount');
+const AppClientAccount = require('./AppClientAccount');
 
 module.exports = {
-  AppManagingAccount
+  AppManagingAccount,
+  AppClientAccount
 };

src/appTemplates/CollectorInvite.js

@@ -118,11 +118,12 @@ describe('[APTX] appTemplates', function () {
     const collectors2 = await appManaging2.getCollectors();
     const collector2 = collectors2.find(c => c.name === collectorName);
     if (!collector2) throw new Error('Should find collector with name: ' + collectorName);
+    // init collector found;
+    await collector2.init();
     // call of StreamStructure should be empty as already created
     const resultCheckStructure3 = await collector2.checkStreamStructure();
     assert.equal(resultCheckStructure3.created.length, 0, 'Should create 0 streams');
     // should return the same access access point
-    await collector2.init();
     const sharingApiEndpoint3 = await collector2.sharingApiEndpoint();
     assert.equal(sharingApiEndpoint3, sharingApiEndpoint);
   });