openclacky 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4107ac9d894f9af9647f19152855f13854d4cfebd8013d2d22057ca98de87274
-  data.tar.gz: 3c86e0b865cccc27f8c785f39c49384744ad4e6cce6cdf257ca0485f1d62c260
+  metadata.gz: 9c90dd169535f465bc4f41ff976ed6c77a66e1bfce5a552a286a6e2d77ef89c4
+  data.tar.gz: f9b44af17510f9e51844e7be9ccf32b106a385af727d6711f89bf14364a6f9a7
 SHA512:
-  metadata.gz: e6d66fd62f6434c05420f5f639a412fb953e49634c3f0740f155a2d20b70d91acb12a9844a61330f0761d88ff2c284a1d071f0590b3e53553bd11d57a035669f
-  data.tar.gz: c64f138d54a5397ba0a49b6878b79576f12b6fc2dec05f7e4b24b5eaf3490060743a0e3a20da17b6cf47476a85eaa093742b616b5be9ab65859db6e8db035404
+  metadata.gz: 52e1c244505b21f4b7e8d6b8dd6adf2a87fe87094df5742c2d24772cff0fdb0f3924ec8f23c006f428cd86b8075f5f35f4b49b708b9959a351bfaa1f924130e1
+  data.tar.gz: 72bd1fb0568f833c8102fbc4d0c2ac6dd10ce6cd0de06ede155fabececd395c51cb13e22b52a114b121a62f32cc5e0243b8144785d4d8e96b886e3bea5e48448

data/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.5] - 2026-05-22
+
+### Fixed
+- Async free skills handling
+
 ## [1.1.4] - 2026-05-22
 
 ### Added

data/lib/clacky/server/http_server.rb

@@ -803,30 +803,12 @@ module Clacky
             refresh_pending = true
           end
 
-          # Free-mode counts: synchronous fetch is acceptable here because
-          # this endpoint is polled lazily and the platform call is cached
-          # via http keep-alive. On error we just return zero counts and the
-          # banner falls back to the legacy "not activated" message.
-          free_count  = 0
-          paid_count  = 0
-          begin
-            result = brand.fetch_free_skills!
-            if result[:success]
-              free_count = result[:skills].size
-              paid_count = result[:paid_skills_count].to_i
-            end
-          rescue StandardError
-            # Network errors are non-fatal here.
-          end
-
           json_response(res, 200, {
             branded:                       true,
             needs_activation:              true,
             product_name:                  brand.product_name,
             test_mode:                     @brand_test,
-            distribution_refresh_pending:  refresh_pending,
-            free_skills_count:             free_count,
-            paid_skills_count:             paid_count
+            distribution_refresh_pending:  refresh_pending
           })
           return
         end

data/lib/clacky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clacky
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/clacky/web/brand.js

@@ -37,14 +37,7 @@ const Brand = (() => {
       // so no DOM update is needed here on boot.
 
       if (data.needs_activation) {
-        // Show a top banner instead of a blocking full-screen panel.
-        // Boot continues normally; user can activate at any time via the banner.
-        _showActivationBanner(data.product_name, data.free_skills_count, data.paid_skills_count);
-
-        // Apply logo/theme from whatever is already cached in brand.yml —
-        // install.sh only writes product_name + package_name, but if a
-        // previous session already pulled the public distribution info,
-        // we can light up the full brand visuals right now.
+        _showActivationBanner(data.product_name);
         _applyHeaderLogo();
 
         // Backend just kicked off an async refresh of the public distribution
@@ -75,9 +68,9 @@ const Brand = (() => {
   // ── Internal ───────────────────────────────────────────────────────────────
 
   // Show a dismissible activation banner at the top of the page.
-  // Clicking the banner creates a dedicated session and invokes the
-  // Clicking the banner opens Settings and focuses the license key input directly.
-  function _showActivationBanner(brandName, freeCount, paidCount) {
+  // Renders immediately with a generic prompt, then asynchronously fetches
+  // the free/paid skill counts and refines the copy.
+  function _showActivationBanner(brandName) {
     const existing = document.getElementById("brand-activation-banner");
     if (existing) return;
 
@@ -85,21 +78,12 @@ const Brand = (() => {
     bar.id        = "brand-activation-banner";
     bar.className = "brand-activation-banner";
 
-    const span = document.createElement("span");
     const name = brandName || I18n.t("brand.banner.defaultName");
-    const free = Number(freeCount) || 0;
-    const paid = Number(paidCount) || 0;
-
-    let i18nKey;
-    if (free > 0 && paid > 0)       i18nKey = "brand.banner.freePromptBoth";
-    else if (free > 0 && paid === 0) i18nKey = "brand.banner.freePromptOnlyFree";
-    else if (free === 0 && paid > 0) i18nKey = "brand.banner.freePromptOnlyPaid";
-    else                             i18nKey = "brand.banner.prompt";
 
-    const vars = { name, free, paid, freePlural: free === 1 ? "" : "s", paidPlural: paid === 1 ? "" : "s" };
-    span.textContent = I18n.t(i18nKey, vars);
-    span.setAttribute("data-i18n", i18nKey);
-    span.setAttribute("data-i18n-vars", `name=${name};free=${free};paid=${paid};freePlural=${vars.freePlural};paidPlural=${vars.paidPlural}`);
+    const span = document.createElement("span");
+    span.textContent = I18n.t("brand.banner.prompt", { name });
+    span.setAttribute("data-i18n", "brand.banner.prompt");
+    span.setAttribute("data-i18n-vars", `name=${name}`);
 
     const link = document.createElement("button");
     link.className   = "brand-activation-banner-link";
@@ -107,11 +91,6 @@ const Brand = (() => {
     link.setAttribute("data-i18n", "brand.banner.action");
     link.addEventListener("click", () => _goToLicenseInput());
 
-    // Hide the "Activate Now" button when there is nothing premium to unlock.
-    if (paid === 0 && free > 0) {
-      link.style.display = "none";
-    }
-
     const closeBtn = document.createElement("button");
     closeBtn.className = "brand-activation-banner-close";
     closeBtn.innerHTML = "✕";
@@ -121,6 +100,34 @@ const Brand = (() => {
     bar.appendChild(link);
     bar.appendChild(closeBtn);
     document.getElementById("main").prepend(bar);
+
+    _refineBannerWithCounts(name, span, link);
+  }
+
+  async function _refineBannerWithCounts(name, span, link) {
+    try {
+      const res  = await fetch("/api/brand/skills");
+      const data = await res.json();
+      if (!data.ok || !data.free_mode) return;
+
+      const free = (data.skills || []).length;
+      const paid = Number(data.paid_skills_count) || 0;
+
+      let i18nKey;
+      if (free > 0 && paid > 0)        i18nKey = "brand.banner.freePromptBoth";
+      else if (free > 0 && paid === 0) i18nKey = "brand.banner.freePromptOnlyFree";
+      else if (free === 0 && paid > 0) i18nKey = "brand.banner.freePromptOnlyPaid";
+      else                             return;
+
+      const vars = { name, free, paid, freePlural: free === 1 ? "" : "s", paidPlural: paid === 1 ? "" : "s" };
+      span.textContent = I18n.t(i18nKey, vars);
+      span.setAttribute("data-i18n", i18nKey);
+      span.setAttribute("data-i18n-vars", `name=${name};free=${free};paid=${paid};freePlural=${vars.freePlural};paidPlural=${vars.paidPlural}`);
+
+      if (paid === 0 && free > 0) link.style.display = "none";
+    } catch (_) {
+      // Network failure: leave the generic prompt in place.
+    }
   }
 
   // Navigate to Settings, scroll to Brand & License section, flash it, then focus the input.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - windy