@seasonkoh/webaz 0.1.24 → 0.1.26

package/dist/pwa/routes/buyer-feeds.js

@@ -1,21 +1,23 @@
+import { dbOne, dbAll } from '../../layer0-foundation/L0-1-database/db.js'; // RFC-016 异步 DB seam
 export function registerBuyerFeedsRoutes(app, deps) {
-    const { db, auth, isTrustedRole, errorRes, getNearbyCellPrecision, getProtocolParam } = deps;
-    app.get('/api/recommendations/me', (req, res) => {
+    // db 已走 RFC-016 异步 seam(dbOne/dbAll),不再直接用 deps.db
+    const { auth, isTrustedRole, errorRes, getNearbyCellPrecision, getProtocolParam } = deps;
+    app.get('/api/recommendations/me', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
         if (isTrustedRole(user))
             return void errorRes(res, 403, 'TRUSTED_ROLE_NO_TRADE', '受信角色无购物功能');
         const limit = Math.min(30, Math.max(5, Number(req.query.limit) || 20));
-        const wishlistRows = db.prepare(`
+        const wishlistRows = await dbAll(`
       SELECT w.product_id, p.category, p.seller_id FROM user_wishlist w
       JOIN products p ON p.id = w.product_id
       WHERE w.user_id = ? AND p.status = 'active' LIMIT 50
-    `).all(user.id);
-        const purchasedRows = db.prepare(`
+    `, [user.id]);
+        const purchasedRows = await dbAll(`
       SELECT DISTINCT product_id, seller_id FROM orders WHERE buyer_id = ? AND status = 'completed' LIMIT 200
-    `).all(user.id);
-        const followedRows = db.prepare(`SELECT followee_id FROM follows WHERE follower_id = ?`).all(user.id);
+    `, [user.id]);
+        const followedRows = await dbAll(`SELECT followee_id FROM follows WHERE follower_id = ?`, [user.id]);
         const wishCats = new Set(wishlistRows.map(r => r.category).filter(Boolean));
         const knownProductIds = new Set([...wishlistRows.map(r => r.product_id), ...purchasedRows.map(r => r.product_id)]);
         const knownSellerIds = new Set([...wishlistRows.map(r => r.seller_id), ...purchasedRows.map(r => r.seller_id)]);
@@ -31,40 +33,40 @@ export function registerBuyerFeedsRoutes(app, deps) {
         let followedProducts = [];
         if (followedSellerIds.length > 0) {
             const ph = followedSellerIds.map(() => '?').join(',');
-            followedProducts = db.prepare(`
+            followedProducts = await dbAll(`
         SELECT ${baseCols}
         FROM products p JOIN users u ON u.id = p.seller_id
         WHERE p.seller_id IN (${ph}) AND p.status = 'active' AND p.stock > 0 ${exclSql}
         ORDER BY p.created_at DESC LIMIT 10
-      `).all(...followedSellerIds, ...exclArgs);
+      `, [...followedSellerIds, ...exclArgs]);
         }
         let categoryProducts = [];
         if (wishCats.size > 0) {
             const ph = [...wishCats].map(() => '?').join(',');
-            categoryProducts = db.prepare(`
+            categoryProducts = await dbAll(`
         SELECT ${baseCols}
         FROM products p JOIN users u ON u.id = p.seller_id
         WHERE p.category IN (${ph}) AND p.status = 'active' AND p.stock > 0 ${exclSql}
         ORDER BY sales_count DESC LIMIT 10
-      `).all(...wishCats, ...exclArgs);
+      `, [...wishCats, ...exclArgs]);
         }
         let pastSellerProducts = [];
         const pastSellers = [...knownSellerIds].filter(s => !followedSellerIds.includes(s));
         if (pastSellers.length > 0) {
             const ph = pastSellers.map(() => '?').join(',');
-            pastSellerProducts = db.prepare(`
+            pastSellerProducts = await dbAll(`
         SELECT ${baseCols}
         FROM products p JOIN users u ON u.id = p.seller_id
         WHERE p.seller_id IN (${ph}) AND p.status = 'active' AND p.stock > 0 ${exclSql}
         ORDER BY p.created_at DESC LIMIT 10
-      `).all(...pastSellers, ...exclArgs);
+      `, [...pastSellers, ...exclArgs]);
         }
-        const fallback = db.prepare(`
+        const fallback = await dbAll(`
       SELECT ${baseCols}
       FROM products p JOIN users u ON u.id = p.seller_id
       WHERE p.status = 'active' AND p.stock > 0 ${exclSql}
       ORDER BY sales_count DESC, p.created_at DESC LIMIT 10
-    `).all(...exclArgs);
+    `, exclArgs);
         const seen = new Set();
         const labeled = (bucket, arr) => arr.filter(it => {
             const id = String(it.id);
@@ -88,7 +90,7 @@ export function registerBuyerFeedsRoutes(app, deps) {
             },
         });
     });
-    app.get('/api/feed', (req, res) => {
+    app.get('/api/feed', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
@@ -137,13 +139,13 @@ export function registerBuyerFeedsRoutes(app, deps) {
       WHERE ts IS NOT NULL
       ORDER BY ts DESC LIMIT 50
     `;
-        const events = db.prepare(sql).all(...params);
+        const events = await dbAll(sql, params);
         res.json({ events, scope });
     });
     // 雷达扫描 MVP (2026-05-29)：scope 范围档 + window 时间窗，k≥3 守护贯穿
     //   scope: cell(本格) / neighbors(周边 3×3) / region(同城) / global(全网)
     //   window: 24h / 7d / 30d
-    app.get('/api/nearby', (req, res) => {
+    app.get('/api/nearby', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
@@ -153,7 +155,7 @@ export function registerBuyerFeedsRoutes(app, deps) {
         const days = windowKey === '24h' ? 1 : windowKey === '30d' ? 30 : 7;
         const { precision_deg, approx_km } = getNearbyCellPrecision();
         const K = getProtocolParam('nearby_k_anonymity', 3);
-        const u = db.prepare("SELECT geo_lat, geo_lng, geo_updated_at, region FROM users WHERE id = ?").get(user.id);
+        const u = (await dbOne("SELECT geo_lat, geo_lng, geo_updated_at, region FROM users WHERE id = ?", [user.id]));
         const needsGeo = scope === 'cell' || scope === 'neighbors';
         if (needsGeo && (u?.geo_lat == null || u?.geo_lng == null)) {
             // 本格/周边需定位；同城/全网不需 → 前端可引导切到更大范围
@@ -186,24 +188,24 @@ export function registerBuyerFeedsRoutes(app, deps) {
             scopeLabel = '全网';
         }
         const dayClause = `o.updated_at > datetime('now', '-${days} day')`;
-        const totals = db.prepare(`
+        const totals = (await dbOne(`
       SELECT COUNT(DISTINCT o.buyer_id) as au, COUNT(*) as orders
       FROM orders o JOIN users u ON u.id = o.buyer_id
       WHERE ${where} AND o.status = 'completed' AND ${dayClause}
-    `).get(...args);
+    `, args));
         const sufficient = Number(totals.au) >= K;
-        const topProducts = sufficient ? db.prepare(`
+        const topProducts = sufficient ? await dbAll(`
       SELECT p.id, p.title, p.price, p.category, p.images, COUNT(DISTINCT o.buyer_id) as buyers
       FROM orders o JOIN users u ON u.id = o.buyer_id JOIN products p ON p.id = o.product_id
       WHERE ${where} AND o.status = 'completed' AND ${dayClause}
       GROUP BY p.id HAVING buyers >= ? ORDER BY buyers DESC LIMIT 10
-    `).all(...args, K) : [];
-        const topCategories = sufficient ? db.prepare(`
+    `, [...args, K]) : [];
+        const topCategories = sufficient ? await dbAll(`
       SELECT p.category, COUNT(*) as orders, COUNT(DISTINCT o.buyer_id) as buyers
       FROM orders o JOIN users u ON u.id = o.buyer_id JOIN products p ON p.id = o.product_id
       WHERE ${where} AND o.status = 'completed' AND ${dayClause} AND p.category IS NOT NULL
       GROUP BY p.category HAVING buyers >= ? ORDER BY orders DESC LIMIT 6
-    `).all(...args, K) : [];
+    `, [...args, K]) : [];
         const staleDays = u?.geo_updated_at
             ? Math.floor((Date.now() - new Date(u.geo_updated_at.replace(' ', 'T') + 'Z').getTime()) / 86400_000)
             : null;

package/dist/pwa/routes/cart.js

@@ -1,12 +1,13 @@
 import { transition } from '../../layer0-foundation/L0-2-state-machine/engine.js';
 import { notifyTransition } from '../../layer2-business/L2-6-notifications/notification-engine.js';
+import { dbOne, dbAll, dbRun } from '../../layer0-foundation/L0-1-database/db.js'; // RFC-016 异步 DB seam
 export function registerCartRoutes(app, deps) {
     const { db, generateId, auth, isTrustedRole, errorRes, broadcastSystemEvent, checkStockAndMaybeDelist, addHours } = deps;
-    app.get('/api/cart', (req, res) => {
+    app.get('/api/cart', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
-        const items = db.prepare(`
+        const items = await dbAll(`
       SELECT c.product_id, c.qty, c.added_at,
         p.title, p.price, p.category, p.commission_rate, p.stock, p.status as product_status,
         u.name as seller_name
@@ -15,10 +16,10 @@ export function registerCartRoutes(app, deps) {
       JOIN users u ON u.id = p.seller_id
       WHERE c.user_id = ?
       ORDER BY c.added_at DESC
-    `).all(user.id);
+    `, [user.id]);
         res.json({ items });
     });
-    app.post('/api/cart', (req, res) => {
+    app.post('/api/cart', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
@@ -26,29 +27,29 @@ export function registerCartRoutes(app, deps) {
         const q = Math.max(1, Math.min(99, Number(qty) || 1));
         if (!product_id)
             return void res.json({ error: 'product_id 必填' });
-        const product = db.prepare("SELECT id, status FROM products WHERE id = ?").get(product_id);
+        const product = await dbOne("SELECT id, status FROM products WHERE id = ?", [product_id]);
         if (!product)
             return void res.json({ error: '商品不存在' });
         if (product.status !== 'active')
             return void res.json({ error: '商品已下架' });
-        db.prepare(`
+        await dbRun(`
       INSERT INTO cart_items (user_id, product_id, qty) VALUES (?, ?, ?)
       ON CONFLICT(user_id, product_id) DO UPDATE SET qty = MIN(99, cart_items.qty + ?)
-    `).run(user.id, product_id, q, q);
+    `, [user.id, product_id, q, q]);
         res.json({ ok: true });
     });
-    app.patch('/api/cart/:product_id', (req, res) => {
+    app.patch('/api/cart/:product_id', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
         const q = Math.max(1, Math.min(99, Number(req.body.qty) || 1));
-        const r = db.prepare("UPDATE cart_items SET qty = ? WHERE user_id = ? AND product_id = ?").run(q, user.id, req.params.product_id);
+        const r = await dbRun("UPDATE cart_items SET qty = ? WHERE user_id = ? AND product_id = ?", [q, user.id, req.params.product_id]);
         if (r.changes === 0)
             return void res.json({ error: '购物车中没有此商品' });
         res.json({ ok: true, qty: q });
     });
     // C-1: 购物车批量下单（按 seller 自动分订单）
-    app.post('/api/cart/checkout', (req, res) => {
+    app.post('/api/cart/checkout', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
@@ -59,11 +60,11 @@ export function registerCartRoutes(app, deps) {
         const { shipping_address, notes } = req.body || {};
         if (!shipping_address)
             return void res.status(400).json({ error: '请填写收货地址' });
-        const items = db.prepare(`
+        const items = await dbAll(`
       SELECT c.product_id, c.qty, p.title, p.price, p.stock, p.seller_id, p.has_variants, p.status
       FROM cart_items c JOIN products p ON p.id = c.product_id
       WHERE c.user_id = ?
-    `).all(user.id);
+    `, [user.id]);
         if (items.length === 0)
             return void res.status(400).json({ error: '购物车为空' });
         const skipped = [];
@@ -93,7 +94,7 @@ export function registerCartRoutes(app, deps) {
         if (ok.length === 0) {
             return void res.status(400).json({ error: '购物车中无可下单商品', skipped });
         }
-        const wallet = db.prepare('SELECT balance FROM wallets WHERE user_id = ?').get(user.id);
+        const wallet = await dbOne('SELECT balance FROM wallets WHERE user_id = ?', [user.id]);
         if (!wallet)
             return void res.status(500).json({ error: '钱包记录缺失' });
         if (wallet.balance < totalNeed)
@@ -145,11 +146,11 @@ export function registerCartRoutes(app, deps) {
             total_paid: created.reduce((s, c) => s + c.total, 0),
         });
     });
-    app.delete('/api/cart/:product_id', (req, res) => {
+    app.delete('/api/cart/:product_id', async (req, res) => {
         const user = auth(req, res);
         if (!user)
             return;
-        db.prepare("DELETE FROM cart_items WHERE user_id = ? AND product_id = ?").run(user.id, req.params.product_id);
+        await dbRun("DELETE FROM cart_items WHERE user_id = ? AND product_id = ?", [user.id, req.params.product_id]);
         res.json({ ok: true });
     });
 }