FIX api service manager

Author: ahmetkuslular

src/index.js

@@ -1,6 +1,5 @@
 import voltran from './universal/partials/withBaseComponent';
-import { SERVICES } from './universal/utils/constants';
-import { ClientApiManager, ServerApiManager } from './universal/core/api';
+import apiService, { ClientApiManager, ServerApiManager } from './universal/core/apiService';
 
 export default voltran;
-export { SERVICES, ClientApiManager, ServerApiManager };
+export { ClientApiManager, ServerApiManager, apiService };

src/renderMultiple.js

@@ -63,32 +63,24 @@ function getRenderer(name, req) {
 }
 
 function iterateServicesMap(servicesMap, callback) {
-  Object.getOwnPropertySymbols(servicesMap).forEach(serviceName => {
-    const endPoints = servicesMap[serviceName];
+  Object.getOwnPropertyNames(servicesMap).forEach(serviceName => {
+    const requests = servicesMap[serviceName];
 
-    Object.keys(endPoints).forEach(endPointName => {
-      callback(serviceName, endPointName);
-    });
+    callback(serviceName, requests);
   });
 }
 
-function reduceServicesMap(servicesMap, callback, initialValue) {
-  return Object.getOwnPropertySymbols(servicesMap).map(serviceName => {
-    const endPoints = servicesMap[serviceName];
-
-    return Object.keys(endPoints).reduce((obj, endPointName) => {
-      return callback(serviceName, endPointName, obj);
-    }, initialValue);
+function reduceServicesMap(servicesMap, callback, obj) {
+  return Object.getOwnPropertyNames(servicesMap).map(serviceName => {
+    return callback(serviceName, obj);
   });
 }
 
 function getHashes(renderers) {
   return renderers
     .filter(renderer => renderer.servicesMap)
     .reduce((hashes, renderer) => {
-      iterateServicesMap(renderer.servicesMap, (serviceName, endPointName) => {
-        const requests = renderer.servicesMap[serviceName][endPointName];
-
+      iterateServicesMap(renderer.servicesMap, (serviceName, requests) => {
         requests.forEach(request => {
           if (hashes[request.hash]) {
             hashes[request.hash].occurrence += 1;
@@ -121,12 +113,8 @@ function incWinnerScore(winner, hashes) {
   hashes[winner.hash].score += 1;
 }
 
-function putWinnerMap(serviceName, endPointName, winnerMap, winner) {
-  if (winnerMap[serviceName]) {
-    winnerMap[serviceName][endPointName] = winner;
-  } else {
-    winnerMap[serviceName] = { [endPointName]: winner };
-  }
+function putWinnerMap(serviceName, winnerMap, winner) {
+  winnerMap[serviceName] = winner;
 }
 
 async function setInitialStates(renderers) {
@@ -135,12 +123,10 @@ async function setInitialStates(renderers) {
   const promises = renderers
     .filter(renderer => renderer.servicesMap)
     .reduce((promises, renderer) => {
-      iterateServicesMap(renderer.servicesMap, (serviceName, endPointName) => {
-        const requests = renderer.servicesMap[serviceName][endPointName];
-
+      iterateServicesMap(renderer.servicesMap, (serviceName, requests) => {
         const winner = getWinner(requests, hashes);
         incWinnerScore(winner, hashes);
-        putWinnerMap(serviceName, endPointName, renderer.winnerMap, winner);
+        putWinnerMap(serviceName, renderer.winnerMap, winner);
 
         if (!promises[winner.hash]) {
           promises[winner.hash] = callback => {
@@ -176,9 +162,9 @@ async function setInitialStates(renderers) {
       renderer.setInitialState(
         reduceServicesMap(
           renderer.winnerMap,
-          (serviceName, endPointName, obj) => {
-            const request = renderer.winnerMap[serviceName][endPointName];
-            obj[endPointName] = results[request.hash];
+          (serviceName, obj) => {
+            const request = renderer.winnerMap[serviceName];
+            obj[serviceName] = results[request.hash];
             return obj;
           },
           {}

src/universal/core/api/ClientApiManager.js

@@ -3,13 +3,13 @@ import {
   CONTENT_TYPE_HEADER,
   JSON_CONTENT_TYPE,
   REQUEST_TYPES_WITH_BODY
-} from '../../utils/constants';
+} from '../../../utils/constants';
 
 function createBaseConfig() {
   return {};
 }
 
-class ApiManager {
+class BaseApiManager {
   constructor(customConfig) {
     const headers = {
       common: {
@@ -40,4 +40,4 @@ class ApiManager {
   }
 }
 
-export default ApiManager;
+export default BaseApiManager;

src/universal/core/api/ClientApiManagerCache.js

@@ -0,0 +1,11 @@
+import createApiClient from '../utils/createApiClient';
+import BaseApiManager from './BaseApiManager';
+
+export default (config, timeout) => {
+  const apiManager = new BaseApiManager({
+    baseURL: config.clientUrl || config.url || config.serverUrl || '/',
+    timeout
+  });
+
+  return createApiClient(apiManager);
+};

src/universal/core/api/ServerApiManagerCache.js

@@ -1,5 +1,5 @@
-import ApiManager from './ApiManager';
-import { createApiClient } from '../../common/network/apiUtils';
+import createApiClient from '../utils/createApiClient';
+import BaseApiManager from './BaseApiManager';
 
 import http from 'http';
 import https from 'https';
@@ -10,9 +10,9 @@ const BASE_HTTP_AGENT_CONFIG = {
 };
 
 export default (config, timeout) => {
-  const apiManager = new ApiManager({
+  const apiManager = new BaseApiManager({
     timeout,
-    baseURL: config.serverUrl,
+    baseURL: config.serverUrl || config.url || config.clientUrl || '/',
     httpAgent: new http.Agent(BASE_HTTP_AGENT_CONFIG),
     httpsAgent: new https.Agent(BASE_HTTP_AGENT_CONFIG)
   });

src/universal/core/api/index.js

@@ -0,0 +1,3 @@
+export { default as BaseApiManager } from './BaseApiManager';
+export { default as ClientApiManager } from './ClientApiManager';
+export { default as ServerApiManager } from './ServerApiManager';