domma-cms 0.103.0 → 0.104.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.103.0",
+  "version": "0.104.0",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/_lib/call/rooms.js

@@ -218,6 +218,23 @@ export function createRooms({now = Date.now, pollMs = POLL_MS, silentMs = SILENT
             return room ? {in: admitted(room).length, waiting: waitingList(room).length} : {in: 0, waiting: 0};
         },
 
+        /**
+         * Take one person out of a call - everyone joined with `identity` (someone who left the conversation
+         * the call belongs to). They are told the call ended for them; the others see them leave.
+         */
+        kick(key, identity) {
+            const room = rooms.get(key);
+            if (!room || !identity) return 0;
+            let n = 0;
+            for (const p of [...room.people.values()]) {
+                if (p.identity !== identity) continue;
+                push(p, {type: 'ended'});
+                remove(room, p, 'removed');
+                n += 1;
+            }
+            return n;
+        },
+
         /** End a call for everyone (a booking cancelled, an event deleted). */
         close(key) {
             const room = rooms.get(key);

package/plugins/_lib/call/routes.js

@@ -84,5 +84,6 @@ export function mountCallRoutes(fastify, {prefix = '/call', ns, resolve, rooms =
     action('recording', (k, id, s, b) => rooms.recording(k, id, s, b.on === true));
     action('leave', (k, id, s) => rooms.leave(k, id, s));
 
-    return {...rooms, closeRoom: (room) => rooms.close(keyOf(room)), countRoom: (room) => rooms.count(keyOf(room))};
+    return {...rooms, closeRoom: (room) => rooms.close(keyOf(room)), countRoom: (room) => rooms.count(keyOf(room)),
+        kickFromRoom: (room, identity) => rooms.kick(keyOf(room), identity)};
 }

package/plugins/_lib/public/call/call.css

@@ -1 +1 @@
-.dmc{--dmc-gap: .75rem;display:flex;flex-direction:column;gap:1rem;min-height:70vh;color:var(--dm-text, inherit)}.dmc [hidden]{display:none!important}.dmc-head{display:flex;align-items:center;gap:.75rem;flex-wrap:wrap}.dmc-title{font-size:1.35rem;margin:0;flex:1 1 auto}.dmc-rec{color:#fff;background:var(--dm-danger, #c62828);border-radius:999px;padding:.2rem .7rem;font-size:.85rem;font-weight:600}.dmc-count{color:var(--dm-text-muted, #666);font-size:.9rem}.dmc-panel{display:grid;grid-template-columns:minmax(0,3fr) minmax(0,2fr);gap:1.5rem;align-items:start}.dmc-panel--msg{display:block;text-align:center;padding:3rem 1rem}.dmc-preview{position:relative;aspect-ratio:16 / 9;background:#111;border-radius:.75rem;overflow:hidden}.dmc-preview video,.dmc-tile video{width:100%;height:100%;object-fit:cover;display:block}.dmc-self,.dmc-self-preview{transform:scaleX(-1)}.dmc-nocam{position:absolute;inset:0;display:grid;place-items:center;color:#ddd;margin:0}.dmc-check h2{margin-top:0}.dmc-label{display:grid;gap:.35rem;margin:1rem 0;font-weight:600}.dmc-input{font:inherit;padding:.55rem .7rem;border:1px solid var(--dm-border, #ccc);border-radius:.5rem;background:var(--dm-surface, #fff);color:inherit;min-width:0}.dmc-row{display:flex;gap:.5rem;flex-wrap:wrap;margin:1rem 0}.dmc-note{color:var(--dm-text-muted, #666)}.dmc-error{color:var(--dm-danger, #c62828);font-weight:600}.dmc-btn{font:inherit;cursor:pointer;padding:.55rem 1rem;border-radius:.5rem;border:1px solid var(--dm-border, #ccc);background:var(--dm-surface, #fff);color:inherit}.dmc-btn:hover{border-color:var(--dm-primary, #555)}.dmc-btn:disabled{opacity:.6;cursor:default}.dmc-btn.is-off{background:var(--dm-danger, #c62828);border-color:transparent;color:#fff}.dmc-btn--go{background:var(--dm-primary, #1f6feb);border-color:transparent;color:#fff}.dmc-btn--leave{background:var(--dm-danger, #c62828);border-color:transparent;color:#fff}.dmc-btn--rec{border-color:var(--dm-danger, #c62828)}.dmc-btn--small{padding:.3rem .65rem;font-size:.9rem}.dmc-call{display:grid;grid-template-columns:minmax(0,1fr) auto;grid-template-rows:1fr auto;gap:var(--dmc-gap)}.dmc-main{display:grid;gap:var(--dmc-gap);grid-template-columns:repeat(auto-fit,minmax(min(100%,280px),1fr));align-content:start}.dmc-main[data-people="1"]{grid-template-columns:minmax(0,1fr)}.dmc-main[data-people="2"]{grid-template-columns:repeat(auto-fit,minmax(min(100%,360px),1fr))}.dmc-grid,.dmc-remote{display:contents}.dmc-tile{position:relative;margin:0;aspect-ratio:16 / 9;background:#111;border-radius:.75rem;overflow:hidden}.dmc-tile figcaption{position:absolute;left:.5rem;bottom:.5rem;padding:.15rem .5rem;border-radius:.35rem;background:#0009;color:#fff;font-size:.85rem}.dmc-side{width:300px;display:flex;flex-direction:column;gap:1rem;grid-row:1 / span 1;grid-column:2}.dmc-side h3{margin:0 0 .5rem;font-size:1rem}.dmc-waiting ul{list-style:none;margin:0;padding:0;display:grid;gap:.5rem}.dmc-waiting li{display:flex;align-items:center;gap:.4rem;flex-wrap:wrap}.dmc-waiting li span{flex:1 1 100%;font-weight:600}.dmc-chat{display:flex;flex-direction:column;min-height:0;flex:1}.dmc-messages{list-style:none;margin:0 0 .5rem;padding:0;overflow-y:auto;max-height:50vh;display:grid;gap:.4rem}.dmc-messages li.is-mine strong{color:var(--dm-primary, #1f6feb)}.dmc-send{display:flex;gap:.4rem}.dmc-send .dmc-input{flex:1}.dmc-bar{grid-column:1 / -1;display:flex;gap:.5rem;flex-wrap:wrap;justify-content:center}@media(max-width:760px){.dmc-panel,.dmc-call{grid-template-columns:1fr}.dmc-side{width:auto;grid-column:1;grid-row:auto}.dmc-bar{position:sticky;bottom:0;background:var(--dm-background, #fff);padding:.5rem 0}.dmc-bar .dmc-btn{flex:1 1 30%}}
+.dmc{--dmc-gap: .75rem;display:flex;flex-direction:column;gap:1rem;min-height:70vh;color:var(--dm-text, inherit)}.dmc [hidden]{display:none!important}.dmc-head{display:flex;align-items:center;gap:.75rem;flex-wrap:wrap}.dmc-title{font-size:1.35rem;margin:0;flex:1 1 auto}.dmc-rec{color:#fff;background:var(--dm-danger, #c62828);border-radius:999px;padding:.2rem .7rem;font-size:.85rem;font-weight:600}.dmc-count{color:var(--dm-text-muted, #666);font-size:.9rem}.dmc-panel{display:grid;grid-template-columns:minmax(0,3fr) minmax(0,2fr);gap:1.5rem;align-items:start}.dmc-panel--msg{display:block;text-align:center;padding:3rem 1rem}.dmc-preview{position:relative;aspect-ratio:16 / 9;background:#111;border-radius:.75rem;overflow:hidden}.dmc-preview video,.dmc-tile video{width:100%;height:100%;object-fit:cover;display:block}.dmc-self,.dmc-self-preview{transform:scaleX(-1)}.dmc-nocam{position:absolute;inset:0;display:grid;place-items:center;color:#ddd;margin:0}.dmc-check h2{margin-top:0}.dmc-label{display:grid;gap:.35rem;margin:1rem 0;font-weight:600}.dmc-input{font:inherit;padding:.55rem .7rem;border:1px solid var(--dm-border, #ccc);border-radius:.5rem;background:var(--dm-surface, #fff);color:inherit;min-width:0}.dmc-row{display:flex;gap:.5rem;flex-wrap:wrap;margin:1rem 0}.dmc-note{color:var(--dm-text-muted, #666)}.dmc-error{color:var(--dm-danger, #c62828);font-weight:600}.dmc-btn{font:inherit;cursor:pointer;padding:.55rem 1rem;border-radius:.5rem;border:1px solid var(--dm-border, #ccc);background:var(--dm-surface, #fff);color:inherit;display:inline-flex;align-items:center;justify-content:center;gap:.45rem;position:relative}.dmc-i{display:inline-flex}.dmc-btn svg,.dmc-rec svg,.dmc-count svg{width:18px;height:18px;flex:none}.dmc-rec svg{width:10px;height:10px;fill:currentColor}.dmc-count{display:inline-flex;align-items:center;gap:.35rem}.dmc-tool{flex-direction:column;gap:.2rem;min-width:5.5rem;padding:.5rem .75rem;font-size:.85rem}.dmc-btn.is-on{border-color:var(--dm-primary, #1f6feb);color:var(--dm-primary, #1f6feb)}.dmc-btn--rec.is-on{border-color:var(--dm-danger, #c62828);color:var(--dm-danger, #c62828)}.dmc-btn--rec.is-on svg{fill:currentColor}.dmc-badge{position:absolute;top:.2rem;right:.35rem;min-width:1.1rem;height:1.1rem;padding:0 .25rem;border-radius:999px;background:var(--dm-danger, #c62828);color:#fff;font-size:.7rem;line-height:1.1rem;text-align:center}.dmc-btn:hover{border-color:var(--dm-primary, #555)}.dmc-btn:disabled{opacity:.6;cursor:default}.dmc-btn.is-off{background:var(--dm-danger, #c62828);border-color:transparent;color:#fff}.dmc-btn--go{background:var(--dm-primary, #1f6feb);border-color:transparent;color:#fff}.dmc-btn--leave{background:var(--dm-danger, #c62828);border-color:transparent;color:#fff}.dmc-btn--rec{border-color:var(--dm-danger, #c62828)}.dmc-btn--small{padding:.3rem .65rem;font-size:.9rem}.dmc-call{display:grid;grid-template-columns:minmax(0,1fr) auto;grid-template-rows:1fr auto;gap:var(--dmc-gap)}.dmc-main{display:grid;gap:var(--dmc-gap);grid-template-columns:repeat(auto-fit,minmax(min(100%,280px),1fr));align-content:start}.dmc-main[data-people="1"]{grid-template-columns:minmax(0,1fr)}.dmc-main[data-people="2"]{grid-template-columns:repeat(auto-fit,minmax(min(100%,360px),1fr))}.dmc-grid,.dmc-remote{display:contents}.dmc-tile{position:relative;margin:0;aspect-ratio:16 / 9;background:#111;border-radius:.75rem;overflow:hidden}.dmc-tile figcaption{position:absolute;left:.5rem;bottom:.5rem;padding:.15rem .5rem;border-radius:.35rem;background:#0009;color:#fff;font-size:.85rem}.dmc-side{width:300px;display:flex;flex-direction:column;gap:1rem;grid-row:1 / span 1;grid-column:2}.dmc-side h3{margin:0 0 .5rem;font-size:1rem}.dmc-waiting ul{list-style:none;margin:0;padding:0;display:grid;gap:.5rem}.dmc-waiting li{display:flex;align-items:center;gap:.4rem;flex-wrap:wrap}.dmc-waiting li span{flex:1 1 100%;font-weight:600}.dmc-chat{display:flex;flex-direction:column;min-height:0;flex:1}.dmc-messages{list-style:none;margin:0 0 .5rem;padding:0;overflow-y:auto;max-height:50vh;display:grid;gap:.4rem}.dmc-messages li.is-mine strong{color:var(--dm-primary, #1f6feb)}.dmc-send{display:flex;gap:.4rem}.dmc-send .dmc-input{flex:1}.dmc-bar{grid-column:1 / -1;display:flex;gap:.5rem;flex-wrap:wrap;justify-content:center}@media(max-width:760px){.dmc-panel,.dmc-call{grid-template-columns:1fr}.dmc-side{width:auto;grid-column:1;grid-row:auto}.dmc-bar{position:sticky;bottom:0;background:var(--dm-background, #fff);padding:.5rem 0}.dmc-bar .dmc-btn{flex:1 1 auto;min-width:3rem}.dmc-lbl{display:none}.dmc-tool{padding:.6rem}}

package/plugins/_lib/public/call/call.js

@@ -19,12 +19,17 @@
 
 const M = window.M;
 
+/** An icon (Domma's I.scan turns it into an SVG after binding - so no binding ever sits on it). */
+const ico = (name) => `<span class="dmc-ico" data-icon="${name}" data-icon-size="18" aria-hidden="true"></span>`;
+/** Two icons, one shown by a condition: the bindings are on the wrappers, never on the icons. */
+const pair = (cond, on, off) => `<span class="dmc-i" data-bind-hidden="!(${cond})">${ico(on)}</span><span class="dmc-i" data-bind-hidden="${cond}">${ico(off)}</span>`;
+
 const TEMPLATE = `
 <div class="dmc">
   <header class="dmc-head">
     <h1 class="dmc-title" data-bind-text="title.value"></h1>
-    <span class="dmc-rec" data-bind-hidden="!recording.value" role="status">● Recording</span>
-    <span class="dmc-count" data-bind-text="countText.value"></span>
+    <span class="dmc-rec" data-bind-hidden="!recording.value" role="status">${ico('circle')} Recording</span>
+    <span class="dmc-count" data-bind-hidden="!countText.value">${ico('users')} <span data-bind-text="countText.value"></span></span>
   </header>
 
   <section class="dmc-panel" data-bind-hidden="stage.value !== 'check'">
@@ -36,18 +41,18 @@ const TEMPLATE = `
       <label class="dmc-label" data-bind-hidden="!askName">Your name
         <input class="dmc-input" data-model="name.value" maxlength="60" autocomplete="name"></label>
       <div class="dmc-row">
-        <button type="button" class="dmc-btn" data-on-click="toggleMic" data-bind-class="!micOn.value && 'is-off'" data-bind-text="micOn.value ? 'Mic on' : 'Mic off'"></button>
-        <button type="button" class="dmc-btn" data-on-click="toggleCam" data-bind-class="!camOn.value && 'is-off'" data-bind-text="camOn.value ? 'Camera on' : 'Camera off'"></button>
+        <button type="button" class="dmc-btn" data-on-click="toggleMic" data-bind-class="!micOn.value && 'is-off'" data-bind-aria-pressed="!micOn.value">${pair('micOn.value', 'mic', 'mic-off')}<span data-bind-text="micOn.value ? 'Mic on' : 'Mic off'"></span></button>
+        <button type="button" class="dmc-btn" data-on-click="toggleCam" data-bind-class="!camOn.value && 'is-off'" data-bind-aria-pressed="!camOn.value">${pair('camOn.value', 'video', 'video-off')}<span data-bind-text="camOn.value ? 'Camera on' : 'Camera off'"></span></button>
       </div>
       <p class="dmc-note" data-bind-hidden="!recordingAllowed.value">The host may record this call. You will see a red Recording notice while they do.</p>
       <p class="dmc-error" data-bind-hidden="!error.value" data-bind-text="error.value" role="alert"></p>
-      <button type="button" class="dmc-btn dmc-btn--go" data-on-click="join" data-bind-disabled="busy.value">Join the call</button>
+      <button type="button" class="dmc-btn dmc-btn--go" data-on-click="join" data-bind-disabled="busy.value">${ico('phone')}<span>Join the call</span></button>
     </div>
   </section>
 
   <section class="dmc-panel dmc-panel--msg" data-bind-hidden="stage.value !== 'waiting'">
     <h2>Waiting for the host</h2><p>They know you are here and will let you in shortly.</p>
-    <button type="button" class="dmc-btn" data-on-click="leave">Leave</button>
+    <button type="button" class="dmc-btn" data-on-click="leave">${ico('log-out')}<span>Leave</span></button>
   </section>
 
   <section class="dmc-panel dmc-panel--msg" data-bind-hidden="!(stage.value === 'ended' || stage.value === 'away' || stage.value === 'error')">
@@ -71,8 +76,8 @@ const TEMPLATE = `
         <h3>Waiting to join</h3>
         <ul data-each="waiting key=id">
           <li><span data-bind-text="name"></span>
-            <button type="button" class="dmc-btn dmc-btn--small dmc-btn--go" data-on-click="$parent.admit($data)">Let in</button>
-            <button type="button" class="dmc-btn dmc-btn--small" data-on-click="$parent.turnAway($data)">Turn away</button></li>
+            <button type="button" class="dmc-btn dmc-btn--small dmc-btn--go" data-on-click="$parent.admit($data)">${ico('check')}<span>Let in</span></button>
+            <button type="button" class="dmc-btn dmc-btn--small" data-on-click="$parent.turnAway($data)">${ico('x')}<span>Turn away</span></button></li>
         </ul>
       </div>
       <div class="dmc-chat" data-bind-hidden="!sideOpen.value">
@@ -82,18 +87,18 @@ const TEMPLATE = `
         </ol>
         <form class="dmc-send" data-on-submit="sendChat">
           <input class="dmc-input" data-model="draft.value" maxlength="1000" placeholder="Message everyone" aria-label="Message everyone">
-          <button type="submit" class="dmc-btn dmc-btn--small">Send</button>
+          <button type="submit" class="dmc-btn dmc-btn--small" aria-label="Send">${ico('message-circle')}<span>Send</span></button>
         </form>
       </div>
     </aside>
 
     <nav class="dmc-bar" aria-label="Call controls">
-      <button type="button" class="dmc-btn" data-on-click="toggleMic" data-bind-class="!micOn.value && 'is-off'" data-bind-text="micOn.value ? 'Mute' : 'Unmute'"></button>
-      <button type="button" class="dmc-btn" data-on-click="toggleCam" data-bind-class="!camOn.value && 'is-off'" data-bind-text="camOn.value ? 'Stop video' : 'Start video'"></button>
-      <button type="button" class="dmc-btn" data-on-click="toggleShare" data-bind-hidden="!canShare" data-bind-text="sharing.value ? 'Stop sharing' : 'Share screen'"></button>
-      <button type="button" class="dmc-btn" data-on-click="toggleSide" data-bind-text="chatLabel.value"></button>
-      <button type="button" class="dmc-btn dmc-btn--rec" data-on-click="toggleRecord" data-bind-hidden="!(host.value && recordingAllowed.value && canRecord)" data-bind-text="iRecord.value ? 'Stop recording' : 'Record'"></button>
-      <button type="button" class="dmc-btn dmc-btn--leave" data-on-click="leave">Leave</button>
+      <button type="button" class="dmc-btn dmc-tool" data-on-click="toggleMic" data-bind-class="!micOn.value && 'is-off'" data-bind-aria-pressed="!micOn.value" data-bind-title="micOn.value ? 'Mute' : 'Unmute'">${pair('micOn.value', 'mic', 'mic-off')}<span class="dmc-lbl" data-bind-text="micOn.value ? 'Mute' : 'Unmute'"></span></button>
+      <button type="button" class="dmc-btn dmc-tool" data-on-click="toggleCam" data-bind-class="!camOn.value && 'is-off'" data-bind-aria-pressed="!camOn.value" data-bind-title="camOn.value ? 'Stop video' : 'Start video'">${pair('camOn.value', 'video', 'video-off')}<span class="dmc-lbl" data-bind-text="camOn.value ? 'Stop video' : 'Start video'"></span></button>
+      <button type="button" class="dmc-btn dmc-tool" data-on-click="toggleShare" data-bind-hidden="!canShare" data-bind-class="sharing.value && 'is-on'" data-bind-aria-pressed="sharing.value" data-bind-title="sharing.value ? 'Stop sharing' : 'Share your screen'">${ico('monitor')}<span class="dmc-lbl" data-bind-text="sharing.value ? 'Stop sharing' : 'Share screen'"></span></button>
+      <button type="button" class="dmc-btn dmc-tool" data-on-click="toggleSide" data-bind-class="sideOpen.value && 'is-on'" data-bind-aria-pressed="sideOpen.value" data-bind-title="chatLabel.value">${ico('message-circle')}<span class="dmc-lbl" data-bind-text="chatLabel.value"></span><span class="dmc-badge" data-bind-hidden="!unread.value || sideOpen.value" data-bind-text="unread.value"></span></button>
+      <button type="button" class="dmc-btn dmc-tool dmc-btn--rec" data-on-click="toggleRecord" data-bind-hidden="!(host.value && recordingAllowed.value && canRecord)" data-bind-class="iRecord.value && 'is-on'" data-bind-aria-pressed="iRecord.value" data-bind-title="iRecord.value ? 'Stop recording' : 'Record the call'">${ico('circle')}<span class="dmc-lbl" data-bind-text="iRecord.value ? 'Stop recording' : 'Record'"></span></button>
+      <button type="button" class="dmc-btn dmc-tool dmc-btn--leave" data-on-click="leave" title="Leave the call">${ico('phone-off')}<span class="dmc-lbl">Leave</span></button>
     </nav>
   </section>
 </div>`;
@@ -130,7 +135,7 @@ function mount(el) {
     const meCaption = M.computed(() => `${name.value || 'You'} (you)${micOn.value ? '' : ' · muted'}`);
     const countText = M.computed(() => (stage.value === 'in' ? `${peers.value.length + 1} of ${max.value}` : ''));
     const people = M.computed(() => String(Math.min(6, peers.value.length + 1)));
-    const chatLabel = M.computed(() => (sideOpen.value ? 'Hide chat' : unread.value ? `Chat (${unread.value})` : 'Chat'));
+    const chatLabel = M.computed(() => (sideOpen.value ? 'Hide chat' : 'Chat'));
     const title = M.observable(cfg.title || 'Call');
 
     // ---- The connection to the site ---------------------------------------------------
@@ -460,9 +465,13 @@ function mount(el) {
 
     el.innerHTML = TEMPLATE;
     const handleBindings = M.applyBindings(model, el.firstElementChild);
+    // Icons after binding (I.scan swaps each span for an SVG); new waiting rows get theirs as they arrive.
+    const scan = () => { try { window.I?.scan?.(el); } catch { /* no icons: the labels still read */ } };
+    scan();
+    const stopScan = M.effect(() => { waiting.value; requestAnimationFrame(scan); });
     window.addEventListener('pagehide', () => { if (me) post('leave', {}, {keepalive: true}); });
     getDevices().then(setTracks);
-    return () => { stopAttach?.(); handleBindings?.dispose?.(); };
+    return () => { stopAttach?.(); stopScan?.(); handleBindings?.dispose?.(); };
 }
 
 document.querySelectorAll('[data-dm-call]').forEach(mount);

package/plugins/booking/CLAUDE.md

@@ -20,6 +20,19 @@ service - no import of the Calendar, which is a separate paid Tool).
 Booking Pro (not yet built) is an ADD-ON that registers into this one (`lib/extensions.js`), the Cart / Cart Pro
 pattern - it does not supersede it. Payment is Pro only.
 
+1.4.0 (2026-09-30): "Call now" hooks for Booking Pro. Registry `version: 4`: `actions: [{id, icon, title, module}]`
+(module under `/plugins/<owner>/`; ids `[a-z0-9-]`, never a screen's or tab's key, first owner keeps an id) ->
+`registry.actions()` -> bootstrap `actions` -> a banner button each (`booking-x-<id>`) that imports the module and calls
+`run(ctx, prefill)` (ctx = the screen's ctx + `owner`, `api` (sectionApi), `bookables`, `services`, `helpPopovers`).
+`#/plugins/booking/<action-id>?contact=|email=&name=` is the Diary + that action with the prefill resolved like `new`
+(the address goes back to `diary`). `callOpenedAt` on an online booking (`changeBooking` patch, online only, history
+`call-opened`; a move clears it): `callWindow` opens at min(start - 10 min, callOpenedAt) and closes at max(end + 60
+min, callOpenedAt + 2 h), so the customer's EXISTING link works at once - Booking (free) honours it after a lapse.
+`registry.services` adds `openCall(id, {by})` (every online HOLDING booking of the session; throws `code` none |
+not-online | cancelled), `callLinks(b, request?)` (absolute join/host URLs from a RAW booking), `adminBooking`,
+`ownContact(id, userId)`, `siteBase(request?)`; `book()` takes `contactId` + `userId` (checked with `ownContact`) and
+`request` (for the email links). An older Pro registers no actions; an older Booking ignores them.
+
 1.3.0 (2026-09-30): online bookings (plan: `dcms-marketplace/docs/online-meetings-plan.md`). An extension's
 `rules()` may say `online` (+ `recordingAllowed`); `placeBooking` then stores `online: true`, `hostKey`,
 `recordingAllowed` ON THE BOOKING, so Booking (free) serves the call for it even after Pro lapses. `lib/call.js`:
@@ -73,7 +86,8 @@ completed, no-show (`HOLDING`); cancelled frees it.
   writes observables, and moves focus / scroll. Without `window.M` the server's page is left as it is.
 - `docs/guide.md` - the user guide in the admin Documentation folder.
 - `tests/pure.test.js` (time, slots, cleaning), `tests/api.test.js` (the whole API against the real collection
-  service; restores config/plugins.json and contacts-contacts), `tests/public.test.js` (the page's paths).
+  service; restores config/plugins.json and contacts-contacts; registry actions, callOpenedAt), `tests/public.test.js`
+  (the page's paths; `call-now/<id>` is left to Booking Pro).
 
 ## Data
 
@@ -83,13 +97,13 @@ all off - bookings hold customers' details). Settings: `config/plugins.json` `bo
 A booking: `serviceId`, `serviceName`, `duration`, `bookableId`, `bookableName`, `startAt`, `endAt`, `blockStart`,
 `blockEnd`, `status`, `name`, `email`, `phone`, `notes`, `staffNote`, `contactId`, `source` (public | admin),
 `createdBy`, `token` (the customer's link; never sent to the admin), `reminderSentAt`, `history` [{at, what, by,
-from?, reason?}], `cancelledAt`, `ext` (Pro's). Services and bookables carry `ext` too (Pro's fields, kept by the
+from?, reason?}], `cancelledAt`, `ext` (Pro's); online ones also `online`, `hostKey`, `recordingAllowed`, `callOpenedAt`. Services and bookables carry `ext` too (Pro's fields, kept by the
 free Tool untouched).
 
 ## Extensions (Booking Pro)
 
-`bookingRegistry()` (`lib/extensions.js`, `version: 2`): `register(owner, {rules, form, answers, check, admin, waitlistUrl,
-on, tabs})` - every hook optional and guarded (one that throws counts as absent). `rules(service)` ->
+`bookingRegistry()` (`lib/extensions.js`, `version: 4`): `register(owner, {rules, form, answers, check, admin, waitlistUrl,
+on, tabs, actions})` - every hook optional and guarded (one that throws counts as absent). `rules(service)` ->
 {capacity, companions: [[ids]], maxPerDay, waitlist}, resolved to bookable objects by `registry.rules(service,
 bookables)` and applied by `slotsFor` / `whoCanTake` / `placeBooking` (same session = same service + start +
 primary bookable: shares places, never clashes with itself; a day's limit counts sessions). `form` / `answers`: extra

package/plugins/booking/admin/lib/kit.js

@@ -13,7 +13,7 @@ export {fmtDate, fmtDateTime};
 
 export const SIDEBAR_URL = '#/plugins/booking';
 export const BASE = '/api/plugins/booking';
-export const V = '1.1.0';
+export const V = '1.4.0';
 
 let kit = null;
 

package/plugins/booking/admin/views/booking.js

@@ -11,11 +11,15 @@
  *   #/plugins/booking/new?contact=<id>  the Diary with New booking open, filled from a contact
  *   #/plugins/booking/new?email=&name=  ... or from an email's sender (Email's "Book Sam…")
  *   #/plugins/booking/<ext-key>         an extension's screen
+ *   #/plugins/booking/<action-id>?contact=<id> | ?email=&name=
+ *                                       the Diary, then an extension's banner action run with that prefill
+ *                                       (Booking Pro's "Call now" from a contact's or an email's menu)
  *
  * Settings are behind the banner's cog, in a slideover.
  */
 
 import {V, api, errText, loadKit, store} from '../lib/kit.js';
+import {sectionApi} from '../lib/extension-sections.js';
 
 const ROUTE = /^#\/plugins\/booking(\/|\?|$)/;
 const TABS = [
@@ -65,8 +69,10 @@ export const bookingView = {
         if (!here()) return;
 
         const tabs = [...TABS, ...(boot.tabs || [])];
+        const actions = (boot.actions || []).filter(a => a && typeof a.module === 'string' && a.module.startsWith(`/plugins/${a.owner}/`));
         const wantNew = tab === 'new';
-        const current = tabs.find(t => t.key === (wantNew ? 'diary' : tab)) || TABS[0];
+        const wantAction = actions.find(a => a.id === tab) || null;
+        const current = tabs.find(t => t.key === (wantNew || wantAction ? 'diary' : tab)) || TABS[0];
 
         // "Booking › Diary" in the banner.
         const name = container.querySelector('.dm-plugin-banner-name');
@@ -138,6 +144,28 @@ export const bookingView = {
         kit.addBannerAction($container, {id: 'booking-new', icon: 'plus', title: 'New booking',
             onClick: () => ctx.newBooking({})});
 
+        /**
+         * An extension's banner action (Booking 1.4): its module's `run(ctx, prefill)`, imported on the click.
+         * ctx is the screen's (boot, openBooking, refresh, go...) plus what sections get (api, owner, helpPopovers).
+         * Anything that must open a new tab does so on a click of its own, never after this import.
+         */
+        const runAction = async (a, prefill = {}) => {
+            try {
+                const mod = await import(a.module);
+                const run = mod.run || mod.default?.run;
+                if (typeof run !== 'function') throw new Error('no run()');
+                return await run({...ctx, owner: a.owner, api: sectionApi, bookables: boot.bookables, services: boot.services,
+                    helpPopovers: (el) => kit.helpPopovers(el)}, prefill);
+            } catch (err) {
+                console.warn(`[booking] ${a.owner} action ${a.id}:`, err);
+                E.toast(`${a.title} could not start: ${errText(err)}`, {type: 'error'});
+                return null;
+            }
+        };
+        for (const a of actions) {
+            kit.addBannerAction($container, {id: `booking-x-${a.id}`, icon: a.icon, title: a.title, onClick: () => runAction(a)});
+        }
+
         try {
             const mod = await import(current.module);
             if (!here()) return;
@@ -154,9 +182,9 @@ export const bookingView = {
         }
         store.set('booking.last-tab', current.key);
 
-        // From Contacts or Email: the New booking slideover, filled in. The
+        // From Contacts or Email: the New booking slideover (or an extension's action), filled in. The
         // address goes back to the Diary so a reload does not open it again.
-        if (wantNew && here()) {
+        if ((wantNew || wantAction) && here()) {
             ctx.replaceHash('#/plugins/booking/diary');
             const prefill = {email: query.email || '', name: query.name || ''};
             if (query.contact) {
@@ -171,7 +199,9 @@ export const bookingView = {
                 const c = await api.contactByEmail(query.email).catch(() => null);
                 if (c?.id) Object.assign(prefill, {contactId: c.id, name: c.name || prefill.name, phone: c.phone});
             }
-            if (ROUTE.test(location.hash)) ctx.newBooking(prefill);
+            if (!ROUTE.test(location.hash)) return;
+            if (wantAction) runAction(wantAction, prefill);
+            else ctx.newBooking(prefill);
         }
     }
 };

package/plugins/booking/admin/views/panels.js

@@ -436,7 +436,7 @@ export async function openBooking(ctx, id) {
     const saved = M.observable(b.staffNote || '');
     const tone = `is-${STATUS_TONE[b.status] || 'muted'}`;
     const history = (b.history || []).slice().reverse().map(h => {
-        const what = {made: 'Booked', moved: 'Moved', cancelled: 'Cancelled', completed: 'Marked done', 'no-show': 'Marked no-show', confirmed: 'Back to booked', pending: 'Pending'}[h.what] || h.what;
+        const what = {made: 'Booked', moved: 'Moved', cancelled: 'Cancelled', completed: 'Marked done', 'no-show': 'Marked no-show', confirmed: 'Back to booked', pending: 'Pending', 'call-opened': 'Call opened early'}[h.what] || h.what;
         const was = h.from ? wallClock(h.from, ctx.tz) : null;
         const extra = h.what === 'moved' && was ? ` (was ${dateLabel(was.date)}, ${was.time})` : h.reason ? `: ${h.reason}` : '';
         return `<li><strong>${esc(what)}</strong>${esc(extra)}<small>${esc(fmtDateTime(h.at))}${h.by ? ` · ${esc(h.by)}` : ''}</small></li>`;
@@ -477,7 +477,7 @@ export async function openBooking(ctx, id) {
   <div class="bk-ext-host" data-part="ext"></div>
   ${b.hostUrl && live ? `<div class="bk-actions bk-actions-start bk-call-row">
     <a class="btn btn-sm btn-primary" href="${esc(b.hostUrl)}" target="_blank" rel="noopener"><span data-icon="video" data-icon-size="13"></span> Start the call</a>
-    <span class="bk-muted">You are the host: let ${esc(b.name || 'them')} in when they arrive. It opens 10 minutes before the start.</span></div>` : ''}
+    <span class="bk-muted">You are the host: let ${esc(b.name || 'them')} in when they arrive. ${Date.parse(b.callOpenedAt || '') > Date.now() - 2 * 3600000 ? 'It was opened early, so it is open now.' : 'It opens 10 minutes before the start.'}</span></div>` : ''}
   <div class="bk-actions bk-actions-start">
     <button type="button" class="btn btn-sm btn-outline" data-on-click="move" ${live ? '' : 'disabled'}><span data-icon="move" data-icon-size="13"></span> Move</button>
     <button type="button" class="btn btn-sm btn-outline" data-on-click="done" ${live && b.status !== 'completed' ? '' : 'disabled'}><span data-icon="check" data-icon-size="13"></span> Done</button>

package/plugins/booking/docs/guide.md

@@ -58,6 +58,7 @@ Booking has its own permission, **Booking**, which admins have by default. **See
 
 Booking Pro adds the following to the free Tool:
 - Online appointments, held as a video call on your site.
+- **Call now**: open an online booking's call early, or start a video call with anyone straight away - from Booking, a contact or an email.
 - Services that need more than one person or room at once.
 - Classes and group sessions with places and a waiting list.
 - Recurring bookings.

package/plugins/booking/lib/call.js

@@ -33,12 +33,26 @@ export const joinPath = (settings, b) => `${settings.bookingPath}/call/${session
 /** The host's (the person booked) - never shown to the customer. */
 export const hostPath = (settings, b) => `${settings.bookingPath}/call/${sessionOf(b)}?b=${encodeURIComponent(b.id)}&h=${encodeURIComponent(b.hostKey)}`;
 
-/** When the call opens and closes, for a booking. */
-export function callWindow(b) {
-    return {
-        opensAt: new Date(Date.parse(b.startAt) - OPENS_BEFORE_MIN * 60000).toISOString(),
-        closesAt: new Date(Date.parse(b.endAt) + CLOSES_AFTER_MIN * 60000).toISOString()
-    };
+/** How long a call opened early ("Call now", Booking 1.4) stays open at least. */
+export const OPENED_EARLY_HOURS = 2;
+
+/**
+ * When the call opens and closes, for a booking. Staff may open it early
+ * (`callOpenedAt`, "Call now"): it opens then, and stays open at least
+ * OPENED_EARLY_HOURS after, even when the booking itself is later.
+ */
+export function callWindow(b, now = Date.now()) {
+    const opens = Date.parse(b.startAt) - OPENS_BEFORE_MIN * 60000;
+    const closes = Date.parse(b.endAt) + CLOSES_AFTER_MIN * 60000;
+    const early = Date.parse(b.callOpenedAt || '');
+    const iso = (a, z) => ({opensAt: new Date(a).toISOString(), closesAt: new Date(z).toISOString()});
+    // Opened early ("Call now"): open for OPENED_EARLY_HOURS from then - not all the way to the booking,
+    // which may be days off - joined up with the booking's own window when the two meet.
+    if (Number.isFinite(early) && now >= early && now <= early + OPENED_EARLY_HOURS * 3600000) {
+        const earlyEnd = early + OPENED_EARLY_HOURS * 3600000;
+        return iso(Math.min(early, opens), earlyEnd >= opens ? Math.max(earlyEnd, closes) : earlyEnd);
+    }
+    return iso(opens, closes);
 }
 
 /**
@@ -48,9 +62,9 @@ export function callWindow(b) {
  * @param {string} room - the room in the address
  * @param {{t?: string, h?: string}} cred
  */
-export function whoIsCalling(b, room, cred = {}) {
+export function whoIsCalling(b, room, cred = {}, now = Date.now()) {
     if (!b || b.online !== true || !HOLDING.has(b.status) || sessionOf(b) !== room) return null;
-    const base = {title: b.serviceName, recordingAllowed: b.recordingAllowed === true, max: 6, ...callWindow(b)};
+    const base = {title: b.serviceName, recordingAllowed: b.recordingAllowed === true, max: 6, ...callWindow(b, now)};
     // identity: a link the host turns away cannot knock again (the engine remembers it per room).
     if (cred.h && same(cred.h, b.hostKey)) return {...base, host: true, name: b.bookableName || 'Host', identity: `${b.id}:host`};
     if (cred.t && same(cred.t, b.token)) return {...base, host: false, name: b.name || 'Guest', identity: `${b.id}:guest`};

package/plugins/booking/lib/extensions.js

@@ -14,6 +14,9 @@
  *   waitlistUrl              -  where the booking page posts "join the waiting list"
  *   on:    {made, moved, cancelled, status}  - told after the fact, never waited on
  *   tabs:  [{key, label, icon, module}]      - admin screens beside Booking's own
+ *   actions: [{id, icon, title, module}]     - banner buttons on Booking's screens (Booking 1.4); the module's
+ *                               `run(ctx, prefill)` is called on the click - and for `#/plugins/booking/<id>?...`
+ *                               (a deep link from another Tool), with the prefill from the address
  *
  * Every hook is optional and guarded: one that throws counts as absent, so an
  * extension can never stop a booking being made. A lapsed Pro licence means
@@ -35,7 +38,8 @@ export function bookingRegistry() {
         globalThis[KEY] = {
             // 2: rules, form, answers, check, admin sections, waitlistUrl, services.book / cancel (Booking 1.1).
             // 3: rules may say online (+ recordingAllowed): held as a video call (Booking 1.3).
-            version: 3,
+            // 4: actions (banner buttons), services.openCall / callLinks, book({contactId, request}) (Booking 1.4).
+            version: 4,
             services: {},
             register(owner, ext = {}) {
                 if (typeof owner !== 'string' || !owner) return false;
@@ -136,6 +140,21 @@ export function bookingRegistry() {
                 return out;
             },
 
+            /** Banner buttons extensions add to Booking's screens. Ids are unique; the first to claim one keeps it. */
+            actions() {
+                const out = [];
+                // A deep link is #/plugins/booking/<id>: never a screen's own address.
+                const taken = new Set(['diary', 'bookings', 'services', 'people', 'new', 'settings', ...this.tabs().map(t => t.key)]);
+                for (const [owner, ext] of owners) {
+                    for (const a of Array.isArray(ext.actions) ? ext.actions : []) {
+                        if (typeof a?.id !== 'string' || !/^[a-z0-9-]{1,40}$/.test(a.id) || taken.has(a.id) || !underOwner(owner, a.module)) continue;
+                        taken.add(a.id);
+                        out.push({id: a.id, title: String(a.title || a.id).slice(0, 80), icon: String(a.icon || 'puzzle'), module: a.module, owner});
+                    }
+                }
+                return out;
+            },
+
             /** Tell every extension; never throws, never waits. */
             emit(event, ...args) {
                 for (const ext of owners.values()) {

package/plugins/booking/lib/store.js

@@ -260,7 +260,8 @@ export function placeBooking({service, candidates, startAt, fields, moveId = '',
             const current = await getEntry(BOOKINGS, moveId);
             if (!current) throw new Error('That booking no longer exists.');
             const history = [...(current.data.history || []), {at: new Date().toISOString(), what: 'moved', from: current.data.startAt, by: fields.by || ''}].slice(-50);
-            return flat(await updateEntry(BOOKINGS, moveId, {...current.data, ...times, history}));
+            // A call opened early ("Call now") was for the old time; the new one opens as usual.
+            return flat(await updateEntry(BOOKINGS, moveId, {...current.data, ...times, callOpenedAt: '', history}));
         }
         const {by, ...rest} = fields;
         return flat(await createEntry(BOOKINGS, {
@@ -307,6 +308,11 @@ export function changeBooking(id, patch, by = '') {
         }
         if (patch.reminderSentAt !== undefined) data.reminderSentAt = patch.reminderSentAt;
         if (patch.contactId !== undefined) data.contactId = patch.contactId;
+        // "Call now" (1.4): an online booking's call opened before its time.
+        if (patch.callOpenedAt !== undefined && data.online === true) {
+            data.callOpenedAt = String(patch.callOpenedAt || '');
+            if (data.callOpenedAt) data.history = [...(data.history || []), {at: data.callOpenedAt, what: 'call-opened', by}].slice(-50);
+        }
         if (patch.ext && typeof patch.ext === 'object') data.ext = {...(data.ext || {}), ...patch.ext};
         return {booking: flat(await updateEntry(BOOKINGS, id, data)), from};
     });

package/plugins/booking/plugin.js

@@ -119,7 +119,7 @@ function registerShortcodes(hooks) {
     });
 }
 
-export const ASSET_V = '1.3.1';
+export const ASSET_V = '1.4.0';
 
 export default async function booking(fastify, options) {
     const {authenticate, requirePermission} = options.auth;
@@ -271,7 +271,13 @@ export default async function booking(fastify, options) {
 
     registry.services = {
         name: NAME, liveSettings, allBookings, allServices, allBookables, getBooking, getService, getBookable,
-        changeBooking, sendReminders, siteBase: () => siteBase(null),
+        changeBooking, sendReminders,
+        /** The site's address: `site.baseUrl`, else the request's origin (a signed-in one), else the last admin's. */
+        siteBase: (request = null) => siteBase(request),
+        /** A booking as the admin may see it (no customer token; an online one's host key as `hostUrl`). */
+        adminBooking,
+        /** The contact `id` when it is `userId`'s own (Contacts on), else null. */
+        ownContact: async (id, userId) => (contactsOn() && id && userId ? ownContact(String(id), String(userId)).catch(() => null) : null),
         manageUrl: (b) => liveSettings().then(s => manageUrl(s, b, siteBase(null))),
         /** Make a booking the whole way (contacts, emails, notices, events) - a waiting list's place, a series. Throws SlotTaken. */
         book: (p) => bookForExtension(p),
@@ -286,6 +292,30 @@ export default async function booking(fastify, options) {
             }
             return res.booking;
         },
+        /**
+         * "Call now" (1.4): open an online booking's call now, even when it is booked for later - for everyone
+         * booked into that session (a class shares one call). The customer's own link then works at once.
+         * Throws with `code`: 'none' | 'not-online' | 'cancelled'.
+         */
+        openCall: async (id, {by = ''} = {}) => {
+            const b = await getBooking(String(id || ''));
+            const refuse = (code, message) => Object.assign(new Error(message), {code});
+            if (!b) throw refuse('none', 'No such booking.');
+            if (b.online !== true || !b.hostKey) throw refuse('not-online', 'That booking is not an online one, so it has no call.');
+            if (!HOLDING.has(b.status) || b.status === 'cancelled') throw refuse('cancelled', 'That booking is cancelled, so it has no call.');
+            const now = new Date().toISOString();
+            const room = sessionOf(b);
+            const session = (await allBookings()).filter(x => x.online === true && HOLDING.has(x.status) && sessionOf(x) === room);
+            for (const x of session) await changeBooking(x.id, {callOpenedAt: now}, by);
+            return getBooking(b.id);
+        },
+        /** An online booking's call addresses, whole: the customer's (`joinUrl`) and the host's (`hostUrl`). */
+        callLinks: (b, request = null) => {
+            if (b?.online !== true) return {joinUrl: '', hostUrl: ''};
+            const s = settingsNow();
+            const base = siteBase(request);
+            return {joinUrl: b.token ? `${base}${joinPath(s, b)}` : '', hostUrl: b.hostKey ? `${base}${hostPath(s, b)}` : ''};
+        },
         SlotTaken,
         // Booking's own helpers, so an extension never imports Booking's files.
         mail: {send: (msg) => send(msg, {log}), compose, mailReady},
@@ -293,20 +323,27 @@ export default async function booking(fastify, options) {
         timeZone: () => settingsNow().timeZone
     };
 
-    async function bookForExtension({serviceId, bookableId = '', startAt, customer: raw = {}, source = 'extension', ext = {}, force = false, notify = true, by = ''}) {
+    /**
+     * `contactId` (1.4): the caller's own contact (`userId` = the caller) to book as - checked, dropped when it is
+     * not theirs. `request`: the admin request it came from, for the links in the emails.
+     */
+    async function bookForExtension({serviceId, bookableId = '', startAt, customer: raw = {}, source = 'extension', ext = {}, force = false, notify = true, by = '',
+        contactId: askedContact = '', userId = '', request = null}) {
         const s = await liveSettings();
         const {service, candidates, rules} = await candidatesFor(String(serviceId || ''), String(bookableId || ''), {includeInactive: true});
         if (!service || !candidates.length) throw new Error('That service cannot be booked.');
         const {data: customer, errors} = cleanCustomer(raw, {askPhone: true});
         if (Object.keys(errors).length) throw new Error(Object.values(errors)[0]);
+        const contactId = askedContact && userId && await ownContact(String(askedContact), String(userId)).catch(() => null) ? String(askedContact) : '';
         const b = await placeBooking({service, candidates, rules, startAt: new Date(startAt).toISOString(), tz: s.timeZone, force,
-            fields: {...customer, source, by: by || customer.name, ext: extOf(ext)}});
-        if (s.addToContacts) {
+            fields: {...customer, source, by: by || customer.name, ext: extOf(ext), ...(contactId ? {contactId} : {}), ...(userId ? {createdBy: String(userId)} : {})}});
+        if (!contactId && s.addToContacts) {
             const bk = candidates.find(c => c.id === b.bookableId);
             const id = await linkContact(customer, bk?.userId || s.contactsOwnerId, contactsOn()).catch(() => '');
             if (id) Object.assign(b, (await changeBooking(b.id, {contactId: id})).booking);
         }
-        if (notify) tell(b, 'made', {toOwner: source !== 'admin'});
+        if (request) siteBase(request);
+        if (notify) tell(b, 'made', {request, toOwner: source !== 'admin'});
         registry.emit('made', b);
         return b;
     }
@@ -358,6 +395,7 @@ export default async function booking(fastify, options) {
             calendar: Boolean(getPluginStates().calendar?.enabled),
             tabs: registry.tabs(),
             sections: registry.admin(),
+            actions: typeof registry.actions === 'function' ? registry.actions() : [],
             now: new Date().toISOString(),
             today: wallClock(Date.now(), s.timeZone).date
         };
@@ -752,6 +790,14 @@ export default async function booking(fastify, options) {
         const {mountCallRoutes} = await import('../_lib/call/routes.js');
         calls = mountCallRoutes(fastify, {prefix: '/call', ns: 'booking', resolve: async (request, room, body) => {
             const b = await getBooking(String(body?.b || '')).catch(() => null);
+            // A class opened early ("Call now") is open for everyone in the session - someone who booked in
+            // after the click too: take the session's latest opening when this booking has none of its own.
+            if (b && b.online === true && !b.callOpenedAt) {
+                const room0 = sessionOf(b);
+                const opened = (await allBookings()).filter(x => x.id !== b.id && x.online === true && x.callOpenedAt && sessionOf(x) === room0)
+                    .map(x => x.callOpenedAt).sort().at(-1);
+                if (opened) b.callOpenedAt = opened;
+            }
             return whoIsCalling(b, room, {t: body?.t, h: body?.h});
         }});
     } catch (err) {

package/plugins/booking/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "booking",
   "displayName": "Booking",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "tier": "free",
   "description": "Let people book appointments with you or your team, and rooms or equipment, from a booking page on your site. Opening hours, days off and buffers; confirmation and reminder emails with a link to change or cancel; a diary in the admin. Book straight from a contact or an email.",
   "author": "Domma CMS",
@@ -72,7 +72,7 @@
     ],
     "views": {
       "plugin-booking": {
-        "entry": "booking/admin/views/booking.js?v=1.1.0",
+        "entry": "booking/admin/views/booking.js?v=1.4.0",
         "exportName": "bookingView"
       }
     }

package/plugins/booking/tests/api.test.js

@@ -354,3 +354,92 @@ test('online: a service an extension makes online gives a call - the customer an
         reg.unregister('test-online');
     }
 });
+
+test('extensions: banner actions reach the bootstrap, only under their owner, one per id', async () => {
+    const reg = bookingRegistry();
+    assert.ok(reg.version >= 4);
+    reg.register('test-actions', {
+        tabs: [{key: 'extra', label: 'Extra', module: '/plugins/test-actions/admin/extra.js'}],
+        actions: [
+            {id: 'ring', icon: 'video', title: 'Ring now', module: '/plugins/test-actions/admin/ring.js?v=1'},
+            {id: 'steal', title: 'Not mine', module: '/plugins/someone-else/admin/x.js'},
+            {id: 'Bad Id', title: 'Bad', module: '/plugins/test-actions/admin/x.js'},
+            {id: 'bookings', title: 'A screen of Booking\'s', module: '/plugins/test-actions/admin/x.js'},
+            {id: 'extra', title: 'A tab\'s address', module: '/plugins/test-actions/admin/x.js'},
+            {id: 'ring', title: 'Twice', module: '/plugins/test-actions/admin/ring2.js'},
+            null
+        ]
+    });
+    reg.register('test-actions-2', {actions: [{id: 'ring', title: 'Taken already', module: '/plugins/test-actions-2/admin/ring.js'}], tabs: 'nope'});
+    try {
+        const r = await call('GET', '/bootstrap');
+        assert.equal(r.status, 200);
+        assert.deepEqual(r.body.actions, [{id: 'ring', title: 'Ring now', icon: 'video', module: '/plugins/test-actions/admin/ring.js?v=1', owner: 'test-actions'}]);
+    } finally {
+        reg.unregister('test-actions');
+        reg.unregister('test-actions-2');
+    }
+    assert.deepEqual((await call('GET', '/bootstrap')).body.actions, []);
+});
+
+test('Call now on a booking: its call opens early for the customer\'s own link; moving it closes it again', async () => {
+    const reg = bookingRegistry();
+    reg.register('test-online', {rules: (s) => (s?.slug === 'early-call' ? {online: true} : {})});
+    try {
+        const vic = (await call('GET', '/bookables')).body.find(b => b.name === 'Vic')
+            || (await call('POST', '/bookables', {name: 'Vic', kind: 'person'})).body;
+        const svc = (await call('POST', '/services', {name: 'Early call', duration: 30, bookables: [vic.id]})).body;
+        const plain = (await call('GET', '/services')).body.find(s => s.slug === 'consultation');
+        const day = aheadWeekday();
+        let r = await call('POST', '/bookings', {serviceId: svc.id, startAt: atWallClock(day, '10:00', TZ).toISOString(), customer: {name: 'Early Bird', email: 'early@example.com'}, force: true, notify: false});
+        assert.equal(r.status, 201, JSON.stringify(r.body));
+        const b = r.body;
+        const raw = await reg.services.getBooking(b.id);
+        const links = reg.services.callLinks(raw);
+        assert.match(links.joinUrl, new RegExp(`/booking/call/[\\w-]+\\?b=${b.id}&t=${raw.token}$`));
+        assert.match(links.hostUrl, /&h=/);
+        const room = b.hostUrl.split('/call/')[1].split('?')[0];
+        const join = () => call('POST', `/call/${room}/join`, {b: b.id, t: raw.token});
+        assert.equal((await join()).status, 425, 'a fortnight ahead: not open yet');
+
+        const opened = await reg.services.openCall(b.id, {by: 'Sam'});
+        assert.ok(opened.callOpenedAt);
+        assert.equal(opened.history.at(-1).what, 'call-opened');
+        r = await join();
+        assert.equal(r.status, 200, JSON.stringify(r.body));
+        assert.equal(r.body.state, 'waiting', 'the customer knocks at once');
+        const host = await call('POST', `/call/${room}/join`, {b: b.id, h: raw.hostKey});
+        assert.equal(host.status, 200);
+        assert.equal(host.body.host, true);
+        assert.equal(reg.services.adminBooking(opened).token, undefined);
+        assert.equal(reg.services.adminBooking(opened).hostKey, undefined);
+
+        // Moved: the new time opens as usual again.
+        r = await call('PUT', `/bookings/${b.id}/move`, {startAt: atWallClock(day, '11:00', TZ).toISOString(), force: true, notify: false});
+        assert.equal(r.status, 200, JSON.stringify(r.body));
+        assert.equal(r.body.callOpenedAt, '');
+        const moved = await reg.services.getBooking(b.id);
+        const room2 = r.body.hostUrl.split('/call/')[1].split('?')[0];
+        assert.equal((await call('POST', `/call/${room2}/join`, {b: b.id, t: moved.token})).status, 425);
+
+        // Refused: not online, cancelled, missing.
+        const other = (await call('POST', '/bookings', {serviceId: plain.id, startAt: atWallClock(day, '15:00', TZ).toISOString(), customer: {name: 'In Person', email: 'ip@example.com'}, force: true, notify: false})).body;
+        await assert.rejects(reg.services.openCall(other.id), {code: 'not-online'});
+        await call('PUT', `/bookings/${b.id}`, {status: 'cancelled', notify: false});
+        await assert.rejects(reg.services.openCall(b.id), {code: 'cancelled'});
+        await assert.rejects(reg.services.openCall('nope'), {code: 'none'});
+        for (const id of [b.id, other.id]) await call('DELETE', `/bookings/${id}`);
+    } finally {
+        reg.unregister('test-online');
+    }
+});
+
+test('an early-opened call lasts two hours from the click, not all the way to a booking days off', async () => {
+    const {callWindow} = await import('../lib/call.js');
+    const b = {startAt: '2031-01-10T10:00:00.000Z', endAt: '2031-01-10T11:00:00.000Z', callOpenedAt: '2031-01-03T09:00:00.000Z'};
+    const at = (iso) => Date.parse(iso);
+    assert.deepEqual(callWindow(b, at('2031-01-03T09:30:00.000Z')), {opensAt: '2031-01-03T09:00:00.000Z', closesAt: '2031-01-03T11:00:00.000Z'});
+    assert.deepEqual(callWindow(b, at('2031-01-05T09:00:00.000Z')), {opensAt: '2031-01-10T09:50:00.000Z', closesAt: '2031-01-10T12:00:00.000Z'}, "days later: back to the booking's own window");
+    const soon = {...b, callOpenedAt: '2031-01-10T09:00:00.000Z'};
+    assert.deepEqual(callWindow(soon, at('2031-01-10T09:05:00.000Z')), {opensAt: '2031-01-10T09:00:00.000Z', closesAt: '2031-01-10T12:00:00.000Z'}, 'joined up when they meet');
+});

package/plugins/booking/tests/public.test.js

@@ -16,6 +16,7 @@ test('addresses under the booking page', () => {
     assert.equal(matchBookingPath('/booking/manage', b), null, '"manage" alone is not a service');
     assert.equal(matchBookingPath('/booking/manage/short', b), null);
     assert.equal(matchBookingPath('/booking/a/b', b), null);
+    assert.equal(matchBookingPath('/booking/call-now/AbCdEf0123456789', b), null, 'an instant call is Booking Pro\'s page');
     assert.equal(matchBookingPath('/booking/Hair_Cut', b), null);
     assert.equal(matchBookingPath('/bookings', b), null, 'a neighbour address is not ours');
     assert.equal(matchBookingPath('/booking/%E0%A4%A', b), null, 'bad encoding');

package/plugins/free-tier.lock.json

@@ -1,6 +1,6 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@7098cbc",
+  "source": "dcms-marketplace@4cdfbe1",
   "plugins": {
     "blog": {
       "version": "1.9.4",
@@ -73,19 +73,19 @@
       }
     },
     "booking": {
-      "version": "1.3.1",
+      "version": "1.4.0",
       "files": {
-        "CLAUDE.md": "66c75435a64162573e9dd20bd6c28118f4b5c5505d56cf9ad73891e1e91f79fe",
+        "CLAUDE.md": "8e96d41dcbba3adcebf8456a6638e266f559d6fbfb4ba1406645a82cb40ce146",
         "admin/css/index.css": "4f7731921c0c5038cb1566a6ab2d43ffc35bf9b161e58f87a0cff423e81b47fa",
         "admin/lib/details.js": "8b37536bfa9ccfcc5265cc957ba8266d3f5f777133e7c0946ae49540f1c80e3c",
         "admin/lib/diary-layout.js": "d818c79001fb9a9ecc15c96239ba961b0a1d98b9e8fce903eefb57d85adf2a73",
         "admin/lib/extension-sections.js": "0588ad47660e511b0dd8077bb9c3999c775d97597333a75e87ee12d915bbf00b",
-        "admin/lib/kit.js": "f1935abbfebb5c5054ac1691e92d5af622db50ea1b17251d99089a765e4f6997",
+        "admin/lib/kit.js": "661e9c407bf398694dfa08105590065a6352594d526f3c09c31b180c840045bf",
         "admin/templates/booking.html": "20b9a3bfe3e5d5bbee613f29be99551b12790fb38f80d119585360cc38e9ec57",
-        "admin/views/booking.js": "562f7212d4f6074e6154afd2764c374eba8c1aed46dfc6c876c9fb08d04da938",
+        "admin/views/booking.js": "4eddf6c0b60dbbba4c6e35352df247a3d34b66ee1d43c51fe2d53f894707348f",
         "admin/views/bookings.js": "bf17db82ed4d2f5c29ac924dd60dc0b84c8bd9c8ce32da6cbb011527699a56a6",
         "admin/views/diary.js": "9e8976e67c2232d353b3d9a1ef0d0503cc4d06b710d54d0cba84fb5b796fdfe9",
-        "admin/views/panels.js": "7cc00b24f780e6364be7c5cb929d0a6e71ee820b207b4be1f5a87cf07ea1b1ea",
+        "admin/views/panels.js": "9d1c45e56d2a7a8caa12e9af29545c808ffb88da3ea48397d55aae19e802ec69",
         "admin/views/people.js": "58cb9cc550b48c959a5572a4d25650ea2b32b658c9d0bf4c244e4abe0277c211",
         "admin/views/services.js": "122326d222ed16dc8ec903fef6f62f6a7638c31d73c4612b7a8c2ced38358068",
         "admin/views/settings.js": "299297b47a6509986276a859807a33ea225681d28e0e9cd06cdf36b0f6ec0c11",
@@ -93,14 +93,14 @@
         "collections/booking-bookings.json": "fa0b15cc81b4a2114734a0bc8adc4b4d25049d16cf62549b83634cdbeb543b52",
         "collections/booking-services.json": "cecb500a9215a0eba894e6b4c9ae78f5fbeb209830d07d47050c56c75143f66a",
         "config.js": "5565fd627481cf809322257cc300a7cbb7ccbf6cae076b4cf8a7453fcf554bd3",
-        "docs/guide.md": "885a4bb9ffde34309a9d795232c376104e550f84ea0ea997aaba215c88cb5bcc",
+        "docs/guide.md": "545b050500a09ffdf7bc620e01f0b63bf59e92dfe855ba3201419b0bcc92a1fc",
         "inject/body.html": "ab55ce945eec2302eb0c836a4626cffa5e091d050c6a59c6f2af332b05570777",
-        "lib/call.js": "ce14cc92ac150f25893b60e7d5a20b5627067efbf4b776eae8ccfa534e3ab061",
-        "lib/extensions.js": "ccb8a1c451f111ccee8b7f71c92d5ef54ee7771ec35cbfefa5632bddee906457",
+        "lib/call.js": "7dfa0ae60be87d8f7f26b4360d5c1144322abe66eb61b233ed812e35bb8e59bd",
+        "lib/extensions.js": "8cec28ff8685daad8083b23f034f1c3bf82fd2322943dd19d46570ccdc311105",
         "lib/mail.js": "cad8f409df62d6e42f0f4024ec364bbe018a62b842fa3f7c38786fd4e7f92408",
-        "lib/store.js": "1b8d625c16fc4fd1dd233e9a5157de6e5b25ffb6f6fe05fc49749e4008e3ba82",
-        "plugin.js": "ae3ea8f5a63a1af7818064e9f9b83fbb16502266510d24216f3e65c93919a5f8",
-        "plugin.json": "2f973abbdcf0b1b148e89295b1b6469cc48b9d5585e5e8ffc2b7099f3ff4c018",
+        "lib/store.js": "270161f907c68de39d32758931e86c290582524af4650e722c2c3be209acc875",
+        "plugin.js": "963e8190dbcaec71915d73402648899bb38135b25ec869a659d0938d03868682",
+        "plugin.json": "0ef595cd1925b41194821f97d0e0e0fca5edb20a98a0f97a8a0efd52e8c50c16",
         "plugin.public.js": "cd607de84ba7cffe384aa40a1a5976277896bf3973baa6415a01a1a4c9e3aca1",
         "public/booking.css": "8b88989fdd04e50efc1688a2f32fe2e422299d7d13b81bb8fce0cc162fa99df6",
         "public/booking.js": "7dfc3d205696967013886567f67a867443c2e370bac29019d69911d695fdbade",
@@ -110,8 +110,8 @@
         "public/lib/time.js": "48e13a23e3d7a4916e2097e8f87c03a87d37b71c4ef037a5a16143c6a4185c41",
         "templates/booking.html": "a4995de46dfdab7e692b56f21347f29c76320cf3b0477889dc3c5d14e0b6dcd7",
         "tests/admin-diary.test.js": "4e34b447d62b41272ceec49bad9d491ae00dd04f4760d8a7a3046be1912f4abe",
-        "tests/api.test.js": "f97b3b82370dd7eb3001fea7f4f806fa56f25e77605f1c6f843fe89244f9e86d",
-        "tests/public.test.js": "0d14c2fe47877ccb7aeae45210cec977c78973be4d2edc323a9315bb985d1f8b",
+        "tests/api.test.js": "57ce73f48776e15454794405bae5b9674baeda46a96e4a11d0e253c6a977a764",
+        "tests/public.test.js": "0b7b626d60df5a3d73d7c0077b73f59b62a9fded98ce84a8d93cd32cd0333159",
         "tests/pure.test.js": "8ba0c8f76b4c9efcc422f39ff29509612544d81f760025a4b9a5594af14e7bcf"
       }
     },