npm - @ductape/sdk - Versions diffs - 0.0.4-v32 → 0.0.4-v34 - Mend

@ductape/sdk 0.0.4-v32 → 0.0.4-v34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist/api/services/appApi.service.d.ts +46 -0
package/dist/api/services/appApi.service.js +92 -0
package/dist/api/services/appApi.service.js.map +1 -1
package/dist/api/services/productsApi.service.d.ts +34 -0
package/dist/api/services/productsApi.service.js +51 -0
package/dist/api/services/productsApi.service.js.map +1 -1
package/dist/api/utils/cache.utils.d.ts +1 -1
package/dist/api/utils/cache.utils.js +2 -2
package/dist/api/utils/cache.utils.js.map +1 -1
package/dist/apps/services/app.service.d.ts +32 -32
package/dist/apps/services/app.service.js +135 -105
package/dist/apps/services/app.service.js.map +1 -1
package/dist/index.d.ts +44 -44
package/dist/index.js +45 -45
package/dist/index.js.map +1 -1
package/dist/processor/services/processor.service.d.ts +4 -4
package/dist/processor/services/processor.service.js +89 -94
package/dist/processor/services/processor.service.js.map +1 -1
package/dist/products/services/products.service.d.ts +82 -74
package/dist/products/services/products.service.js +266 -318
package/dist/products/services/products.service.js.map +1 -1
package/dist/test/test.notifiers.d.ts +1 -0
package/dist/test/test.notifiers.js +94 -0
package/dist/test/test.notifiers.js.map +1 -0
package/package.json +1 -1

package/dist/products/services/products.service.js CHANGED Viewed

@@ -63,13 +63,22 @@ class ProductsBuilderService {
             this.queues = queues;
         }
     }
+    fetchPrivateKey() {
+        return this.product.private_key;
+    }
+    fetchWorkspaceId() {
+        return this.product.workspace_id;
+    }
+    fetchProductId() {
+        return this.product._id;
+    }
     async createHealthcheck(data) {
         try {
             await validators_1.CreateProductHealthcheckSchema.validateAsync(data);
             if (!data.tag) {
                 throw new Error('tag field is required');
             }
-            const exists = this.fetchHealthcheck(data.app, data.tag);
+            const exists = await this.fetchHealthcheck(data.app, data.tag);
             if (!exists) {
                 const { app: access_tag, event: action } = data;
                 const app = await this.fetchThirdPartyAppByAccessTag(access_tag);
@@ -79,16 +88,16 @@ class ProductsBuilderService {
                 }
                 const event = version.actions.find((act) => act.tag === action);
                 data.envs = await Promise.all(data.envs.map(async (env) => {
-                    const exists = this.fetchEnv(env.slug);
+                    const exists = await this.fetchEnv(env.slug);
                     if (!exists) {
                         throw new Error(`Env ${env.slug} does not exist`);
                     }
                     await this.validateActionDataInput({ input: env.input }, event, env.input, 0, 0);
-                    env.input = (0, processor_utils_1.encrypt)(JSON.stringify(env.input), this.fetchProduct().private_key);
+                    env.input = (0, processor_utils_1.encrypt)(JSON.stringify(env.input), this.product.private_key);
                     console.log("INPUT", env);
                     return env;
                 }));
-                const envs = this.fetchEnvs();
+                const envs = await this.fetchEnvs();
                 console.log("ENVS ===>>>>", envs);
                 console.log("DBENVS ====>>>>", data.envs);
                 envs.map((env) => {
@@ -99,7 +108,6 @@ class ProductsBuilderService {
                 });
                 console.log("UPDATING VALUE", data);
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { action: enums_1.RequestAction.CREATE, component: enums_1.ProductComponents.HEALTHCHECK }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
                 data.envs.map(async (env) => {
                     const payload = {
                         app: data.app,
@@ -126,20 +134,20 @@ class ProductsBuilderService {
     async updateHealthcheck(tag, data) {
         try {
             // 1. Fetch the existing healthcheck
-            const healthcheck = this.fetchHealthcheck(data.app, tag);
+            const healthcheck = await this.fetchHealthcheck(data.app, tag);
             if (!healthcheck) {
                 throw new Error(`Healthcheck with tag: ${tag} not found`);
             }
             // 2. Validate the incoming data
             await validators_1.CreateProductHealthcheckSchema.validateAsync(data); // No Update schema, use Create
             // 3. Check for tag conflicts
-            if (data.tag && data.tag !== tag && this.fetchHealthcheck(data.app, data.tag)) {
+            if (data.tag && data.tag !== tag && await this.fetchHealthcheck(data.app, data.tag)) {
                 throw new Error(`Healthcheck with tag ${data.tag} already exists`);
             }
             // 4. Validate and process envs
             if (data.envs) {
                 data.envs = await Promise.all(data.envs.map(async (env) => {
-                    const exists = this.fetchEnv(env.slug);
+                    const exists = await this.fetchEnv(env.slug);
                     if (!exists) {
                         throw new Error(`Env ${env.slug} does not exist`);
                     }
@@ -152,13 +160,13 @@ class ProductsBuilderService {
                         }
                         const event = version.actions.find((act) => act.tag === data.event);
                         await this.validateActionDataInput({ input: env.input }, event, env.input, 0, 0);
-                        env.input = (0, processor_utils_1.encrypt)(JSON.stringify(env.input), this.fetchProduct().private_key);
+                        env.input = (0, processor_utils_1.encrypt)(JSON.stringify(env.input), this.product.private_key);
                     }
                     return env;
                 }));
             }
             // 5. Ensure all product envs are covered
-            const envs = this.fetchEnvs();
+            const envs = await this.fetchEnvs();
             envs.map((env) => {
                 var _a;
                 const exists = (_a = data.envs) === null || _a === void 0 ? void 0 : _a.findIndex((dbEnv) => dbEnv.slug === env.slug);
@@ -168,24 +176,29 @@ class ProductsBuilderService {
             });
             // 6. Update the healthcheck
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({}, healthcheck), data), { tag, component: enums_1.ProductComponents.HEALTHCHECK, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchHealthcheck(access_tag, tag, throwError = false) {
-        const health = this.product.healthchecks.find((data) => data.tag === tag && data.app === access_tag);
+    async fetchHealthcheck(access_tag, tag, throwError = false) {
+        const healthchecks = await this.productApi.fetchProductComponents(this.product_id, 'healthcheck');
+        const health = healthchecks.find((data) => data.tag === tag && data.app === access_tag);
         if (!health && throwError)
             throw new Error(`Healthcheck ${tag} not found`);
-        return health;
+        return health || null;
     }
-    fetchHealthchecks(access_tag, throwError = false) {
-        const health = this.product.healthchecks.filter((data) => data.app === access_tag);
+    async fetchHealthchecks(access_tag, throwError = false) {
+        const healthchecks = await this.productApi.fetchProductComponents(this.product_id, 'healthcheck');
+        const health = healthchecks.filter((data) => data.app === access_tag);
         if (!health && throwError)
             throw new Error(`Access tag ${access_tag} not found`);
         return health;
     }
+    async fetchProductHealthchecks() {
+        const healthchecks = await this.productApi.fetchProductComponents(this.product_id, 'healthcheck');
+        return healthchecks;
+    }
     async updateDataValidation(selector, update) {
         if (!selector.startsWith('$Data{') && !selector.startsWith('$Filter')) {
             throw new Error(`selector ${selector} is expected to start with $Data or $Filter`);
@@ -205,7 +218,7 @@ class ProductsBuilderService {
         let data;
         switch (type) {
             case productsBuilder_types_1.FeatureEventTypes.DB_ACTION:
-                const action = this.fetchDatabaseAction(tag);
+                const action = await this.fetchDatabaseAction(tag);
                 if (!action)
                     throw new Error(`DB Action ${tag} not found`);
                 data = useData ? action.data : action.filterData;
@@ -216,7 +229,7 @@ class ProductsBuilderService {
                 if (!stages[3] || (stage3Str !== 'push' && stage3Str !== 'callback' && stage3Str !== 'email')) {
                     throw new Error(`Invalid value ${stage3Str} in ${selector}, expected to be "push", "callback" or "email" in notification`);
                 }
-                const notification = this.fetchNotificationMessage(tag);
+                const notification = await this.fetchNotificationMessage(tag);
                 if (!notification)
                     throw new Error(`Notification ${tag} not found`);
                 if (stage3Str === 'push') {
@@ -261,11 +274,11 @@ class ProductsBuilderService {
             await validators_1.CreateProductBuilderSchema.validateAsync(data);
             const exists = await this.checkIfProductExists(data.name);
             if (exists && (exists === null || exists === void 0 ? void 0 : exists._id)) {
-                await this.initializeProduct(exists === null || exists === void 0 ? void 0 : exists._id);
+                // await this.initializeProduct(exists?._id);
             }
             else {
                 const product = await this.createNewProduct(data);
-                await this.initializeProduct(product._id);
+                // await this.initializeProduct(product._id);
             }
         }
         catch (e) {
@@ -279,7 +292,7 @@ class ProductsBuilderService {
     }
     async initializeProduct(product_id) {
         try {
-            this.product = await this.productApi.fetchProduct(product_id, this.getUserAccess());
+            this.product = await this.productApi.initProduct(product_id, this.getUserAccess());
             this.product_id = product_id;
         }
         catch (e) {
@@ -288,7 +301,7 @@ class ProductsBuilderService {
     }
     async initializeProductByTag(tag) {
         try {
-            this.product = await this.productApi.fetchProductByTag(tag, this.getUserAccess());
+            this.product = await this.productApi.initProduct(tag, this.getUserAccess());
             if (!this.product) {
                 throw new Error(`Product with tag "${tag}" not found or failed to fetch`);
             }
@@ -304,7 +317,6 @@ class ProductsBuilderService {
                 throw new Error('Product not initialized');
             await validators_1.CreateProductBuilderSchema.validateAsync(data);
             await this.productApi.updateProduct(this.product_id, Object.assign({}, data), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
@@ -321,11 +333,11 @@ class ProductsBuilderService {
             return false;
         }
     }
-    fetchProduct() {
+    async fetchProduct() {
         if (!this.product) {
             throw new Error('Product not yet initiated');
         }
-        return this.product;
+        return await this.productApi.fetchProductByTag(this.product.tag, this.getUserAccess());
     }
     async createSession(data, throwErrorIfExists = false) {
         try {
@@ -333,7 +345,7 @@ class ProductsBuilderService {
             if (!data.tag) {
                 throw new Error('tag field is required');
             }
-            const exists = this.fetchSession(data.tag);
+            const exists = await this.fetchSession(data.tag);
             if (!exists) {
                 if (!data.selector.startsWith('$Session{')) {
                     throw new Error('Selector should be in the format $Session{...}{key}');
@@ -360,7 +372,6 @@ class ProductsBuilderService {
                 data.selectorValue = current;
                 const payload = Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.SESSION, action: enums_1.RequestAction.CREATE });
                 await this.productApi.updateProduct(this.product_id, payload, this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -373,7 +384,7 @@ class ProductsBuilderService {
     }
     async updateSession(tag, data) {
         try {
-            const session = this.fetchSession(tag);
+            const session = await this.fetchSession(tag);
             if (!session) {
                 throw new Error(`Session with tag: ${tag} not found`);
             }
@@ -413,18 +424,18 @@ class ProductsBuilderService {
                 }
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, Object.assign(Object.assign({}, session), data)), { component: enums_1.ProductComponents.SESSION, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchSession(tag) {
-        var _a;
-        return (_a = this.product.sessions) === null || _a === void 0 ? void 0 : _a.find((auth) => auth.tag === tag);
+    async fetchSessions(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'session');
+        return components;
     }
-    fetchSessions() {
-        return this.product.sessions;
+    async fetchSession(tag) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'session', tag);
+        return component;
     }
     async createMessageBrokerTopic(data, throwErrorIfExists = false) {
         try {
@@ -438,16 +449,17 @@ class ProductsBuilderService {
             if (data.sample)
                 data.sample = JSON.stringify(data.sample);
             await create_productMessageBrokerTopic_validator_1.default.validateAsync(data);
-            const exists = this.fetchMessageBrokerTopic(data.tag);
-            const broker = this.fetchMessageBroker(messageBrokerTag);
-            (0, functions_utils_1.validateAWSSQSQueueUrl)(broker.envs, data.queueUrls);
+            const exists = await this.fetchMessageBrokerTopic(data.tag);
+            const broker = await this.fetchMessageBroker(messageBrokerTag);
+            if (broker) {
+                (0, functions_utils_1.validateAWSSQSQueueUrl)(broker.envs, data.queueUrls);
+            }
             data.tag = tag;
             if (!exists) {
                 if (data.sample) {
                     data.data = (await (0, string_utils_1.extractPlaceholders)(data.sample));
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { messageBrokerTag, component: enums_1.ProductComponents.MESSAGEBROKER_TOPIC, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -470,12 +482,12 @@ class ProductsBuilderService {
             if (!messageBrokerTag || !tag) {
                 throw new Error(`tag is expected to be defined as "messageBrokr_tag:topic_tag"`);
             }
-            const exists = this.fetchMessageBrokerTopic(data.tag);
+            const exists = await this.fetchMessageBrokerTopic(data.tag);
             if (!exists) {
                 throw new Error(`Topic ${data.tag} not found`);
             }
-            const broker = this.fetchMessageBroker(messageBrokerTag);
-            if (data.queueUrls) {
+            const broker = await this.fetchMessageBroker(messageBrokerTag);
+            if (data.queueUrls && broker) {
                 (0, functions_utils_1.validateAWSSQSQueueUrl)(broker.envs, data.queueUrls);
             }
             data.tag = tag;
@@ -484,7 +496,6 @@ class ProductsBuilderService {
                     data.data = (await (0, string_utils_1.extractPlaceholders)(data.sample));
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { messageBrokerTag, component: enums_1.ProductComponents.MESSAGEBROKER_TOPIC, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 throw new Error(`Message Broker Topic ${data.tag} not found`);
@@ -494,7 +505,7 @@ class ProductsBuilderService {
             throw e;
         }
     }
-    fetchMessageBrokerTopic(tag, throwErrorIfExists = false) {
+    async fetchMessageBrokerTopic(tag, throwErrorIfExists = false) {
         const [messageBrokerTag, topicTag] = tag.split(':');
         if (!messageBrokerTag || !topicTag) {
             throw new Error(`tag is expected to be defined as "messageBroker_tag:topic_tag"`);
@@ -507,7 +518,7 @@ class ProductsBuilderService {
             throw new Error(`MessageBroker topic ${tag} not found`);
         return topic;
     }
-    fetchMessageBrokerTopics(messageBrokerTag) {
+    async fetchMessageBrokerTopics(messageBrokerTag) {
         const messageBroker = this.product.messageBrokers.find((data) => data.tag === messageBrokerTag);
         if (!messageBroker)
             throw new Error(`Message Broker ${messageBrokerTag} not found`);
@@ -545,7 +556,7 @@ class ProductsBuilderService {
             this.checkActionQuotaFallbackInput(action.body, option.input.body, input, 'body');
         }
         else {
-            const feature = this.fetchFeature(option.event);
+            const feature = await this.fetchFeature(option.event);
             if (!feature) {
                 throw new Error(`Feature ${option.event} not found`);
             }
@@ -635,7 +646,7 @@ class ProductsBuilderService {
         }
         else {
             // fetch feature
-            const feature = this.fetchFeature(option.event);
+            const feature = await this.fetchFeature(option.event);
             if (!feature) {
                 throw new Error(`Feature ${option.event} not found`);
             }
@@ -703,7 +714,7 @@ class ProductsBuilderService {
             if (!data.tag) {
                 throw new Error('tag field is required');
             }
-            if (!this.fetchQuota(data.tag)) {
+            if (!(await this.fetchQuota(data.tag))) {
                 await validators_1.CreateProductQuotaSchema.validateAsync(data);
                 await this.validateQuotaFallbackInputAndOutput(data, 'quota');
                 data.total_quota = 0;
@@ -746,7 +757,7 @@ class ProductsBuilderService {
     }
     async updateQuota(tag, data) {
         try {
-            const quota = this.fetchQuota(tag);
+            const quota = await this.fetchQuota(tag);
             if (quota) {
                 await validators_1.UpdateProductQuotaSchema.validateAsync(data);
                 if (data.options) {
@@ -794,18 +805,20 @@ class ProductsBuilderService {
             throw e;
         }
     }
-    fetchQuota(tag) {
-        return this.fetchQuotas().find((data) => data.tag === tag);
+    async fetchQuotas(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'quota');
+        return components;
     }
-    fetchQuotas() {
-        return this.product.quota;
+    async fetchQuota(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'quota', tag);
+        return component;
     }
     async createFallback(data) {
         try {
             if (!data.tag) {
                 throw new Error('tag field is required');
             }
-            if (!this.fetchFallback(data.tag)) {
+            if (!(await this.fetchFallback(data.tag))) {
                 await validators_1.CreateProductFallbackSchema.validateAsync(data);
                 await this.validateQuotaFallbackInputAndOutput(data, 'fallback');
                 await Promise.all(data.options.map(async (d) => {
@@ -845,7 +858,7 @@ class ProductsBuilderService {
     }
     async updateFallback(tag, data) {
         try {
-            const fallback = this.fetchFallback(tag);
+            const fallback = await this.fetchFallback(tag);
             if (fallback) {
                 await validators_1.UpdateProductFallbackSchema.validateAsync(data);
                 if (data.options) {
@@ -890,19 +903,20 @@ class ProductsBuilderService {
             throw e;
         }
     }
-    fetchFallback(tag) {
-        return this.fetchFallbacks().find((data) => data.tag === tag);
+    async fetchFallbacks(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'fallback');
+        return components;
     }
-    fetchFallbacks() {
-        return this.product.fallback;
+    async fetchFallback(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'fallback', tag);
+        return component;
     }
     async createEnv(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchEnv(data.slug)) {
+            if (!(await this.fetchEnv(data.slug))) {
                 await validators_1.CreateProductEnvSchema.validateAsync(data);
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.ENV, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -915,54 +929,53 @@ class ProductsBuilderService {
     }
     async updateEnv(slug, data) {
         try {
-            const env = this.fetchEnv(slug, true);
+            const env = await this.fetchEnv(slug);
             if (!env) {
                 throw new Error(`Env ${slug} not found`);
             }
             const { _id } = env;
             await validators_1.UpdateProductEnvSchema.validateAsync(data); // Change to update;
-            if (data.slug && this.fetchEnv(data.slug)) {
+            if (data.slug && (await this.fetchEnv(data.slug))) {
                 throw new Error(`slug ${slug} is in use`); // TODO: also check on the backend
             }
             if (!data.slug) {
                 data.slug = slug;
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, Object.assign(Object.assign({}, env), data)), { component: enums_1.ProductComponents.ENV, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchEnvs() {
-        return this.product.envs;
+    async fetchEnvs(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'env');
+        return components;
     }
-    fetchEnv(slug, throwErrorIfExists = false) {
-        const env = this.product.envs.find((data) => data.slug === slug);
-        if (!env && throwErrorIfExists)
-            throw new Error(`Env ${slug} not found`);
-        return env;
+    async fetchEnv(slug) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'env', slug);
+        return component;
     }
     async createMessageBroker(data, throwErrorIfExists = false) {
-        if (!this.fetchMessageBroker(data.tag, false)) {
+        if (!(await this.fetchMessageBroker(data.tag))) {
             await validators_1.CreateMessageBrokerSchema.validateAsync(data);
-            data.envs = data.envs.map((env) => {
-                const exists = this.fetchEnv(env.slug);
+            const processedEnvs = [];
+            for (const env of data.envs) {
+                const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
                     throw new Error(`Env ${env.slug} does not exist`);
                 }
-                env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
-                return env;
-            });
-            const envs = this.fetchEnvs();
-            envs.map((env) => {
+                env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
+                processedEnvs.push(env);
+            }
+            data.envs = processedEnvs;
+            const envs = await this.fetchEnvs();
+            for (const env of envs) {
                 const exists = data.envs.findIndex((dbEnv) => dbEnv.slug === env.slug);
                 if (exists === -1) {
                     throw new Error(`Product env ${env.slug} is not defined, please provide connection details`);
                 }
-            });
+            }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.MESSAGEBROKER, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         else {
             if (throwErrorIfExists)
@@ -971,30 +984,32 @@ class ProductsBuilderService {
     }
     async updateMessageBroker(tag, data) {
         try {
-            const messageBroker = this.fetchMessageBroker(tag);
+            const messageBroker = await this.fetchMessageBroker(tag);
             if (!messageBroker) {
                 throw new Error(`Broker ${tag} not found`);
             }
             const { _id, envs } = messageBroker;
             await validators_1.UpdateMessageBrokerSchema.validateAsync(data); // Change to update;
-            if (data.tag && this.fetchMessageBroker(data.tag)) {
+            if (data.tag && (await this.fetchMessageBroker(data.tag))) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
             console.log('2', data.envs);
-            data.envs = data.envs.map((env) => {
-                const exists = this.fetchEnv(env.slug);
+            const processedEnvs = [];
+            for (const env of data.envs) {
+                const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
                     throw new Error(`Env ${env.slug} does not exist`);
                 }
                 if (env.config)
-                    env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
-                return env;
-            });
+                    env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
+                processedEnvs.push(env);
+            }
+            data.envs = processedEnvs;
             const overwrite = [];
             const newEnvs = [];
-            data.envs.map((dataEnv) => {
+            for (const dataEnv of data.envs) {
                 const exists = envs.findIndex((env) => env.slug === dataEnv.slug);
-                if (!this.fetchEnv(dataEnv.slug)) {
+                if (!(await this.fetchEnv(dataEnv.slug))) {
                     throw new Error(`Product Environment ${dataEnv.slug} doesn't exist`);
                 }
                 if (exists === -1) {
@@ -1005,47 +1020,36 @@ class ProductsBuilderService {
                 }
                 else {
                     if (envs[exists].config) {
-                        envs[exists].config = (0, processor_utils_1.encrypt)(JSON.stringify(envs[exists].config), this.fetchProduct().private_key);
+                        envs[exists].config = (0, processor_utils_1.encrypt)(JSON.stringify(envs[exists].config), this.product.private_key);
                     }
                     overwrite.push(Object.assign(Object.assign({}, envs[exists]), dataEnv));
                 }
-            });
+            }
             const unchanged = [];
-            envs.map((env) => {
+            for (const env of envs) {
                 const newEnv = newEnvs.findIndex((dataEnv) => env.slug === dataEnv.slug) > -1;
                 const overwriteEnv = overwrite.findIndex((dataEnv) => env.slug === dataEnv.slug) > -1;
                 if (!newEnv && !overwriteEnv) {
                     if (env.config) {
-                        env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
+                        env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
                     }
                     unchanged.push(env);
                 }
-            });
+            }
             data.envs = [...unchanged, ...overwrite, ...newEnvs];
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({ _id }, messageBroker), data), { component: enums_1.ProductComponents.MESSAGEBROKER, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchMessageBroker(tag, throwErrorIfExists = false) {
-        const messageBroker = this.product.messageBrokers.find((data) => data.tag === tag);
-        if (!messageBroker && throwErrorIfExists)
-            throw new Error(`Message Broker ${tag} not found`);
-        if (messageBroker) {
-            messageBroker.envs.map((broker) => {
-                if (typeof broker.config === 'string') {
-                    broker.config = JSON.parse((0, processor_utils_1.decrypt)(String(broker.config), this.fetchProduct().private_key));
-                }
-            });
-        }
-        return messageBroker;
+    async fetchMessageBrokers(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'message_broker');
+        return components;
     }
-    fetchMessageBrokers() {
-        return this.product.messageBrokers.map((broker) => {
-            return this.fetchMessageBroker(broker.tag);
-        });
+    async fetchMessageBroker(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'message_broker', tag);
+        return component;
     }
     async fetchStorageFiles(filter) {
         try {
@@ -1081,10 +1085,11 @@ class ProductsBuilderService {
         }
     }
     async createStorage(data, throwErrorIfExists = false) {
-        if (!this.fetchStorage(data.tag, false)) {
+        if (!(await this.fetchStorage(data.tag))) {
             await create_productStorage_validator_1.CreateProductStorageSchema.validateAsync(data);
-            data.envs = data.envs.map((env) => {
-                const exists = this.fetchEnv(env.slug);
+            const processedEnvs = [];
+            for (const env of data.envs) {
+                const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
                     throw new Error(`Env ${env.slug} does not exist`);
                 }
@@ -1092,18 +1097,18 @@ class ProductsBuilderService {
                     // @ts-ignore
                     //env.config.config.private_key = gcpPKCSConvert(env.config.config.private_key)
                 }
-                env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
-                return env;
-            });
-            const envs = this.fetchEnvs();
-            envs.map((env) => {
+                env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
+                processedEnvs.push(env);
+            }
+            data.envs = processedEnvs;
+            const envs = await this.fetchEnvs();
+            for (const env of envs) {
                 const exists = data.envs.findIndex((dbEnv) => dbEnv.slug === env.slug);
                 if (exists === -1) {
                     throw new Error(`Product env ${env.slug} is not defined, please provide connection details`);
                 }
-            });
+            }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.STORAGE, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         else {
             if (throwErrorIfExists)
@@ -1112,7 +1117,7 @@ class ProductsBuilderService {
     }
     async updateStorage(tag, data) {
         try {
-            const storage = this.fetchStorage(tag);
+            const storage = await this.fetchStorage(tag);
             if (!storage) {
                 throw new Error(`Storage ${tag} not found`);
             }
@@ -1121,8 +1126,8 @@ class ProductsBuilderService {
             if (data.tag && this.fetchStorage(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
-            data.envs = data.envs.map((env) => {
-                const exists = this.fetchEnv(env.slug);
+            data.envs = await Promise.all(data.envs.map(async (env) => {
+                const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
                     throw new Error(`Env ${env.slug} does not exist`);
                 }
@@ -1131,9 +1136,9 @@ class ProductsBuilderService {
                     //env.config.config.private_key = gcpPKCSConvert(env.config.config.private_key)
                 }
                 if (env.config)
-                    env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
+                    env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
                 return env;
-            });
+            }));
             const overwrite = [];
             const newEnvs = [];
             data.envs.map((dataEnv) => {
@@ -1149,7 +1154,7 @@ class ProductsBuilderService {
                 }
                 else {
                     if (envs[exists].config) {
-                        envs[exists].config = (0, processor_utils_1.encrypt)(JSON.stringify(envs[exists].config), this.fetchProduct().private_key);
+                        envs[exists].config = (0, processor_utils_1.encrypt)(JSON.stringify(envs[exists].config), this.product.private_key);
                     }
                     overwrite.push(Object.assign(Object.assign({}, envs[exists]), dataEnv));
                 }
@@ -1160,36 +1165,25 @@ class ProductsBuilderService {
                 const overwriteEnv = overwrite.findIndex((dataEnv) => env.slug === dataEnv.slug) > -1;
                 if (!newEnv && !overwriteEnv) {
                     if (env.config) {
-                        env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.fetchProduct().private_key);
+                        env.config = (0, processor_utils_1.encrypt)(JSON.stringify(env.config), this.product.private_key);
                     }
                     unchanged.push(env);
                 }
             });
             data.envs = [...unchanged, ...overwrite, ...newEnvs];
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({ _id }, storage), data), { component: enums_1.ProductComponents.STORAGE, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchStorage(tag, throwErrorIfExists = false) {
-        const storage = this.product.storage.find((data) => data.tag === tag);
-        if (!storage && throwErrorIfExists)
-            throw new Error(`Storage ${tag} not found`);
-        if (storage) {
-            storage.envs.map((store) => {
-                if (typeof store.config === 'string') {
-                    store.config = JSON.parse((0, processor_utils_1.decrypt)(String(store.config), this.fetchProduct().private_key));
-                }
-            });
-        }
-        return storage;
+    async fetchStorages(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'storage');
+        return components;
     }
-    fetchStorages() {
-        return this.product.storage.map((storage) => {
-            return this.fetchStorage(storage.tag);
-        });
+    async fetchStorage(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'storage', tag);
+        return component;
     }
     async validateAppData(appData, app) {
         // TODO:
@@ -1231,7 +1225,7 @@ class ProductsBuilderService {
         const { envs: appEnvs } = version;
         return envs.map((env) => {
             const { auth } = env;
-            this.fetchEnv(env.product_env_slug, true);
+            this.fetchEnv(env.product_env_slug);
             const appEnv = appEnvs.find((appEnv) => appEnv.slug === env.app_env_slug);
             if (!appEnv) {
                 throw new Error(`app_slug ${env.app_env_slug} not found`);
@@ -1321,10 +1315,10 @@ class ProductsBuilderService {
             });
             (0, inputs_utils_create_1.validateInputSchema)(queryValues, querySchema);
         }
-        const updateData = (0, processor_utils_1.encrypt)(JSON.stringify(data), this.fetchProduct().private_key);
+        const updateData = (0, processor_utils_1.encrypt)(JSON.stringify(data), this.product.private_key);
         let updateValues = null;
         if (exists.setup_type === enums_1.AuthTypes.TOKEN) {
-            updateValues = (0, processor_utils_1.encrypt)(JSON.stringify(data), this.fetchProduct().private_key);
+            updateValues = (0, processor_utils_1.encrypt)(JSON.stringify(data), this.product.private_key);
         }
         return { data: updateData, values: updateValues };
     }
@@ -1361,7 +1355,6 @@ class ProductsBuilderService {
                     cleanedAppData.pricing_tag = `${appData.tag}:${productsBuilder_types_1.PricingTag.FREE}`;
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, cleanedAppData), { app_tag: appData.tag, component: enums_1.ProductComponents.APP, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -1392,7 +1385,7 @@ class ProductsBuilderService {
     }
     async updateApp(access_tag, data) {
         try {
-            const app = this.fetchApp(access_tag);
+            const app = await this.fetchApp(access_tag);
             if (!app) {
                 throw new Error(`App ${access_tag} not found`);
             }
@@ -1408,16 +1401,15 @@ class ProductsBuilderService {
                       throw new Error(`access_tag ${access_tag} is in use`); // TODO: also check on the backend
                   }*/
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({ _id }, data), { access_tag, component: enums_1.ProductComponents.APP, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchApps() {
+    async fetchApps() {
         return this.product.apps;
     }
-    fetchApp(tag, throwErrorIfExists = false) {
+    async fetchApp(tag, throwErrorIfExists = false) {
         const app = this.product.apps.find((data) => data.app_tag === tag || data.access_tag === tag);
         if (!app && throwErrorIfExists)
             throw new Error(`App ${tag} not found`);
@@ -1426,10 +1418,10 @@ class ProductsBuilderService {
     async createFunction(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchFunction(data.tag)) {
+            if (!(await this.fetchFunction(data.tag))) {
                 await validators_1.CreateProductFunctionSchema.validateAsync(data);
                 data.envs.map((env) => {
-                    env.auth = (0, processor_utils_1.encrypt)(JSON.stringify(env.auth), this.fetchProduct().private_key);
+                    env.auth = (0, processor_utils_1.encrypt)(JSON.stringify(env.auth), this.product.private_key);
                 });
                 data.sample_data = (await this.inputsService.parseJson({
                     data: data.sample,
@@ -1442,7 +1434,6 @@ class ProductsBuilderService {
                     category: enums_1.Categories.DATA,
                 }));
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.FUNCTION, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -1455,37 +1446,35 @@ class ProductsBuilderService {
     }
     async updateFunction(tag, data) {
         try {
-            const func = this.fetchFunction(tag);
+            const func = await this.fetchFunction(tag);
             if (!func) {
                 throw new Error(`Function ${tag} not found`);
             }
             const { _id } = func;
             await validators_1.UpdateProductFunctionSchema.validateAsync(data); // Change to update;
-            if (data.tag && this.fetchFunction(data.tag)) {
+            if (data.tag && await this.fetchFunction(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({ _id }, func), data), { component: enums_1.ProductComponents.FUNCTION, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchFunctions() {
-        return this.product.functions;
+    async fetchFunctions(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'function');
+        return components;
     }
-    fetchFunction(tag) {
-        const func = this.product.functions.find((data) => data.tag === tag);
-        // if (!func) throw new Error(`Function ${tag} not found`);
-        return func;
+    async fetchFunction(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'function', tag);
+        return component;
     }
     async createCache(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchCache(data.tag)) {
+            if (!(await this.fetchCache(data.tag))) {
                 await validators_1.CreateProductCacheSchema.validateAsync(data);
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.CACHE, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -1498,62 +1487,59 @@ class ProductsBuilderService {
     }
     async updateCache(tag, data) {
         try {
-            const cache = this.fetchCache(tag);
+            const cache = await this.fetchCache(tag);
             if (!cache) {
                 throw new Error(`Cache ${tag} not found`);
             }
             const { _id } = cache;
             await validators_1.UpdateProductCacheSchema.validateAsync(data); // Change to update;
-            if (data.tag && this.fetchCache(data.tag)) {
+            if (data.tag && await this.fetchCache(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({ _id }, data), { component: enums_1.ProductComponents.CACHE, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchCache(tag, throwErrorIfExists = false) {
-        const cache = this.product.caches.find((data) => data.tag === tag);
-        if (!cache && throwErrorIfExists)
-            throw new Error(`Cache ${tag} not found`);
-        return cache;
+    async fetchCaches(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'cache');
+        return components;
     }
-    fetchCaches() {
-        return this.product.caches;
+    async fetchCache(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'cache', tag);
+        return component;
     }
     async createNotification(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchNotification(data.tag)) {
+            if (!(await this.fetchNotification(data.tag))) {
                 await validators_1.CreateProductNotificationSchema.validateAsync(data);
-                const envs = this.fetchEnvs();
-                envs.map((env) => {
+                const envs = await this.fetchEnvs();
+                for (const env of envs) {
                     const exists = data.envs.findIndex((nEnv) => nEnv.slug === env.slug);
                     if (exists === -1) {
                         throw new Error(`Notification for environment ${env.slug} is not defined, please provide the environment details`);
                     }
-                });
+                }
                 for (let i = 0; i < data.envs.length; i++) {
                     const updates = {
                         push_notifications: data.envs[i].push_notifications
-                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].push_notifications), this.fetchProduct().private_key)
+                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].push_notifications), this.product.private_key)
                             : undefined,
                         emails: data.envs[i].emails
-                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].emails), this.fetchProduct().private_key)
+                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].emails), this.product.private_key)
                             : undefined,
                         callbacks: data.envs[i].callbacks
-                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].callbacks), this.fetchProduct().private_key)
+                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].callbacks), this.product.private_key)
                             : undefined,
                         sms: data.envs[i].sms
-                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].sms), this.fetchProduct().private_key)
+                            ? (0, processor_utils_1.encrypt)(JSON.stringify(data.envs[i].sms), this.product.private_key)
                             : undefined,
                     };
                     data.envs[i] = Object.assign(Object.assign({}, data.envs[i]), updates);
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.NOTIFICATION, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -1574,7 +1560,7 @@ class ProductsBuilderService {
             if (!notificationTag || !tag) {
                 throw new Error(`tag is expected to be defined as "notification_tag:message_tag"`);
             }
-            const exists = this.fetchNotificationMessage(data.tag);
+            const exists = await this.fetchNotificationMessage(data.tag);
             data.tag = tag;
             if (!exists) {
                 if (!data.email && !data.push_notification && !data.callback) {
@@ -1611,7 +1597,6 @@ class ProductsBuilderService {
                     data.sms_data = (0, string_utils_1.extractPlaceholders)(data.sms, '');
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { notificationTag, component: enums_1.ProductComponents.NOTIFICATION_MESSAGE, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -1622,12 +1607,12 @@ class ProductsBuilderService {
             throw e;
         }
     }
-    fetchNotificationMessage(tag, throwErrorIfExists = false) {
+    async fetchNotificationMessage(tag, throwErrorIfExists = false) {
         const [notificationTag, messageTag] = tag.split(':');
         if (!notificationTag || !messageTag) {
             throw new Error(`tag is expected to be defined as "notification_tag:message_tag"`);
         }
-        const notification = this.fetchNotification(notificationTag);
+        const notification = await this.fetchNotification(notificationTag);
         if (!notification)
             throw new Error(`Notification ${notificationTag} not found`);
         const message = notification.messages.find((data) => data.tag === messageTag);
@@ -1635,7 +1620,7 @@ class ProductsBuilderService {
             throw new Error(`Notification message ${tag} not found`);
         return message;
     }
-    fetchNotificationMessages(notificationTag, throwErrorIfExists = false) {
+    async fetchNotificationMessages(notificationTag, throwErrorIfExists = false) {
         const notification = this.product.notifications.find((data) => data.tag === notificationTag);
         if (!notification)
             throw new Error(`Notification ${notificationTag} not found`);
@@ -1689,7 +1674,6 @@ class ProductsBuilderService {
             const payload = Object.assign(Object.assign(Object.assign({}, message), data), { notificationTag, component: enums_1.ProductComponents.NOTIFICATION_MESSAGE, action: enums_1.RequestAction.UPDATE });
             // Update product and reinitialize
             await this.productApi.updateProduct(this.product_id, payload, this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (error) {
             throw error;
@@ -1697,21 +1681,25 @@ class ProductsBuilderService {
     }
     async updateNotification(tag, data) {
         try {
-            const { _id, envs } = this.fetchNotification(tag);
-            if (data.tag && tag !== data.tag && this.fetchNotification(data.tag)) {
+            const notificationResult = await this.fetchNotification(tag);
+            if (!notificationResult) {
+                throw new Error(`Notification with tag ${tag} not found`);
+            }
+            const { _id, envs } = notificationResult;
+            if (data.tag && tag !== data.tag && (await this.fetchNotification(data.tag))) {
                 throw new Error(`Notification of tag ${data.tag} already exists`);
             }
             await validators_1.UpdateProductNotificationSchema.validateAsync(data); // Change to update;
-            let notification = this.fetchNotification(tag);
+            let notification = await this.fetchNotification(tag);
             if (!notification) {
                 throw new Error(`Notification with tag ${tag} not found`);
             }
             if (data.envs) {
                 const overwrite = [];
                 const newEnvs = [];
-                data.envs.map(async (dataEnv) => {
+                for (const dataEnv of data.envs) {
                     const exists = envs.findIndex((env) => env.slug === dataEnv.slug);
-                    if (!this.fetchEnv(dataEnv.slug)) {
+                    if (!(await this.fetchEnv(dataEnv.slug))) {
                         throw new Error(`Product Environment ${dataEnv.slug} doesn't exist`);
                     }
                     if (exists === -1) {
@@ -1721,70 +1709,42 @@ class ProductsBuilderService {
                     else {
                         overwrite.push(Object.assign(Object.assign({}, envs[exists]), dataEnv));
                     }
-                });
+                }
                 const unchanged = [];
-                envs.map((env) => {
+                for (const env of envs) {
                     const newEnv = newEnvs.findIndex((dataEnv) => env.slug === dataEnv.slug) > -1;
                     const overwriteEnv = overwrite.findIndex((dataEnv) => env.slug === dataEnv.slug) > -1;
                     if (!newEnv && !overwriteEnv) {
                         unchanged.push(env);
                     }
-                });
+                }
                 data.envs = [...unchanged, ...overwrite, ...newEnvs];
             }
             const update = Object.assign(Object.assign({}, notification), data);
-            update.envs.map((env) => {
+            for (const env of update.envs) {
                 if (env.emails)
-                    env.emails = (0, processor_utils_1.encrypt)(JSON.stringify(env.emails), this.fetchProduct().private_key);
+                    env.emails = (0, processor_utils_1.encrypt)(JSON.stringify(env.emails), this.product.private_key);
                 if (env.push_notifications)
-                    env.push_notifications = (0, processor_utils_1.encrypt)(JSON.stringify(env.push_notifications), this.fetchProduct().private_key);
+                    env.push_notifications = (0, processor_utils_1.encrypt)(JSON.stringify(env.push_notifications), this.product.private_key);
                 if (env.callbacks)
-                    env.callbacks = (0, processor_utils_1.encrypt)(JSON.stringify(env.callbacks), this.fetchProduct().private_key);
+                    env.callbacks = (0, processor_utils_1.encrypt)(JSON.stringify(env.callbacks), this.product.private_key);
                 if (env.sms)
-                    env.sms = (0, processor_utils_1.encrypt)(JSON.stringify(env.sms), this.fetchProduct().private_key);
-                return env;
-            });
+                    env.sms = (0, processor_utils_1.encrypt)(JSON.stringify(env.sms), this.product.private_key);
+            }
             const payload = Object.assign(Object.assign({ _id }, update), { component: enums_1.ProductComponents.NOTIFICATION, action: enums_1.RequestAction.UPDATE });
             await this.productApi.updateProduct(this.product_id, payload, this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchNotification(tag, notification_slug = '', throwErrorIfExists = false) {
-        const notification = this.product.notifications.find((data) => data.tag === tag);
-        if (notification && throwErrorIfExists)
-            throw new Error(`Notification ${tag} is in use`);
-        /*if (notification_slug) {
-          const { notifications, emails, callbacks } = notification.envs.find(
-            (data: INotificationEnv) => (data.slug = notification_slug),
-          );
-          return { notifications, emails, callbacks };
-        }*/
-        if (notification) {
-            notification.envs.map((data) => {
-                if (data.callbacks && typeof data.callbacks == 'string') {
-                    data.callbacks = JSON.parse((0, processor_utils_1.decrypt)(String(data.callbacks), this.fetchProduct().private_key));
-                }
-                if (data.push_notifications && typeof data.push_notifications == 'string') {
-                    data.push_notifications = JSON.parse((0, processor_utils_1.decrypt)(String(data.push_notifications), this.fetchProduct().private_key));
-                }
-                if (data.emails && typeof data.emails == 'string') {
-                    data.emails = JSON.parse((0, processor_utils_1.decrypt)(String(data.emails), this.fetchProduct().private_key));
-                }
-                if (data.sms && typeof data.sms == 'string') {
-                    data.sms = JSON.parse((0, processor_utils_1.decrypt)(String(data.sms), this.fetchProduct().private_key));
-                }
-                return data;
-            });
-        }
-        return notification;
+    async fetchNotifications(version) {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'notification');
+        return components;
     }
-    fetchNotifications() {
-        return this.product.notifications.map((notification) => {
-            return this.fetchNotification(notification.tag);
-        });
+    async fetchNotification(tag, version) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'notification', tag);
+        return component;
     }
     validateFeatureSequence(array) {
         // Validate uniqueness of sequence_tag
@@ -1884,24 +1844,27 @@ class ProductsBuilderService {
         await this.validateActionDataInput(data, action, event.input, event_index, sequence_index);
     }
     async checkAndValidateFunctionDataInput(data, sequence_index, event, event_index) {
-        const func = this.fetchFunction(event.event);
+        const func = await this.fetchFunction(event.event);
         await this.validateActionDataInput(data, func, event.input, event_index, sequence_index);
     }
     async checkAndValidateDBActionDataInput(data, sequence_index, event, event_index) {
         console.log('EVENTY', event.event);
-        const { filterData, data: dbData, filterTemplate, template } = this.fetchDatabaseAction(event.event);
+        const { filterData, data: dbData, filterTemplate, template } = await this.fetchDatabaseAction(event.event);
         await this.validateDBActionDataInput(data, { filterData, data: dbData, template, filter: filterTemplate }, event.input, event_index, sequence_index);
     }
     async checkAndValidateFeatureDataInput(data, sequence_index, event, event_index) {
-        const { input } = this.fetchFeature(event.event);
+        const feature = await this.fetchFeature(event.event);
+        if (!feature)
+            throw new Error(`Feature ${event.event} not found`);
+        const { input } = feature;
         await this.validateFeatureDataInput(data, input, event.input, event_index, sequence_index);
     }
     async checkAndValidateNotificationDataInput(data, sequence_index, event, event_index) {
-        const { callback_data: callback, push_notification_data: notification, email_data: email, sms_data: sms, } = this.fetchNotificationMessage(event.event);
+        const { callback_data: callback, push_notification_data: notification, email_data: email, sms_data: sms, } = await this.fetchNotificationMessage(event.event);
         await this.validateNotificationDataInput(data, { callback, notification, email, sms }, event.input, event_index, sequence_index);
     }
     async checkAndValidatePublishDataInput(data, sequence_index, event, event_index) {
-        const topic = this.fetchMessageBrokerTopic(event.event);
+        const topic = await this.fetchMessageBrokerTopic(event.event);
         if (!topic) {
             throw new Error(`Topic ${event.event} not registered`);
         }
@@ -1909,14 +1872,14 @@ class ProductsBuilderService {
         //await this.validatePublishTopicDataInput(data, { data: topicData }, event.input, event_index, sequence_index)
     }
     async checkAndValidateStorageDataInput(data, sequence_index, event, event_index) {
-        const storage = this.fetchStorage(event.event);
+        const storage = await this.fetchStorage(event.event);
         if (!storage) {
             throw new Error(`Storage ${event.event} does not exist`);
         }
         //await this.validateStorageDataInput(data, {}, event.input, event_index, sequence_index);
     }
     async checkAndValidateJobDataInput(data, sequence_index, event, event_index) {
-        const job = this.fetchJob(event.event);
+        const job = await this.fetchJob(event.event);
         if (job.type === productsBuilder_types_1.JobEventTypes.ACTION) {
             await this.checkAndValidateActionDataInput(data, sequence_index, event, event_index);
         }
@@ -1956,7 +1919,7 @@ class ProductsBuilderService {
             await this.checkAndValidatePublishDataInput(data, sequence_index, event, event_index);
         }
         /*if (event.type === FeatureEventTypes.SUBSCRIBE) {
-          const topic = this.fetchMessageBrokerTopic(event.event);
+          const topic = await this.fetchMessageBrokerTopic(event.event);
           if(!topic) {
             throw new Error(`Topic ${event.event} not registered`);
@@ -2421,13 +2384,13 @@ class ProductsBuilderService {
             }
             else {
                 //const envs =
-                const app = this.fetchApp(access_tag);
+                const app = await this.fetchApp(access_tag);
                 const { envs } = app;
                 await Promise.all(envs.map((env) => {
                     if (stages[0] !== env.auth.auth_tag) {
                         throw new Error(`Auth ${stages[0]} does not exist on env ${env.product_env_slug} on app ${access_tag}`);
                     }
-                    const decrypted = JSON.parse((0, processor_utils_1.decrypt)(env.auth.values, this.fetchProduct().private_key));
+                    const decrypted = JSON.parse((0, processor_utils_1.decrypt)(env.auth.values, this.product.private_key));
                     // Convert stages to string[] for findFaultyKeys
                     const stringStages = stages.slice(1).map(stage => String(stage));
                     const check = (0, objects_utils_1.findFaultyKeys)(stringStages, decrypted);
@@ -2619,7 +2582,7 @@ class ProductsBuilderService {
             if (stages.length > 2) {
                 throw new Error(`sequence ${sequence.tag} event ${sequence.events[meta.event_index].event} ${meta.type}, has invalid varibale definition ${value}, only two keys is required`);
             }
-            const app = this.fetchApp(String(stages[0]));
+            const app = await this.fetchApp(String(stages[0]));
             if (!app) {
                 throw new Error(`App ${stages[0]} not found in sequence ${sequence.tag} event ${sequence.events[meta.event_index].event} ${meta.type}, has invalid varibale definition ${value}. `);
             }
@@ -2774,12 +2737,11 @@ class ProductsBuilderService {
     }
     async createFeature(data, throwErrorIfExists = false) {
         try {
-            if (!this.fetchFeature(data.tag, false)) {
+            if (!(await this.fetchFeature(data.tag))) {
                 await validators_1.CreateProductFeatureSchema.validateAsync(data);
                 try {
                     await this.validateFeatureData(data);
                     await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.FEATURE, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                    await this.initializeProduct(this.product_id);
                 }
                 catch (e) {
                     throw e;
@@ -2796,7 +2758,7 @@ class ProductsBuilderService {
     }
     async updateFeature(tag, data) {
         try {
-            const feature = this.fetchFeature(tag);
+            const feature = await this.fetchFeature(tag);
             if (!feature) {
                 throw new Error(`Feature ${tag} not found`);
             }
@@ -2808,43 +2770,42 @@ class ProductsBuilderService {
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({ _id,
                 tag }, data), { component: enums_1.ProductComponents.FEATURE, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchFeature(tag, throwErrorIfExists = true) {
-        const feature = this.product.features.find((data) => data.tag === tag);
-        if (!feature && throwErrorIfExists)
-            throw new Error(`Feature ${tag} not found`);
-        return feature;
+    async fetchFeatures() {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'feature');
+        return components;
     }
-    fetchFeatures() {
-        return this.product.features;
+    async fetchFeature(tag) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'feature', tag);
+        return component;
     }
     async createDatabase(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchDatabase(data.tag, false)) {
+            if (!(await this.fetchDatabase(data.tag))) {
                 await validators_1.CreateProductDatabaseSchema.validateAsync(data);
-                data.envs = data.envs.map((env) => {
-                    const exists = this.fetchEnv(env.slug);
+                const processedEnvs = [];
+                for (const env of data.envs) {
+                    const exists = await this.fetchEnv(env.slug);
                     if (!exists) {
                         throw new Error(`Env ${env.slug} does not exist`);
                     }
-                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.fetchProduct().private_key);
-                    return env;
-                });
-                const envs = this.fetchEnvs();
-                envs.map((env) => {
+                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
+                    processedEnvs.push(env);
+                }
+                data.envs = processedEnvs;
+                const envs = await this.fetchEnvs();
+                for (const env of envs) {
                     const exists = data.envs.findIndex((dbEnv) => dbEnv.slug === env.slug);
                     if (exists === -1) {
                         throw new Error(`Product env ${env.slug} is not defined, please provide connection details`);
                     }
-                });
+                }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.DATABASE, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -2857,7 +2818,7 @@ class ProductsBuilderService {
     }
     async updateDatabase(tag, data) {
         try {
-            const db = this.fetchDatabase(tag);
+            const db = await this.fetchDatabase(tag);
             if (!db) {
                 throw new Error(`Database  ${tag} not found`);
             }
@@ -2866,15 +2827,16 @@ class ProductsBuilderService {
             if (data.tag && this.fetchDatabase(data.tag)) {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
-            data.envs = data.envs.map((env) => {
-                const exists = this.fetchEnv(env.slug);
+            data.envs = await Promise.all(data.envs.map(async (env) => {
+                const exists = await this.fetchEnv(env.slug);
                 if (!exists) {
                     throw new Error(`Env ${env.slug} does not exist`);
                 }
-                if (env.connection_url)
-                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.fetchProduct().private_key);
+                if (env.connection_url) {
+                    env.connection_url = (0, processor_utils_1.encrypt)(env.connection_url, this.product.private_key);
+                }
                 return env;
-            });
+            }));
             const overwrite = [];
             const newEnvs = [];
             data.envs.map((dataEnv) => {
@@ -2903,25 +2865,18 @@ class ProductsBuilderService {
             data.envs = [...unchanged, ...overwrite, ...newEnvs];
             //console.log("UPDATED!!!", JSON.stringify(data.envs))
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({ _id }, data), { tag, component: enums_1.ProductComponents.DATABASE, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchDatabase(tag, throwErrorIfExists = false) {
-        const database = this.product.databases.find((data) => data.tag === tag);
-        if (!database && throwErrorIfExists)
-            throw new Error(`Database ${tag} not found`);
-        if (database && database.envs.length > 0) {
-            database.envs.map((env) => {
-                env.connection_url = (0, processor_utils_1.decrypt)(env.connection_url, this.fetchProduct().private_key);
-            });
-        }
-        return database;
+    async fetchDatabases() {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'database');
+        return components;
     }
-    fetchDatabases() {
-        return this.product.databases;
+    async fetchDatabase(tag) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'database', tag);
+        return component;
     }
     async createDatabaseAction(data, throwErrorIfExists = false) {
         try {
@@ -2932,10 +2887,10 @@ class ProductsBuilderService {
             if (!databaseTag || !tag) {
                 throw new Error(`tag is expected to be defined as "database_tag:action_tag"`);
             }
-            const exists = this.fetchDatabaseAction(data.tag);
+            const exists = await this.fetchDatabaseAction(data.tag);
             data.tag = tag;
             if (!exists) {
-                const database = this.fetchDatabase(databaseTag);
+                const database = await this.fetchDatabase(databaseTag);
                 let values, template;
                 if (database.type === productsBuilder_types_1.DatabaseTypes.MONGODB) {
                     await create_productDatabaseAction_validator_1.NOSQLDatabaseActionsSchema.validateAsync(data);
@@ -2959,7 +2914,6 @@ class ProductsBuilderService {
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { data: values, template,
                     databaseTag, component: enums_1.ProductComponents.DATABASE_ACTION, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -2970,7 +2924,7 @@ class ProductsBuilderService {
             throw e;
         }
     }
-    fetchDatabaseAction(tag, throwErrorIfExists = false) {
+    async fetchDatabaseAction(tag, throwErrorIfExists = false) {
         const [databaseTag, actionTag] = tag.split(':');
         if (!databaseTag || !actionTag) {
             throw new Error(`tag is expected to be defined as "database_tag:action_tag"`);
@@ -2997,7 +2951,7 @@ class ProductsBuilderService {
                 throw new Error(`tag is expected to be defined as "database_tag:action_tag"`);
             }
             // Fetch required data
-            const database = await this.fetchDatabase(databaseTag, true);
+            const database = await this.fetchDatabase(databaseTag);
             const action = await this.fetchDatabaseAction(data.tag, true);
             // Construct payload
             const payload = Object.assign(Object.assign(Object.assign({}, action), data), { databaseTag, component: enums_1.ProductComponents.DATABASE_ACTION, action: enums_1.RequestAction.UPDATE });
@@ -3025,13 +2979,12 @@ class ProductsBuilderService {
             }
             // Update product and reinitialize
             await this.productApi.updateProduct(this.product_id, payload, this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (error) {
             throw error;
         }
     }
-    fetchDatabaseActions(databaseTag) {
+    async fetchDatabaseActions(databaseTag) {
         const database = this.product.databases.find((data) => data.tag === databaseTag);
         if (!database)
             throw new Error(`Database ${databaseTag} not found`);
@@ -3055,12 +3008,11 @@ class ProductsBuilderService {
         data.tag = tag;
         await create_productDatabaseMigration_validator_1.default.validateAsync(Object.assign(Object.assign({}, data), { databaseTag })); // Change to update;
         if (!exists) {
-            const database = this.fetchDatabase(databaseTag, true);
+            const database = await this.fetchDatabase(databaseTag);
             if (database.type === productsBuilder_types_1.DatabaseTypes.MONGODB) {
                 throw new Error(`${database.type} does not support migrations`);
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { databaseTag, component: enums_1.ProductComponents.DATABASE_MIGRATION }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         else {
             if (throwErrorIfExists)
@@ -3082,9 +3034,8 @@ class ProductsBuilderService {
         }
         data.tag = tag;
         await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({}, action), Object.assign(Object.assign({}, data), { databaseTag })), { component: enums_1.ProductComponents.DATABASE_MIGRATION }), this.getUserAccess());
-        await this.initializeProduct(this.product_id);
     }
-    fetchDatabaseMigration(tag, throwError = false) {
+    async fetchDatabaseMigration(tag, throwError = false) {
         const [databaseTag, migrationTag] = tag.split(':');
         if (!databaseTag || !migrationTag) {
             throw new Error(`tag is expected to be defined as "database_tag:action_tag"`);
@@ -3097,7 +3048,7 @@ class ProductsBuilderService {
             throw new Error(`Database migration ${tag} not found`);
         return migration;
     }
-    fetchDatabaseMigrations(databaseTag) {
+    async fetchDatabaseMigrations(databaseTag) {
         const database = this.product.databases.find((data) => data.tag === databaseTag);
         if (!database)
             throw new Error(`Database ${databaseTag} not found`);
@@ -3118,31 +3069,31 @@ class ProductsBuilderService {
             }
         }
         if (type === productsBuilder_types_1.JobEventTypes.DATABASE_ACTION) {
-            const found = this.fetchDatabaseAction(event);
+            const found = await this.fetchDatabaseAction(event);
             if (!found) {
                 throw new Error(`Database action ${event} not found`);
             }
         }
         if (type === productsBuilder_types_1.JobEventTypes.FUNCTION) {
-            const found = this.fetchFunction(event);
+            const found = await this.fetchFunction(event);
             if (!found) {
                 throw new Error(`Cloud function ${event} not found`);
             }
         }
         if (type === productsBuilder_types_1.JobEventTypes.STORAGE) {
-            const found = this.fetchStorage(event);
+            const found = await this.fetchStorage(event);
             if (!found) {
                 throw new Error(`Storage ${event} not found`);
             }
         }
         if (type === productsBuilder_types_1.JobEventTypes.NOTIFICATION) {
-            const found = this.fetchNotification(event);
+            const found = await this.fetchNotification(event);
             if (!found) {
                 throw new Error(`Notification ${event} not found`);
             }
         }
         if (type === productsBuilder_types_1.JobEventTypes.PUBLISH) {
-            const found = this.fetchMessageBroker(event);
+            const found = await this.fetchMessageBroker(event);
             if (!found) {
                 throw new Error(`Message Broker ${event} not found`);
             }
@@ -3151,7 +3102,7 @@ class ProductsBuilderService {
     async createJob(data, throwErrorIfExists = false) {
         try {
             // TODO: figure out a way to check if this has run before, halt if it has
-            if (!this.fetchJob(data.tag)) {
+            if (!(await this.fetchJob(data.tag))) {
                 await validators_1.CreateProductJobSchema.validateAsync(data);
                 await this.validateJobEvent(data);
                 if (data.type === productsBuilder_types_1.JobEventTypes.ACTION) {
@@ -3173,7 +3124,6 @@ class ProductsBuilderService {
                     const dbAction = await this.fetchDatabaseAction(data.event);
                 }
                 await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign({}, data), { component: enums_1.ProductComponents.JOB, action: enums_1.RequestAction.CREATE }), this.getUserAccess());
-                await this.initializeProduct(this.product_id);
             }
             else {
                 if (throwErrorIfExists)
@@ -3196,20 +3146,18 @@ class ProductsBuilderService {
                 throw new Error(`tag ${tag} is in use`); // TODO: also check on the backend
             }
             await this.productApi.updateProduct(this.product_id, Object.assign(Object.assign(Object.assign({}, job), data), { component: enums_1.ProductComponents.JOB, action: enums_1.RequestAction.UPDATE }), this.getUserAccess());
-            await this.initializeProduct(this.product_id);
         }
         catch (e) {
             throw e;
         }
     }
-    fetchJob(tag, throwError = false) {
-        const job = this.product.jobs.find((data) => data.tag === tag);
-        if (!job && throwError)
-            throw new Error(`Job ${tag} not found`);
-        return job;
+    async fetchJobs() {
+        const components = await this.productApi.fetchProductComponents(this.product_id, 'job');
+        return components;
     }
-    fetchJobs() {
-        return this.product.jobs;
+    async fetchJob(tag) {
+        const component = await this.productApi.fetchProductComponentByTag(this.product_id, 'job', tag);
+        return component;
     }
     getUserAccess() {
         return {