obsidian-plugin/jamescliffordspratt_macros
1
0
Fork 0
mirror of https://github.com/jamescliffordspratt/macros.git synced 2026-07-22 05:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove CDN script-injection fallbacks for ZXing (use bundled import only)

Browse source
This commit is contained in:
James Clifford Spratt 2026-06-28 22:32:21 +01:00
parent 347bf6975c
commit 86c331754d
2 changed files with 24 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
RELEASE_NOTES_v2.6.1.md Normal file
View file

@ -0,0 +1,24 @@
# Macros v2.6.1
A maintenance and reliability release: faster food search, two notable bug fixes, and a full code-quality pass to meet Obsidian's new plugin review standards.
## 🐛 Bug fixes
- **Manual food entry — micronutrient section:** Fixed the collapsible micronutrient dropdown not opening when clicked. It now expands and collapses correctly.
- **Live search — "All" tab:** Results no longer vanish when one food database is slow or unavailable. Previously, if Open Food Facts errored, the entire "All" tab returned nothing even though FatSecret and USDA had results; a failing source is now skipped instead of blanking the whole tab.
- Fixed an edge-case error in search-result highlighting for queries containing special characters.
## ⚡ Performance
- **Much faster Open Food Facts search.** Searches now query the main (world) database directly instead of fanning out to several slow regional mirror endpoints — cutting each search from up to ~6 network requests down to 2. This speeds up both the Open Food Facts tab and the combined "All" tab.
- The "All" tab now gives each food source a time budget, so a slow or unresponsive API can no longer stall the whole search.
## 🔧 Under the hood
- **Full type-safety pass:** added proper TypeScript types for every food-database API response (FatSecret, USDA, Open Food Facts) and the internal data flow, removing unsafe `any` usage throughout.
- Brought the codebase fully in line with Obsidian's official plugin guidelines (now passes `eslint-plugin-obsidianmd` with zero issues) and updated the build toolchain (TypeScript 5, latest typescript-eslint).
- Improved popout-window and cross-platform compatibility (`activeDocument` and the Obsidian `Platform` API).
- Moved inline styles into CSS classes for better theme and snippet compatibility.
- Set the minimum Obsidian version to **1.4.10** to match the APIs the plugin actually uses.
> No changes to your data or note format — this release is fully backward compatible.

72
src/utils/BarcodeUtils.ts
View file

@ -70,78 +70,6 @@ export class ZXingLoader {
const ZXing = await import('@zxing/library');
return ZXing as unknown;
},
// Method 3: Try browser-specific CDN with full browser support
async (): Promise<ZXingLibrary> => {
return new Promise((resolve, reject) => {
// Remove any existing script first
const existingScript = activeDocument.querySelector('script[src*="zxing"]');
if (existingScript) {
existingScript.remove();
}
const script = activeDocument.createElement('script');
script.src = 'https://unpkg.com/@zxing/browser@0.1.1/lib/index.min.js';
script.onload = () => {
// Check multiple possible global names
const ZXing = window.ZXingBrowser || window.ZXing || window.ZXingLibrary;
if (ZXing) {
resolve(ZXing);
} else {
reject(new Error('ZXing browser not found on window after CDN load'));
}
};
script.onerror = (_error) => {
reject(new Error('Failed to load ZXing browser from CDN'));
};
activeDocument.head.appendChild(script);
});
},
// Method 4: Try CDN import with specific version
async (): Promise<ZXingLibrary> => {
return new Promise((resolve, reject) => {
// Remove any existing script first
const existingScript = activeDocument.querySelector('script[src*="zxing"]');
if (existingScript) {
existingScript.remove();
}
const script = activeDocument.createElement('script');
script.src = 'https://unpkg.com/@zxing/library@0.20.0/umd/index.min.js';
script.onload = () => {
// Check multiple possible global names
const ZXing = window.ZXing || window.ZXingLibrary || window.ZXingBrowser;
if (ZXing) {
resolve(ZXing);
} else {
reject(new Error('ZXing not found on window after CDN load'));
}
};
script.onerror = (_error) => {
reject(new Error('Failed to load ZXing from CDN'));
};
activeDocument.head.appendChild(script);
});
},
// Method 5: Try alternative CDN
async (): Promise<ZXingLibrary> => {
return new Promise((resolve, reject) => {
const script = activeDocument.createElement('script');
script.src = 'https://cdn.jsdelivr.net/npm/@zxing/library@0.20.0/umd/index.min.js';
script.onload = () => {
const ZXing = window.ZXing || window.ZXingLibrary;
if (ZXing) {
resolve(ZXing);
} else {
reject(new Error('ZXing not found after jsdelivr load'));
}
};
script.onerror = () => reject(new Error('Failed to load ZXing from jsdelivr'));
activeDocument.head.appendChild(script);
});
},
];
let lastError: Error | null = null;