mirror of
https://github.com/hugo-fixit/FixIt.git
synced 2026-09-02 11:42:39 +00:00
14a965f9c1
* refactor: add TypeScript support and refactor utility functions * docs: add CLAUDE.md for Claude Code guidance Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(assets): replace factory-function pattern with service classes and DI container Introduce typed service container, event bus, and service interfaces to replace the shared FixItContext factory-function pattern. Each module is now a standalone class implementing a typed interface, with explicit constructor-injected dependencies. The window.fixit backward-compatibility facade is built via a publicAPI() helper that extracts class methods. Also removes unnecessary setTimeout/afterPaint deferred execution wrappers from init sequences, and improves module header comments. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor: replace private properties with class fields in modules Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(assets): rewrite link page script in TypeScript Rename pages/link.js to link.ts with proper type annotations and update the Hugo template reference accordingly. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: rewrite CLAUDE.md and copilot-instructions.md in English Update both files to reflect the new service-class architecture with DI container, typed event bus, and ES6 # private fields. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * fix: update event handling to use CustomEvent for better type safety * refactor: enhance theme switching by adding isChanged flag to event details * refactor(assets): refactor Mermaid module structure and event wiring * refactor(assets): align lib integrations with TypedEventBus and add module overviews * chore(assets): remove vite-specific import ignore comments * refactor(assets): remove deprecated forEach utility and use native forEach Replace custom forEach wrapper with native .forEach() on NodeList, HTMLCollection (via querySelectorAll), and arrays. The utility was already marked @deprecated and all 30+ call sites use synchronous handlers, making the wrapper unnecessary. Also replace getElementsByClassName/getElementsByTagName with querySelectorAll for consistency. - Delete utils/array.ts (no longer needed) - Remove forEach export from utils/index.ts - Refactor 11 module files to use native .forEach() - Switch getElementsByClassName to querySelectorAll in theme.ts and charts.ts * refactor(assets): split ChartsModule into independent lib files Move ECharts, Mapbox GL, and TypeIt integrations from the ServiceContainer-managed ChartsModule into three standalone lib files (echarts.ts, mapbox.ts, typeit.ts). Each lib: - Instantiates its own TypedEventBus - Reads config from window.config.* - Self-initializes on DOMContentLoaded - Handles decrypt/re-init events independently - Uses implicit idempotency via DOM element queries Key improvements: - Reduces ServiceContainer complexity - Makes chart libs independently loadable - Fixes partial decryption handling in echarts (only re-inits decrypted portion) - Maintains consistency with aplayer/file-tree lib pattern * refactor(assets): extract third-party libraries to standalone lib files Extract twemoji, pangu, cookieconsent, watermark, lightgallery, and json-viewer from modules into separate lib files for better separation of concerns. Each lib is loaded conditionally via assets.html and handles its own initialization and event lifecycle independently. Additionally, unify fixit event handling by replacing document.addEventListener calls with TypedEventBus.on() in EncryptionModule and MiscModule for consistent event architecture. Remove unused MiscService dependency from ContentModule. * refactor(assets): unify js.Build pipeline and defaults - extract shared helper partial function/js-build.html for js.Build + minify - make plugin script renderer and Mermaid use the same js.Build logic - default Build.minify to hugo.IsProduction when unset - default Build.sourceMap to cond hugo.IsDevelopment "linked" "none" - remove duplicated sourceMap branching in layout templates - update js targetPath naming to .js (no explicit .min.js suffix) * refactor(assets): extract comment systems to independent lib files Extract comment system initialization logic from CommentModule into 7 independent lib files (artalk, gitalk, valine, waline, utterances, twikoo, giscus). Each lib: - Conditionally loads based on window.config.comment configuration - Handles backend-specific initialization via DOMContentLoaded - Manages its own theme synchronization and event listeners - Is loaded conditionally in assets.html only when enabled Simplify CommentModule to handle only: - Comment section UI display and visibility toggle - Shared lightGallery initialization utility (used by Artalk and Twikoo) - Comment expiration handling This reduces module complexity and enables per-backend lazy loading. * refactor(assets): unify js.Build pipeline and consolidate PWA config Enhance js-build.html to accept Build as bool/dict, auto-derive targetPath from resource name (.ts → .js), and skip js.Build when Build is false/omit. Simplify assets.html by removing explicit targetPath dicts for all .ts lib builds. Consolidate enablePWA and serviceWorkerURL into a PWA config object. * refactor(assets): decouple toc from content module and add JSDoc headers - Remove TocService dependency from ContentModule, toc now self-manages - Rename initContent() → setup(), init() → setup() for toc - Make initFootnotes private (#initFootnotes) - Add multi-line JSDoc headers with Responsibilities to all modules, main.ts, pages/link.ts, and head/color-scheme.ts * refactor(assets): split types.ts into types/ directory module * refactor(assets): simplify JS module architecture and expose typed window.fixit API - Remove DI container (core/container.ts), use direct constructor calls - Export shared eventBus singleton from core/event-bus.ts, remove 16 redundant instances - Merge thin modules: SvgModule/CommentModule/LinkGuardModule into ContentModule/MiscModule - Trim service interfaces to externally-used methods only - Replace publicAPI() reflection with minimal typed window.fixit facade - Expose public APIs: setThemeMode, eventBus, initContent, mask overlay, scroll state - Extract setThemeMode from initSwitchTheme closure as public method - Rename fixit:reset to fixit:re-encrypt, remove dead events - Replace custom.js.example with custom.ts.example - Update CLAUDE.md and copilot-instructions.md * style(i18n): use semantic names for comment dividers instead of file paths Replace file-path-based comment dividers (e.g. partials/base/header.html) with semantic names (e.g. Header) across all 16 i18n files for consistency. * chore(workflow): update cron schedule for library updates --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
208 lines
7.6 KiB
TypeScript
208 lines
7.6 KiB
TypeScript
/**
|
|
* Encrypted content decryptor for FixIt pages and shortcodes.
|
|
*
|
|
* Responsibilities:
|
|
* - Validate password input and decrypt Base64 payloads into target containers.
|
|
* - Support both full-page and shortcode-scoped encrypted blocks.
|
|
* - Persist and validate page-level decrypt cache with expiration.
|
|
* - Emit and react to FixIt events for decrypted/partial-decrypted/reset flows.
|
|
*/
|
|
import { eventBus } from '../core/event-bus'
|
|
import { flashTooltip } from '../utils'
|
|
|
|
declare const CryptoJS: any
|
|
|
|
interface DecryptorOptions {
|
|
duration?: number
|
|
}
|
|
|
|
interface CachedStat {
|
|
expiration: number
|
|
password: string
|
|
salt: string
|
|
}
|
|
|
|
class FixItDecryptor {
|
|
options: Required<DecryptorOptions>
|
|
|
|
/**
|
|
* Create a decryptor instance and register custom elements.
|
|
* @param options - Configuration options.
|
|
* @param options.duration - Cache duration in seconds for decrypted content (default: 24 hours).
|
|
*/
|
|
constructor(options: DecryptorOptions = {}) {
|
|
this.options = { duration: options.duration || 24 * 60 * 60 }
|
|
customElements.get('fixit-encryptor') || customElements.define('fixit-encryptor', class extends HTMLElement {})
|
|
customElements.get('cipher-text') || customElements.define('cipher-text', class extends HTMLElement {})
|
|
}
|
|
|
|
/**
|
|
* Decode Base64 cipher text and inject the decrypted HTML into the target.
|
|
* @param $cipherText - The `<cipher-text>` element containing the encrypted content.
|
|
* @param $target - The DOM element to inject decrypted HTML into.
|
|
* @param salt - The salt string derived from the password.
|
|
*/
|
|
#decryptContent($cipherText: HTMLElement, $target: HTMLElement, salt: string) {
|
|
try {
|
|
$target.innerHTML = CryptoJS!.enc.Base64
|
|
.parse($cipherText.textContent!.replace(salt, ''))
|
|
.toString(CryptoJS!.enc.Utf8)
|
|
$cipherText.parentElement!.classList.add('decrypted')
|
|
}
|
|
catch (err) {
|
|
return console.error(err)
|
|
}
|
|
if ($target.id === 'content')
|
|
eventBus.emit('fixit:decrypted')
|
|
else
|
|
eventBus.emit('fixit:partial-decrypted', { target: $target })
|
|
}
|
|
|
|
/**
|
|
* Validate user input against the stored password hash; invoke callback on success.
|
|
* @param $encryptor - The `<fixit-encryptor>` element containing the input field.
|
|
* @param callback - Invoked with `(cipherText, passwordHash, salt)` on success.
|
|
*/
|
|
async #validatePassword($encryptor: Element, callback: ($cipherText: HTMLElement, passwordHash: string, salt: string) => void) {
|
|
const $cipherText = $encryptor.querySelector<HTMLElement>('cipher-text')!
|
|
const password = $cipherText.dataset.password
|
|
const inputEl = $encryptor.querySelector<HTMLInputElement>('.fixit-decryptor-input')!
|
|
const input = inputEl.value.trim()
|
|
const { h64ToString } = await window.xxhash!()
|
|
const inputHash = h64ToString(input)
|
|
const inputSha256 = CryptoJS!.SHA256(input).toString()
|
|
const saltLen = input.length % 2 ? input.length : input.length + 1
|
|
|
|
inputEl.value = ''
|
|
inputEl.blur()
|
|
if (!input) {
|
|
flashTooltip(inputEl, 'Please enter the correct password!')
|
|
return console.warn('Please enter the correct password!')
|
|
}
|
|
if (inputHash !== password) {
|
|
flashTooltip(inputEl, `Password error: ${input} not the correct password!`)
|
|
return console.warn(`Password error: ${input} not the correct password!`)
|
|
}
|
|
callback($cipherText, inputHash, inputSha256.slice(saltLen))
|
|
}
|
|
|
|
/**
|
|
* Initialize page-level and/or shortcode-level decryption based on flags.
|
|
* @param options - `{ all?, shortcode? }` controlling which modes to activate.
|
|
* @param options.all - Enable whole-page decryption.
|
|
* @param options.shortcode - Enable shortcode-level decryption.
|
|
*/
|
|
init({ all, shortcode }: { all?: boolean, shortcode?: boolean }) {
|
|
const $content = document.querySelector<HTMLElement>('#content')
|
|
if (shortcode) {
|
|
eventBus.on('fixit:decrypted', () => {
|
|
this.initShortcodes($content!)
|
|
})
|
|
eventBus.on('fixit:partial-decrypted', ({ detail }) => {
|
|
this.initShortcodes(detail.target)
|
|
})
|
|
}
|
|
if (all) {
|
|
this.initPage()
|
|
}
|
|
else if (shortcode) {
|
|
this.initShortcodes($content!)
|
|
}
|
|
}
|
|
|
|
/** Initialize whole-page decryption with cache validation and encrypt/re-encrypt buttons. */
|
|
initPage() {
|
|
this.validateCache()
|
|
const $encryptor = document.querySelector<HTMLElement>('article > fixit-encryptor')!
|
|
const $content = document.querySelector<HTMLElement>('#content')!
|
|
|
|
const decryptorHandler = () => {
|
|
this.#validatePassword($encryptor, ($cipherText, passwordHash, salt) => {
|
|
window.localStorage?.setItem(
|
|
`fixit-decryptor/#${location.pathname}`,
|
|
JSON.stringify({
|
|
expiration: Math.ceil(Date.now() / 1000) + this.options.duration,
|
|
password: passwordHash,
|
|
salt,
|
|
}),
|
|
)
|
|
this.#decryptContent($cipherText, $content, salt)
|
|
})
|
|
}
|
|
|
|
$encryptor.querySelector('.fixit-decryptor-input')?.addEventListener('keydown', (e) => {
|
|
if ((e as KeyboardEvent).key === 'Enter') {
|
|
e.preventDefault()
|
|
decryptorHandler()
|
|
}
|
|
})
|
|
|
|
$encryptor.querySelector('.fixit-decryptor-btn')?.addEventListener('click', (e) => {
|
|
e.preventDefault()
|
|
decryptorHandler()
|
|
})
|
|
|
|
$encryptor.querySelector('.fixit-encryptor-btn')?.addEventListener('click', (e) => {
|
|
e.preventDefault()
|
|
$encryptor.classList.remove('decrypted')
|
|
$content.innerHTML = ''
|
|
window.localStorage?.removeItem(`fixit-decryptor/#${location.pathname}`)
|
|
eventBus.emit('fixit:re-encrypt')
|
|
})
|
|
|
|
$encryptor.classList.add('initialized')
|
|
}
|
|
|
|
/**
|
|
* Initialize decryption for all unprocessed `fixit-encryptor` shortcodes under a parent.
|
|
* @param $parent - The parent element to search for shortcodes.
|
|
*/
|
|
initShortcodes($parent: Element) {
|
|
const $shortcodes = $parent.querySelectorAll<HTMLElement>('fixit-encryptor:not(.initialized)')
|
|
|
|
$shortcodes.forEach(($shortcode) => {
|
|
const decryptorHandler = () => {
|
|
const $content = $shortcode.querySelector<HTMLElement>('.decryptor-content')!
|
|
this.#validatePassword($shortcode, ($cipherText, passwordHash, salt) => {
|
|
this.#decryptContent($cipherText, $content, salt)
|
|
})
|
|
}
|
|
|
|
$shortcode.querySelector('.fixit-decryptor-input')?.addEventListener('keydown', (e) => {
|
|
if ((e as KeyboardEvent).key === 'Enter') {
|
|
e.preventDefault()
|
|
decryptorHandler()
|
|
}
|
|
})
|
|
|
|
$shortcode.querySelector('.fixit-decryptor-btn')?.addEventListener('click', (e) => {
|
|
e.preventDefault()
|
|
decryptorHandler()
|
|
})
|
|
|
|
$shortcode.classList.add('initialized')
|
|
})
|
|
}
|
|
|
|
/** Restore decrypted content from localStorage cache if the password has not expired. */
|
|
validateCache() {
|
|
const $content = document.querySelector<HTMLElement>('#content')!
|
|
const $encryptor = document.querySelector<HTMLElement>('article > fixit-encryptor')!
|
|
const $cipherText = $encryptor.querySelector<HTMLElement>('cipher-text')!
|
|
const password = $cipherText.dataset.password
|
|
const cachedStat: CachedStat | null = JSON.parse(window.localStorage?.getItem(`fixit-decryptor/#${location.pathname}`) || 'null')
|
|
|
|
if (!cachedStat || cachedStat.password !== password || cachedStat.expiration < Math.ceil(Date.now() / 1000)) {
|
|
if (cachedStat) {
|
|
window.localStorage?.removeItem(`fixit-decryptor/#${location.pathname}`)
|
|
console.warn('The password has expired, please re-enter!')
|
|
}
|
|
return this
|
|
}
|
|
this.#decryptContent($cipherText, $content, cachedStat.salt)
|
|
return this
|
|
}
|
|
}
|
|
|
|
window.FixItDecryptor = FixItDecryptor
|