@withbuddi/buddi 0.1.0-pre.41 → 0.1.0-pre.42

package/extension/background.js

@@ -1985,6 +1985,7 @@ var GATEWAY_KEY = "gateway";
 var MAX_BACKOFF = 3e4;
 var KNOCK_MS = 3e3;
 var SILENCE = 7e4;
+var KEEPALIVE_MS = 2e4;
 function socketUrl(address) {
   const parsed = new URL(address);
   if (!["127.0.0.1", "localhost", "[::1]", "::1"].includes(parsed.hostname)) throw new Error("A buddi address has to be on this machine.");
@@ -2031,6 +2032,7 @@ var commands = new BrowserCommands(chrome, { onFrame: send, onEvent: send, onLog
 var attempt = 0;
 var timer;
 var silence;
+var keepalive;
 var last = { connection: "offline", code: null, installation: null, error: null };
 var incoming = Promise.resolve();
 var protocol = new Protocol({
@@ -2083,6 +2085,10 @@ async function connect() {
     attempt = 0;
     quiet();
     flush(opening);
+    if (keepalive) clearInterval(keepalive);
+    keepalive = setInterval(() => {
+      if (socket === opening) send({ type: "keepalive" });
+    }, KEEPALIVE_MS);
     safely(() => protocol.open());
   });
   opening.addEventListener("message", (event) => {
@@ -2099,6 +2105,10 @@ async function connect() {
     if (socket === opening) {
       socket = void 0;
       pending = [];
+      if (keepalive) {
+        clearInterval(keepalive);
+        keepalive = void 0;
+      }
     }
     if (silence) {
       clearTimeout(silence);
@@ -2194,6 +2204,7 @@ chrome.alarms.onAlarm.addListener((alarm) => {
 safely(() => connect());
 export {
   DEFAULT_GATEWAY,
+  KEEPALIVE_MS,
   connect,
   send,
   socketUrl

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "buddi",
-  "version": "0.1.0.41",
+  "version": "0.1.0.42",
   "description": "Lets your buddi work in background tabs of this browser. The sites it opens are the ones you ask it for; it opens none on its own.",
   "minimum_chrome_version": "116",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR4JT/OlKKPcZQ33euO9mSv7RrSIWNVanldhT2Uzc9YfzF/X0lg5NfXLc+G/UGFjB8v+uMCbpMhRBZ2SVwDHQH3buv3VEUzuOIDTPHgv99T5lq5imZrDxmIE+EL/fWrsjhcXaIB4e4fn0tJqw6ivJUGmYpG5XhWn65nlLniHfFBKMpZ/y7bVnvfzAgMQUa13qTAVxPTpMRtNl/flQq4Q/vWYm28H7W7OzygDV+/4X2azUrB8yPk67QsipbdDLxiX2GMxjXuKK6iD5CQiytoxTsAqUzB886HbOZsxJfQpRIjrUgBmGjLyaKuz617ZGJW9zS23LmnlL6mkX3+ggca1AQIDAQAB",
@@ -38,5 +38,5 @@
     "48": "icons/48.png",
     "128": "icons/128.png"
   },
-  "version_name": "0.1.0-pre.41"
+  "version_name": "0.1.0-pre.42"
 }

package/extension/popup.html

@@ -33,7 +33,7 @@
         <p class="code" id="code" aria-label="Pairing code"></p>
         <button class="btn" data-size="sm" id="copy" type="button">Copy</button>
       </div>
-      <p class="hint">Type it into buddi under Settings → Computer&nbsp;&amp;&nbsp;browser, within five minutes.</p>
+      <p class="hint">Type it into buddi under Settings → Browser&nbsp;&amp;&nbsp;apps, within five minutes. Open buddi settings may open buddi.app: if Chrome asks, allow it.</p>
       <div class="actions actions-split">
         <button class="link" id="not-this" type="button">Not this buddi</button>
         <button class="btn" id="open-settings" type="button">Open buddi settings</button>

package/extension/popup.js

@@ -60,6 +60,52 @@ function render(model, doc = document) {
   byId(doc, "paired-to").textContent = view === "paired" ? `Your buddi at ${state.installation ?? hostOf(model.gateway)}` : "";
   byId(doc, "working").textContent = workingLine(model.tabs);
 }
+var APP_WAIT_MS = 1500;
+function digitsOf(code) {
+  const digits = (code ?? "").replace(/[^0-9]/g, "");
+  return digits.length === 6 ? digits : null;
+}
+function appSettingsLink(code) {
+  const digits = digitsOf(code);
+  return digits ? `buddi://settings/browser?code=${digits}` : "buddi://settings/browser";
+}
+function settingsWebUrl(gateway, code, userAgent = "") {
+  const digits = digitsOf(code);
+  const base = dashboardUrl(gateway);
+  if (!base) return null;
+  const search = triesApp(gateway, userAgent) ? "?from=extension" : "";
+  return `${base}${search}${SETTINGS_HASH}${digits ? `?code=${digits}` : ""}`;
+}
+function triesApp(gateway, userAgent) {
+  if (!/Macintosh|Mac OS X/.test(userAgent)) return false;
+  try {
+    const url = new URL(gateway);
+    return (url.hostname === "127.0.0.1" || url.hostname === "localhost") && (url.port || (url.protocol === "https:" ? "443" : "80")) === "4317";
+  } catch {
+    return false;
+  }
+}
+function openSettings(options) {
+  const web = settingsWebUrl(options.gateway, options.code, options.userAgent);
+  const fallback = () => {
+    if (web) options.openTab(web);
+  };
+  if (!triesApp(options.gateway, options.userAgent)) {
+    fallback();
+    return;
+  }
+  try {
+    options.launch(appSettingsLink(options.code));
+  } catch {
+    fallback();
+    return;
+  }
+  (options.wait ?? ((ms, then) => {
+    setTimeout(then, ms);
+  }))(APP_WAIT_MS, () => {
+    if (!options.focusLost()) fallback();
+  });
+}
 var COPIED_FOR = 2e3;
 function wireCopy(button, read) {
   let restore;
@@ -126,6 +172,14 @@ async function main() {
     draw();
     void recount();
   });
+  setInterval(() => {
+    void ask({ type: "buddi-get-state" }).then((answer) => {
+      if (!answer?.state || JSON.stringify(answer.state) === JSON.stringify(model.state)) return;
+      model.state = answer.state;
+      draw();
+      void recount();
+    });
+  }, 3e3);
   wireCopy(byId(document, "copy"), () => byId(document, "code").textContent ?? "");
   byId(document, "connect").addEventListener("click", async () => {
     const gateway = field.value.trim();
@@ -150,7 +204,30 @@ async function main() {
     const url = dashboardUrl(model.gateway, hash);
     if (url) void chrome.tabs.create({ url });
   };
-  byId(document, "open-settings").addEventListener("click", () => open(SETTINGS_HASH));
+  byId(document, "open-settings").addEventListener("click", () => {
+    let lost = false;
+    const away = () => {
+      lost = true;
+    };
+    window.addEventListener("blur", away, { once: true });
+    document.addEventListener("visibilitychange", away, { once: true });
+    openSettings({
+      gateway: model.gateway,
+      code: model.state.connection === "pairing" ? model.state.code : null,
+      userAgent: navigator.userAgent,
+      // A link clicked in this page: Chrome hands buddi:// to the app registered for it, or does nothing.
+      launch: (url) => {
+        const link = document.createElement("a");
+        link.href = url;
+        link.rel = "noopener";
+        link.click();
+      },
+      openTab: (url) => {
+        void chrome.tabs.create({ url });
+      },
+      focusLost: () => lost || !document.hasFocus()
+    });
+  });
   byId(document, "open-buddi").addEventListener("click", () => open(""));
   byId(document, "forget").addEventListener("click", async () => {
     const answer = await ask({ type: "buddi-forget" });
@@ -163,12 +240,17 @@ async function main() {
 }
 if (typeof chrome !== "undefined" && chrome?.runtime?.onMessage) void main();
 export {
+  APP_WAIT_MS,
   COPIED_FOR,
   SETTINGS_HASH,
+  appSettingsLink,
   countBuddiTabs,
   dashboardUrl,
   groupCode,
+  openSettings,
   render,
+  settingsWebUrl,
+  triesApp,
   viewOf,
   wireCopy,
   workingLine