payment-kit 1.29.1 → 1.29.2

package/api/src/routes/{archive.ts → hono/archive.ts}

@@ -1,18 +1,22 @@
-import { Router } from 'express';
+// Phase 3 (express→hono) — hono fork of routes/archive.ts. Sub-app with
+// routes relative to /api/archive (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 dayjs from '../libs/dayjs';
-import { authenticate } from '../libs/security';
-import logger from '../libs/logger';
-import { createFlexibleEvent } from '../libs/audit';
-import { getRetentionConfig } from '../libs/archive/config';
-import { previewArchive } from '../libs/archive/executor';
-import { queryArchive } from '../libs/archive/query';
-import { enqueueArchiveJob } from '../queues/archive';
-import { ArchiveMetadata } from '../store/models/archive-metadata';
-import { listArchiveFiles, getFileSize } from '../libs/archive/store';
-
-const router = Router();
+import dayjs from '../../libs/dayjs';
+import { authenticate } from '../../middlewares/hono/security';
+import logger from '../../libs/logger';
+import { createFlexibleEvent } from '../../libs/audit';
+import { getRetentionConfig } from '../../libs/archive/config';
+import { previewArchive } from '../../libs/archive/executor';
+import { queryArchive } from '../../libs/archive/query';
+import { enqueueArchiveJob } from '../../queues/archive';
+import { ArchiveMetadata } from '../../store/models/archive-metadata';
+import { listArchiveFiles, getFileSize } from '../../libs/archive/store';
+
+const app = new Hono();
 const authAdmin = authenticate({ component: true, roles: ['owner', 'admin'] });
 
 const querySchema = Joi.object({
@@ -24,7 +28,12 @@ const querySchema = Joi.object({
   limit: Joi.number().integer().min(1).max(100).default(20),
 });
 
-router.get('/status', authAdmin, async (_req, res) => {
+const runSchema = Joi.object({
+  tables: Joi.array().items(Joi.string()).optional(),
+  dryRun: Joi.boolean().optional(),
+});
+
+app.get('/status', authAdmin, async (c) => {
   try {
     const config = getRetentionConfig();
     const lastRun = await ArchiveMetadata.findOne({ order: [['created_at', 'DESC']] });
@@ -39,7 +48,7 @@ router.get('/status', authAdmin, async (_req, res) => {
       nextRun = nextRun.add(1, 'week');
     }
 
-    res.json({
+    return c.json({
       enabled: config.enabled,
       config,
       lastRun: lastRun
@@ -66,32 +75,63 @@ router.get('/status', authAdmin, async (_req, res) => {
     });
   } catch (error: any) {
     logger.error('archive status error', error);
-    res.status(500).json({ error: error.message });
+    return c.json({ error: error.message }, 500);
+  }
+});
+
+app.post('/run', authAdmin, async (c) => {
+  try {
+    const config = getRetentionConfig();
+    if (!config.enabled) {
+      return c.json({ error: 'Archive is disabled' }, 400);
+    }
+
+    const body = c.get('sanitizedBody') ?? {};
+    const { value, error } = runSchema.validate(body, { stripUnknown: true });
+    if (error) {
+      return c.json({ error: error.message }, 400);
+    }
+
+    if (value?.dryRun) {
+      const preview = await previewArchive({ tables: value.tables });
+      return c.json({ status: 'dry_run_complete', preview });
+    }
+
+    const jobId = enqueueArchiveJob({
+      tables: value.tables,
+      triggeredBy: 'manual',
+      triggeredByUserId: c.get('user')?.did,
+    });
+
+    return c.json({ status: 'started', jobId });
+  } catch (error: any) {
+    logger.error('archive run error', error);
+    return c.json({ error: error.message }, 500);
   }
 });
 
-router.get('/:table', authAdmin, async (req, res) => {
+app.get('/:table', authAdmin, async (c) => {
   try {
     const config = getRetentionConfig();
     if (!config.enabled) {
-      return res.status(400).json({ error: 'Archive is disabled' });
+      return c.json({ error: 'Archive is disabled' }, 400);
     }
 
-    const { value, error } = querySchema.validate(req.query, { stripUnknown: true, convert: true });
+    const { value, error } = querySchema.validate(c.req.query(), { stripUnknown: true, convert: true });
     if (error) {
-      return res.status(400).json({ error: error.message });
+      return c.json({ error: error.message }, 400);
     }
 
-    const { table } = req.params;
+    const table = c.req.param('table');
     if (!table) {
-      return res.status(400).json({ error: 'table is required' });
+      return c.json({ error: 'table is required' }, 400);
     }
     if (!Object.prototype.hasOwnProperty.call(config.tables, table)) {
-      return res.status(400).json({ error: `Unsupported table: ${table}` });
+      return c.json({ error: `Unsupported table: ${table}` }, 400);
     }
 
     if (value.from === undefined) {
-      return res.status(400).json({ error: 'from is required' });
+      return c.json({ error: 'from is required' }, 400);
     }
 
     const result = await queryArchive(
@@ -104,7 +144,7 @@ router.get('/:table', authAdmin, async (req, res) => {
         page: value.page,
         limit: value.limit,
       },
-      req.user?.did
+      c.get('user')?.did
     );
 
     await createFlexibleEvent(
@@ -117,10 +157,10 @@ router.get('/:table', authAdmin, async (req, res) => {
         result_count: result.data.length,
         archive_files: result.archiveFiles,
       },
-      { requestedBy: req.user?.did }
+      { requestedBy: c.get('user')?.did }
     );
 
-    return res.json({
+    return c.json({
       data: result.data,
       pagination: {
         page: value.page,
@@ -134,43 +174,8 @@ router.get('/:table', authAdmin, async (req, res) => {
     });
   } catch (error: any) {
     logger.error('archive query error', error);
-    return res.status(500).json({ error: error.message });
-  }
-});
-
-const runSchema = Joi.object({
-  tables: Joi.array().items(Joi.string()).optional(),
-  dryRun: Joi.boolean().optional(),
-});
-
-router.post('/run', authAdmin, async (req, res) => {
-  try {
-    const config = getRetentionConfig();
-    if (!config.enabled) {
-      return res.status(400).json({ error: 'Archive is disabled' });
-    }
-
-    const { value, error } = runSchema.validate(req.body, { stripUnknown: true });
-    if (error) {
-      return res.status(400).json({ error: error.message });
-    }
-
-    if (value?.dryRun) {
-      const preview = await previewArchive({ tables: value.tables });
-      return res.json({ status: 'dry_run_complete', preview });
-    }
-
-    const jobId = enqueueArchiveJob({
-      tables: value.tables,
-      triggeredBy: 'manual',
-      triggeredByUserId: req.user?.did,
-    });
-
-    return res.json({ status: 'started', jobId });
-  } catch (error: any) {
-    logger.error('archive run error', error);
-    return res.status(500).json({ error: error.message });
+    return c.json({ error: error.message }, 500);
   }
 });
 
-export default router;
+export default app;

package/api/src/routes/{auto-recharge-configs.ts → hono/auto-recharge-configs.ts}

@@ -1,12 +1,15 @@
-import { Router } from 'express';
+// Phase 3 (express→hono) — hono fork of routes/auto-recharge-configs.ts. Sub-app with
+// routes relative to /api/auto-recharge-configs (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 { CustomError } from '@blocklet/error';
 import { Op } from 'sequelize';
-import { sessionMiddleware } from '@blocklet/sdk/lib/middlewares/session';
 import { BN, fromTokenToUnit, fromUnitToToken } from '@ocap/util';
-import { trimDecimals } from '../libs/math-utils';
-import { applySlippageToAmount } from '../libs/slippage';
+import { trimDecimals } from '../../libs/math-utils';
+import { applySlippageToAmount } from '../../libs/slippage';
 import {
   AutoRechargeConfig,
   Customer,
@@ -17,14 +20,19 @@ import {
   Price,
   Product,
   TPriceExpanded,
-} from '../store/models';
-import { isDelegationSufficientForPayment } from '../libs/payment';
-import { validateStripePaymentAmounts } from '../libs/session';
-import { getPriceUintAmountByCurrency } from '../libs/price';
-import { ensureStripeSetupIntentForAutoRecharge } from '../integrations/stripe/resource';
-import logger from '../libs/logger';
+} from '../../store/models';
+import { isDelegationSufficientForPayment } from '../../libs/payment';
+import { validateStripePaymentAmounts } from '../../libs/session';
+import { getPriceUintAmountByCurrency } from '../../libs/price';
+import { ensureStripeSetupIntentForAutoRecharge } from '../../integrations/stripe/resource';
+import logger from '../../libs/logger';
+import { sessionMiddleware } from '../../middlewares/hono/session';
 
-const router = Router();
+const app = new Hono();
+
+// faithful fork of the express `sessionMiddleware({ accessKey: true })` — populates
+// c.get('user') from a login token OR access key, and does NOT gate (next() either way).
+const user = sessionMiddleware({ accessKey: true });
 
 const slippageConfigSchema = Joi.object({
   mode: Joi.string().valid('percent', 'rate').optional(),
@@ -161,27 +169,28 @@ async function applyBalanceCheckResults(
 }
 
 // Get auto-recharge configuration for a customer
-router.get('/customer/:customerId', sessionMiddleware({ accessKey: true }), async (req, res) => {
-  const { error, value } = getConfigSchema.validate(req.query, {
+// Static segment — registered before /:id variants
+app.get('/customer/:customerId', user, async (c) => {
+  const { error, value } = getConfigSchema.validate(c.req.query(), {
     stripUnknown: true,
   });
   if (error) {
     throw new CustomError(400, error.message || 'Validation error');
   }
 
-  if (!req.user) {
+  if (!c.get('user')) {
     throw new CustomError(403, 'Please login to continue');
   }
 
-  let { customerId } = req.params;
+  let customerId = c.req.param('customerId');
   if (!customerId) {
-    customerId = req.user?.did;
+    customerId = c.get('user')?.did;
   }
 
   const { currency_id: currencyId } = value;
   const customer = await ensureCustomerExists(customerId);
 
-  if (customer.did !== req.user?.did && !['admin', 'owner'].includes(req.user?.role)) {
+  if (customer.did !== c.get('user')?.did && !['admin', 'owner'].includes(c.get('user')?.role)) {
     throw new CustomError(403, 'You are not allowed to access this resource');
   }
 
@@ -229,7 +238,7 @@ router.get('/customer/:customerId', sessionMiddleware({ accessKey: true }), asyn
       quantity: 1,
       recharge_currency_id: price.currency_id,
     });
-    return res.json({
+    return c.json({
       ...newConfig.toJSON(),
       currency,
       price: {
@@ -250,7 +259,7 @@ router.get('/customer/:customerId', sessionMiddleware({ accessKey: true }), asyn
   const configThreshold = new BN(config.threshold || '0').lt(new BN(minimumThreshold))
     ? minimumThreshold
     : config.threshold;
-  return res.json({
+  return c.json({
     ...config.toJSON(),
     daily_limits: {
       max_attempts: config.daily_limits?.max_attempts || 0,
@@ -267,8 +276,9 @@ router.get('/customer/:customerId', sessionMiddleware({ accessKey: true }), asyn
 });
 
 // Retrieve specific auto-recharge configuration by ID
-router.get('/retrieve/:id', sessionMiddleware({ accessKey: true }), async (req, res) => {
-  const config = await AutoRechargeConfig.findByPk(req.params.id);
+// Static segment — registered before plain /:id
+app.get('/retrieve/:id', user, async (c) => {
+  const config = await AutoRechargeConfig.findByPk(c.req.param('id'));
   if (!config) {
     throw new CustomError(404, 'Auto recharge config not found');
   }
@@ -276,7 +286,7 @@ router.get('/retrieve/:id', sessionMiddleware({ accessKey: true }), async (req,
   if (!paymentMethod) {
     throw new CustomError(404, 'Payment method not found');
   }
-  return res.json({
+  return c.json({
     ...config.toJSON(),
     paymentMethod,
   });
@@ -376,8 +386,9 @@ async function checkSufficientBalance({
 }
 
 // Submit auto-recharge configuration
-router.post('/submit', async (req, res) => {
-  const { error, value } = createConfigSchema.validate(req.body, {
+app.post('/submit', async (c) => {
+  const body = c.get('sanitizedBody') ?? {};
+  const { error, value } = createConfigSchema.validate(body, {
     stripUnknown: true,
   });
   if (error) {
@@ -471,7 +482,7 @@ router.post('/submit', async (req, res) => {
       await existingConfig.update({
         enabled: false,
       });
-      return res.json({
+      return c.json({
         ...existingConfig.toJSON(),
         paymentMethod,
         customer,
@@ -510,7 +521,7 @@ router.post('/submit', async (req, res) => {
     });
     // Update payment details and settings based on balance check result
     await applyBalanceCheckResults(existingConfig, balanceResult, paymentMethod);
-    return res.json({
+    return c.json({
       ...existingConfig.toJSON(),
       balanceResult,
       paymentMethod,
@@ -550,7 +561,7 @@ router.post('/submit', async (req, res) => {
 
   // Update payment details and settings based on balance check result
   await applyBalanceCheckResults(config, balanceResult, paymentMethod, true);
-  return res.json({
+  return c.json({
     ...config.toJSON(),
     balanceResult,
     paymentMethod,
@@ -558,4 +569,4 @@ router.post('/submit', async (req, res) => {
   });
 });
 
-export default router;
+export default app;