@rimelight/ui 0.0.16 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimelight/ui",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "private": false,
   "description": "Rimelight Entertainment UI Library.",
   "homepage": "https://rimelight.com/docs",

package/src/integrations/sri.ts

@@ -1,92 +1,92 @@
-import type { AstroIntegration } from "astro"
-import { createHash } from "node:crypto"
-
-interface SRIConfig {
-  security?: {
-    csp?: {
-      scriptDirective?: {
-        resources?: string[]
-      }
-    }
-  }
-}
-
-function assertSRIConfig(obj: unknown): asserts obj is SRIConfig {
-  if (!obj || typeof obj !== "object") throw new Error("Expected config")
-}
-
-/**
- * Astro SRI Integration Fetches external scripts at build-time and generates hashes for the SSR
- * middleware.
- */
-export function sri(): AstroIntegration {
-  const sriManifest: Record<string, string> = {}
-
-  return {
-    name: "sri",
-    hooks: {
-      "astro:config:setup": async ({ updateConfig, config, logger }) => {
-        logger.info("Initializing SRI Discovery...")
-
-        // 1. Identify External Scripts from CSP config
-        // We look into the custom 'security' block in astro.config.mjs
-        assertSRIConfig(config)
-
-        const security = config.security
-        const externalUrls: string[] = []
-
-        if (security?.csp?.scriptDirective?.resources) {
-          for (const resource of security.csp.scriptDirective.resources) {
-            if (resource.startsWith("https://")) {
-              externalUrls.push(resource)
-            }
-          }
-        }
-
-        // 2. Fetch and Hash External Scripts
-        await Promise.all(
-          externalUrls.map(async (url) => {
-            try {
-              logger.info(`Fetching ${url} for SRI hashing...`)
-              const response = await fetch(url)
-              if (!response.ok) throw new Error(`HTTP ${response.status}`)
-
-              const buffer = await response.arrayBuffer()
-              const hash = createHash("sha384").update(Buffer.from(buffer)).digest("base64")
-
-              sriManifest[url] = `sha384-${hash}`
-              logger.info(`Successfully hashed ${url}`)
-            } catch (err: unknown) {
-              const message = err instanceof Error ? err.message : String(err)
-              logger.error(`Failed to fetch SRI for ${url}: ${message}`)
-            }
-          })
-        )
-
-        // 3. Provide hashes to the runtime via Vite's virtual module
-        const virtualModuleId = "virtual:sri-manifest"
-        const resolvedVirtualModuleId = "\0" + virtualModuleId
-
-        updateConfig({
-          vite: {
-            plugins: [
-              {
-                name: "vite-plugin-sri-manifest",
-                resolveId(id: string) {
-                  if (id === virtualModuleId) return resolvedVirtualModuleId
-                  return null
-                },
-                load(id: string) {
-                  if (id === resolvedVirtualModuleId) {
-                    return `export const manifest = ${JSON.stringify(sriManifest)};`
-                  }
-                  return null
-                }
-              }
-            ]
-          }
-        })
-      }
-    }
-  }
-}
+import type { AstroIntegration } from "astro"
+import { createHash } from "node:crypto"
+
+interface SRIConfig {
+  security?: {
+    csp?: {
+      scriptDirective?: {
+        resources?: string[]
+      }
+    }
+  }
+}
+
+function assertSRIConfig(obj: unknown): asserts obj is SRIConfig {
+  if (!obj || typeof obj !== "object") throw new Error("Expected config")
+}
+
+/**
+ * Astro SRI Integration Fetches external scripts at build-time and generates hashes for the SSR
+ * middleware.
+ */
+export function sri(): AstroIntegration {
+  const sriManifest: Record<string, string> = {}
+
+  return {
+    name: "sri",
+    hooks: {
+      "astro:config:setup": async ({ updateConfig, config, logger }) => {
+        logger.info("Initializing SRI Discovery...")
+
+        // 1. Identify External Scripts from CSP config
+        // We look into the custom 'security' block in astro.config.mjs
+        assertSRIConfig(config)
+
+        const security = config.security
+        const externalUrls: string[] = []
+
+        if (security?.csp?.scriptDirective?.resources) {
+          for (const resource of security.csp.scriptDirective.resources) {
+            if (resource.startsWith("https://")) {
+              externalUrls.push(resource)
+            }
+          }
+        }
+
+        // 2. Fetch and Hash External Scripts
+        await Promise.all(
+          externalUrls.map(async (url) => {
+            try {
+              logger.info(`Fetching ${url} for SRI hashing...`)
+              const response = await fetch(url)
+              if (!response.ok) throw new Error(`HTTP ${response.status}`)
+
+              const buffer = await response.arrayBuffer()
+              const hash = createHash("sha384").update(Buffer.from(buffer)).digest("base64")
+
+              sriManifest[url] = `sha384-${hash}`
+              logger.info(`Successfully hashed ${url}`)
+            } catch (err: unknown) {
+              const message = err instanceof Error ? err.message : String(err)
+              logger.error(`Failed to fetch SRI for ${url}: ${message}`)
+            }
+          })
+        )
+
+        // 3. Provide hashes to the runtime via Vite's virtual module
+        const virtualModuleId = "virtual:sri-manifest"
+        const resolvedVirtualModuleId = "\0" + virtualModuleId
+
+        updateConfig({
+          vite: {
+            plugins: [
+              {
+                name: "vite-plugin-sri-manifest",
+                resolveId(id: string) {
+                  if (id === virtualModuleId) return resolvedVirtualModuleId
+                  return null
+                },
+                load(id: string) {
+                  if (id === resolvedVirtualModuleId) {
+                    return `export const manifest = ${JSON.stringify(sriManifest)};`
+                  }
+                  return null
+                }
+              }
+            ]
+          }
+        })
+      }
+    }
+  }
+}

package/src/middleware/index.ts

@@ -1,2 +1 @@
-export * from "./sri"
 export * from "./security"

package/src/middleware/security.ts

@@ -1,22 +1,92 @@
 import { defineMiddleware } from "astro:middleware"
+// @ts-ignore - virtual module generated by the SRI integration
+import { manifest } from "virtual:sri-manifest"
 
+declare const HTMLRewriter: any
+
+function assertManifest(obj: unknown): asserts obj is Record<string, string> {
+  if (!obj || typeof obj !== "object") throw new Error("Expected manifest")
+}
+
+function addSecurityHeaders(response: Response): Response {
+  const newResponse = new Response(response.body, response)
+  newResponse.headers.set("Referrer-Policy", "strict-origin-when-cross-origin")
+  newResponse.headers.set("X-Content-Type-Options", "nosniff")
+  newResponse.headers.set("X-Frame-Options", "DENY")
+  newResponse.headers.set("Cross-Origin-Resource-Policy", "same-origin")
+  newResponse.headers.set(
+    "Strict-Transport-Security",
+    "max-age=31536000; includeSubDomains; preload"
+  )
+  return newResponse
+}
+
+/**
+ * Security Middleware: Injects SRI integrity attributes and security headers.
+ */
 export const security = defineMiddleware(async (context, next) => {
-  // HTTP to HTTPS redirect
-  if (context.request.url.startsWith("http://")) {
+  // HTTP to HTTPS redirect only in production
+  if (import.meta.env.PROD && context.request.url.startsWith("http://")) {
     const httpsUrl = context.request.url.replace(/^http:/, "https:")
     return Response.redirect(httpsUrl, 301)
   }
 
   const response = await next()
+  const contentType = response.headers.get("content-type") || ""
 
-  const newResponse = new Response(response.body, response)
+  if (!contentType.includes("text/html")) {
+    return addSecurityHeaders(response)
+  }
 
-  // Standard Security Headers
-  newResponse.headers.set("Referrer-Policy", "strict-origin-when-cross-origin")
-  newResponse.headers.set("X-Content-Type-Options", "nosniff")
-  newResponse.headers.set("X-Frame-Options", "DENY")
-  newResponse.headers.set("Cross-Origin-Resource-Policy", "same-origin")
-  newResponse.headers.set("Strict-Transport-Security", "max-age=31536000; includeSubDomains")
+  if (typeof HTMLRewriter !== "undefined") {
+    return new HTMLRewriter()
+      .on("script[src]", {
+        element(el: any) {
+          const src = el.getAttribute("src")
+          if (src && manifest[src]) {
+            el.setAttribute("integrity", manifest[src])
+            el.setAttribute("crossorigin", "anonymous")
+          }
+        }
+      })
+      .on('link[rel="stylesheet"][href]', {
+        element(el: any) {
+          const href = el.getAttribute("href")
+          if (href && manifest[href]) {
+            el.setAttribute("integrity", manifest[href])
+            el.setAttribute("crossorigin", "anonymous")
+          }
+        }
+      })
+      .transform(response)
+  }
 
-  return newResponse
-})
+  let modifiedHtml = await response.text()
+
+  assertManifest(manifest)
+
+  const entries = Object.entries(manifest)
+  for (const [url, hash] of entries) {
+    if (!hash) continue
+
+    const scriptRegex = new RegExp(`(<script[^>]+src=["']${url}["'][^>]*)(/?>)`, "g")
+    modifiedHtml = modifiedHtml.replace(
+      scriptRegex,
+      `$1 integrity="${hash}" crossorigin="anonymous"$2`
+    )
+
+    const linkRegex = new RegExp(`(<link[^>]+href=["']${url}["'][^>]*)(/?>)`, "g")
+    modifiedHtml = modifiedHtml.replace(
+      linkRegex,
+      `$1 integrity="${hash}" crossorigin="anonymous"$2`
+    )
+  }
+
+  return addSecurityHeaders(
+    new Response(modifiedHtml, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: new Headers(response.headers)
+    })
+  )
+})

package/src/plugins/starlightAddons/index.ts

@@ -1,132 +1,132 @@
-/// <reference path="./locals.d.ts" />
-import type { StarlightPlugin, StarlightUserConfig } from "@astrojs/starlight/types"
-import virtual from "vite-plugin-virtual"
-import path from "node:path"
-import { fileURLToPath } from "node:url"
-import { z } from "astro/zod"
-
-import {
-  StarlightSidebarTopicsConfigSchema,
-  StarlightSidebarTopicsOptionsSchema,
-  type StarlightSidebarTopicsUserConfig,
-  type StarlightSidebarTopicsUserOptions
-} from "./libs/config"
-import { throwPluginError } from "./libs/plugin"
-import { vitePluginStarlightSidebarTopics } from "./libs/vite"
-
-export type {
-  StarlightSidebarTopicsConfig,
-  StarlightSidebarTopicsUserConfig,
-  StarlightSidebarTopicsOptions,
-  StarlightSidebarTopicsUserOptions
-} from "./libs/config"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-export interface StarlightAddonsConfig {
-  copy?: boolean
-  share?: boolean
-  packageManagers?: string[]
-  // Merged config for Topics
-  topics?: StarlightSidebarTopicsUserConfig
-  topicOptions?: StarlightSidebarTopicsUserOptions
-}
-
-export default function starlightAddons(userConfig?: StarlightAddonsConfig): StarlightPlugin {
-  // 1. Setup default and merged config for Addons
-  const defaultAddonConfig: StarlightAddonsConfig = {
-    copy: true,
-    share: true,
-    packageManagers: ["npm"]
-  }
-
-  const addonConfig = { ...defaultAddonConfig, ...userConfig }
-
-  // 2. Validate Sidebar Topics configurations if they exist
-  const parsedTopics = StarlightSidebarTopicsConfigSchema.safeParse(addonConfig.topics || [])
-  if (!parsedTopics.success) {
-    throwPluginError(
-      `Invalid topics config: ${parsedTopics.error.issues.map((i) => i.message).join("\n")}`
-    )
-  }
-
-  const parsedOptions = StarlightSidebarTopicsOptionsSchema.safeParse(addonConfig.topicOptions)
-  if (!parsedOptions.success) {
-    throwPluginError(`Invalid topic options: ${z.prettifyError(parsedOptions.error)}`)
-  }
-
-  const topicsData = parsedTopics.data
-  const optionsData = parsedOptions.data
-
-  return {
-    name: "rimelight-ui-starlight-addons",
-    hooks: {
-      "config:setup"({
-        addIntegration,
-        updateConfig,
-        logger,
-        addRouteMiddleware,
-        command,
-        config: starlightConfig
-      }) {
-        // --- Sidebar Topics Logic ---
-        if ((command === "dev" || command === "build") && topicsData.length > 0) {
-          if (starlightConfig.sidebar) {
-            throwPluginError(
-              "Sidebar detected. To use topics, move your sidebar items into the topics config."
-            )
-          }
-
-          const topicSidebar: StarlightUserConfig["sidebar"] = topicsData.map((topic, index) => {
-            return "items" in topic
-              ? { label: String(index), items: topic.items }
-              : { label: String(index), items: [] }
-          })
-
-          updateConfig({
-            sidebar: topicSidebar,
-            components: {
-              Sidebar: `starlight-sidebar-topics/overrides/Sidebar.astro`
-            }
-          })
-        }
-
-        // --- Addons Logic ---
-        if (
-          !addonConfig.copy &&
-          !addonConfig.share &&
-          (!addonConfig.packageManagers || addonConfig.packageManagers.length === 0)
-        ) {
-          logger.warn("StarlightAddons: No features enabled.")
-        }
-
-        updateConfig({
-          components: {
-            // This will merge with the Sidebar override if both exist
-            PageTitle: path.join(__dirname, "PageTitle.astro")
-          }
-        })
-
-        // --- Unified Integration ---
-        addIntegration({
-          name: "rimelight-ui-starlight-addons-integration",
-          hooks: {
-            "astro:config:setup": ({ updateConfig: updateAstroConfig }) => {
-              updateAstroConfig({
-                vite: {
-                  plugins: [
-                    virtual({
-                      "virtual:rimelight-starlight-addons-config": `export default ${JSON.stringify(addonConfig)}`
-                    }),
-                    // Pass the validated topic data to the vite plugin
-                    vitePluginStarlightSidebarTopics(topicsData, optionsData)
-                  ]
-                }
-              } as Record<string, unknown>)
-            }
-          }
-        })
-      }
-    }
-  }
-}
+/// <reference path="./locals.d.ts" />
+import type { StarlightPlugin, StarlightUserConfig } from "@astrojs/starlight/types"
+import virtual from "vite-plugin-virtual"
+import path from "node:path"
+import { fileURLToPath } from "node:url"
+import { z } from "astro/zod"
+
+import {
+  StarlightSidebarTopicsConfigSchema,
+  StarlightSidebarTopicsOptionsSchema,
+  type StarlightSidebarTopicsUserConfig,
+  type StarlightSidebarTopicsUserOptions
+} from "./libs/config"
+import { throwPluginError } from "./libs/plugin"
+import { vitePluginStarlightSidebarTopics } from "./libs/vite"
+
+export type {
+  StarlightSidebarTopicsConfig,
+  StarlightSidebarTopicsUserConfig,
+  StarlightSidebarTopicsOptions,
+  StarlightSidebarTopicsUserOptions
+} from "./libs/config"
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+export interface StarlightAddonsConfig {
+  copy?: boolean
+  share?: boolean
+  packageManagers?: string[]
+  // Merged config for Topics
+  topics?: StarlightSidebarTopicsUserConfig
+  topicOptions?: StarlightSidebarTopicsUserOptions
+}
+
+export default function starlightAddons(userConfig?: StarlightAddonsConfig): StarlightPlugin {
+  // 1. Setup default and merged config for Addons
+  const defaultAddonConfig: StarlightAddonsConfig = {
+    copy: true,
+    share: true,
+    packageManagers: ["npm"]
+  }
+
+  const addonConfig = { ...defaultAddonConfig, ...userConfig }
+
+  // 2. Validate Sidebar Topics configurations if they exist
+  const parsedTopics = StarlightSidebarTopicsConfigSchema.safeParse(addonConfig.topics || [])
+  if (!parsedTopics.success) {
+    throwPluginError(
+      `Invalid topics config: ${parsedTopics.error.issues.map((i) => i.message).join("\n")}`
+    )
+  }
+
+  const parsedOptions = StarlightSidebarTopicsOptionsSchema.safeParse(addonConfig.topicOptions)
+  if (!parsedOptions.success) {
+    throwPluginError(`Invalid topic options: ${z.prettifyError(parsedOptions.error)}`)
+  }
+
+  const topicsData = parsedTopics.data
+  const optionsData = parsedOptions.data
+
+  return {
+    name: "rimelight-ui-starlight-addons",
+    hooks: {
+      "config:setup"({
+        addIntegration,
+        updateConfig,
+        logger,
+        addRouteMiddleware,
+        command,
+        config: starlightConfig
+      }) {
+        // --- Sidebar Topics Logic ---
+        if ((command === "dev" || command === "build") && topicsData.length > 0) {
+          if (starlightConfig.sidebar) {
+            throwPluginError(
+              "Sidebar detected. To use topics, move your sidebar items into the topics config."
+            )
+          }
+
+          const topicSidebar: StarlightUserConfig["sidebar"] = topicsData.map((topic, index) => {
+            return "items" in topic
+              ? { label: String(index), items: topic.items }
+              : { label: String(index), items: [] }
+          })
+
+          updateConfig({
+            sidebar: topicSidebar,
+            components: {
+              Sidebar: `starlight-sidebar-topics/overrides/Sidebar.astro`
+            }
+          })
+        }
+
+        // --- Addons Logic ---
+        if (
+          !addonConfig.copy &&
+          !addonConfig.share &&
+          (!addonConfig.packageManagers || addonConfig.packageManagers.length === 0)
+        ) {
+          logger.warn("StarlightAddons: No features enabled.")
+        }
+
+        updateConfig({
+          components: {
+            // This will merge with the Sidebar override if both exist
+            PageTitle: path.join(__dirname, "PageTitle.astro")
+          }
+        })
+
+        // --- Unified Integration ---
+        addIntegration({
+          name: "rimelight-ui-starlight-addons-integration",
+          hooks: {
+            "astro:config:setup": ({ updateConfig: updateAstroConfig }) => {
+              updateAstroConfig({
+                vite: {
+                  plugins: [
+                    virtual({
+                      "virtual:rimelight-starlight-addons-config": `export default ${JSON.stringify(addonConfig)}`
+                    }),
+                    // Pass the validated topic data to the vite plugin
+                    vitePluginStarlightSidebarTopics(topicsData, optionsData)
+                  ]
+                }
+              } as Record<string, unknown>)
+            }
+          }
+        })
+      }
+    }
+  }
+}