wiki-plugin-shoppe 0.0.43 → 0.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-shoppe",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "Multi-tenant digital goods shoppe for federated wiki, powered by Sanora",
   "keywords": [
     "wiki",

package/server/server.js

@@ -84,10 +84,24 @@ function getSanoraUrl() {
 }
 
 function getAddieUrl() {
-  try { return new URL(getSanoraUrl()).origin + '/plugin/allyabase/addie'; } catch { /* fall through */ }
+  const sanora = getSanoraUrl();
+  try {
+    const url = new URL(sanora);
+    // Only derive from origin when sanora is a wiki proxy URL (has a path component).
+    // A bare host:port URL (e.g. http://localhost:7243) means Addie is on its own port.
+    if (url.pathname && url.pathname !== '/') {
+      return url.origin + '/plugin/allyabase/addie';
+    }
+  } catch { /* fall through */ }
   return `http://localhost:${process.env.ADDIE_PORT || 3005}`;
 }
 
+// Returns the public-facing Sanora URL (via wiki proxy) for browser-visible resource URLs.
+// Always constructed from the current request so it matches the host the browser is using.
+function getSanoraPublicUrl(req) {
+  return `${reqProto(req)}://${req.get('host')}/plugin/allyabase/sanora`;
+}
+
 function getLucilleUrl() {
   const config = loadConfig();
   if (config.lucilleUrl) return config.lucilleUrl.replace(/\/$/, '');
@@ -1501,7 +1515,7 @@ async function processArchive(zipPath, onProgress = () => {}) {
 // PORTFOLIO PAGE GENERATION
 // ============================================================
 
-async function getShoppeGoods(tenant) {
+async function getShoppeGoods(tenant, imageBaseUrl) {
   let products = {};
   try {
     const resp = await fetch(`${getSanoraUrl()}/products/${tenant.uuid}`, { timeout: 15000 });
@@ -1556,7 +1570,7 @@ async function getShoppeGoods(tenant) {
       description: product.description || '',
       price: product.price || 0,
       shipping: product.shipping || 0,
-      image: product.image ? `${getSanoraUrl()}/images/${product.image}` : null,
+      image: product.image ? `${imageBaseUrl || getSanoraUrl()}/images/${product.image}` : null,
       url: resolvedUrl,
       ...(isPost && { category: product.category, tags: product.tags || '' }),
       ...(lucillePlayerUrl && { lucillePlayerUrl }),
@@ -3207,7 +3221,7 @@ async function startServer(params) {
       const product = products[title] || Object.values(products).find(p => p.title === title);
       if (!product) return res.status(404).send('<h1>Product not found</h1>');
 
-      const imageUrl = product.image ? `${sanoraUrlInternal}/images/${product.image}` : '';
+      const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
       const ebookUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}/download/${encodeURIComponent(title)}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
       const payees = tenant.addieKeys
@@ -3278,7 +3292,7 @@ async function startServer(params) {
       const schedule = await getAppointmentSchedule(tenant, product);
       const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
-      const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
+      const imageUrl = product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : '';
 
       const price = product.price || 0;
       const html = fillTemplate(APPOINTMENT_BOOKING_TMPL, {
@@ -3346,7 +3360,7 @@ async function startServer(params) {
       const tierInfo = await getTierInfo(tenant, product);
       const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
-      const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
+      const imageUrl = product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : '';
       const benefits = tierInfo && tierInfo.benefits
         ? tierInfo.benefits.map(b => `<li>${escHtml(b)}</li>`).join('')
         : '';
@@ -3527,7 +3541,7 @@ async function startServer(params) {
           productId:          product.productId,
           description:        product.description || '',
           price:              product.price || 0,
-          image:              product.image ? `${sanoraUrl}/images/${product.image}` : null,
+          image:              product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : null,
           benefits:           tierInfo ? (tierInfo.benefits || []) : [],
           renewalDays:        tierInfo ? (tierInfo.renewalDays || 30) : 30,
           active:             status.active,
@@ -4036,14 +4050,15 @@ async function startServer(params) {
         if (!purchased) return res.status(403).send('<h1>No purchase found for this key</h1>');
       }
 
-      const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
+      const sanoraPublicUrl = getSanoraPublicUrl(req);
+      const imageUrl = product.image ? `${sanoraPublicUrl}/images/${product.image}` : '';
 
       // Map artifact UUIDs to download paths by extension
       let epubPath = '', pdfPath = '', mobiPath = '';
       (product.artifacts || []).forEach(artifact => {
-        if (artifact.includes('epub')) epubPath = `${sanoraUrl}/artifacts/${artifact}`;
-        if (artifact.includes('pdf'))  pdfPath  = `${sanoraUrl}/artifacts/${artifact}`;
-        if (artifact.includes('mobi')) mobiPath = `${sanoraUrl}/artifacts/${artifact}`;
+        if (artifact.includes('epub')) epubPath = `${sanoraPublicUrl}/artifacts/${artifact}`;
+        if (artifact.includes('pdf'))  pdfPath  = `${sanoraPublicUrl}/artifacts/${artifact}`;
+        if (artifact.includes('mobi')) mobiPath = `${sanoraPublicUrl}/artifacts/${artifact}`;
       });
 
       const html = fillTemplate(EBOOK_DOWNLOAD_TMPL, {
@@ -4089,7 +4104,7 @@ async function startServer(params) {
       const fm = parseFrontMatter(mdContent);
       const postTitle = fm.title || title;
       const postDate  = fm.date || '';
-      const imageUrl  = product.image ? `${getSanoraUrl()}/images/${product.image}` : null;
+      const imageUrl  = product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : null;
 
       res.set('Content-Type', 'text/html');
       res.send(generatePostHTML(tenant, postTitle, postDate, imageUrl, fm.body || mdContent));
@@ -4164,7 +4179,7 @@ async function startServer(params) {
               productId:    product.productId,
               title:        product.title,
               category:     product.category,
-              image:        product.image ? `${sanoraUrl}/images/${product.image}` : null,
+              image:        product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : null,
               price:        product.price,
               paidAt:       match.paidAt,
               status:       match.status,
@@ -4190,7 +4205,7 @@ async function startServer(params) {
     try {
       const tenant = getTenantByIdentifier(req.params.identifier);
       if (!tenant) return res.status(404).json({ error: 'Shoppe not found' });
-      const goods = await getShoppeGoods(tenant);
+      const goods = await getShoppeGoods(tenant, getSanoraPublicUrl(req));
       const cat = req.query.category;
       res.json({ success: true, goods: (cat && goods[cat]) ? goods[cat] : goods });
     } catch (err) {
@@ -4212,7 +4227,7 @@ async function startServer(params) {
       const tracks = [];
       for (const [key, product] of Object.entries(products)) {
         if (product.category !== 'music') continue;
-        const cover = product.image ? `${sanoraUrl}/images/${product.image}` : null;
+        const cover = product.image ? `${getSanoraPublicUrl(req)}/images/${product.image}` : null;
         const artifacts = product.artifacts || [];
         if (artifacts.length > 1) {
           albums.push({
@@ -4246,7 +4261,7 @@ async function startServer(params) {
     try {
       const tenant = getTenantByIdentifier(req.params.identifier);
       if (!tenant) return res.status(404).send('<h1>Shoppe not found</h1>');
-      const goods = await getShoppeGoods(tenant);
+      const goods = await getShoppeGoods(tenant, getSanoraPublicUrl(req));
 
       // Check if the request carries a valid owner signature — if so, embed auth
       // params in the page so the upload button can authenticate with upload-info.

package/server/templates/generic-recover-stripe.html

@@ -193,7 +193,7 @@
       return p;
     }).filter(p => p.pubKey);
   }
-  const URL_PAYEES = parseUrlPayees();
+  var URL_PAYEES = parseUrlPayees();
 </script>
 
 <!-- ── Shoppere (pubKey) path ────────────────────────────────────────────── -->
@@ -202,7 +202,7 @@
   const _buyerPubKey    = '{{buyerPubKey}}' || new URLSearchParams(window.location.search).get('pubKey')    || '';
   const _buyerTimestamp = '{{buyerTimestamp}}' || new URLSearchParams(window.location.search).get('timestamp') || '';
   const _buyerSignature = '{{buyerSignature}}' || new URLSearchParams(window.location.search).get('signature') || '';
-  const IS_SHOPPERE = !!(_buyerPubKey && _buyerTimestamp && _buyerSignature);
+  var IS_SHOPPERE = !!(_buyerPubKey && _buyerTimestamp && _buyerSignature);
   // Affiliate (NFC proximity charge / referral link) param — present when buyer arrived via a referred link
   const _affiliatePubKey = new URLSearchParams(window.location.search).get('affiliatePubKey') || '';
   const IS_AFFILIATE_CHARGE = !!_affiliatePubKey;