mdorigin 0.2.1 → 0.3.2

package/dist/search.js

@@ -1,14 +1,10 @@
-import { rmSync } from 'node:fs';
-import { mkdtemp, mkdir, readdir, readFile, realpath, stat, writeFile, } from 'node:fs/promises';
-import os from 'node:os';
+import { mkdir, readdir, readFile, realpath, stat, writeFile, } from 'node:fs/promises';
 import path from 'node:path';
 import { inferDirectoryContentType } from './core/content-type.js';
 import { getDirectoryIndexCandidates } from './core/directory-index.js';
 import { getDocumentSummary, getDocumentTitle, parseMarkdownDocument, stripMachineOnlyMarkdownComments, stripManagedIndexBlock, } from './core/markdown.js';
 import { isIgnoredContentName } from './core/content-store.js';
 const OVERVIEW_CONTENT_FILENAMES = new Set(['readme.md', 'index.md', 'skill.md']);
-const materializedSearchBundleDirectories = new Set();
-let searchBundleDirectoryCleanupRegistered = false;
 export async function buildSearchBundle(options) {
     const buildModule = await loadIndexbindBuildModule();
     const rootDir = path.resolve(options.rootDir);
@@ -364,13 +360,9 @@ async function loadIndexbindCloudflareModule() {
     }
 }
 async function openWebIndexFromVirtualBundle(bundleEntries, loadResponse) {
-    if (isNodeRuntime()) {
-        return openWebIndexFromMaterializedBundle(bundleEntries, loadResponse);
-    }
     const baseUrl = 'https://mdorigin-search.invalid/';
-    const originalFetch = globalThis.fetch;
     const bundleMap = new Map(bundleEntries.map((entry) => [new URL(entry.path, baseUrl).toString(), entry]));
-    globalThis.fetch = async (input, init) => {
+    const bundleFetch = async (input, init) => {
         const requestUrl = typeof input === 'string'
             ? input
             : input instanceof URL
@@ -380,23 +372,22 @@ async function openWebIndexFromVirtualBundle(bundleEntries, loadResponse) {
         if (entry) {
             return loadResponse(entry);
         }
-        return originalFetch(input, init);
+        return fetch(input, init);
     };
     try {
-        try {
-            const cloudflareModule = await loadIndexbindCloudflareModule();
-            return await cloudflareModule.openWebIndex(new URL(baseUrl));
-        }
-        catch (error) {
-            if (!isCloudflareWasmImportError(error)) {
-                throw error;
-            }
-            const webModule = await loadIndexbindWebModule();
-            return await webModule.openWebIndex(new URL(baseUrl));
-        }
+        const cloudflareModule = await loadIndexbindCloudflareModule();
+        return await cloudflareModule.openWebIndex(new URL(baseUrl), {
+            fetch: bundleFetch,
+        });
     }
-    finally {
-        globalThis.fetch = originalFetch;
+    catch (error) {
+        if (!isCloudflareWasmImportError(error)) {
+            throw error;
+        }
+        const webModule = await loadIndexbindWebModule();
+        return await webModule.openWebIndex(new URL(baseUrl), {
+            fetch: bundleFetch,
+        });
     }
 }
 async function openSearchContextFromDirectory(indexDir) {
@@ -414,25 +405,6 @@ async function openSearchContextFromBundle(bundleEntries, loadResponse) {
     ]);
     return { index, documentsById };
 }
-async function openWebIndexFromMaterializedBundle(bundleEntries, loadResponse) {
-    const tempDir = await mkdtemp(path.join(os.tmpdir(), 'mdorigin-search-bundle-'));
-    registerMaterializedSearchBundleDirectory(tempDir);
-    for (const entry of bundleEntries) {
-        const response = await loadResponse(entry);
-        if (!response.ok) {
-            throw new Error(`Failed to materialize search bundle file ${entry.path}: ${response.status} ${response.statusText}`);
-        }
-        const outputPath = resolveMaterializedSearchBundlePath(tempDir, entry.path);
-        await mkdir(path.dirname(outputPath), { recursive: true });
-        if (entry.mediaType.startsWith('text/') || entry.mediaType.includes('json')) {
-            await writeFile(outputPath, await response.text(), 'utf8');
-            continue;
-        }
-        await writeFile(outputPath, new Uint8Array(await response.arrayBuffer()));
-    }
-    const webModule = await loadIndexbindWebModule();
-    return webModule.openWebIndex(tempDir);
-}
 function createInlineSearchBundleResponse(entry) {
     const headers = new Headers({ 'content-type': entry.mediaType });
     const binaryBody = decodeBase64(entry.base64 ?? '');
@@ -457,7 +429,9 @@ function isCloudflareWasmImportError(error) {
         visited.add(current);
         if (current instanceof Error) {
             const currentMessage = current.message;
-            if (targetMessages.some((message) => currentMessage.includes(message))) {
+            if (targetMessages.some((message) => currentMessage.includes(message)) ||
+                (currentMessage.includes('Cannot find module') &&
+                    currentMessage.includes('indexbind_wasm_bg.js'))) {
                 return true;
             }
         }
@@ -539,48 +513,6 @@ async function loadBundleResponseText(entry, loadResponse) {
     }
     return response.text();
 }
-function isNodeRuntime() {
-    return (typeof process !== 'undefined' &&
-        typeof process.versions === 'object' &&
-        typeof process.versions.node === 'string');
-}
-function resolveMaterializedSearchBundlePath(baseDir, entryPath) {
-    if (path.isAbsolute(entryPath)) {
-        throw new Error(`Search bundle path must be relative: ${entryPath}`);
-    }
-    const normalizedEntryPath = entryPath.replaceAll('/', path.sep);
-    const outputPath = path.resolve(baseDir, normalizedEntryPath);
-    const relativeOutputPath = path.relative(baseDir, outputPath);
-    if (relativeOutputPath === '' ||
-        relativeOutputPath.startsWith(`..${path.sep}`) ||
-        relativeOutputPath === '..' ||
-        path.isAbsolute(relativeOutputPath)) {
-        throw new Error(`Search bundle path escapes materialized bundle directory: ${entryPath}`);
-    }
-    return outputPath;
-}
-function registerMaterializedSearchBundleDirectory(directoryPath) {
-    materializedSearchBundleDirectories.add(directoryPath);
-    if (searchBundleDirectoryCleanupRegistered || !isNodeRuntime()) {
-        return;
-    }
-    const cleanup = () => {
-        for (const stagedDirectory of materializedSearchBundleDirectories) {
-            rmSync(stagedDirectory, { recursive: true, force: true });
-        }
-        materializedSearchBundleDirectories.clear();
-    };
-    process.once('exit', cleanup);
-    process.once('SIGINT', () => {
-        cleanup();
-        process.exit(130);
-    });
-    process.once('SIGTERM', () => {
-        cleanup();
-        process.exit(143);
-    });
-    searchBundleDirectoryCleanupRegistered = true;
-}
 function rerankSearchHits(hits) {
     const remaining = [...hits];
     const ordered = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdorigin",
-  "version": "0.2.1",
+  "version": "0.3.2",
   "type": "module",
   "description": "Markdown-first publishing for humans and agents.",
   "repository": {
@@ -78,6 +78,6 @@
     "typescript": "^5.9.2"
   },
   "optionalDependencies": {
-    "indexbind": "^0.3.0"
+    "indexbind": "^0.3.3"
   }
 }