@lancom/shared 0.0.415 → 0.0.416

package/assets/js/api/index.js

@@ -2,8 +2,14 @@ import { _get, _post, _put, _delete, _patch } from './helpers';
 import adminApi from './admin';
 import { unminifySimpleProducts } from './utils/simple-products';
 import { unminifyProduct } from './utils/product';
+import { getSharePromise } from './../utils/share-promises';
+
+const shareRequestsPromises = getSharePromise(5 * 60 * 1000);
 
 const api = {
+  clearAllSharePromises() {
+    return _post('clear-share-promises');
+  },
   fetchClientSettings(shop, params) {
     return _get(`shop/${shop}/client-settings`, params);
   },
@@ -71,7 +77,8 @@ const api = {
     return _get(`shop/${shop}/menus`);
   },
   fetchBanners(shop, params) {
-    return _get(`shop/${shop}/banners`, params);
+    const KEY = `shop/${shop}/banners_${JSON.stringify(params || {})}`;
+    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/banners`, params));
   },
   fetchProductsKits(shop, params) {
     return _get(`shop/${shop}/products-kit`, params);
@@ -86,7 +93,8 @@ const api = {
     return _get(`shop/${shop}/news/${alias}?preview=${preview}`);
   },
   fetchNewsTags(shop, params) {
-    return _get(`shop/${shop}/news-tag`, params);
+    const KEY = `shop/${shop}/news-tag_${JSON.stringify(params || {})}`
+    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/news-tag`, params));
   },
   fetchNewsTag(shop, alias) {
     return _get(`shop/${shop}/news-tag/${alias}`);

package/assets/js/utils/share-promises/index.js

@@ -0,0 +1,76 @@
+const MAX_PROMISES_COUNT = 1000;
+const DEFAULT_SHARE_LIFETIME = 10 * 1000;
+
+export class SharePromises {
+  constructor(clearSharesTimeoutDelay) {
+    this.promises = new Map();
+    this.clearSharesTimeout = null;
+    this.clearSharesTimeoutDelay = clearSharesTimeoutDelay || DEFAULT_SHARE_LIFETIME;
+  }
+
+  startClearTimeout(key) {
+    const promise = this.promises.get(key);
+    if (promise) {
+      clearTimeout(promise.timeout);
+      promise.timeout = setTimeout(() => {
+        this.promises.delete(key);
+      }, this.clearSharesTimeoutDelay);
+    }
+  }
+
+  share(keyObj, promiseFactory) {
+    const key = `${keyObj}`;
+    let promise = this.promises.get(key);
+    if (!promise) {
+      this.checkMaxPromisesCount();
+
+      promise = {
+        promise: promiseFactory(),
+        timeout: null
+      };
+
+      this.promises.set(key, promise);
+
+      this.startClearTimeout(key);
+    }
+
+    promise.promise = promise.promise.then((result) => result);
+
+    return promise.promise;
+  }
+
+  checkMaxPromisesCount() {
+    if (this.promises.size >= MAX_PROMISES_COUNT) {
+      this.clear();
+    }
+  }
+
+  clear() {
+    this.promises.forEach(promise => {
+      clearTimeout(promise.timeout);
+    });
+    this.promises.clear();
+  }
+
+  clearPromise(keyObj) {
+    const key = `${keyObj}`;
+    let promise = this.promises.get(key);
+    if (promise) {
+      clearTimeout(promise.timeout);
+      this.promises.delete(key);
+    }
+  }
+}
+
+const allSharePromises = [];
+export function getSharePromise(timeout) {
+  const sharePromise = new SharePromises(timeout);
+  allSharePromises.push(sharePromise);
+  return sharePromise;
+}
+
+export function clearAllSharePromises() {
+  for (const sharePromise of allSharePromises) {
+    sharePromise.clear();
+  }
+}

package/components/product/product.vue

@@ -32,12 +32,6 @@
         <section class="Product__section">
           <wizard-editor />
         </section>
-        <!-- <section class="Product__section">
-          <product-colors-selector v-if="productDetails" />
-        </section> -->
-        <!-- <section class="Product__section">
-          <product-tier-prices :product="product" />
-        </section> -->
         <section class="Product__section">
           <product-fabric-and-size-info :product="product" />
         </section>
@@ -59,23 +53,17 @@ import RelatedProducts from '@lancom/shared/components/product/related_products/
 import Gallery from '@lancom/shared/components/product/gallery/gallery';
 import { generateProductLink } from '@lancom/shared/assets/js/utils/product';
 import ProductMainInfo from './layouts/product_main_info/product-main-info';
-import ProductColorsSelector from './product_colors_selector/product-colors-selector';
-import ProductTierPrices from './layouts/product_tier_prices/product-tier-prices';
 import ProductFabricAndSizeInfo from './layouts/product_fabric_and_size_info/product-fabric-and-size-info';
 import ProductPackaging from './layouts/product_packaging/product-packaging';
 import ProductModelMeasurements from './layouts/product_model_measurements/product-model-measurements';
 import ProductSizeTable from './layouts/product_size_table/product-size-table';
 import WizardEditor from './wizard-editor/wizard-editor.vue';
 
-    
-// import ProductLabelsCustomization from './layouts/product_labels_customization/product-labels-customization';
 
 export default {
   name: 'Product',
   components: {
     ProductMainInfo,
-    ProductColorsSelector,
-    ProductTierPrices,
     ProductFabricAndSizeInfo,
     ProductPackaging,
     ProductModelMeasurements,

package/components/product/product_reviews/product-reviews.vue

@@ -41,6 +41,12 @@ export default {
     ProductReview
   },
   mixins: [],
+  props: {
+    product: {
+      type: Object,
+      required: true
+    }
+  },
   data() {
     const reviews = this.product.reviews || [];
     const [, mainReviewId] = (this.$route.hash || '').match(/review-([a-z0-9]+)/i) || [];
@@ -56,12 +62,6 @@ export default {
       ].filter(review => !!review)
     };
   },
-  props: {
-    product: {
-      type: Object,
-      required: true
-    }
-  },
   computed: {
     currentReview() {
       return this.reviews[this.activeIndex];

package/components/product/related_products/related-products.vue

@@ -36,15 +36,15 @@ export default {
       products: []
     };
   },
+  async fetch() {
+    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
+    this.products = products.splice(0, 6);
+  },
   computed: {
     ...mapGetters(['shop']),
     hasProducts() {
       return this.products.length > 0;
     }
-  },
-  async fetch() {
-    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
-    this.products = products.splice(0, 6);
   }
 };
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.415",
+  "version": "0.0.416",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/store/index.js

@@ -4,9 +4,13 @@ import { getAuthToken } from '@lancom/shared/assets/js/utils/auth';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
 import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
+import { getSharePromise, clearAllSharePromises } from '@lancom/shared/assets/js/utils/share-promises';
+
 const cookieparser = process.server ? require('cookieparser') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
 
+const shareShopInfo = getSharePromise(60 * 1000);
+
 export const state = () => ({
   googleClickId: null,
   stockCountry: null,
@@ -69,9 +73,14 @@ export const actions = {
       await commit('setShop', shop);
     }
   },
-  async nuxtServerInit({ commit }, { req }) {
-    const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
-    const menus = await api.fetchMenus(shop._id);
+  async nuxtServerInit({ commit }, { req, query }) {
+    if (query?.cache === 'false') {
+      clearAllSharePromises();
+      await api.clearAllSharePromises();
+    }
+
+    const shop = await shareShopInfo.share(process.env.HOST_NAME, () => api.fetchShopByUrl(process.env.HOST_NAME));
+    const menus = await shareShopInfo.share(`menus_${shop._id}`, () => api.fetchMenus(shop._id));
     commit('setMenus', menus);
     commit('setShop', shop);
     // if (req.headers.cookie) {