Finalized refactor

Author: perki

src/appTemplates/AppClientAccount.js

@@ -11,10 +11,6 @@ class AppClientAccount extends Application {
     };
   }
 
-  get streamData () {
-    return this.cache.streamData;
-  }
-
   /**
    * - Check connection validity
    * - Make sure stream structure exists

src/appTemplates/AppManagingAccount.js

@@ -41,7 +41,8 @@ class AppManagingAccount extends Application {
   async getCollectors (forceRefresh) {
     if (!forceRefresh && this.cache.collectorsMap) return Object.values(this.cache.collectorsMap);
     // Collectors are materialized by streams
-    const streams = await this.connection.apiOne('streams.get', { parentId: this.baseStreamId }, 'streams');
+    if (forceRefresh) await this.loadStreamData();
+    const streams = this.streamData.children || [];
     const collectorsMap = {};
     for (const stream of streams) {
       const collector = new Collector(this, stream);
@@ -75,6 +76,8 @@ class AppManagingAccount extends Application {
       parentId: this.baseStreamId
     };
     const stream = await this.connection.apiOne('streams.create', params, 'stream');
+    // add new stream to streamCache
+    this.streamData.children.push(stream);
     const collector = new Collector(this, stream);
     this.cache.collectorsMap[collector.streamId] = collector;
     return collector;

src/appTemplates/Application.js

@@ -9,8 +9,18 @@ class Application {
 
   cache;
 
+  /**
+   * Get application stream structure
+   * Initialized at init()
+   * Can be refreshed with loadStreamData
+   */
+  get streamData () {
+    if (!this.cache.streamData) throw new Error('Call .init() first');
+    return this.cache.streamData;
+  }
+
   get appSettings () {
-    throw new Error('appSettings must be implemneted');
+    throw new Error('appSettings must be implemented');
     // possible return values:
     /**
      * return {
@@ -69,6 +79,17 @@ class Application {
   async init () {
     await createAppStreams(this);
   }
+
+  /**
+   * Force loading of streamData
+   */
+  async loadStreamData () {
+    const streamData = (await this.connection.apiOne('streams.get', { id: this.baseStreamId }, 'streams'))[0];
+    if (streamData) {
+      this.cache.streamData = streamData;
+    }
+    return streamData;
+  }
 }
 
 module.exports = Application;
@@ -101,11 +122,8 @@ async function createAppStreams (app) {
   // get streamStructure
   let found = false;
   try {
-    const stream = (await app.connection.apiOne('streams.get', { id: app.baseStreamId }, 'streams'))[0];
-    if (stream) {
-      app.cache.streamData = stream;
-    }
-    found = true;
+    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') {
       throw e;

tests/apptemplates.test.js

@@ -36,6 +36,8 @@ describe('[APTX] appTemplates', function () {
     const newCollector = await appManaging.createCollectorUnitialized(collectorName);
     assert.ok(newCollector.streamId.startsWith(baseStreamIdManager), 'Collectors id should start with baseStreamId');
     assert.ok(newCollector.name, collectorName);
+    // check that streams has been addes to streamData
+    assert.ok(appManaging.streamData.children[0].name, collectorName);
 
     // Create a Collector with the same name should fail
     try {