@xuda.io/account_module 1.2.2287 → 1.2.2288

package/index.mjs

@@ -6382,6 +6382,37 @@ const _nl_ensure_storage = async () => {
   if (save.code < 0) console.error('[newsletter] replicator ensure failed:', save.data);
 };
 
+// The admin panel is served from whatever region CF routes the superuser to, but
+// xuda_newsletter lives on master + master2 only. So the read-side methods must
+// resolve MASTER's couch when running on a region (reachable over the WG hub at
+// 10.8.0.1), and read the local couch on master itself and on dev (standalone,
+// is_debug). Returns a DSN for the _custom read helpers, or null = local couch.
+const _nl_read_dsn = () => {
+  if (_conf.is_debug) return null;
+  if (process.env.XUDA_HOSTNAME === 'master.xuda.ai') return null;
+  const m = _conf.couchdb_control_database?.['master.xuda.ai'];
+  if (!m?.db_server_location) return null;
+  return `${m.db_server_http}://${m.db_server_username}:${m.db_server_password}@${m.db_server_location}`;
+};
+
+// Mango query against xuda_newsletter wherever it actually lives (master from a
+// region, local on master/dev). Same {docs} shape either way.
+const _nl_find = async (selector, extra = {}) => {
+  const dsn = _nl_read_dsn();
+  if (dsn) return await db_module.find_couch_query_custom(NEWSLETTER_DB, dsn, { selector, ...extra });
+  return await db_module.find_couch_query(NEWSLETTER_DB, { selector, ...extra }, true);
+};
+
+// Fetch one issue by _id from the same source. Returns {code, data} like
+// get_couch_doc so callers stay unchanged.
+const _nl_get = async (id) => {
+  const dsn = _nl_read_dsn();
+  if (!dsn) return await db_module.get_couch_doc(NEWSLETTER_DB, id);
+  const ret = await db_module.find_couch_query_custom(NEWSLETTER_DB, dsn, { selector: { _id: id }, limit: 1 });
+  const doc = (ret.docs || [])[0];
+  return doc ? { code: 1, data: doc } : { code: -1, data: 'issue not found' };
+};
+
 // Next issue number = max(existing) + 1. Read-only projection (never PUT these).
 const _nl_next_number = async () => {
   try {
@@ -6811,7 +6842,7 @@ export const newsletter_generate = async function (req = {}) {
 export const newsletter_list_issues = async function (req = {}) {
   try {
     if (!_ops_is_super(req)) return { code: -403, data: 'superuser only' };
-    const ret = await db_module.find_couch_query(NEWSLETTER_DB, { selector: { docType: 'newsletter_issue' }, limit: 500 }, true);
+    const ret = await _nl_find({ docType: 'newsletter_issue' }, { limit: 500 });
     const rows = (ret.docs || [])
       .sort((a, b) => (b.issue_number || 0) - (a.issue_number || 0))
       .map((d) => ({ id: d._id, issue_number: d.issue_number, status: d.status, subject: d.subject, created_ts: d.created_ts, published_ts: d.published_ts || null, coupon: d.content && d.content.coupon ? d.content.coupon.promo_code : null, sent: d.sent || { count: 0, failed: 0 } }));
@@ -6825,7 +6856,7 @@ export const newsletter_preview = async function (req = {}) {
   try {
     if (!_ops_is_super(req)) return { code: -403, data: 'superuser only' };
     const id = req.id || `nl_issue_${req.issue_number}`;
-    const ret = await db_module.get_couch_doc(NEWSLETTER_DB, id);
+    const ret = await _nl_get(id);
     if (ret.code < 0 || !ret.data) return { code: -1, data: 'issue not found' };
     const host = _ops_host();
     const [fpool, ppool] = await Promise.all([_nl_fashion_pool(), _nl_partner_pool()]);
@@ -6844,7 +6875,7 @@ export const newsletter_send_sample = async function (req = {}) {
   try {
     if (!_ops_is_super(req)) return { code: -403, data: 'superuser only' };
     const id = req.id || `nl_issue_${req.issue_number}`;
-    const ret = await db_module.get_couch_doc(NEWSLETTER_DB, id);
+    const ret = await _nl_get(id);
     if (ret.code < 0 || !ret.data) return { code: -1, data: 'issue not found' };
     const to = req.email || 'info@xuda.ai';
     const sr = await _newsletter_send_sample_internal(ret.data, to, req.theme);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.2287",
+  "version": "1.2.2288",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {