@blocklet/payment-react 1.18.2 → 1.18.4

package/lib/contexts/payment.js

@@ -13,6 +13,7 @@ var _ahooks = require("ahooks");
 var _react = require("react");
 var _api = _interopRequireDefault(require("../libs/api"));
 var _util = require("../libs/util");
+var _cachedRequest = require("../libs/cached-request");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const PaymentContext = exports.PaymentContext = (0, _react.createContext)({
   api: _api.default
@@ -22,31 +23,15 @@ const {
   Consumer
 } = PaymentContext;
 exports.SettingsConsumer = Consumer;
-let settingsPromise = null;
 const getSettings = (forceRefresh = false) => {
   const livemode = localStorage.getItem("livemode") !== "false";
   const cacheKey = `payment-settings-${window.location.pathname}-${livemode}`;
-  const cachedData = sessionStorage.getItem(cacheKey);
-  if (cachedData && !forceRefresh) {
-    return JSON.parse(cachedData);
-  }
-  if (!settingsPromise) {
-    settingsPromise = _api.default.get("/api/settings", {
-      params: {
-        livemode
-      }
-    }).then(({
-      data
-    }) => {
-      sessionStorage.setItem(cacheKey, JSON.stringify(data));
-      return data;
-    }).catch(error => {
-      throw error;
-    }).finally(() => {
-      settingsPromise = null;
-    });
-  }
-  return settingsPromise;
+  const cachedRequest = new _cachedRequest.CachedRequest(cacheKey, () => _api.default.get("/api/settings", {
+    params: {
+      livemode
+    }
+  }));
+  return cachedRequest.fetch(forceRefresh);
 };
 const getCurrency = (currencyId, methods) => {
   const currencies = methods.reduce((acc, x) => acc.concat(x.payment_currencies), []);

package/lib/index.d.ts

@@ -34,7 +34,9 @@ export { PaymentThemeProvider } from './theme';
 export * from './libs/util';
 export * from './libs/connect';
 export * from './libs/phone-validator';
+export * from './libs/cached-request';
 export * from './contexts/payment';
+export * from './contexts/donate';
 export * from './hooks/subscription';
 export * from './hooks/mobile';
 export * from './hooks/table';

package/lib/index.js

@@ -319,6 +319,18 @@ Object.keys(_phoneValidator).forEach(function (key) {
     }
   });
 });
+var _cachedRequest = require("./libs/cached-request");
+Object.keys(_cachedRequest).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _cachedRequest[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _cachedRequest[key];
+    }
+  });
+});
 var _payment = require("./contexts/payment");
 Object.keys(_payment).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -331,6 +343,18 @@ Object.keys(_payment).forEach(function (key) {
     }
   });
 });
+var _donate2 = require("./contexts/donate");
+Object.keys(_donate2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _donate2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _donate2[key];
+    }
+  });
+});
 var _subscription = require("./hooks/subscription");
 Object.keys(_subscription).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/libs/cache.d.ts

@@ -0,0 +1,14 @@
+type CacheItem = {
+    promise: Promise<any> | null;
+};
+declare class GlobalCacheManager {
+    private static instance;
+    private cacheMap;
+    private constructor();
+    static getInstance(): GlobalCacheManager;
+    get(cacheKey: string): CacheItem | undefined;
+    set(cacheKey: string, item: CacheItem): void;
+    delete(cacheKey: string): void;
+}
+export declare const globalCache: GlobalCacheManager;
+export {};

package/lib/libs/cache.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.globalCache = void 0;
+class GlobalCacheManager {
+  static instance;
+  cacheMap;
+  constructor() {
+    this.cacheMap = /* @__PURE__ */new Map();
+  }
+  static getInstance() {
+    if (!GlobalCacheManager.instance) {
+      GlobalCacheManager.instance = new GlobalCacheManager();
+    }
+    return GlobalCacheManager.instance;
+  }
+  get(cacheKey) {
+    return this.cacheMap.get(cacheKey);
+  }
+  set(cacheKey, item) {
+    this.cacheMap.set(cacheKey, item);
+  }
+  delete(cacheKey) {
+    this.cacheMap.delete(cacheKey);
+  }
+}
+const globalCache = exports.globalCache = GlobalCacheManager.getInstance();

package/lib/libs/cached-request.d.ts

@@ -0,0 +1,17 @@
+type CacheStrategy = 'session' | 'local' | 'memory';
+interface CacheOptions {
+    strategy?: CacheStrategy;
+    ttl?: number;
+}
+export declare class CachedRequest {
+    private cacheKey;
+    private fetchData;
+    private options;
+    constructor(cacheKey: string, fetchData: () => Promise<any>, options?: CacheOptions);
+    private getCache;
+    private getCachedData;
+    private setCachedData;
+    private clearCache;
+    fetch(forceRefresh?: boolean): Promise<any>;
+}
+export {};

package/lib/libs/cached-request.js

@@ -0,0 +1,90 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CachedRequest = void 0;
+var _cache = require("./cache");
+class CachedRequest {
+  cacheKey;
+  fetchData;
+  options;
+  constructor(cacheKey, fetchData, options = {}) {
+    this.cacheKey = cacheKey;
+    this.fetchData = fetchData;
+    this.options = {
+      strategy: "session",
+      ttl: 0,
+      ...options
+    };
+  }
+  getCache() {
+    const {
+      strategy
+    } = this.options;
+    switch (strategy) {
+      case "local":
+        return localStorage;
+      case "memory":
+        return _cache.globalCache;
+      case "session":
+      default:
+        return sessionStorage;
+    }
+  }
+  getCachedData() {
+    const cache = this.getCache();
+    const data = this.options.strategy === "memory" ? cache.get(this.cacheKey) : cache.getItem(this.cacheKey);
+    if (!data) return null;
+    const parsed = JSON.parse(data);
+    if (this.options.ttl && parsed.timestamp) {
+      const isExpired = Date.now() - parsed.timestamp > this.options.ttl;
+      if (isExpired) {
+        this.clearCache();
+        return null;
+      }
+    }
+    return parsed.data;
+  }
+  setCachedData(data) {
+    const cache = this.getCache();
+    const value = JSON.stringify({
+      data,
+      timestamp: Date.now()
+    });
+    if (this.options.strategy === "memory") {
+      cache.set(this.cacheKey, value);
+    } else {
+      cache.setItem(this.cacheKey, value);
+    }
+  }
+  clearCache() {
+    const cache = this.getCache();
+    if (this.options.strategy === "memory") {
+      cache.delete(this.cacheKey);
+    } else {
+      cache.removeItem(this.cacheKey);
+    }
+  }
+  fetch(forceRefresh = false) {
+    const cachedData = !forceRefresh && this.getCachedData();
+    if (cachedData) return Promise.resolve(cachedData);
+    const globalItem = _cache.globalCache.get(this.cacheKey);
+    if (globalItem?.promise) {
+      return globalItem.promise;
+    }
+    const newPromise = this.fetchData().then(({
+      data
+    }) => {
+      this.setCachedData(data);
+      return data;
+    }).finally(() => {
+      _cache.globalCache.delete(this.cacheKey);
+    });
+    _cache.globalCache.set(this.cacheKey, {
+      promise: newPromise
+    });
+    return newPromise;
+  }
+}
+exports.CachedRequest = CachedRequest;

package/lib/libs/util.d.ts

@@ -111,3 +111,5 @@ export declare function getInvoiceDescriptionAndReason(invoice: TInvoiceExpanded
     reason: string;
     type: string;
 };
+export declare function getPaymentKitComponent(): any;
+export declare function openDonationSettings(openInNewTab?: boolean): void;

package/lib/libs/util.js

@@ -33,6 +33,7 @@ exports.getFreeTrialTime = getFreeTrialTime;
 exports.getInvoiceDescriptionAndReason = getInvoiceDescriptionAndReason;
 exports.getInvoiceStatusColor = getInvoiceStatusColor;
 exports.getPaymentIntentStatusColor = getPaymentIntentStatusColor;
+exports.getPaymentKitComponent = getPaymentKitComponent;
 exports.getPayoutStatusColor = getPayoutStatusColor;
 exports.getPrefix = void 0;
 exports.getPriceCurrencyOptions = getPriceCurrencyOptions;
@@ -52,6 +53,7 @@ exports.isPaymentKitMounted = void 0;
 exports.isValidCountry = isValidCountry;
 exports.lazyLoad = lazyLoad;
 exports.mergeExtraParams = void 0;
+exports.openDonationSettings = openDonationSettings;
 exports.sleep = sleep;
 exports.stopEvent = stopEvent;
 exports.truncateText = truncateText;
@@ -1096,4 +1098,14 @@ function getInvoiceDescriptionAndReason(invoice, locale = "en") {
     reason: reasonMap[reason] || reason,
     type: invoiceType
   };
+}
+function getPaymentKitComponent() {
+  const paymentKit = window.blocklet?.componentMountPoints?.find(c => c.did === PAYMENT_KIT_DID);
+  return paymentKit || null;
+}
+function openDonationSettings(openInNewTab = false) {
+  const paymentKit = getPaymentKitComponent();
+  if (paymentKit) {
+    window.open(`${window.location.origin}${paymentKit.mountPoint === "/" ? "" : paymentKit.mountPoint}/integrations/donations`, openInNewTab ? "_blank" : "_self");
+  }
 }

package/lib/locales/en.js

@@ -141,7 +141,14 @@ module.exports = (0, _flat.default)({
           one: "{name} will receive all tips",
           multiple: "Tips will be distributed to {count} beneficiaries",
           view: "Click to view details"
-        }
+        },
+        inactive: "Donation feature is not enabled",
+        enable: "Enable Donation",
+        enableSuccess: "Enable Success",
+        configPrompt: "Donation feature is enabled, you can configure donation options in Payment Kit",
+        configNow: "Configure Now",
+        later: "Configure Later",
+        configTip: "Configure donation settings in Payment Kit"
       },
       cardPay: "{action} with card",
       empty: "No thing to pay",

package/lib/locales/zh.js

@@ -141,7 +141,14 @@ module.exports = (0, _flat.default)({
           one: "{name} \u5C06\u83B7\u5F97\u5168\u90E8\u6253\u8D4F",
           multiple: "\u6253\u8D4F\u5C06\u6309\u6BD4\u4F8B\u5206\u914D\u7ED9 {count} \u4F4D\u53D7\u76CA\u4EBA",
           view: "\u70B9\u51FB\u67E5\u770B\u8BE6\u60C5"
-        }
+        },
+        inactive: "\u6253\u8D4F\u529F\u80FD\u6682\u672A\u5F00\u542F",
+        enable: "\u542F\u7528\u6253\u8D4F",
+        enableSuccess: "\u542F\u7528\u6210\u529F",
+        configPrompt: "\u6253\u8D4F\u529F\u80FD\u5DF2\u542F\u7528\uFF0C\u60A8\u53EF\u4EE5\u524D\u5F80 Payment Kit \u8FDB\u4E00\u6B65\u914D\u7F6E\u6253\u8D4F\u9009\u9879",
+        configNow: "\u7ACB\u5373\u914D\u7F6E",
+        later: "\u7A0D\u540E\u914D\u7F6E",
+        configTip: "\u524D\u5F80 Payment Kit \u914D\u7F6E\u6253\u8D4F\u9009\u9879"
       },
       cardPay: "\u4F7F\u7528\u5361\u7247{action}",
       empty: "\u6CA1\u6709\u53EF\u652F\u4ED8\u7684\u9879\u76EE",

package/lib/payment/skeleton/donation.js

@@ -22,7 +22,7 @@ function DonationSkeleton() {
           mt: 2
         },
         variant: "rounded",
-        height: 80
+        height: 40
       }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Divider, {
         sx: {
           mt: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -53,15 +53,15 @@
     }
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.11.27",
-    "@arcblock/ux": "^2.11.27",
-    "@arcblock/ws": "^1.19.3",
-    "@blocklet/ui-react": "^2.11.27",
+    "@arcblock/did-connect": "^2.11.34",
+    "@arcblock/ux": "^2.11.34",
+    "@arcblock/ws": "^1.19.9",
+    "@blocklet/ui-react": "^2.11.34",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/util": "^1.19.3",
+    "@ocap/util": "^1.19.9",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "@vitejs/plugin-legacy": "^5.4.1",
@@ -92,7 +92,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@blocklet/payment-types": "1.18.2",
+    "@blocklet/payment-types": "1.18.4",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -123,5 +123,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "577491d13f4b2e53e9a71be3b90298b5685f5e8a"
+  "gitHead": "003d3b762bc9e3e224e4814dea95ff02d014868d"
 }