@homie-rocks/studio 0.39.0 → 0.42.0

package/worker/service-terms.mjs

@@ -0,0 +1,2 @@
+/** Shared immutable terms for priced tools and their Stripe Payment Links. */
+export const serviceTerms = (price) => ({billing:'one-time',scope:'service',updates:'none',source:false,commercialUse:true,transferable:false,onRefund:'terminate',onExpiry:'terminate',refund:'Ask the studio for a refund.',...price});

package/worker/shop-rules.mjs

@@ -128,14 +128,15 @@ export function checkShop(raw, { games = null, audience = 'general', studioName
   const requestBytes = optionalNumber(raw.requestBytes, 'requestBytes');
   const refundDays = optionalNumber(raw.refundDays, 'refundDays');
   const cap = optionalNumber(raw.capPerPlayerMonth, 'capPerPlayerMonth');
-  // 600 new buyers per hour allows a school or venue to arrive together without disabling flood protection.
-  const guestBuyersPerAddressPerHour = numeric(raw.guestBuyersPerAddressPerHour ?? 600);
-  if (!Number.isSafeInteger(guestBuyersPerAddressPerHour) || guestBuyersPerAddressPerHour < 1) err('guestBuyersPerAddressPerHour', 'use a positive whole number for new guest flood protection');
-  const purchaseAttemptsPerMinute = numeric(raw.purchaseAttemptsPerMinute ?? 6);
-  // A school or venue can share an address; its aggregate bucket must allow many independent accounts.
-  const purchaseAttemptsPerAddressPerMinute = numeric(raw.purchaseAttemptsPerAddressPerMinute ?? 600);
-  if (!Number.isSafeInteger(purchaseAttemptsPerAddressPerMinute) || purchaseAttemptsPerAddressPerMinute < 1) err('purchaseAttemptsPerAddressPerMinute', 'use a positive whole number for address flood protection');
-  if (!Number.isSafeInteger(purchaseAttemptsPerMinute) || purchaseAttemptsPerMinute < 1) err('purchaseAttemptsPerMinute', 'use a positive whole number for the studio account rate limit');
+  const ratePolicy = key => {
+    if(raw[key] === undefined || raw[key] === null)return null;
+    const value=numeric(raw[key]);
+    if(!Number.isSafeInteger(value)||value<1)err(key,'use a positive whole number, or omit the rate policy');
+    return value;
+  };
+  const guestBuyersPerAddressPerHour = ratePolicy('guestBuyersPerAddressPerHour');
+  const purchaseAttemptsPerMinute = ratePolicy('purchaseAttemptsPerMinute');
+  const purchaseAttemptsPerAddressPerMinute = ratePolicy('purchaseAttemptsPerAddressPerMinute');
 
   for (const key of ['automaticTax', 'referralNewPlayersOnly']) if (raw[key] !== undefined && typeof raw[key] !== 'boolean') err(key, 'use a boolean');
   const items = [];

package/worker/shop.mjs

@@ -556,8 +556,8 @@ const WAY_WORDS = Object.freeze({
 });
 
 function purchaseLimited(request, shop, player, kind) {
-  const account = player && limited(`${kind}:account:${player}`, shop.purchaseAttemptsPerMinute, 60_000);
-  const address = limited(`${kind}:address:${addressOf(request)}`, shop.purchaseAttemptsPerAddressPerMinute, 60_000);
+  const account = player && shop.purchaseAttemptsPerMinute !== null && limited(`${kind}:account:${player}`, shop.purchaseAttemptsPerMinute, 60_000);
+  const address = shop.purchaseAttemptsPerAddressPerMinute !== null && limited(`${kind}:address:${addressOf(request)}`, shop.purchaseAttemptsPerAddressPerMinute, 60_000);
   return account || address;
 }
 
@@ -707,6 +707,18 @@ function refundableNow(order, owns, shop, now = Date.now()) {
   return shop.policy.refundUsedItems || !owns.some((o) => o.item === order.item && o.used);
 }
 
+/** Shared authorization for web and claim refunds, using persisted grants and line snapshots. */
+export async function refundableShopOrder(env, order, shop, lines = null) {
+  if (!order || !shop) return false;
+  lines ??= await orderLines(env, order.id);
+  if (!lines.length) return false;
+  for (const line of lines) {
+    const used = await lineWasUsed(env, order.id, line);
+    if (!refundableNow({ ...lineView(line), paidAt: order.paid_at }, used ? [{ item: line.item, used: true }] : [], shop)) return false;
+  }
+  return true;
+}
+
 /** A player's own refund follows the studio window and used-item setting, excluding tips. */
 async function selfRefundRoute(request, env, shop, ready) {
   const b = await bodyOf(request, requestSize(shop));
@@ -717,10 +729,7 @@ async function selfRefundRoute(request, env, shop, ready) {
   if (!o || o.player !== p.id) return fail(404, 'order', 'no such order on this account');
   const lines = (await orderLines(env, o.id)).filter((l) => !b.body.line || l.id === b.body.line);
   if (!lines.length) return fail(404, 'line', 'no such line on this order');
-  for (const line of lines) {
-    const used = await lineWasUsed(env, o.id, line);
-    if (!refundableNow({ ...lineView(line), paidAt: o.paid_at }, used ? [{ item: line.item, used: true }] : [], shop)) return fail(403, 'not-refundable', 'Ask the studio for this refund. Tips are not refundable by the player; items follow the studio refund settings.');
-  }
+  if (!await refundableShopOrder(env, o, shop, lines)) return fail(403, 'not-refundable', 'Ask the studio for this refund. Tips are not refundable by the player; items follow the studio refund settings.');
   if (Number(o.amount) !== 0 && !hasStripeKey(env)) return fail(409, 'ask-studio', 'Ask the studio to refund this payment in Stripe.');
   const r = await refundOrder(env, o, { reason: 'requested_by_customer', by: 'player', line: b.body.line });
   if (r.held) return json({ ...r, error: r.error === 'pending' ? 'pending' : 'held', message: r.error === 'pending' ? r.message : 'The studio approves this refund in Stripe first. Your money comes back once they do, and the item leaves your account then.' }, 202);
@@ -743,7 +752,11 @@ async function hook(request, env, cat, shop, ready) {
   if (selling.enabled) {
     if (typeof ev.livemode === 'boolean' && ev.livemode !== (shopMode(env) === 'live')) return json({ ok: true, ignored: 'mode' });
     const purchase = await selling.purchasePaymentEvent(env, ev);
-    if (purchase !== null) { await env.DB.prepare('INSERT INTO shop_events (id, type, at) VALUES (?1, ?2, ?3) ON CONFLICT(id) DO NOTHING').bind(ev.id, ev.type, Date.now()).run(); return json({ ok: true, did: purchase }); }
+    if (purchase !== null) {
+      // Resource carts share the web shop's grants and refund bookkeeping.
+      const payment = typeof obj.payment_intent === 'string' ? obj.payment_intent : obj.payment_intent?.id;
+      if (payment) await syncRefunds(env, payment);
+      await env.DB.prepare('INSERT INTO shop_events (id, type, at) VALUES (?1, ?2, ?3) ON CONFLICT(id) DO NOTHING').bind(ev.id, ev.type, Date.now()).run(); return json({ ok: true, did: purchase }); }
   }
   if (!needed.includes(ev.type)) return json({ ok: true, did: 'ignored' });
   if (typeof ev.livemode === 'boolean' && (hasStripeKey(env) || linkConfig(env)) && ev.livemode !== (shopMode(env) === 'live')) return json({ ok: true, ignored: 'mode' });
@@ -864,7 +877,7 @@ async function bindLinkSession(env, session, mode) {
 }
 
 /** A paid checkout: the order is paid, its entitlements granted, a referral line written. Idempotent. */
-async function paid(env, shop, session, paidAt = Date.now()) {
+export async function paid(env, shop, session, paidAt = Date.now()) {
   const o = await orderBySession(env, session.id);
   if (!o) return 'unknown-order';
   // The session must be the one this order opened, for this player and this price.
@@ -950,7 +963,7 @@ async function paid(env, shop, session, paidAt = Date.now()) {
  * https://docs.stripe.com/api/refunds/object#refund_object-status
  * https://docs.stripe.com/api/refunds/list
  */
-async function syncRefunds(env, payment, freeOrder = null, freeLines = []) {
+export async function syncRefunds(env, payment, freeOrder = null, freeLines = []) {
   const o = freeOrder ?? await orderByPayment(env, payment);
   if (!o) return 'unknown-order';
   const all = await orderLines(env, o.id);

package/worker/tool-webhook.mjs

@@ -6,6 +6,7 @@ export async function toolWebhook(request,env,{cat,definitions}) {
   const name=new URL(request.url).pathname.split('/').pop(),tool=definitions.find(t=>t.name===name&&t.webhook);
   const fail=(status)=>Response.json({ok:false},{status});
   if(!tool||request.method!=='POST')return fail(404);
+  if(tool.price)return Response.json({ok:false,error:'Use /mcp to approve and pay for this tool'},{status:402});
   const timestamp=request.headers.get('x-studio-timestamp')??'',delivery=request.headers.get('x-studio-delivery')??'',signature=request.headers.get('x-studio-signature')??'';
   if(!/^\d{10}$/.test(timestamp)||Math.abs(Date.now()/1000-Number(timestamp))>300||!/^[a-zA-Z0-9_-]{8,100}$/.test(delivery)||!/^[a-f0-9]{64}$/.test(signature))return fail(401);
   const secret=env[tool.webhook.secret];if(typeof secret!=='string'||secret.length<32)return fail(503);

package/worker/version.mjs

@@ -1,2 +1,2 @@
 /** The @homie-rocks/studio version this Worker code is (package.json's; a test keeps them equal). Cache-busts /_homie/site.js. */
-export const STUDIO_VERSION_TAG = '0.39.0';
+export const STUDIO_VERSION_TAG = '0.42.0';