@qkix/strapi-plugin-better-blocks 0.23.0 → 0.23.2

package/dist/server/index.mjs

@@ -1,7 +1,7 @@
-const g = ({ strapi: t }) => {
-}, k = ({ strapi: t }) => {
-}, y = ({ strapi: t }) => {
-  t.customFields.register({
+const k = ({ strapi: o }) => {
+}, w = ({ strapi: o }) => {
+}, y = ({ strapi: o }) => {
+  o.customFields.register({
     name: "better-blocks",
     plugin: "better-blocks",
     type: "json",
@@ -10,7 +10,7 @@ const g = ({ strapi: t }) => {
       isResizable: !1
     }
   });
-}, w = {
+}, C = {
   default: {
     /**
      * Defaults for the collapsible Details / Summary block.
@@ -97,32 +97,36 @@ const g = ({ strapi: t }) => {
       cache: !0,
       cacheTTL: 86400,
       // seconds (24h)
+      // Upper bound on cached embeds, evicted least-recently-used. Without one
+      // the cache keeps an entry for every post ever embedded, for the life of
+      // the process — expiry alone never frees anything nobody asks for again.
+      cacheMaxEntries: 500,
       instagram: { accessToken: void 0 },
       facebook: { accessToken: void 0 }
     }
   },
-  validator(t = {}) {
-    const o = t?.details?.style;
-    if (o && o !== "github" && o !== "custom")
+  validator(o = {}) {
+    const t = o?.details?.style;
+    if (t && t !== "github" && t !== "custom")
       throw new Error(
-        `[better-blocks] config.details.style must be "github" or "custom" (received "${o}")`
+        `[better-blocks] config.details.style must be "github" or "custom" (received "${t}")`
       );
   }
-}, C = {}, v = ({ strapi: t }) => ({
-  index(o) {
-    o.body = t.plugin("better-blocks").service("service").getWelcomeMessage();
+}, v = {}, x = ({ strapi: o }) => ({
+  index(t) {
+    t.body = o.plugin("better-blocks").service("service").getWelcomeMessage();
   },
   /**
    * Exposes the plugin config (config/plugins.js merged with server defaults) to
    * the admin panel, so blocks like Details can honour admin-level settings.
    */
-  getConfig(o) {
-    o.body = {
-      details: t.plugin("better-blocks").config("details", {
+  getConfig(t) {
+    t.body = {
+      details: o.plugin("better-blocks").config("details", {
         defaultSummary: "Click to expand",
         style: "github"
       }),
-      button: t.plugin("better-blocks").config("button", {
+      button: o.plugin("better-blocks").config("button", {
         defaultStyle: {
           backgroundColor: "#4945ff",
           textColor: "#ffffff",
@@ -155,7 +159,7 @@ const g = ({ strapi: t }) => {
         }
       }),
       social: (() => {
-        const e = t.plugin("better-blocks").config("social", {
+        const e = o.plugin("better-blocks").config("social", {
           enabled: !0,
           platforms: [
             "twitter",
@@ -175,35 +179,35 @@ const g = ({ strapi: t }) => {
       })()
     };
   }
-}), x = [
+}), E = [
   "twitter",
   "instagram",
   "facebook",
   "tiktok",
   "linkedin",
   "pinterest"
-], $ = ({ strapi: t }) => ({
+], $ = ({ strapi: o }) => ({
   /**
    * GET /better-blocks/oembed?url=...&platform=...
-   * Proxies the platform oEmbed request server-side and returns the normalised
+   * Proxies the platform oEmbed request server-side and returns the normalized
    * payload used by the social-embed block.
    */
-  async fetch(o) {
-    const { url: e, platform: i } = o.query;
+  async fetch(t) {
+    const { url: e, platform: r } = t.query;
     if (!e || typeof e != "string")
-      return o.badRequest('Missing required "url" query parameter.');
-    const r = i && x.includes(i) ? i : void 0;
+      return t.badRequest('Missing required "url" query parameter.');
+    const n = r && E.includes(r) ? r : void 0;
     try {
-      o.body = await t.plugin("better-blocks").service("oembed").fetch(e, r);
-    } catch (n) {
-      const a = n instanceof Error ? n.message : "oEmbed request failed.";
-      return o.badRequest(a);
+      t.body = await o.plugin("better-blocks").service("oembed").fetch(e, n);
+    } catch (s) {
+      const c = s instanceof Error ? s.message : "oEmbed request failed.";
+      return t.badRequest(c);
     }
   }
 }), T = {
-  controller: v,
+  controller: x,
   oembed: $
-}, E = {}, R = {}, L = [
+}, R = {}, _ = {}, L = [
   {
     method: "GET",
     path: "/",
@@ -213,7 +217,7 @@ const g = ({ strapi: t }) => {
       policies: []
     }
   }
-], _ = [
+], S = [
   {
     method: "GET",
     path: "/config",
@@ -232,20 +236,54 @@ const g = ({ strapi: t }) => {
       policies: ["admin::isAuthenticatedAdmin"]
     }
   }
-], S = {
+], z = {
   "content-api": {
     type: "content-api",
     routes: L
   },
   admin: {
     type: "admin",
-    routes: _
+    routes: S
   }
-}, U = ({ strapi: t }) => ({
+}, A = ({ strapi: o }) => ({
   getWelcomeMessage() {
     return "Welcome to Strapi 🚀";
   }
-}), I = [
+}), U = ({ max: o }) => {
+  if (o < 1)
+    throw new Error(`ttlCache: max must be at least 1 (received ${o})`);
+  const t = /* @__PURE__ */ new Map();
+  return {
+    get(e) {
+      const r = t.get(e);
+      if (r) {
+        if (r.expires <= Date.now()) {
+          t.delete(e);
+          return;
+        }
+        return t.delete(e), t.set(e, r), r.value;
+      }
+    },
+    set(e, r, n) {
+      if (t.delete(e), t.size >= o) {
+        const s = Date.now();
+        for (const [c, i] of t)
+          i.expires <= s && t.delete(c);
+      }
+      for (; t.size >= o; ) {
+        const s = t.keys().next();
+        if (s.done) break;
+        t.delete(s.value);
+      }
+      t.set(e, { expires: Date.now() + n, value: r });
+    },
+    delete: (e) => t.delete(e),
+    clear: () => t.clear(),
+    get size() {
+      return t.size;
+    }
+  };
+}, I = [
   {
     platform: "twitter",
     re: /(?:twitter\.com|x\.com)\/[^/]+\/status(?:es)?\/\d+/i
@@ -255,28 +293,28 @@ const g = ({ strapi: t }) => {
   { platform: "facebook", re: /facebook\.com\//i },
   { platform: "linkedin", re: /linkedin\.com\//i },
   { platform: "pinterest", re: /(?:pinterest\.[a-z.]+|pin\.it)\//i }
-], b = (t) => {
-  const o = I.find(({ re: e }) => e.test(t));
-  return o ? o.platform : null;
-}, A = (t, o, e) => {
-  const i = encodeURIComponent(o);
-  switch (t) {
+], g = (o) => {
+  const t = I.find(({ re: e }) => e.test(o));
+  return t ? t.platform : null;
+}, M = (o, t, e) => {
+  const r = encodeURIComponent(t);
+  switch (o) {
     case "twitter":
-      return `https://publish.twitter.com/oembed?url=${i}&omit_script=true&dnt=true`;
+      return `https://publish.twitter.com/oembed?url=${r}&omit_script=true&dnt=true`;
     case "tiktok":
-      return `https://www.tiktok.com/oembed?url=${i}`;
+      return `https://www.tiktok.com/oembed?url=${r}`;
     case "pinterest":
-      return `https://www.pinterest.com/oembed.json?url=${i}`;
+      return `https://www.pinterest.com/oembed.json?url=${r}`;
     case "instagram": {
-      const r = e.instagram?.accessToken;
-      return r ? `https://graph.facebook.com/v17.0/instagram_oembed?url=${i}&access_token=${encodeURIComponent(
-        r
+      const n = e.instagram?.accessToken;
+      return n ? `https://graph.facebook.com/v17.0/instagram_oembed?url=${r}&access_token=${encodeURIComponent(
+        n
       )}&omitscript=true` : null;
     }
     case "facebook": {
-      const r = e.facebook?.accessToken;
-      return r ? `https://graph.facebook.com/v17.0/oembed_post?url=${i}&access_token=${encodeURIComponent(
-        r
+      const n = e.facebook?.accessToken;
+      return n ? `https://graph.facebook.com/v17.0/oembed_post?url=${r}&access_token=${encodeURIComponent(
+        n
       )}&omitscript=true` : null;
     }
     case "linkedin":
@@ -284,32 +322,32 @@ const g = ({ strapi: t }) => {
     default:
       return null;
   }
-}, P = async (t) => {
-  if (!/^https?:\/\/pin\.it\//i.test(t)) return t;
+}, P = async (o) => {
+  if (!/^https?:\/\/pin\.it\//i.test(o)) return o;
   try {
-    const e = (await fetch(t, { redirect: "follow" })).url || t;
-    return /pinterest\.[a-z.]+\/pin\//i.test(e) ? e : t;
+    const e = (await fetch(o, { redirect: "follow" })).url || o;
+    return /pinterest\.[a-z.]+\/pin\//i.test(e) ? e : o;
   } catch {
-    return t;
+    return o;
   }
-}, q = (t) => {
-  const o = t.match(
+}, q = (o) => {
+  const t = o.match(
     /(?:urn:li:)?(ugcPost|activity|share)[:-](\d{10,})/i
   );
-  if (!o) return null;
-  const i = `urn:li:${o[1].toLowerCase() === "ugcpost" ? "ugcPost" : o[1].toLowerCase()}:${o[2]}`, r = `https://www.linkedin.com/embed/feed/update/${encodeURIComponent(i)}`;
+  if (!t) return null;
+  const r = `urn:li:${t[1].toLowerCase() === "ugcpost" ? "ugcPost" : t[1].toLowerCase()}:${t[2]}`, n = `https://www.linkedin.com/embed/feed/update/${encodeURIComponent(r)}`;
   return {
     platform: "linkedin",
-    url: t,
-    html: `<iframe src="${r}" height="600" width="100%" frameborder="0" allowfullscreen title="Embedded LinkedIn post" loading="lazy"></iframe>`,
+    url: o,
+    html: `<iframe src="${n}" height="600" width="100%" frameborder="0" allowfullscreen title="Embedded LinkedIn post" loading="lazy"></iframe>`,
     providerName: "LinkedIn",
     width: 504,
     height: 600
   };
-}, z = (t) => t.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "").trim(), M = (t, o, e) => ({
-  platform: t,
-  url: o,
-  html: typeof e.html == "string" && z(e.html) || null,
+}, D = (o) => o.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "").trim(), W = (o, t, e) => ({
+  platform: o,
+  url: t,
+  html: typeof e.html == "string" && D(e.html) || null,
   title: typeof e.title == "string" ? e.title : void 0,
   author: typeof e.author_name == "string" ? e.author_name : void 0,
   authorUrl: typeof e.author_url == "string" ? e.author_url : void 0,
@@ -317,77 +355,83 @@ const g = ({ strapi: t }) => {
   providerName: typeof e.provider_name == "string" ? e.provider_name : void 0,
   width: typeof e.width == "number" ? e.width : void 0,
   height: typeof e.height == "number" ? e.height : void 0
-}), h = /* @__PURE__ */ new Map(), W = ({ strapi: t }) => {
-  const o = () => t.plugin("better-blocks").config("social", {});
+}), j = 500, F = ({ strapi: o }) => {
+  const t = () => o.plugin("better-blocks").config("social", {});
+  let e = null;
+  const r = () => (e || (e = U({
+    max: t().cacheMaxEntries ?? j
+  })), e);
   return {
-    detectPlatform: b,
+    detectPlatform: g,
+    /** Exposed for tests and for anyone who needs to drop cached embeds. */
+    clearCache: () => e?.clear(),
     /**
-     * Fetch (and cache) the normalised oEmbed for `url`. `platform` may be
+     * Fetch (and cache) the normalized oEmbed for `url`. `platform` may be
      * passed to skip auto-detection. Throws on an unsupported/unconfigured
      * platform or a failed upstream request.
      */
-    async fetch(e, i) {
-      const r = o();
-      if (r.enabled === !1)
+    async fetch(n, s) {
+      const c = t();
+      if (c.enabled === !1)
         throw new Error("Social embeds are disabled in plugin config.");
-      const n = i ?? b(e);
-      if (!n)
-        throw new Error(`Unsupported or unrecognised social URL: ${e}`);
-      const a = r.platforms;
-      if (Array.isArray(a) && !a.includes(n))
+      const i = s ?? g(n);
+      if (!i)
+        throw new Error(`Unsupported or unrecognized social URL: ${n}`);
+      const u = c.platforms;
+      if (Array.isArray(u) && !u.includes(i))
         throw new Error(
-          `Platform "${n}" is not enabled in plugin config.`
+          `Platform "${i}" is not enabled in plugin config.`
         );
-      const f = r.cache !== !1, u = (r.cacheTTL ?? 86400) * 1e3, p = `${n}:${e}`;
-      if (f) {
-        const c = h.get(p);
-        if (c && c.expires > Date.now()) return c.data;
+      const p = c.cache !== !1, m = (c.cacheTTL ?? 86400) * 1e3, b = `${i}:${n}`;
+      if (p) {
+        const l = r().get(b);
+        if (l) return l;
       }
-      let s = null;
-      if (n === "linkedin") {
-        if (s = q(e), !s)
+      let a = null;
+      if (i === "linkedin") {
+        if (a = q(n), !a)
           throw new Error(
             "Could not derive a LinkedIn embed from this URL. Paste the post embed code instead."
           );
       } else {
-        const c = await P(e), m = A(n, c, r);
-        if (!m)
+        const l = await P(n), h = M(i, l, c);
+        if (!h)
           throw new Error(
-            `oEmbed for "${n}" requires an access token. Configure config.social.${n}.accessToken, or paste the embed code instead.`
+            `oEmbed for "${i}" requires an access token. Configure config.social.${i}.accessToken, or paste the embed code instead.`
           );
-        const l = await fetch(m, {
+        const d = await fetch(h, {
           headers: { Accept: "application/json" }
         });
-        if (!l.ok)
+        if (!d.ok)
           throw new Error(
-            `oEmbed request to ${n} failed (HTTP ${l.status}).`
+            `oEmbed request to ${i} failed (HTTP ${d.status}).`
           );
-        const d = await l.json();
-        if (typeof d.error == "string")
-          throw new Error(`${n} could not embed this URL: ${d.error}`);
-        if (s = M(n, c, d), !s.html)
+        const f = await d.json();
+        if (typeof f.error == "string")
+          throw new Error(`${i} could not embed this URL: ${f.error}`);
+        if (a = W(i, l, f), !a.html)
           throw new Error(
-            `${n} returned no embed markup for this URL. Check the post is public, or paste the embed code instead.`
+            `${i} returned no embed markup for this URL. Check the post is public, or paste the embed code instead.`
           );
       }
-      return f && u > 0 && h.set(p, { expires: Date.now() + u, data: s }), s;
+      return p && m > 0 && r().set(b, a, m), a;
     }
   };
-}, j = {
-  service: U,
-  oembed: W
-}, D = {
+}, N = {
+  service: A,
+  oembed: F
+}, G = {
   register: y,
-  bootstrap: g,
-  destroy: k,
-  config: w,
+  bootstrap: k,
+  destroy: w,
+  config: C,
   controllers: T,
-  routes: S,
-  services: j,
-  contentTypes: C,
-  policies: R,
-  middlewares: E
+  routes: z,
+  services: N,
+  contentTypes: v,
+  policies: _,
+  middlewares: R
 };
 export {
-  D as default
+  G as default
 };

package/dist/server/src/config/index.d.ts

@@ -77,6 +77,7 @@ declare const _default: {
             platforms: string[];
             cache: boolean;
             cacheTTL: number;
+            cacheMaxEntries: number;
             instagram: {
                 accessToken: any;
             };

package/dist/server/src/controllers/oembed.d.ts

@@ -4,7 +4,7 @@ declare const oembed: ({ strapi }: {
 }) => {
     /**
      * GET /better-blocks/oembed?url=...&platform=...
-     * Proxies the platform oEmbed request server-side and returns the normalised
+     * Proxies the platform oEmbed request server-side and returns the normalized
      * payload used by the social-embed block.
      */
     fetch(ctx: any): Promise<any>;

package/dist/server/src/index.d.ts

@@ -51,6 +51,7 @@ declare const _default: {
                 platforms: string[];
                 cache: boolean;
                 cacheTTL: number;
+                cacheMaxEntries: number;
                 instagram: {
                     accessToken: any;
                 };
@@ -115,6 +116,7 @@ declare const _default: {
             strapi: import("@strapi/types/dist/core").Strapi;
         }) => {
             detectPlatform: (url: string) => import("./services/oembed").SocialPlatform;
+            clearCache: () => void;
             fetch(url: string, platform?: import("./services/oembed").SocialPlatform): Promise<import("./services/oembed").NormalisedOEmbed>;
         };
     };

package/dist/server/src/services/index.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
         strapi: import("@strapi/types/dist/core").Strapi;
     }) => {
         detectPlatform: (url: string) => import("./oembed").SocialPlatform;
+        clearCache: () => void;
         fetch(url: string, platform?: import("./oembed").SocialPlatform): Promise<import("./oembed").NormalisedOEmbed>;
     };
 };

package/dist/server/src/services/oembed.d.ts

@@ -12,13 +12,56 @@ export interface NormalisedOEmbed {
     width?: number;
     height?: number;
 }
+export interface SocialConfig {
+    enabled?: boolean;
+    platforms?: SocialPlatform[];
+    cache?: boolean;
+    cacheTTL?: number;
+    cacheMaxEntries?: number;
+    instagram?: {
+        accessToken?: string;
+    };
+    facebook?: {
+        accessToken?: string;
+    };
+}
 export declare const detectPlatform: (url: string) => SocialPlatform | null;
+/**
+ * Returns the platform oEmbed endpoint to call, or null when the platform has
+ * no public oEmbed API (e.g. LinkedIn, which we render via a constructed iframe).
+ */
+export declare const buildEndpoint: (platform: SocialPlatform, url: string, config: SocialConfig) => string | null;
+/**
+ * `pin.it` short links are 30x redirects that Pinterest's oEmbed endpoint
+ * rejects outright, so expand them to the canonical `/pin/<id>/` URL first.
+ * Returns the original URL when it isn't a short link or can't be resolved.
+ */
+export declare const resolveShortUrl: (url: string) => Promise<string>;
+/** LinkedIn has no oEmbed API but exposes a stable iframe embed by URN. */
+export declare const buildLinkedInIframe: (url: string) => NormalisedOEmbed | null;
+/**
+ * Platform oEmbed markup often ships the widget script inline (TikTok always
+ * does; Twitter/Instagram only when `omit_script` isn't honoured). Renderers
+ * inject that script themselves, and a `<script>` added through `innerHTML`
+ * never executes anyway — worse, its inert tag makes a renderer believe the
+ * widget is already loaded. Strip it so the stored html is markup only.
+ */
+export declare const stripScripts: (html: string) => string;
+export declare const normalize: (platform: SocialPlatform, url: string, raw: Record<string, unknown>) => NormalisedOEmbed;
+/**
+ * Bounded so a long-running instance cannot accumulate one entry per social post
+ * ever embedded. 500 posts is far more than an editor touches in a TTL window,
+ * and `cacheMaxEntries` raises it for anyone who disagrees.
+ */
+export declare const DEFAULT_CACHE_MAX_ENTRIES = 500;
 declare const service: ({ strapi }: {
     strapi: Core.Strapi;
 }) => {
     detectPlatform: (url: string) => SocialPlatform | null;
+    /** Exposed for tests and for anyone who needs to drop cached embeds. */
+    clearCache: () => void;
     /**
-     * Fetch (and cache) the normalised oEmbed for `url`. `platform` may be
+     * Fetch (and cache) the normalized oEmbed for `url`. `platform` may be
      * passed to skip auto-detection. Throws on an unsupported/unconfigured
      * platform or a failed upstream request.
      */

package/dist/server/src/services/ttlCache.d.ts

@@ -0,0 +1,23 @@
+/**
+ * A bounded cache with per-entry expiry.
+ *
+ * The oEmbed service used a bare `Map` keyed by URL, which meant one entry for
+ * every social post ever embedded, for the life of the process. Entries expired
+ * logically — a stale hit was discarded on read — but nothing ever removed them,
+ * so a long-running instance kept the memory whether or not anyone asked for
+ * that post again.
+ *
+ * Eviction is least-recently-used: a hit moves its entry to the end, and a write
+ * past `max` drops the entry at the front. `Map` iterates in insertion order and
+ * re-inserting moves a key to the end, which is the whole implementation.
+ */
+export interface TtlCache<T> {
+    get(key: string): T | undefined;
+    set(key: string, value: T, ttlMs: number): void;
+    delete(key: string): boolean;
+    clear(): void;
+    readonly size: number;
+}
+export declare const createTtlCache: <T>({ max }: {
+    max: number;
+}) => TtlCache<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qkix/strapi-plugin-better-blocks",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "An enhanced Rich Text (Blocks) field for Strapi with inline color picker and more",
   "strapi": {
     "kind": "plugin",
@@ -54,7 +54,8 @@
     "remark-math": "^6.0.0",
     "remark-parse": "^11.0.0",
     "shiki": "^4.3.0",
-    "unified": "^11.0.5"
+    "unified": "^11.0.5",
+    "@qkix/better-blocks-core": "^0.2.2"
   },
   "devDependencies": {
     "@strapi/sdk-plugin": "^5.3.2",
@@ -73,6 +74,7 @@
     "typescript": "^5.8.3",
     "vitest": "^3.2.4",
     "@qkix/eslint-config": "0.0.0",
+    "@qkix/strapi-test-harness": "0.0.0",
     "@qkix/tsconfig": "0.0.0"
   },
   "peerDependencies": {
@@ -99,17 +101,25 @@
   "author": "qkix",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/qkix/strapi-plugin-better-blocks.git",
+    "url": "git+https://github.com/qkix/strapi-plugins.git",
     "directory": "packages/strapi-plugin-better-blocks"
   },
   "bugs": {
-    "url": "https://github.com/qkix/strapi-plugin-better-blocks/issues"
+    "url": "https://github.com/qkix/strapi-plugins/issues"
   },
-  "homepage": "https://github.com/qkix/strapi-plugin-better-blocks#readme",
+  "homepage": "https://github.com/qkix/strapi-plugins#readme",
   "nx": {
     "tags": [
       "scope:plugin"
-    ]
+    ],
+    "targets": {
+      "test": {
+        "dependsOn": [
+          "build",
+          "^build"
+        ]
+      }
+    }
   },
   "publishConfig": {
     "access": "public"
@@ -126,6 +136,6 @@
     "verify": "strapi-plugin verify",
     "watch": "strapi-plugin watch",
     "watch:link": "strapi-plugin watch:link",
-    "typecheck": "tsc -p admin/tsconfig.json && tsc -p server/tsconfig.json"
+    "typecheck": "tsc -p admin/tsconfig.json --noEmit && tsc -p server/tsconfig.json --noEmit"
   }
 }