payment-kit 1.25.7 → 1.25.10

package/api/tests/libs/archive-store.spec.ts

@@ -0,0 +1,159 @@
+import fs from 'fs';
+
+import {
+  getArchiveDir,
+  getArchiveFilePath,
+  listArchiveFiles,
+  getFileSize,
+  cleanupOldArchiveFiles,
+} from '../../src/libs/archive/store';
+
+jest.mock('@blocklet/sdk/lib/config', () => ({
+  __esModule: true,
+  default: {
+    env: {
+      dataDir: '/tmp/test-payment-kit',
+    },
+  },
+}));
+
+jest.mock('fs');
+jest.mock('../../src/libs/logger', () => ({
+  __esModule: true,
+  default: {
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
+describe('archive/store', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('getArchiveDir', () => {
+    it('should create archive directory if it does not exist', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(false);
+      (fs.mkdirSync as jest.Mock).mockReturnValue(undefined);
+
+      const result = getArchiveDir();
+
+      expect(result).toContain('archive');
+      expect(fs.mkdirSync).toHaveBeenCalledWith(expect.stringContaining('archive'), { recursive: true });
+    });
+
+    it('should not create directory if it already exists', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+
+      getArchiveDir();
+
+      expect(fs.mkdirSync).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getArchiveFilePath', () => {
+    it('should return full path for archive file', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+
+      const result = getArchiveFilePath('archive-2024.db');
+
+      expect(result).toContain('archive-2024.db');
+      expect(result).toContain('archive');
+    });
+  });
+
+  describe('listArchiveFiles', () => {
+    it('should return sorted list of .db files', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+      (fs.readdirSync as jest.Mock).mockReturnValue([
+        'archive-2025.db',
+        'archive-2023.db',
+        'archive-2024.db',
+        'some-other-file.txt',
+      ]);
+
+      const result = listArchiveFiles();
+
+      expect(result).toHaveLength(3);
+      expect(result[0]).toContain('archive-2023.db');
+      expect(result[1]).toContain('archive-2024.db');
+      expect(result[2]).toContain('archive-2025.db');
+    });
+
+    it('should return empty array when no .db files', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+      (fs.readdirSync as jest.Mock).mockReturnValue(['readme.txt', 'config.json']);
+
+      const result = listArchiveFiles();
+
+      expect(result).toHaveLength(0);
+    });
+  });
+
+  describe('getFileSize', () => {
+    it('should return file size in bytes', () => {
+      (fs.statSync as jest.Mock).mockReturnValue({ size: 1024 });
+
+      const result = getFileSize('/tmp/archive.db');
+
+      expect(result).toBe(1024);
+    });
+
+    it('should return 0 when file does not exist', () => {
+      (fs.statSync as jest.Mock).mockImplementation(() => {
+        throw new Error('ENOENT');
+      });
+
+      const result = getFileSize('/tmp/nonexistent.db');
+
+      expect(result).toBe(0);
+    });
+  });
+
+  describe('cleanupOldArchiveFiles', () => {
+    it('should not remove files when under max limit', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+      (fs.readdirSync as jest.Mock).mockReturnValue(['archive-2023.db', 'archive-2024.db']);
+
+      const result = cleanupOldArchiveFiles(10);
+
+      expect(result).toHaveLength(0);
+      expect(fs.unlinkSync).not.toHaveBeenCalled();
+    });
+
+    it('should remove oldest files when exceeding max limit', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+      (fs.readdirSync as jest.Mock).mockReturnValue([
+        'archive-2021.db',
+        'archive-2022.db',
+        'archive-2023.db',
+        'archive-2024.db',
+      ]);
+      (fs.unlinkSync as jest.Mock).mockReturnValue(undefined);
+
+      const result = cleanupOldArchiveFiles(2);
+
+      expect(result).toHaveLength(2);
+      expect(result).toContain('archive-2021.db');
+      expect(result).toContain('archive-2022.db');
+      expect(fs.unlinkSync).toHaveBeenCalledTimes(2);
+    });
+
+    it('should continue cleanup even if one file fails to delete', () => {
+      (fs.existsSync as jest.Mock).mockReturnValue(true);
+      (fs.readdirSync as jest.Mock).mockReturnValue(['archive-2022.db', 'archive-2023.db', 'archive-2024.db']);
+      (fs.unlinkSync as jest.Mock)
+        .mockImplementationOnce(() => {
+          throw new Error('Permission denied');
+        })
+        .mockReturnValue(undefined);
+
+      const result = cleanupOldArchiveFiles(1);
+
+      expect(fs.unlinkSync).toHaveBeenCalledTimes(2);
+      expect(result).toHaveLength(1);
+      expect(result).toContain('archive-2023.db');
+    });
+  });
+});

package/api/tests/libs/credit-grant.spec.ts

@@ -0,0 +1,184 @@
+import { Op } from 'sequelize';
+
+import { getCreditGrantStats } from '../../src/libs/credit-grant';
+import { CreditGrant, PaymentCurrency } from '../../src/store/models';
+
+jest.mock('../../src/libs/logger', () => ({
+  __esModule: true,
+  default: {
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    debug: jest.fn(),
+  },
+}));
+
+jest.mock('../../src/libs/subscription', () => ({
+  getMeterPriceIdsFromSubscription: jest.fn(),
+}));
+
+jest.mock('../../src/store/models', () => ({
+  CreditGrant: {
+    findAll: jest.fn(),
+  },
+  PaymentCurrency: {
+    findByPk: jest.fn(),
+  },
+  Customer: {
+    findByPk: jest.fn(),
+  },
+  Subscription: {
+    findByPk: jest.fn(),
+  },
+}));
+
+describe('libs/credit-grant.ts', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  it('aggregates daily stats and totals', async () => {
+    const currencyJson = { id: 'cur_1', name: 'USD', symbol: '$', decimal: 2 };
+    (PaymentCurrency.findByPk as jest.Mock).mockResolvedValue({
+      ...currencyJson,
+      toJSON: () => currencyJson,
+    });
+
+    (CreditGrant.findAll as jest.Mock).mockResolvedValue([
+      {
+        amount: '100',
+        remaining_amount: '40',
+        created_at: new Date('2024-01-01T01:00:00Z'),
+      },
+      {
+        amount: '200',
+        remaining_amount: '200',
+        created_at: new Date('2024-01-01T10:00:00Z'),
+      },
+      {
+        amount: '50',
+        remaining_amount: '10',
+        created_at: new Date('2024-01-02T05:00:00Z'),
+      },
+    ]);
+
+    const result = await getCreditGrantStats({
+      currencyId: 'cur_1',
+      startDate: 1704067200,
+      endDate: 1704240000,
+    });
+
+    expect(PaymentCurrency.findByPk).toHaveBeenCalledWith('cur_1', {
+      attributes: ['id', 'name', 'symbol', 'decimal'],
+    });
+
+    const callArg = (CreditGrant.findAll as jest.Mock).mock.calls[0][0];
+    expect(callArg.attributes).toEqual(['amount', 'remaining_amount', 'created_at']);
+    expect(callArg.raw).toBe(true);
+
+    expect(result.stats).toEqual({
+      currency_id: 'cur_1',
+      currency: currencyJson,
+      grant_count: 3,
+      total_granted: '350',
+      total_remaining: '250',
+      total_consumed: '100',
+    });
+
+    expect(result.daily_stats).toEqual([
+      {
+        date: '2024-01-01',
+        currency_id: 'cur_1',
+        grant_count: 2,
+        total_granted: '300',
+        total_remaining: '240',
+        total_consumed: '60',
+      },
+      {
+        date: '2024-01-02',
+        currency_id: 'cur_1',
+        grant_count: 1,
+        total_granted: '50',
+        total_remaining: '10',
+        total_consumed: '40',
+      },
+    ]);
+  });
+
+  it('groups grants by day using timezone offset', async () => {
+    const currencyJson = { id: 'cur_2', name: 'USD', symbol: '$', decimal: 2 };
+    (PaymentCurrency.findByPk as jest.Mock).mockResolvedValue({
+      ...currencyJson,
+      toJSON: () => currencyJson,
+    });
+
+    (CreditGrant.findAll as jest.Mock).mockResolvedValue([
+      {
+        amount: '10',
+        remaining_amount: '5',
+        created_at: new Date('2024-01-01T23:30:00Z'),
+      },
+      {
+        amount: '20',
+        remaining_amount: '0',
+        created_at: new Date('2024-01-02T01:00:00Z'),
+      },
+    ]);
+
+    const result = await getCreditGrantStats({
+      currencyId: 'cur_2',
+      startDate: 1704067200,
+      endDate: 1704240000,
+      timezoneOffset: 480,
+    });
+
+    expect(result.daily_stats).toEqual([
+      {
+        date: '2024-01-02',
+        currency_id: 'cur_2',
+        grant_count: 2,
+        total_granted: '30',
+        total_remaining: '5',
+        total_consumed: '25',
+      },
+    ]);
+  });
+
+  it('builds where clause with grantedBy and category filters', async () => {
+    const currencyJson = { id: 'cur_3', name: 'USD', symbol: '$', decimal: 2 };
+    (PaymentCurrency.findByPk as jest.Mock).mockResolvedValue({
+      ...currencyJson,
+      toJSON: () => currencyJson,
+    });
+    (CreditGrant.findAll as jest.Mock).mockResolvedValue([]);
+
+    const startDate = 1704067200;
+    const endDate = 1704153600;
+
+    const result = await getCreditGrantStats({
+      currencyId: 'cur_3',
+      startDate,
+      endDate,
+      grantedBy: 'did:example:123',
+      category: 'paid',
+    });
+
+    const callArg = (CreditGrant.findAll as jest.Mock).mock.calls[0][0];
+    expect(callArg.where.currency_id).toBe('cur_3');
+    expect(callArg.where['metadata.granted_by']).toBe('did:example:123');
+    expect(callArg.where.category).toBe('paid');
+    expect(callArg.where.created_at[Op.gte]).toEqual(new Date(startDate * 1000));
+    expect(callArg.where.created_at[Op.lte]).toEqual(new Date(endDate * 1000));
+
+    expect(result.stats).toEqual({
+      currency_id: 'cur_3',
+      currency: currencyJson,
+      grant_count: 0,
+      total_granted: '0',
+      total_remaining: '0',
+      total_consumed: '0',
+    });
+    expect(result.daily_stats).toEqual([]);
+  });
+});

package/blocklet.prefs.json

@@ -0,0 +1,187 @@
+{
+  "form": {
+    "labelCol": 6,
+    "wrapperCol": 12
+  },
+  "schema": {
+    "type": "object",
+    "properties": {
+      "8ezxt923qyy": {
+        "type": "void",
+        "x-component": "Card",
+        "x-component-props": {
+          "title": "Config"
+        },
+        "x-designable-id": "8ezxt923qyy",
+        "properties": {
+          "wvny47lybcc": {
+            "type": "void",
+            "x-component": "FormCollapse",
+            "x-component-props": {},
+            "name": "Data Retention",
+            "x-designable-id": "wvny47lybcc",
+            "properties": {
+              "5tiydb79qp2": {
+                "type": "void",
+                "x-component": "FormCollapse.CollapsePanel",
+                "x-component-props": {
+                  "header": "Data Retention"
+                },
+                "x-designable-id": "5tiydb79qp2",
+                "properties": {
+                  "retentionEnabled": {
+                    "type": "boolean",
+                    "title": "Enable Data Retention ",
+                    "x-decorator": "FormItem",
+                    "x-component": "Switch",
+                    "x-validator": [],
+                    "x-component-props": {},
+                    "x-decorator-props": {},
+                    "name": "retentionEnabled",
+                    "default": false,
+                    "description": "Archive expired data to reduce database size",
+                    "x-designable-id": "886b4pe1o1y",
+                    "x-index": 0
+                  },
+                  "scheduleEnabled": {
+                    "type": "boolean",
+                    "title": "Enable Scheduled  Archive",
+                    "x-decorator": "FormItem",
+                    "x-component": "Switch",
+                    "x-validator": [],
+                    "x-component-props": {},
+                    "x-decorator-props": {},
+                    "description": "Run archive job automatically every day",
+                    "name": "scheduleEnabled",
+                    "default": true,
+                    "x-reactions": {
+                      "dependencies": [
+                        {
+                          "property": "value",
+                          "type": "boolean",
+                          "source": "8ezxt923qyy.wvny47lybcc.5tiydb79qp2.retentionEnabled",
+                          "name": "retentionEnabled"
+                        }
+                      ],
+                      "fulfill": {
+                        "state": {
+                          "visible": "{{$deps.retentionEnabled}}"
+                        }
+                      }
+                    },
+                    "x-designable-id": "53cmu3qg9j3",
+                    "x-index": 1
+                  },
+                  "scheduleHour": {
+                    "type": "number",
+                    "title": " Archive Hour (0-23)     ",
+                    "x-decorator": "FormItem",
+                    "x-component": "NumberPicker",
+                    "x-validator": "number",
+                    "x-component-props": {
+                      "min": 0,
+                      "max": 23
+                    },
+                    "x-decorator-props": {},
+                    "name": "scheduleHour",
+                    "default": 2,
+                    "description": "Hour of day to\nrun the archive job （server Local\ntime）",
+                    "x-reactions": {
+                      "dependencies": [
+                        {
+                          "property": "value",
+                          "type": "boolean",
+                          "source": "8ezxt923qyy.wvny47lybcc.5tiydb79qp2.retentionEnabled",
+                          "name": "retentionEnabled"
+                        },
+                        {
+                          "property": "value",
+                          "type": "boolean",
+                          "source": "8ezxt923qyy.wvny47lybcc.5tiydb79qp2.scheduleEnabled",
+                          "name": "scheduleEnabled"
+                        }
+                      ],
+                      "fulfill": {
+                        "state": {
+                          "visible": "{{$deps.retentionEnabled === true && $deps.scheduleEnabled === true}}"
+                        }
+                      }
+                    },
+                    "x-designable-id": "dvdqp2aaszw",
+                    "x-index": 2
+                  },
+                  "batchSize": {
+                    "type": "number",
+                    "title": "Batch Size      ",
+                    "x-decorator": "FormItem",
+                    "x-component": "NumberPicker",
+                    "x-validator": [],
+                    "x-component-props": {
+                      "min": 100
+                    },
+                    "x-decorator-props": {},
+                    "name": "batchSize",
+                    "default": 500,
+                    "description": "Number of records to archive per batch. Smaller\nvalues reduce database load",
+                    "x-reactions": {
+                      "dependencies": [
+                        {
+                          "property": "value",
+                          "type": "boolean",
+                          "source": "8ezxt923qyy.wvny47lybcc.5tiydb79qp2.retentionEnabled",
+                          "name": "retentionEnabled"
+                        }
+                      ],
+                      "fulfill": {
+                        "state": {
+                          "visible": "{{$deps.retentionEnabled}}"
+                        }
+                      }
+                    },
+                    "x-designable-id": "5mdfl84f6xw",
+                    "x-index": 3
+                  },
+                  "minFreeDiskMB": {
+                    "type": "number",
+                    "title": "Min Free Disk Space (MB)",
+                    "x-decorator": "FormItem",
+                    "x-component": "NumberPicker",
+                    "x-validator": [],
+                    "x-component-props": {
+                      "min": 100
+                    },
+                    "x-decorator-props": {},
+                    "name": "minFreeDiskMB",
+                    "default": 1000,
+                    "description": "Stop archiving when free disk space falls below this threshold (default 1GB)",
+                    "x-reactions": {
+                      "dependencies": [
+                        {
+                          "property": "value",
+                          "type": "boolean",
+                          "source": "8ezxt923qyy.wvny47lybcc.5tiydb79qp2.retentionEnabled",
+                          "name": "retentionEnabled"
+                        }
+                      ],
+                      "fulfill": {
+                        "state": {
+                          "visible": "{{$deps.retentionEnabled}}"
+                        }
+                      }
+                    },
+                    "x-designable-id": "ud3govolh1e",
+                    "x-index": 4
+                  }
+                },
+                "x-index": 0
+              }
+            },
+            "x-index": 0
+          }
+        },
+        "x-index": 0
+      }
+    },
+    "x-designable-id": "yfw4ta3wi0l"
+  }
+}

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.25.7
+version: 1.25.10
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.25.7",
+  "version": "1.25.10",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -47,23 +47,23 @@
   "dependencies": {
     "@abtnode/cron": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/did": "^1.28.5",
-    "@arcblock/did-connect-react": "^3.4.7",
+    "@arcblock/did-connect-react": "^3.5.1",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
     "@arcblock/did-util": "^1.28.5",
     "@arcblock/jwt": "^1.28.5",
-    "@arcblock/react-hooks": "^3.4.7",
-    "@arcblock/ux": "^3.4.7",
+    "@arcblock/react-hooks": "^3.5.1",
+    "@arcblock/ux": "^3.5.1",
     "@arcblock/validator": "^1.28.5",
     "@arcblock/vc": "^1.28.5",
     "@blocklet/did-space-js": "^1.2.15",
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/logger": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/payment-broker-client": "1.25.7",
-    "@blocklet/payment-react": "1.25.7",
-    "@blocklet/payment-vendor": "1.25.7",
+    "@blocklet/payment-broker-client": "1.25.10",
+    "@blocklet/payment-react": "1.25.10",
+    "@blocklet/payment-vendor": "1.25.10",
     "@blocklet/sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/ui-react": "^3.4.7",
+    "@blocklet/ui-react": "^3.5.1",
     "@blocklet/uploader": "^0.3.19",
     "@blocklet/xss": "^0.3.16",
     "@mui/icons-material": "^7.1.2",
@@ -132,7 +132,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.25.7",
+    "@blocklet/payment-types": "1.25.10",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -179,5 +179,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0aa950a5d3f01a150ec21c66e2efeaf81ee1cc69"
+  "gitHead": "36417122ec9a0cfd1e289b4ca21d33f1b5d87a9a"
 }

package/src/locales/en.tsx

@@ -164,6 +164,10 @@ export default flat({
           title: 'Total Income',
           subtitle: "User's actual payment",
         },
+        refundAmount: {
+          title: 'Refund Amount',
+          subtitle: 'Total refunds issued',
+        },
         costOfGoods: {
           title: 'Cost of Goods',
           subtitle: 'Supplier share',

package/src/locales/zh.tsx

@@ -162,6 +162,10 @@ export default flat({
           title: '总收入',
           subtitle: '用户实际支付',
         },
+        refundAmount: {
+          title: '退款金额',
+          subtitle: '已退款总额',
+        },
         costOfGoods: {
           title: '进货成本',
           subtitle: '供应商分成',

package/src/pages/admin/overview.tsx

@@ -47,7 +47,9 @@ import DateRangePicker from '../../components/date-range-picker';
 
 type TRevenueStat = {
   totalRevenue: string;
+  refundAmount: string;
   promotionCost: string;
+  creditGrantCost: string;
   vendorCost: string;
   taxedRevenue: string;
   netRevenue: string;

package/vite.config.ts

@@ -54,6 +54,7 @@ export default defineConfig(({ mode }) => {
       react({ babel: { plugins: isProduction ? [['lodash']] : [] } }),
       createBlockletPlugin({
         disableDynamicAssetHost: false,
+        chunkSizeLimit: 3500,
       }),
       svgr(),
       process.env.ANALYZE && visualizer({ open: true, gzipSize: true, brotliSize: true }),