trustbase-seller-backend 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trustbase-seller-backend",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "TrustBase Seller Backend (merchant edition) — 商品上链/订单/支付/质押 write API for TrustBase 保障链生态. 单卖家自托管形态: 签名 key 即卖家身份, 私钥不出门.",
   "main": "run-unified.js",
   "bin": {

package/routes/onboard.html

@@ -566,6 +566,29 @@ function renderApplyment(j){
   }
   box.innerHTML=html;
   if(j.status==='APPLYMENT_STATE_FINISHED') markStepDone('st-verification');
+  maybeAutoKyc(j); // M2 断点 a: 进件受理后自动提交身份认证 (feegrant 已备, 0 余额可签)
+}
+// M2 自动 KYC: 进件已被微信/SP 受理 (SUBMITTED/AUDITING 等) 且本地未标已提交 → 自动调
+// POST /onboard/submit-verification (此时 SP submit 成功已触发 oracle 入队 → feegrant 先行,
+// 商户 0 余额可签)。失败只 warn + 5min 退避重试, 不阻塞页面; 成功打 localStorage 标记防重复。
+async function maybeAutoKyc(j){
+  try{
+    if(!j||!j.status) return;
+    if(['NOT_SUBMITTED','PENDING_PUSH','APPLYMENT_STATE_REJECTED','APPLYMENT_STATE_CANCELED'].indexOf(j.status)>=0) return;
+    if(localStorage.getItem('tbKycSubmitted')==='1') return;
+    var last=Number(localStorage.getItem('tbKycLastTry')||0);
+    if(Date.now()-last < 5*60*1000) return; // 失败退避 (feegrant 可能还在 oracle tick 路上)
+    localStorage.setItem('tbKycLastTry', String(Date.now()));
+    var rj=await readJson(await fetch('/onboard/submit-verification',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'}));
+    if(rj && rj.ok){
+      localStorage.setItem('tbKycSubmitted','1');
+      var msg=document.getElementById('verify-msg');
+      if(msg){msg.style.display='block';msg.textContent='✅ 身份认证已自动提交 (手续费由服务商代付), 等待审核'+(rj.duplicate?' — 此前已提交过':'');}
+      loadStatus();
+    }else{
+      console.warn('[onboard] KYC 自动提交未成功 (5min 后重试):', (rj&&(rj.message||rj.error))||'');
+    }
+  }catch(e){ console.warn('[onboard] KYC 自动提交异常 (5min 后重试):', e && e.message); }
 }
 async function submitApplyment(){
   var btn=document.getElementById('btn-apply-submit');

package/routes/onboard.js

@@ -633,6 +633,9 @@ CREATE TABLE IF NOT EXISTS onboard_applyments (
                 payload.sales_scene = scene; // 场景必带 (SP 侧按它组装 biz_store_info/web_info/mp_info)
                 // 通用类目资质留空 → 默认 "无" (微信通用场景接受, 避免留空被 SP 拒)
                 if (!payload.qualification_type) payload.qualification_type = "无";
+                // M2 断点 c: tb_address 贯通 — SP 台账落列, FINISHED 后 oracle 引导金才知道发给谁
+                const identity = await ensureSellerIdentity(basePaths.baseDir());
+                payload.tb_address = identity.address;
                 // F3: business_code 卖家侧首次提交时本地生成 (TB{毫秒}{rand6}), 台账暂存/转发/重试都带同号;
                 // SP 侧收到带号的提交不再新生成 (驳回重提也复用原号 — 微信同号覆盖)
                 const businessCode = (latest && latest.business_code) || spApplyment.genBusinessCode();

package/routes/sp-applyment.js

@@ -75,10 +75,25 @@ CREATE TABLE IF NOT EXISTS sp_applyments (
   state_msg TEXT NOT NULL DEFAULT '',    -- 微信状态描述
   audit_detail TEXT NOT NULL DEFAULT '[]', -- 驳回明细 JSON (field/field_name/reject_reason)
   subject_json TEXT NOT NULL DEFAULT '{}', -- 表单快照 (敏感字段已脱敏)
+  tb_address TEXT NOT NULL DEFAULT '',   -- 商户链上地址 (M2: 引导金 recipient 贯通)
+  hook_fired_at INTEGER,                 -- FINISHED 钩子已触发时间 (NULL=未触发, 幂等)
   created_at INTEGER NOT NULL,
   updated_at INTEGER NOT NULL
 );
+-- 回调路由表 (与 sp-notify 同构; 这里兜底建, FINISHED 钩子 upsert 写入)
+CREATE TABLE IF NOT EXISTS sp_sub_merchants (
+  sub_mchid TEXT PRIMARY KEY,
+  seller_address TEXT DEFAULT '',
+  shop_name TEXT DEFAULT '',
+  webhook_url TEXT DEFAULT '',
+  status TEXT DEFAULT 'active',
+  created_at INTEGER NOT NULL
+);
 `);
+    // 老库兼容: 缺列补列 (PRAGMA 检查后再 ALTER)
+    const cols = db.prepare("PRAGMA table_info(sp_applyments)").all().map((c) => c.name);
+    if (!cols.includes("tb_address")) db.exec("ALTER TABLE sp_applyments ADD COLUMN tb_address TEXT NOT NULL DEFAULT ''");
+    if (!cols.includes("hook_fired_at")) db.exec("ALTER TABLE sp_applyments ADD COLUMN hook_fired_at INTEGER");
 }
 
 /** 微信支付公钥 pem (mock 无配置时临时生成内存对, 仅测试用) */
@@ -305,6 +320,39 @@ function maskTail(s) {
     return s.length <= 4 ? "***" : "***" + s.slice(-4);
 }
 
+// ============================== M2: oracle 引导金入队通知 (进件→feegrant→KYC→审核→发放 自动链) ==============================
+/** oracle 配置 (懒读 env): ORACLE_URL 默认 .123; 鉴权头对齐 oracle-sync c5AdminAuth (X-API-Key/X-API-Password) */
+function oracleConf() {
+    return {
+        url: (process.env.ORACLE_URL || "http://192.168.1.123:3004").trim().replace(/\/+$/, ""),
+        key: (process.env.ORACLE_ADMIN_API_KEY || "").trim(),
+        pass: (process.env.ORACLE_ADMIN_API_PASSWORD || "").trim(),
+    };
+}
+/** 入队引导金: POST {ORACLE_URL}/api/oracle/bootstrap-grant {recipient, credential_hash}
+ *  credential_hash 锚点对齐 c5-glue enqueueBootstrapGrant: sha256("license:"+统一社会信用代码)
+ *  (ops-console 材料入库的 recipient 哈希锚点不同, 但 enqueue 有 recipient 双去重 → 同商户只留一行)
+ *  幂等由 oracle 侧担保; 失败上抛由调用方降级 warn (不阻塞进件)。 */
+async function notifyOracleGrant(deps, info) {
+    if (!info.tb_address) return { ok: false, skipped: true, reason: "no_tb_address" };
+    const cfg = oracleConf();
+    // mock 模式默认假成功 (测试不打真 oracle); 注入 deps.oracleFetch 可捕获断言
+    const fetcher = deps.oracleFetch || (isMock()
+        ? async () => ({ ok: true, status: 200, json: async () => ({ ok: true, enqueued: true, mock: true }) })
+        : globalThis.fetch);
+    const headers = { "Content-Type": "application/json" };
+    if (cfg.key) headers["X-API-Key"] = cfg.key;
+    if (cfg.pass) headers["X-API-Password"] = cfg.pass;
+    const credentialHash = crypto.createHash("sha256").update("license:" + String(info.license_number || "")).digest("hex");
+    const r = await fetcher(cfg.url + "/api/oracle/bootstrap-grant", {
+        method: "POST", headers,
+        body: JSON.stringify({ recipient: info.tb_address, credential_hash: credentialHash }),
+        signal: AbortSignal.timeout(8000),
+    });
+    const j = await r.json().catch(() => ({}));
+    return { ok: !!r.ok, status: r.status, json: j, credential_hash: credentialHash };
+}
+
 // ============================== 手机单页表单 (内联 HTML, 无构建) ==============================
 // 注意: 内嵌脚本只用单/双引号字符串, 不用反引号模板串 (本页本身在 JS 模板串内)。
 const PAGE_HTML = `<!DOCTYPE html>
@@ -680,14 +728,27 @@ function createSpApplymentRouter(deps) {
             };
             const now = nowSec();
             // upsert: 驳回重提时更新已有行 (同 business_code 覆盖), 否则插新行
+            // M2: tb_address 落列 (商户链上地址贯通 — 引导金 recipient)
+            const tbAddress = /^tct1[a-z0-9]{20,60}$/.test(String(f.tb_address || "")) ? String(f.tb_address) : "";
             db.prepare(`INSERT INTO sp_applyments
- (business_code, applyment_id, status, subject_json, created_at, updated_at)
- VALUES (?,?,?,?,?,?)
+ (business_code, applyment_id, status, subject_json, tb_address, created_at, updated_at)
+ VALUES (?,?,?,?,?,?,?)
  ON CONFLICT(business_code) DO UPDATE SET
    applyment_id=excluded.applyment_id, status=excluded.status,
-   subject_json=excluded.subject_json, updated_at=excluded.updated_at`)
-                .run(businessCode, applymentId, "SUBMITTED", JSON.stringify(snapshot).slice(0, 8000), now, now);
-            console.log(`[sp-applyment] 进件已提交 bc=${businessCode} applyment_id=${applymentId}`);
+   subject_json=excluded.subject_json, tb_address=excluded.tb_address, updated_at=excluded.updated_at`)
+                .run(businessCode, applymentId, "SUBMITTED", JSON.stringify(snapshot).slice(0, 8000), tbAddress, now, now);
+            console.log(`[sp-applyment] 进件已提交 bc=${businessCode} applyment_id=${applymentId}${tbAddress ? " tb=" + tbAddress.slice(0, 14) + "…" : ""}`);
+            // M2 断点 b/d: 微信受理成功即入队 oracle 引导金 → oracle tick 先发 feegrant (N16 顺序已有测试锁定),
+            // 商户 0 余额也能签 KYC。失败 warn 不阻塞, FINISHED 钩子里会再入队 (oracle 侧幂等)。
+            if (tbAddress) {
+                try {
+                    const g = await notifyOracleGrant(deps, { tb_address: tbAddress, license_number: f.license_number });
+                    if (g.ok) console.log(`[sp-applyment] oracle 引导金已入队 recipient=${tbAddress.slice(0, 14)}… enqueued=${g.json && g.json.enqueued}`);
+                    else console.warn(`[sp-applyment] oracle 入队未成功 status=${g.status} (FINISHED 钩子再试)`);
+                } catch (e) {
+                    console.warn("[sp-applyment] oracle 入队失败 (不阻塞进件):", e && e.message);
+                }
+            }
             res.json({ applyment_id: applymentId, business_code: businessCode });
         } catch (e) {
             return chainWrites.handleError(res, e, "/api/sp/applyment/submit");
@@ -718,6 +779,36 @@ function createSpApplymentRouter(deps) {
                     j.applyment_id != null ? String(j.applyment_id) : "", j.applyment_id != null ? String(j.applyment_id) : "",
                     now, bc);
             console.log(`[sp-applyment] 状态查询 bc=${bc} state=${state}${j.sub_mchid ? " sub=" + j.sub_mchid : ""}`);
+            // M2 FINISHED 钩子 (断点 b/c): 审核通过 → ① upsert sp_sub_merchants 回调路由表 (顺带修 M3
+            // 生产无写入) ② oracle 入队引导金 (submit 时已入过一次, 这里幂等兜底)。只触发一次 (hook_fired_at)。
+            if (state === "APPLYMENT_STATE_FINISHED" && j.sub_mchid) {
+                const row = db.prepare("SELECT * FROM sp_applyments WHERE business_code = ?").get(bc);
+                if (row && !row.hook_fired_at) {
+                    try {
+                        const snap = JSON.parse(row.subject_json || "{}");
+                        db.prepare(`INSERT INTO sp_sub_merchants (sub_mchid, seller_address, shop_name, webhook_url, status, created_at)
+ VALUES (?,?,?,'','active',?)
+ ON CONFLICT(sub_mchid) DO UPDATE SET seller_address=excluded.seller_address, shop_name=excluded.shop_name`)
+                            .run(String(j.sub_mchid), row.tb_address || "", String(snap.merchant_shortname || ""), now);
+                        console.log(`[sp-applyment] FINISHED 钩子: sub_mchid=${j.sub_mchid} 已登记回调路由 seller=${(row.tb_address || "").slice(0, 14)}…`);
+                        if (row.tb_address) {
+                            const g = await notifyOracleGrant(deps, { tb_address: row.tb_address, license_number: snap.license_number });
+                            if (g.ok) {
+                                console.log(`[sp-applyment] FINISHED 钩子: oracle 入队确认 enqueued=${g.json && g.json.enqueued}`);
+                                db.prepare("UPDATE sp_applyments SET hook_fired_at=? WHERE business_code=?").run(now, bc);
+                            } else {
+                                // oracle 暂时不可达: 不标 hook_fired_at, 下轮状态查询重试 (oracle 侧入队幂等, 重试安全)
+                                console.warn(`[sp-applyment] FINISHED 钩子: oracle 入队未成功 status=${g.status} (下轮重试)`);
+                            }
+                        } else {
+                            console.warn(`[sp-applyment] FINISHED 钩子: 台账无 tb_address bc=${bc}, 引导金无法定向 (人工补录)`);
+                            db.prepare("UPDATE sp_applyments SET hook_fired_at=? WHERE business_code=?").run(now, bc);
+                        }
+                    } catch (e) {
+                        console.warn("[sp-applyment] FINISHED 钩子失败 (下轮状态查询重试):", e && e.message);
+                    }
+                }
+            }
             res.json({
                 business_code: bc,
                 status: state,

package/test-onboard-applyment.js

@@ -25,6 +25,7 @@ const pubKeyPath = path.join(tmpDir, "wx_sp_pub.pem");
 fs.writeFileSync(pubKeyPath, wxPub.publicKey.export({ type: "spki", format: "pem" }));
 
 process.env.WXPAY_SP_PUBLIC_KEY_PATH = pubKeyPath;
+process.env.TB_BASE_DIR = tmpDir; // M2: applyment submit 会读本机 seller 身份 (tb_address 贯通), 隔离到临时目录
 process.env.SP_MERCHANT_TOKEN = MERCHANT_TOKEN;
 
 const onboard = require("./routes/onboard");
@@ -154,6 +155,7 @@ test("submit: 本地加密转发 (转发体无明文, 密文可还原) + 台账
         assert.strictEqual(spCapture.submits.length, submitsBefore + 1);
         const fwd = spCapture.submits[submitsBefore];
         assert.strictEqual(fwd.already_encrypted, true);
+        assert.match(fwd.tb_address || "", /^tct1[a-z0-9]{20,60}$/, "M2: payload 带商户链上地址 (引导金 recipient)");
         const fwdStr = JSON.stringify(fwd);
         assert.ok(!fwdStr.includes(PLAINTEXT.id), "转发体不含明文身份证");
         assert.ok(!fwdStr.includes(PLAINTEXT.card), "转发体不含明文卡号");
@@ -277,6 +279,8 @@ test("onboard 页面含进件表单 (btn-apply-submit) 且第③步状态机元
         assert.ok(html.includes('name="sales_scene"'), "场景单选");
         assert.ok(html.includes("SALES_SCENES_WEB") && html.includes("SALES_SCENES_MP"), "WEB/MP 场景");
         assert.ok(html.includes("apply-err"), "错误红卡容器");
+        assert.ok(html.includes("maybeAutoKyc"), "M2: 进件受理后自动 KYC 提交");
+        assert.ok(!html.includes("btn-verify"), "手动实名按钮已删 (自动触发)");
     } finally { srv.close(); }
 });
 

package/test-sp-applyment.js

@@ -284,3 +284,73 @@ test("business_code 直通: 调用方带号 (卖家侧生成) → SP 不新生
         assert.strictEqual(db.prepare("SELECT COUNT(*) n FROM sp_applyments").get().n, 1, "同号覆盖不新增行");
     } finally { srv.close(); }
 });
+
+test("M2: tb_address 落列 + submit 即入队 oracle + FINISHED 钩子 (upsert 路由表 + 幂等一次)", async () => {
+    // oracleFetch 注入捕获 (不打真 oracle)
+    const oracleCalls = [];
+    const oracleFetch = async (url, opts) => {
+        oracleCalls.push({ url, body: JSON.parse(opts.body) });
+        return { ok: true, status: 200, json: async () => ({ ok: true, enqueued: true }) };
+    };
+    const db = new Database(":memory:");
+    const app = express();
+    app.use(express.json());
+    app.use("/api/sp", spApplyment.createSpApplymentRouter({ db, oracleFetch }));
+    const srv = app.listen(0);
+    await new Promise((r) => srv.once("listening", r));
+    const base = `http://127.0.0.1:${srv.address().port}`;
+    const TB_ADDR = "tct1qpz7x0f2fakeselleraddress0000aaaa12";
+    try {
+        const form = await fillForm(base);
+        form.tb_address = TB_ADDR;
+        const r = await fetch(base + "/api/sp/applyment/submit", { method: "POST", headers: H, body: JSON.stringify(form) });
+        const j = await r.json();
+        assert.strictEqual(r.status, 200, JSON.stringify(j));
+        // tb_address 落列
+        const row = db.prepare("SELECT * FROM sp_applyments WHERE business_code = ?").get(j.business_code);
+        assert.strictEqual(row.tb_address, TB_ADDR, "M2: tb_address 落台账");
+        // submit 成功即入队 oracle (feegrant 前置: 商户 0 余额可签 KYC)
+        assert.strictEqual(oracleCalls.length, 1, "submit 成功即入队 oracle");
+        assert.strictEqual(oracleCalls[0].body.recipient, TB_ADDR);
+        const expectCh = crypto.createHash("sha256").update("license:" + form.license_number).digest("hex");
+        assert.strictEqual(oracleCalls[0].body.credential_hash, expectCh, "锚点 sha256('license:'+信用代码) 对齐 c5-glue");
+        assert.ok(oracleCalls[0].url.endsWith("/api/oracle/bootstrap-grant"));
+
+        // FINISHED 钩子: upsert sp_sub_merchants + 再入队 (幂等兜底) + hook_fired_at
+        const s1 = await (await fetch(base + "/api/sp/applyment/status/" + j.business_code, { headers: H })).json();
+        assert.strictEqual(s1.status, "APPLYMENT_STATE_FINISHED");
+        const mch = db.prepare("SELECT * FROM sp_sub_merchants WHERE sub_mchid = ?").get("1600000999");
+        assert.ok(mch, "回调路由表已 upsert (M3 生产写入修复)");
+        assert.strictEqual(mch.seller_address, TB_ADDR);
+        assert.strictEqual(mch.shop_name, form.merchant_shortname);
+        assert.strictEqual(mch.status, "active");
+        const row2 = db.prepare("SELECT * FROM sp_applyments WHERE business_code = ?").get(j.business_code);
+        assert.ok(row2.hook_fired_at, "hook_fired_at 已标记");
+        assert.strictEqual(oracleCalls.length, 2, "FINISHED 钩子再入队一次 (oracle 侧幂等兜底)");
+        assert.strictEqual(oracleCalls[1].body.recipient, TB_ADDR);
+        // 幂等: 再查一次状态, 钩子不重火
+        await (await fetch(base + "/api/sp/applyment/status/" + j.business_code, { headers: H })).json();
+        assert.strictEqual(oracleCalls.length, 2, "FINISHED 钩子只触发一次");
+    } finally { srv.close(); }
+});
+
+test("M2: FINISHED 钩子在 oracle 不可达时不标 hook_fired_at (下轮重试)", async () => {
+    const oracleFetch = async () => { throw new Error("connect refused"); };
+    const db = new Database(":memory:");
+    const app = express();
+    app.use(express.json());
+    app.use("/api/sp", spApplyment.createSpApplymentRouter({ db, oracleFetch }));
+    const srv = app.listen(0);
+    await new Promise((r) => srv.once("listening", r));
+    const base = `http://127.0.0.1:${srv.address().port}`;
+    try {
+        const form = await fillForm(base);
+        form.tb_address = "tct1qpz7x0f2fakeselleraddress0000aaaa12";
+        const j = await (await fetch(base + "/api/sp/applyment/submit", { method: "POST", headers: H, body: JSON.stringify(form) })).json();
+        await (await fetch(base + "/api/sp/applyment/status/" + j.business_code, { headers: H })).json();
+        const row = db.prepare("SELECT * FROM sp_applyments WHERE business_code = ?").get(j.business_code);
+        assert.ok(!row.hook_fired_at, "oracle 不可达不标 hook (下轮重试)");
+        // 但回调路由表已 upsert (不依赖 oracle)
+        assert.ok(db.prepare("SELECT * FROM sp_sub_merchants WHERE sub_mchid='1600000999'").get(), "路由表仍落行");
+    } finally { srv.close(); }
+});