payment-kit 1.29.1 → 1.29.3

package/api/src/routes/hono/credit-tokens.ts

@@ -0,0 +1,43 @@
+// Phase 3a (express→hono) — hono fork of routes/credit-tokens.ts. Sub-app with
+// routes relative to /api/credit-tokens (mounted via mountResourceGroup). The
+// business logic is unchanged; only the express plumbing becomes hono:
+//   req.body → c.get('sanitizedBody'); res.status(n).json(x) → c.json(x, n).
+import { Hono } from 'hono';
+import Joi from 'joi';
+
+import logger from '../../libs/logger';
+import { authenticate } from '../../middlewares/hono/security';
+import { createToken } from '../../integrations/arcblock/token';
+
+const app = new Hono();
+const auth = authenticate({ component: true, roles: ['owner', 'admin'] });
+
+const createTokenSchema = Joi.object({
+  name: Joi.string().max(64).required(),
+  symbol: Joi.string().max(16).required(),
+  decimal: Joi.number().integer().min(2).max(18).default(10),
+}).unknown(true);
+
+app.post('/', auth, async (c) => {
+  const body = (c.get('sanitizedBody') ?? {}) as any;
+  try {
+    const { error } = createTokenSchema.validate(body);
+    if (error) {
+      return c.json({ error: `Token create request invalid: ${error.message}` }, 400);
+    }
+
+    const tokenFactoryState = await createToken({
+      name: body.name,
+      symbol: body.symbol,
+      decimal: body.decimal,
+      livemode: !!c.get('livemode'),
+    });
+
+    return c.json(tokenFactoryState);
+  } catch (err: any) {
+    logger.error('create credit token failed', { error: err?.message, request: body });
+    return c.json({ error: err?.message }, 400);
+  }
+});
+
+export default app;

package/api/src/routes/{credit-transactions.ts → hono/credit-transactions.ts}

@@ -1,11 +1,15 @@
-import { Router } from 'express';
+// Phase 3 (express→hono) — hono fork of routes/credit-transactions.ts. Sub-app with
+// routes relative to /api/credit-transactions (mounted via mountResourceGroup). The
+// business logic is unchanged; only the express plumbing becomes hono:
+//   req.body → c.get('sanitizedBody') ?? {}; res.status(n).json(x) → c.json(x, n).
+import { Hono } from 'hono';
 import Joi from 'joi';
 
 import { Op } from 'sequelize';
-import { createListParamSchema, getOrder, getWhereFromKvQuery } from '../libs/api';
-import { mergePaginate, type DataSource } from '../libs/pagination';
-import logger from '../libs/logger';
-import { authenticate } from '../libs/security';
+import { createListParamSchema, getOrder, getWhereFromKvQuery } from '../../libs/api';
+import { mergePaginate, type DataSource } from '../../libs/pagination';
+import logger from '../../libs/logger';
+import { authenticate } from '../../middlewares/hono/security';
 import {
   CreditTransaction,
   Customer,
@@ -17,9 +21,9 @@ import {
   PaymentMethod,
   Invoice,
   TCreditTransactionExpanded,
-} from '../store/models';
+} from '../../store/models';
 
-const router = Router();
+const app = new Hono();
 const authMine = authenticate<CreditTransaction>({ component: true, roles: ['owner', 'admin'], mine: true });
 const authPortal = authenticate<CreditTransaction>({
   component: true,
@@ -51,17 +55,17 @@ const listSchema = createListParamSchema<{
   include_grants: Joi.boolean().optional(),
 });
 
-router.get('/', authMine, async (req, res) => {
+app.get('/', authMine, async (c) => {
   try {
-    const { page, pageSize, ...query } = await listSchema.validateAsync(req.query, { stripUnknown: true });
+    const { page, pageSize, ...query } = await listSchema.validateAsync(c.req.query(), { stripUnknown: true });
     const includeGrants = !!query.include_grants;
     const where = getWhereFromKvQuery(query.q);
 
     if (query.meter_id) {
       where.meter_id = query.meter_id;
     }
-    if (query.customer_id) {
-      where.customer_id = query.customer_id;
+    if (c.get('customer_id') ?? query.customer_id) {
+      where.customer_id = c.get('customer_id') ?? query.customer_id;
     }
 
     if (query.subscription_id) {
@@ -95,10 +99,13 @@ router.get('/', authMine, async (req, res) => {
     }
 
     if (includeGrants) {
-      if (!query.customer_id) {
-        return res.status(400).json({
-          error: 'customer_id is required when include_grants=true',
-        });
+      if (!(c.get('customer_id') ?? query.customer_id)) {
+        return c.json(
+          {
+            error: 'customer_id is required when include_grants=true',
+          },
+          400
+        );
       }
 
       const orderDirection = query.o === 'asc' ? 'ASC' : 'DESC';
@@ -138,7 +145,7 @@ router.get('/', authMine, async (req, res) => {
 
       // Grant where conditions
       const grantWhere: any = {
-        customer_id: query.customer_id,
+        customer_id: c.get('customer_id') ?? query.customer_id,
         status: ['granted', 'depleted', 'expired'],
       };
       if (query.subscription_id) {
@@ -272,7 +279,7 @@ router.get('/', authMine, async (req, res) => {
         ),
       }));
 
-      return res.json({
+      return c.json({
         count: result.total,
         list: enhancedData,
         paging: result.paging,
@@ -329,7 +336,7 @@ router.get('/', authMine, async (req, res) => {
       paymentCurrency: paymentCurrencies.find((x) => x.id === (item as any).creditGrant?.currency_id),
     }));
 
-    return res.json({
+    return c.json({
       count,
       list: result,
       paging: { page, pageSize },
@@ -340,7 +347,7 @@ router.get('/', authMine, async (req, res) => {
     });
   } catch (err) {
     logger.error('Error listing credit transactions', err);
-    return res.status(400).json({ error: err.message });
+    return c.json({ error: err.message }, 400);
   }
 });
 
@@ -354,7 +361,8 @@ const summarySchema = Joi.object({
 }).unknown(true);
 
 // get credit transaction summary for customer or subscription
-router.get('/summary', authMine, async (req, res) => {
+// Static path — registered before /:id so hono matches it first.
+app.get('/summary', authMine, async (c) => {
   try {
     const {
       customer_id: customerId,
@@ -363,7 +371,7 @@ router.get('/summary', authMine, async (req, res) => {
       meter_id: meterId,
       start,
       end,
-    } = await summarySchema.validateAsync(req.query, { stripUnknown: true });
+    } = await summarySchema.validateAsync(c.req.query(), { stripUnknown: true });
 
     const result = await CreditTransaction.getUsageSummary({
       customerId,
@@ -374,16 +382,16 @@ router.get('/summary', authMine, async (req, res) => {
       endTime: end ? new Date(end * 1000) : undefined,
     });
 
-    return res.json(result);
+    return c.json(result);
   } catch (err) {
     logger.error('get credit transaction summary failed', err);
-    return res.status(400).json({ error: err.message });
+    return c.json({ error: err.message }, 400);
   }
 });
 
-router.get('/:id', authPortal, async (req, res) => {
+app.get('/:id', authPortal, async (c) => {
   try {
-    const transaction = (await CreditTransaction.findByPk(req.params.id, {
+    const transaction = (await CreditTransaction.findByPk(c.req.param('id'), {
       include: [
         {
           model: Customer,
@@ -430,7 +438,7 @@ router.get('/:id', authPortal, async (req, res) => {
       TCreditTransactionExpanded & { creditGrant?: CreditGrant & { paymentCurrency?: PaymentCurrency } };
 
     if (!transaction) {
-      return res.status(404).json({ error: 'Credit transaction not found' });
+      return c.json({ error: 'Credit transaction not found' }, 404);
     }
 
     let paymentMethod = null;
@@ -438,14 +446,14 @@ router.get('/:id', authPortal, async (req, res) => {
       paymentMethod = await PaymentMethod.findByPk(transaction.creditGrant.paymentCurrency.payment_method_id);
     }
 
-    return res.json({
+    return c.json({
       ...transaction.toJSON(),
       paymentMethod,
     });
   } catch (err) {
     logger.error('get credit transaction failed', err);
-    return res.status(400).json({ error: err.message });
+    return c.json({ error: err.message }, 400);
   }
 });
 
-export default router;
+export default app;