wiki-plugin-shoppe 0.0.21 → 0.0.22

package/package.json

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

package/server/server.js

@@ -48,6 +48,12 @@ function saveConfig(config) {
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 
+// Derive the public-facing protocol from the request, respecting reverse-proxy headers.
+// Behind HTTPS proxies req.protocol is 'http'; X-Forwarded-Proto carries the real value.
+function reqProto(req) {
+  return (req.get('x-forwarded-proto') || req.protocol || 'https').split(',')[0].trim();
+}
+
 function getSanoraUrl() {
   const config = loadConfig();
   if (config.sanoraUrl) return config.sanoraUrl.replace(/\/$/, '');
@@ -898,7 +904,7 @@ async function getShoppeGoods(tenant) {
 // Fetch and parse the schedule JSON artifact for an appointment product.
 async function getAppointmentSchedule(tenant, product) {
   const sanoraUrl = getSanoraUrl();
-  const scheduleArtifact = (product.artifacts || []).find(a => a.includes('schedule'));
+  const scheduleArtifact = (product.artifacts || []).find(a => a.endsWith('.json'));
   if (!scheduleArtifact) return null;
   const resp = await fetch(`${sanoraUrl}/artifacts/${scheduleArtifact}`);
   if (!resp.ok) return null;
@@ -948,20 +954,15 @@ function generateAvailableSlots(schedule, bookedSlots) {
     const dateStr = dateFmt.format(date);
     const dayName = weekdayFmt.format(date).toLowerCase();
     const rule    = (schedule.availability || []).find(a => a.day.toLowerCase() === dayName);
-    if (!rule) continue;
-
-    const [startH, startM] = rule.start.split(':').map(Number);
-    const [endH,   endM]   = rule.end.split(':').map(Number);
-    const startMins = startH * 60 + startM;
-    const endMins   = endH   * 60 + endM;
+    if (!rule || !rule.slots || !rule.slots.length) continue;
 
     const slots = [];
-    for (let m = startMins; m + duration <= endMins; m += duration) {
+    for (const slotTime of rule.slots) {
+      const [h, m] = slotTime.split(':').map(Number);
+      const slotMins = h * 60 + m;
       // For today, skip slots within the next hour
-      if (d === 0 && m <= nowMins + 60) continue;
-      const h      = Math.floor(m / 60).toString().padStart(2, '0');
-      const min    = (m % 60).toString().padStart(2, '0');
-      const slotStr = `${dateStr}T${h}:${min}`;
+      if (d === 0 && slotMins <= nowMins + 60) continue;
+      const slotStr = `${dateStr}T${slotTime}`;
       if (!bookedSet.has(slotStr)) slots.push(slotStr);
     }
 
@@ -979,7 +980,7 @@ function generateAvailableSlots(schedule, bookedSlots) {
 // Fetch tier metadata (benefits list, renewalDays) from the tier-info artifact.
 async function getTierInfo(tenant, product) {
   const sanoraUrl = getSanoraUrl();
-  const tierArtifact = (product.artifacts || []).find(a => a.includes('tier-info'));
+  const tierArtifact = (product.artifacts || []).find(a => a.endsWith('.json'));
   if (!tierArtifact) return null;
   const resp = await fetch(`${sanoraUrl}/artifacts/${tierArtifact}`);
   if (!resp.ok) return null;
@@ -1049,7 +1050,7 @@ function generateShoppeHTML(tenant, goods) {
     { id: 'albums',       label: '🖼️ Albums',         count: goods.albums.length },
     { id: 'products',     label: '📦 Products',       count: goods.products.length },
     { id: 'appointments',  label: '📅 Appointments',  count: goods.appointments.length },
-    { id: 'subscriptions', label: '🎁 Support',        count: goods.subscriptions.length }
+    { id: 'subscriptions', label: '🎁 Infuse',          count: goods.subscriptions.length }
   ]
     .filter(t => t.always || t.count > 0)
     .map((t, i) => `<div class="tab${i === 0 ? ' active' : ''}" onclick="show('${t.id}',this)">${t.label} <span class="badge">${t.count}</span></div>`)
@@ -1108,7 +1109,7 @@ function generateShoppeHTML(tenant, goods) {
     <div id="appointments" class="section"><div class="grid">${renderCards(goods.appointments, 'appointment')}</div></div>
     <div id="subscriptions" class="section"><div class="grid">${renderCards(goods.subscriptions, 'subscription')}</div></div>
     <div style="text-align:center;padding:24px 0 8px;font-size:14px;color:#888;">
-      Already a supporter? <a href="/plugin/shoppe/${tenant.uuid}/membership" style="color:#0066cc;">Access your membership →</a>
+      Already infusing? <a href="/plugin/shoppe/${tenant.uuid}/membership" style="color:#0066cc;">Access your membership →</a>
     </div>
   </main>
   <script>
@@ -1265,7 +1266,7 @@ async function startServer(params) {
 
       const title = decodeURIComponent(req.params.title);
       const sanoraUrlInternal = getSanoraUrl();
-      const wikiOrigin = `${req.protocol}://${req.get('host')}`;
+      const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const sanoraUrl = `${wikiOrigin}/plugin/allyabase/sanora`;
       const productsResp = await fetch(`${sanoraUrlInternal}/products/${tenant.uuid}`);
       const products = await productsResp.json();
@@ -1326,7 +1327,7 @@ async function startServer(params) {
       if (!product) return res.status(404).send('<h1>Appointment not found</h1>');
 
       const schedule = await getAppointmentSchedule(tenant, product);
-      const wikiOrigin = `${req.protocol}://${req.get('host')}`;
+      const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
       const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
 
@@ -1393,7 +1394,7 @@ async function startServer(params) {
       if (!product) return res.status(404).send('<h1>Tier not found</h1>');
 
       const tierInfo = await getTierInfo(tenant, product);
-      const wikiOrigin = `${req.protocol}://${req.get('host')}`;
+      const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
       const imageUrl = product.image ? `${sanoraUrl}/images/${product.image}` : '';
       const benefits = tierInfo && tierInfo.benefits
@@ -1425,7 +1426,7 @@ async function startServer(params) {
   app.get('/plugin/shoppe/:identifier/membership', (req, res) => {
     const tenant = getTenantByIdentifier(req.params.identifier);
     if (!tenant) return res.status(404).send('<h1>Shoppe not found</h1>');
-    const wikiOrigin = `${req.protocol}://${req.get('host')}`;
+    const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
     const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
     const html = fillTemplate(SUBSCRIPTION_MEMBERSHIP_TMPL, { shoppeUrl, tenantUuid: tenant.uuid });
     res.set('Content-Type', 'text/html');
@@ -1444,7 +1445,7 @@ async function startServer(params) {
       const sanoraUrl = getSanoraUrl();
       const productsResp = await fetch(`${sanoraUrl}/products/${tenant.uuid}`);
       const products = await productsResp.json();
-      const wikiOrigin = `${req.protocol}://${req.get('host')}`;
+      const wikiOrigin = `${reqProto(req)}://${req.get('host')}`;
       const shoppeUrl = `${wikiOrigin}/plugin/shoppe/${tenant.uuid}`;
 
       const subscriptions = [];
@@ -1459,7 +1460,7 @@ async function startServer(params) {
         // Only expose exclusive artifact URLs to active subscribers
         const exclusiveArtifacts = status.active
           ? (product.artifacts || [])
-              .filter(a => !a.includes('tier-info'))
+              .filter(a => !a.endsWith('.json'))
               .map(a => ({ name: a.split('-').slice(1).join('-'), url: `${sanoraUrl}/artifacts/${a}` }))
           : [];
 

package/server/templates/subscription-membership.html

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-  <title>Membership Portal</title>
+  <title>Infuse Portal</title>
   <style>
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
     body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #0f0f12; color: white; min-height: 100vh; }
@@ -75,14 +75,14 @@
 </head>
 <body>
   <header>
-    <h1>🎁 Membership Portal</h1>
-    <p>Enter your recovery key to access your membership benefits</p>
+    <h1>🎁 Infuse Portal</h1>
+    <p>Enter your recovery key to access your infuser benefits</p>
   </header>
 
   <div class="container">
 
     <div id="key-section">
-      <h2>Check your membership</h2>
+      <h2>Check your infusions</h2>
       <p>Enter the recovery key you used when you subscribed.</p>
       <div class="input-row">
         <input type="text" id="recovery-key" placeholder="Your recovery key…" autocomplete="off" onkeydown="if(event.key==='Enter')checkMembership()">
@@ -161,8 +161,8 @@
 
       const activeCount = subscriptions.filter(s => s.active).length;
       heading.textContent = activeCount > 0
-        ? `You have ${activeCount} active membership${activeCount !== 1 ? 's' : ''}`
-        : 'No active memberships found';
+        ? `You have ${activeCount} active infusion${activeCount !== 1 ? 's' : ''}`
+        : 'No active infusions found';
 
       container.innerHTML = '';
 
@@ -278,7 +278,7 @@
         const price = (sub.price / 100).toFixed(2);
         cta.innerHTML = `
           <a class="btn-subscribe" href="${sub.subscribeUrl}">
-            ${sub.renewsAt ? 'Renew' : 'Subscribe'} — $${price}/month
+            ${sub.renewsAt ? 'Renew' : 'Infuse'} — $${price}/month
           </a>
         `;
         body.appendChild(cta);

package/server/templates/subscription-subscribe.html

@@ -4,11 +4,11 @@
   <script src="https://js.stripe.com/v3/"></script>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-  <meta name="twitter:title" content="Support: {{title}}">
+  <meta name="twitter:title" content="Infuse: {{title}}">
   <meta name="description" content="{{description}}">
-  <meta name="og:title" content="Support: {{title}}">
+  <meta name="og:title" content="Infuse: {{title}}">
   <meta name="og:description" content="{{description}}">
-  <title>Support: {{title}}</title>
+  <title>Infuse: {{title}}</title>
   <style>
     *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
     body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #0f0f12; color: white; min-height: 100vh; }
@@ -97,13 +97,13 @@
   <div class="pay-panel">
 
     <div id="already-subscribed">
-      <h3>✅ You're already a supporter!</h3>
+      <h3>✅ You're already infusing!</h3>
       <p id="already-desc"></p>
       <button class="btn-outline" onclick="window.location.href='{{shoppeUrl}}/membership'">View your membership →</button>
     </div>
 
     <div id="subscribe-form">
-      <h2>Become a supporter</h2>
+      <h2>Become an infuser</h2>
       <div class="subtitle">Use a recovery key to access your membership and exclusive content.</div>
 
       <div class="recovery-note">
@@ -120,7 +120,7 @@
     </div>
 
     <div id="payment-section">
-      <h2>Complete your support</h2>
+      <h2>Complete your infusion</h2>
       <div class="subtitle">${{formattedAmount}}/month · renews every {{renewalDays}} days</div>
       <div id="payment-element"></div>
       <button class="btn-primary" id="pay-btn" onclick="confirmPayment()">Pay ${{formattedAmount}}</button>
@@ -130,7 +130,7 @@
 
     <div id="confirmation">
       <div class="icon">🎉</div>
-      <h2>Thank you for your support!</h2>
+      <h2>Thank you for infusing!</h2>
       <div class="renews" id="renews-display"></div>
       <p>Use your recovery key any time at the <a href="{{shoppeUrl}}/membership" style="color:#7ec8e3;">membership portal</a> to access exclusive content and check your subscription status.</p>
       <p style="margin-top:12px;font-size:12px;color:#555;">Keep your recovery key safe — it's the only way to access your membership benefits.</p>

package/test/test.js

@@ -293,8 +293,8 @@ describe('Sanora integration', function() {
     const resp = await fetch(`${BASE_URL}/plugin/shoppe/${tenant.uuid}`);
     resp.status.should.equal(200);
     const html = await resp.text();
-    html.should.include('Integration Test Shoppe');
-    html.should.include('tab-btn');
+    html.should.include('Test Shoppe');
+    html.should.include('class="tab"');
     html.should.include('membership');
   });
 
@@ -315,7 +315,7 @@ describe('Sanora integration', function() {
     html.should.include('Test Session');
     html.should.include('/slots');
     html.should.include('purchase/intent');
-    html.should.include('Confirm Booking'); // free booking label (price=0 in test archive)
+    html.should.include('Continue to Payment'); // paid booking label (price=10000 in test archive)
   });
 
   it('should serve the subscription sign-up page with benefits', async () => {