@mdfriday/foundry 25.9.1 → 25.9.2

package/README.md

@@ -11,6 +11,13 @@ UNLICENSED - This is a private package for commercial use only. Copyright (c) 20
 zip -r clean.zip . -x "*/.DS_Store" -x "__MACOSX/*" -x "*/.*"
 
 ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page /Users/weisun/github/mdfriday/foundry/example/ws/proj/content
+ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page-zh /Users/weisun/github/mdfriday/foundry/example/ws/proj/content.zh
+ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page-de /Users/weisun/github/mdfriday/foundry/example/ws/proj/content.de
+ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page-es /Users/weisun/github/mdfriday/foundry/example/ws/proj/content.es
+ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page-fr /Users/weisun/github/mdfriday/foundry/example/ws/proj/content.fr
+ln -s /Users/weisun/github/mdfriday/foundry/example/ws/bk/content-ob-page-ja /Users/weisun/github/mdfriday/foundry/example/ws/proj/content.ja
+
+
 ln -s /Users/sunwei/github/mdfriday/foundry/example/ws/bk/content /Users/sunwei/github/mdfriday/foundry/example/ws/proj/content
 ln -s /Users/sunwei/github/mdfriday/foundry/example/ws/bk/content.zh /Users/sunwei/github/mdfriday/foundry/example/ws/proj/content.zh
 

package/dist/internal/domain/resources/entity/http.d.ts

@@ -1,13 +1,20 @@
 /**
  * HttpClient for fetching remote content via HTTP/HTTPS
+ * Uses Node.js http/https modules to avoid CORS issues in Obsidian plugin environment
  * Focuses solely on HTTP requests and returns string content
  */
 export declare class HttpClient {
+    private defaultTimeout;
+    private defaultHeaders;
     /**
-     * Fetch content from a remote URI
+     * Fetch content from a remote URI using Node.js http/https modules
      * @param uri - The URI to fetch content from
+     * @param options - Optional request configuration
      * @returns Promise<string | null> - The fetched content as string or null if failed
      */
-    fromRemote(uri: string): Promise<string | null>;
+    fromRemote(uri: string, options?: {
+        headers?: Record<string, string>;
+        timeout?: number;
+    }): Promise<string | null>;
 }
 //# sourceMappingURL=http.d.ts.map

package/dist/internal/domain/resources/entity/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../internal/domain/resources/entity/http.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,qBAAa,UAAU;IACrB;;;;OAIG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAqBtD"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../internal/domain/resources/entity/http.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAEpB;IAEF;;;;;OAKG;IACG,UAAU,CACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GACA,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAoF1B"}

package/dist/internal/domain/resources/entity/http.js

@@ -1,33 +1,130 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 const log_1 = require("../../../../pkg/log");
+const http = __importStar(require("http"));
+const https = __importStar(require("https"));
 const log = (0, log_1.getDomainLogger)('resources', { component: 'http-client' });
 /**
  * HttpClient for fetching remote content via HTTP/HTTPS
+ * Uses Node.js http/https modules to avoid CORS issues in Obsidian plugin environment
  * Focuses solely on HTTP requests and returns string content
  */
 class HttpClient {
+    constructor() {
+        this.defaultTimeout = 30000; // 30 seconds
+        this.defaultHeaders = {
+            'User-Agent': 'MDFriday-Resources/1.0.0',
+        };
+    }
     /**
-     * Fetch content from a remote URI
+     * Fetch content from a remote URI using Node.js http/https modules
      * @param uri - The URI to fetch content from
+     * @param options - Optional request configuration
      * @returns Promise<string | null> - The fetched content as string or null if failed
      */
-    async fromRemote(uri) {
-        try {
-            const response = await fetch(uri);
-            if (!response.ok) {
-                log.errorf("❌ [HttpClient.fromRemote] HTTP error %d when fetching %s: %s", response.status, uri, response.statusText);
-                return null;
+    async fromRemote(uri, options) {
+        return new Promise((resolve) => {
+            try {
+                // Use new URL constructor to parse the URI
+                const parsedUrl = new URL(uri);
+                const isHttps = parsedUrl.protocol === 'https:';
+                const httpModule = isHttps ? https : http;
+                const requestHeaders = {
+                    ...this.defaultHeaders,
+                    ...options?.headers,
+                };
+                const requestOptions = {
+                    hostname: parsedUrl.hostname,
+                    port: parsedUrl.port || (isHttps ? 443 : 80),
+                    path: parsedUrl.pathname + parsedUrl.search,
+                    method: 'GET',
+                    headers: requestHeaders,
+                    timeout: options?.timeout || this.defaultTimeout,
+                };
+                const request = httpModule.request(requestOptions, (response) => {
+                    // Handle redirects
+                    if (response.statusCode && response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
+                        log.infof("🔄 [HttpClient.fromRemote] Redirecting from %s to %s", uri, response.headers.location);
+                        // Recursively handle redirect
+                        this.fromRemote(response.headers.location, options).then(resolve);
+                        return;
+                    }
+                    if (!response.statusCode || response.statusCode < 200 || response.statusCode >= 300) {
+                        log.errorf("❌ [HttpClient.fromRemote] HTTP error %d when fetching %s: %s", response.statusCode || 0, uri, response.statusMessage || 'Unknown error');
+                        resolve(null);
+                        return;
+                    }
+                    const chunks = [];
+                    response.on('data', (chunk) => {
+                        chunks.push(chunk);
+                    });
+                    response.on('end', () => {
+                        try {
+                            const buffer = Buffer.concat(chunks);
+                            const content = buffer.toString('utf8');
+                            log.infof("✅ [HttpClient.fromRemote] Successfully fetched %d bytes from %s", content.length, uri);
+                            resolve(content);
+                        }
+                        catch (error) {
+                            log.errorf("❌ [HttpClient.fromRemote] Error converting response to string from %s: %s", uri, error);
+                            resolve(null);
+                        }
+                    });
+                    response.on('error', (error) => {
+                        log.errorf("❌ [HttpClient.fromRemote] Response error when fetching %s: %s", uri, error.message);
+                        resolve(null);
+                    });
+                });
+                request.on('error', (error) => {
+                    log.errorf("❌ [HttpClient.fromRemote] Request error when fetching %s: %s", uri, error.message);
+                    resolve(null);
+                });
+                request.on('timeout', () => {
+                    request.destroy();
+                    log.errorf("❌ [HttpClient.fromRemote] Request timeout when fetching %s", uri);
+                    resolve(null);
+                });
+                request.end();
+            }
+            catch (error) {
+                log.errorf("❌ [HttpClient.fromRemote] Error fetching content from %s: %s", uri, error);
+                resolve(null);
             }
-            const content = await response.text();
-            log.infof("✅ [HttpClient.fromRemote] Successfully fetched %d bytes from %s", content.length, uri);
-            return content;
-        }
-        catch (error) {
-            log.errorf("❌ [HttpClient.fromRemote] Error fetching content from %s: %s", uri, error);
-            return null;
-        }
+        });
     }
 }
 exports.HttpClient = HttpClient;

package/dist/internal/domain/resources/entity/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../internal/domain/resources/entity/http.ts"],"names":[],"mappings":";;;AAAA,kCAA2C;AAE3C,MAAM,GAAG,GAAG,IAAA,qBAAe,EAAC,WAAW,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;AAEvE;;;GAGG;AACH,MAAa,UAAU;IACrB;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,GAAW;QAC1B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;YAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,GAAG,CAAC,MAAM,CAAC,8DAA8D,EACvE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEtC,GAAG,CAAC,KAAK,CAAC,iEAAiE,EACzE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAEvB,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,8DAA8D,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACvF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF;AA3BD,gCA2BC"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../internal/domain/resources/entity/http.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdfriday/foundry",
-  "version": "25.9.1",
+  "version": "25.9.2",
   "description": "The core engine of MDFriday. Convert Markdown and shortcodes into fully themed static sites – Hugo-style, powered by TypeScript.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",