payment-kit 1.18.2 → 1.18.4

package/api/src/routes/subscription-items.ts

@@ -94,7 +94,7 @@ router.get('/', auth, async (req, res) => {
     }
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -112,7 +112,7 @@ router.get('/:id', auth, async (req, res) => {
       res.status(404).json(null);
     }
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to get subscription item: ${err.message}` });
   }
 });
@@ -249,7 +249,7 @@ router.post('/:id/add-usage-quantity', auth, async (req, res) => {
 
     return res.json(usageRecord);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: `Failed to add usage quantity: ${err.message}` });
   }
 });

package/api/src/routes/subscriptions.ts

@@ -197,7 +197,7 @@ router.get('/', authMine, async (req, res) => {
 
     res.json({ count, list: docs, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -264,7 +264,7 @@ router.get('/:id', authPortal, async (req, res) => {
       res.status(404).json(null);
     }
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to get subscription: ${err.message}` });
   }
 });
@@ -1139,7 +1139,7 @@ router.put('/:id', authPortal, async (req, res) => {
     });
     return res.json({ ...subscription.toJSON(), connectAction });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(500).json({ code: err.code, error: err.message });
   }
 });
@@ -1216,7 +1216,7 @@ router.get('/:id/change-plan', authPortal, async (req, res) => {
     const table = await getUpdateTable(subscription);
     return res.json(table);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.json(null);
   }
 });
@@ -1267,7 +1267,7 @@ router.post('/:id/change-plan', authPortal, async (req, res) => {
       items: newItems,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -1312,7 +1312,7 @@ router.get('/:id/proration', authPortal, async (req, res) => {
       paymentCurrency,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -1344,7 +1344,7 @@ router.get('/:id/staking', authPortal, async (req, res) => {
     });
   } catch (err) {
     logger.error('subscription staking simulation failed', { error: err });
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -1628,7 +1628,7 @@ router.post('/:id/change-payment', authPortal, async (req, res) => {
       delegation,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(500).json({ code: err.code, error: err.message });
   }
 });
@@ -1730,7 +1730,7 @@ router.get('/:id/summary', authPortal, async (req, res) => {
     });
     return res.json(summary);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -1741,7 +1741,7 @@ router.get('/:id/upcoming', authPortal, async (req, res) => {
     const result = await getUpcomingInvoiceAmount(req.params.id as string);
     return res.json(result);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.json({ error: err.message });
   }
 });
@@ -1904,7 +1904,7 @@ router.get('/:id/recharge', authMine, async (req, res) => {
 
     return res.json({ count, list: invoices, subscription, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -1960,7 +1960,7 @@ router.get('/:id/overdue/invoices', authPortal, async (req, res) => {
       invoices,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -2001,7 +2001,7 @@ router.get('/:id/delegation', authPortal, async (req, res) => {
     }
     return res.json(null);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.json(null);
   }
 });
@@ -2028,7 +2028,7 @@ router.get('/:id/overdraft-protection', authPortal, async (req, res) => {
       shouldPay,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -2117,7 +2117,7 @@ router.post('/:id/overdraft-protection', authPortal, async (req, res) => {
       overdraft_protection: subscription.overdraft_protection,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });

package/api/src/routes/usage-records.ts

@@ -192,7 +192,7 @@ router.get('/summary', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -235,7 +235,7 @@ export function createUsageRecordQueryFn(doc?: Subscription) {
 
       res.json({ count, list });
     } catch (err) {
-      console.error(err);
+      logger.error(err);
       res.json({ count: 0, list: [] });
     }
   };

package/api/src/routes/webhook-attempts.ts

@@ -6,6 +6,7 @@ import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { Event, WebhookAttempt, WebhookEndpoint } from '../store/models';
 import { blocklet } from '../libs/auth';
+import logger from '../libs/logger';
 
 const router = Router();
 const auth = authenticate<WebhookAttempt>({ component: true, roles: ['owner', 'admin'] });
@@ -57,7 +58,7 @@ router.get('/', auth, async (req, res) => {
     );
     res.json({ count, list: updatedList, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });

package/api/src/routes/webhook-endpoints.ts

@@ -7,6 +7,7 @@ import { createListParamSchema, MetadataSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import { WebhookEndpoint } from '../store/models';
+import logger from '../libs/logger';
 
 const router = Router();
 const auth = authenticate<WebhookEndpoint>({ component: true, roles: ['owner', 'admin'] });
@@ -69,7 +70,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -82,7 +83,7 @@ router.get('/:id', auth, async (req, res) => {
     });
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });

package/api/src/store/migrations/20250211-setting.ts

@@ -0,0 +1,10 @@
+import type { Migration } from '../migrate';
+import models from '../models';
+
+export const up: Migration = async ({ context }) => {
+  await context.createTable('settings', models.Setting.GENESIS_ATTRIBUTES);
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.dropTable('settings');
+};

package/api/src/store/migrations/20250214-setting-component.ts

@@ -0,0 +1,22 @@
+import { DataTypes } from 'sequelize';
+import { safeApplyColumnChanges, type Migration } from '../migrate';
+
+export const up: Migration = async ({ context }) => {
+  await safeApplyColumnChanges(context, {
+    settings: [
+      {
+        name: 'component_did',
+        field: { type: DataTypes.STRING, allowNull: true },
+      },
+    ],
+  });
+  const columns = await context.describeTable('settings');
+  if (columns.mountLocation) {
+    await context.renameColumn('settings', 'mountLocation', 'mount_location');
+  }
+};
+
+export const down: Migration = async ({ context }) => {
+  await context.removeColumn('settings', 'component_did');
+  await context.renameColumn('settings', 'mount_location', 'mountLocation');
+};

package/api/src/store/models/index.ts

@@ -26,6 +26,7 @@ import type { LineItem, PricingTableItem } from './types';
 import { TUsageRecord, UsageRecord } from './usage-record';
 import { TWebhookAttempt, WebhookAttempt } from './webhook-attempt';
 import { TWebhookEndpoint, WebhookEndpoint } from './webhook-endpoint';
+import { Setting } from './setting';
 
 const models = {
   CheckoutSession,
@@ -55,6 +56,7 @@ const models = {
   WebhookAttempt,
   Job,
   Lock,
+  Setting,
 };
 
 export function initialize(sequelize: any) {
@@ -62,7 +64,9 @@ export function initialize(sequelize: any) {
     model.initialize(sequelize);
   });
   Object.values(models).forEach((model) => {
-    model.associate(models);
+    if ('associate' in model) {
+      (model as any).associate(models);
+    }
   });
 }
 
@@ -96,6 +100,7 @@ export * from './usage-record';
 export * from './webhook-attempt';
 export * from './webhook-endpoint';
 export * from './types';
+export * from './setting';
 
 export type TPriceExpanded = TPrice & {
   object: 'price';

package/api/src/store/models/setting.ts

@@ -0,0 +1,84 @@
+/* eslint-disable @typescript-eslint/lines-between-class-members */
+import { CreationOptional, DataTypes, InferAttributes, InferCreationAttributes, Model } from 'sequelize';
+
+import { createIdGenerator } from '../../libs/util';
+import type { SettingType } from './types';
+
+const nextId = createIdGenerator('set', 24);
+
+// eslint-disable-next-line prettier/prettier
+export class Setting extends Model<InferAttributes<Setting>, InferCreationAttributes<Setting>> {
+  declare id: CreationOptional<string>;
+
+  declare livemode: boolean;
+
+  declare type: SettingType;
+  declare mount_location: string;
+  declare active: boolean;
+  declare component_did?: string;
+
+  declare settings: Record<string, any>;
+
+  declare created_at: CreationOptional<Date>;
+  declare updated_at: CreationOptional<Date>;
+
+  public static readonly GENESIS_ATTRIBUTES = {
+    id: {
+      type: DataTypes.STRING(30),
+      primaryKey: true,
+      allowNull: false,
+      defaultValue: nextId,
+    },
+    livemode: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+    },
+    active: {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: true,
+    },
+    type: {
+      type: DataTypes.STRING(64),
+      allowNull: false,
+    },
+    mount_location: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+    },
+    component_did: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+    },
+    description: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+    },
+    settings: {
+      type: DataTypes.JSON,
+      allowNull: true,
+    },
+    created_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+    updated_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false,
+    },
+  };
+
+  public static initialize(sequelize: any) {
+    this.init(Setting.GENESIS_ATTRIBUTES, {
+      sequelize,
+      modelName: 'Setting',
+      tableName: 'settings',
+      createdAt: 'created_at',
+      updatedAt: 'updated_at',
+    });
+  }
+}
+
+export type TSetting = InferAttributes<Setting>;

package/api/src/store/models/types.ts

@@ -691,3 +691,5 @@ export type EventType = LiteralUnion<
 >;
 
 export type StripeRefundReason = 'duplicate' | 'fraudulent' | 'requested_by_customer';
+
+export type SettingType = LiteralUnion<'donate', string>;

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.18.2
+version: 1.18.4
 logo: logo.png
 files:
   - dist
@@ -94,6 +94,18 @@ navigation:
     role:
       - admin
       - owner
+  - id: integrations
+    title:
+      en: Integrations
+      zh: 快速集成
+    icon: ion:flash-outline
+    link: /integrations
+    section:
+      - dashboard
+      - sessionManager
+    role:
+      - admin
+      - owner
   - id: billing
     title:
       en: Billing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -43,30 +43,30 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "^1.16.37",
-    "@arcblock/did": "^1.19.3",
+    "@abtnode/cron": "^1.16.38",
+    "@arcblock/did": "^1.19.9",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.11.27",
-    "@arcblock/did-util": "^1.19.3",
-    "@arcblock/jwt": "^1.19.3",
-    "@arcblock/ux": "^2.11.27",
-    "@arcblock/validator": "^1.19.3",
-    "@blocklet/js-sdk": "^1.16.37",
-    "@blocklet/logger": "^1.16.37",
-    "@blocklet/payment-react": "1.18.2",
-    "@blocklet/sdk": "^1.16.37",
-    "@blocklet/ui-react": "^2.11.27",
-    "@blocklet/uploader": "^0.1.64",
-    "@blocklet/xss": "^0.1.21",
+    "@arcblock/did-connect": "^2.11.34",
+    "@arcblock/did-util": "^1.19.9",
+    "@arcblock/jwt": "^1.19.9",
+    "@arcblock/ux": "^2.11.34",
+    "@arcblock/validator": "^1.19.9",
+    "@blocklet/js-sdk": "^1.16.38",
+    "@blocklet/logger": "^1.16.38",
+    "@blocklet/payment-react": "1.18.4",
+    "@blocklet/sdk": "^1.16.38",
+    "@blocklet/ui-react": "^2.11.34",
+    "@blocklet/uploader": "^0.1.66",
+    "@blocklet/xss": "^0.1.22",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.19.3",
-    "@ocap/client": "^1.19.3",
-    "@ocap/mcrypto": "^1.19.3",
-    "@ocap/util": "^1.19.3",
-    "@ocap/wallet": "^1.19.3",
+    "@ocap/asset": "^1.19.9",
+    "@ocap/client": "^1.19.9",
+    "@ocap/mcrypto": "^1.19.9",
+    "@ocap/util": "^1.19.9",
+    "@ocap/wallet": "^1.19.9",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -119,9 +119,9 @@
     "web3": "^4.16.0"
   },
   "devDependencies": {
-    "@abtnode/types": "^1.16.37",
+    "@abtnode/types": "^1.16.38",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.2",
+    "@blocklet/payment-types": "1.18.4",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -151,7 +151,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.16",
+    "vite-plugin-blocklet": "^0.9.20",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "577491d13f4b2e53e9a71be3b90298b5685f5e8a"
+  "gitHead": "003d3b762bc9e3e224e4814dea95ff02d014868d"
 }

package/src/app.tsx

@@ -30,6 +30,7 @@ const CustomerSubscriptionChangePlan = React.lazy(() => import('./pages/customer
 const CustomerSubscriptionChangePayment = React.lazy(() => import('./pages/customer/subscription/change-payment'));
 const CustomerRecharge = React.lazy(() => import('./pages/customer/recharge'));
 const CustomerPayoutDetail = React.lazy(() => import('./pages/customer/payout/detail'));
+const IntegrationsPage = React.lazy(() => import('./pages/integrations'));
 
 // const theme = createTheme({
 //   typography: {
@@ -59,6 +60,10 @@ function App() {
                 <Route key="admin-tabs" path="/admin/:group" element={<AdminPage />} />,
                 <Route key="admin-sub" path="/admin/:group/:page" element={<AdminPage />} />,
                 <Route key="admin-fallback" path="/admin/*" element={<AdminPage />} />,
+                <Route key="integrations-index" path="/integrations" element={<IntegrationsPage />} />
+                <Route key="integrations-tabs" path="/integrations/:group" element={<IntegrationsPage />} />
+                <Route key="integrations-sub" path="/integrations/:group/:page" element={<IntegrationsPage />} />
+                <Route key="integrations-fallback" path="/integrations/*" element={<IntegrationsPage />} />
                 <Route
                   key="customer-home"
                   path="/customer"
@@ -166,7 +171,7 @@ export default function WrappedApp() {
     <ToastProvider>
       <SessionProvider
         serviceHost={prefix}
-        protectedRoutes={['/admin/*', '/customer/*'].map((item) => joinURL(prefix, item))}>
+        protectedRoutes={['/admin/*', '/customer/*', '/integrations/*'].map((item) => joinURL(prefix, item))}>
         <Router basename={prefix}>
           <AppWithTracker />
         </Router>

package/src/components/invoice/list.tsx

@@ -332,11 +332,9 @@ export default function InvoiceList({
           } else {
             setSearch({
               ...search!,
-              status: '',
-              customer_id,
-              subscription_id,
               pageSize: 100,
               page: 1,
+              q: {},
             });
           }
         },

package/src/components/payment-intent/list.tsx

@@ -210,10 +210,9 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
 
   const onTableChange = ({ page, rowsPerPage }: any) => {
     if (search!.pageSize !== rowsPerPage) {
-      setSearch((x) => ({ ...x, pageSize: rowsPerPage, page: 1 }));
+      setSearch((x: any) => ({ ...x, pageSize: rowsPerPage, page: 1 }));
     } else if (search!.page !== page + 1) {
-      // @ts-ignore
-      setSearch((x) => ({ ...x, page: page + 1 }));
+      setSearch((x: any) => ({ ...x, page: page + 1 }));
     }
   };
 
@@ -233,6 +232,7 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
         onSearchChange: (text: string) => {
           if (text) {
             setSearch({
+              ...search!,
               q: {
                 'like-description': text,
                 'like-metadata': text,
@@ -242,11 +242,10 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
             });
           } else {
             setSearch({
-              status: '',
-              customer_id,
-              invoice_id,
+              ...search!,
               pageSize: 100,
               page: 1,
+              q: {},
             });
           }
         },

package/src/components/payouts/list.tsx

@@ -239,6 +239,7 @@ export default function PayoutList({ customer_id, payment_intent_id, status, fea
         onSearchChange: (text: string) => {
           if (text) {
             setSearch({
+              ...search!,
               q: {
                 'like-description': text,
                 'like-metadata': text,
@@ -248,11 +249,10 @@ export default function PayoutList({ customer_id, payment_intent_id, status, fea
             });
           } else {
             setSearch({
-              status: '',
-              customer_id,
-              payment_intent_id,
+              ...search!,
               pageSize: 100,
               page: 1,
+              q: {},
             });
           }
         },

package/src/components/refund/list.tsx

@@ -273,23 +273,20 @@ export default function RefundList({
         onSearchChange: (text: string) => {
           if (text) {
             setSearch({
+              ...search!,
               q: {
                 'like-description': text,
                 'like-metadata': text,
               },
-              status: '',
               pageSize: 100,
               page: 1,
             });
           } else {
             setSearch({
-              status: '',
-              customer_id,
-              invoice_id,
-              payment_intent_id,
-              subscription_id,
+              ...search!,
               pageSize: 100,
               page: 1,
+              q: {},
             });
           }
         },

package/src/components/subscription/list.tsx

@@ -226,10 +226,9 @@ export default function SubscriptionList({ customer_id, features, status }: List
           } else {
             setSearch({
               ...search!,
-              status: '',
-              customer_id,
               pageSize: 100,
               page: 1,
+              q: {},
             });
           }
         },