lupine.api 1.1.65 → 1.1.67

package/dev/cp-index-html.js

@@ -29,7 +29,7 @@ const readWebConfig = async (outdirData) => {
 
 const metaTextStart = '<!--META-ENV-START-->';
 const metaTextEnd = '<!--META-ENV-END-->';
-exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThemeName, outdirData) => {
+exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThemeName, outdirData, outdirSub) => {
   const f1 = await fileSizeAndTime(htmlFile);
   const f2 = await fileSizeAndTime(outputFile);
 
@@ -40,7 +40,9 @@ exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThe
   // when it's isMobile, need to update env and configs => no configs as mobile app fetches it from api
   if (!f2 || f2.mtime.getTime() !== chgTime || isMobile) {
     const inHtml = await fs.readFile(htmlFile, 'utf-8');
-    let outStr = inHtml.replace(/{hash}/gi, new Date().getTime().toString(36));
+    let outStr = inHtml
+      .replace(/\{hash\}/gi, new Date().getTime().toString(36))
+      .replace(/\{SUBDIR\}/gi, outdirSub && outdirSub !== '/' ? outdirSub : '');
     if (isMobile) {
       // const outStr = inHtml.replace(/{hash}/gi, new Date().getTime().toString(36)).replace('\<\!--META-ENV--\>', JSON.stringify(envWeb));
       // env is replaced here for the mobile app. And the env is replaced again for the web app at each startup

package/dev/markdown-build.js

@@ -9,7 +9,10 @@ const slugify = (text) =>
     .replace(/[^\w\u4e00-\u9fa5]+/g, '-')
     .replace(/^-+|-+$/g, '');
 
-const cleanMarkdown = (text) => text.replace(/[`*?^]/g, '');
+const cleanMarkdown = (text) =>
+  text
+    .replace(/\[([^\]]+)\]\([^\)]+\)/g, '$1') // remove links: [text](url) -> text
+    .replace(/[`*?^]/g, ''); // remove other markdown symbols
 
 marked.use({
   renderer: {
@@ -22,9 +25,7 @@ marked.use({
   },
 });
 
-const builtFiles = new Map(); // path -> { route, importPath, data, headings }
-
-function processFile(filePath, indir, outdir, relativePath) {
+function processFile(builtFiles, filePath, indir, outdir, relativePath) {
   if (builtFiles.has(filePath)) return builtFiles.get(filePath);
 
   // Mark as processing to handle potential cycles (though minimal risk with hierarchy)
@@ -32,8 +33,7 @@ function processFile(filePath, indir, outdir, relativePath) {
   builtFiles.set(filePath, null);
 
   if (!fs.existsSync(filePath)) {
-    console.warn(`File not found: ${filePath}`);
-    return null;
+    throw new Error(`File not found: ${filePath}`);
   }
 
   const contentRaw = fs.readFileSync(filePath, 'utf8');
@@ -90,7 +90,7 @@ function processFile(filePath, indir, outdir, relativePath) {
         const subAbs = path.join(indir, subRelative);
 
         // Recursively build the submenu index
-        const subFileInfo = processFile(subAbs, indir, outdir, subRelative);
+        const subFileInfo = processFile(builtFiles, subAbs, indir, outdir, subRelative);
 
         if (subFileInfo && subFileInfo.data && subFileInfo.data.sidebar) {
           if (subFileInfo.data.title) {
@@ -120,7 +120,7 @@ function processFile(filePath, indir, outdir, relativePath) {
           subRelative += '.md';
         }
 
-        processFile(subAbs, indir, outdir, subRelative);
+        processFile(builtFiles, subAbs, indir, outdir, subRelative);
         result.push(item);
       } else if (typeof item === 'object' && item.items) {
         item.items = expandSidebar(item.items);
@@ -164,6 +164,8 @@ const markdownProcessOnEnd = async (indir, outdir) => {
   try {
     if (!indir || !outdir) return;
 
+    // 重新变异的时候必须清除缓存，否则会读取到旧的缓存数据
+    matter.clearCache();
     const langPath = path.join(indir, 'index.md');
     if (!fs.existsSync(langPath)) {
       console.warn(`[dev-markdown] No index.md found in ${indir}`);
@@ -171,7 +173,7 @@ const markdownProcessOnEnd = async (indir, outdir) => {
     }
 
     const langContent = fs.readFileSync(langPath, 'utf8');
-    const { data, content: markdown } = matter(langContent);
+    const { data } = matter(langContent);
     const lang = data.lang;
     if (!lang || lang.length < 1 || !lang[0].id) {
       console.warn(`[dev-markdown] No lang found in ${langPath}`);
@@ -183,11 +185,11 @@ const markdownProcessOnEnd = async (indir, outdir) => {
       fs.mkdirSync(outdir, { recursive: true });
     }
 
-    builtFiles.clear();
+    const builtFiles = new Map();
 
     // Process root index.md to provide global config (languages) at '/'
     if (fs.existsSync(langPath)) {
-      const rootInfo = processFile(langPath, indir, outdir, 'index.md');
+      const rootInfo = processFile(builtFiles, langPath, indir, outdir, 'index.md');
       if (rootInfo) {
         rootInfo.route = '/';
         // Re-key as '/' to ensure it's accessible as markdownConfig['/']
@@ -200,7 +202,7 @@ const markdownProcessOnEnd = async (indir, outdir) => {
       const fullPath = path.join(indir, entry.id, 'index.md');
       if (fs.existsSync(fullPath)) {
         const relativePath = path.join(entry.id, 'index.md');
-        processFile(fullPath, indir, outdir, relativePath);
+        processFile(builtFiles, fullPath, indir, outdir, relativePath);
       }
     });
 

package/dev/send-request.js

@@ -1,12 +1,12 @@
 exports.sendRequest = async (url, waitSeconds) => {
   try {
-    // need node 18
+    // need node 18+
     const ret = await fetch(url, {
       signal: AbortSignal.timeout(waitSeconds * 1000),
     });
     waitSeconds > 0 && (await new Promise((r) => setTimeout(r, waitSeconds * 1000)));
     return ret;
   } catch (err) {
-    console.error('sendRequest error: ', err);
+    console.error(`sendRequest ${url} failed: ${err.message}`);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lupine.api",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "license": "MIT",
   "author": "uuware.com",
   "homepage": "https://github.com/uuware/lupine.js",

package/src/app/app-start.ts

@@ -115,6 +115,7 @@ class AppStart {
     const httpsPort = config.httpsPort;
     const sslKeyPath = config.sslKeyPath || '';
     const sslCrtPath = config.sslCrtPath || '';
+    const domainCerts = config.domainCerts;
 
     console.log(`${process.pid} - Starting Web Server, httpPort: ${httpPort}, httpsPort: ${httpsPort}`);
     // for dev to refresh the FE or stop the server
@@ -123,7 +124,7 @@ class AppStart {
     }
 
     const httpServer = httpPort && this.webServer!.startHttp(httpPort, bindIp);
-    const heepsServer = httpsPort && this.webServer!.startHttps(httpsPort, bindIp, sslKeyPath, sslCrtPath);
+    const heepsServer = httpsPort && this.webServer!.startHttps(httpsPort, bindIp, sslKeyPath, sslCrtPath, domainCerts);
 
     process.on('SIGTERM', () => {
       console.log(`${process.pid} - Worker closing servers...`);

package/src/app/web-server.ts

@@ -4,6 +4,7 @@ import { WebListener } from './web-listener';
 import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';
+import * as tls from 'tls';
 import { IncomingMessage, ServerResponse } from 'http';
 import { Duplex } from 'stream';
 import { WebProcessor } from './web-processor';
@@ -58,7 +59,21 @@ export class WebServer {
 
   // multi domain https hosting
   // https://stackoverflow.com/questions/38162077/expressjs-multi-domain-https-hosting
-  startHttps(httpsPort: number, bindIp?: string, sslKeyPath?: string, sslCrtPath?: string, timeout?: number) {
+
+  // domainCerts = {
+  //   'example.com': {
+  //     key: fs.readFileSync(sslKeyPath, 'utf8'),
+  //     cert: fs.readFileSync(sslCrtPath, 'utf8'),
+  //   },
+  // };
+  startHttps(
+    httpsPort: number,
+    bindIp?: string,
+    sslKeyPath?: string,
+    sslCrtPath?: string,
+    domainCerts?: Record<string, { key: string; cert: string }>,
+    timeout?: number
+  ) {
     const httpsOptions: ServerOptions = {};
     if (sslKeyPath && fs.existsSync(sslKeyPath) && sslCrtPath && fs.existsSync(sslCrtPath)) {
       logger.info('Load site ssl certificate.');
@@ -66,16 +81,55 @@ export class WebServer {
       // Even though that set won't be used if SNI provides a hostname.
       httpsOptions['key'] = fs.readFileSync(sslKeyPath, 'utf8');
       httpsOptions['cert'] = fs.readFileSync(sslCrtPath, 'utf8');
-      // httpsOptions['ca'] = 'pem';
-      // httpsOptions['SNICallback'] = function (domain, cb) {
-      //   if (typeof sites[domain] === "undefined") {
-      //     cb(new Error("domain not found"), null);
-      //     console.log("Error: domain not found: " + domain);
 
-      //   } else {
-      //     cb(null, sites[domain].context);
-      //   }
-      // };
+      // load domain certificates
+      const secureContexts: Record<string, tls.SecureContext> = {};
+      if (domainCerts) {
+        const start = Date.now();
+        let certCount = 0;
+        const fileCache = new Map<string, string>();
+
+        const getFileContent = (path: string) => {
+          if (!fileCache.has(path)) {
+            fileCache.set(path, fs.readFileSync(path, 'utf8'));
+          }
+          return fileCache.get(path)!;
+        };
+
+        for (const [domain, paths] of Object.entries(domainCerts)) {
+          if (paths.key && paths.cert && fs.existsSync(paths.key) && fs.existsSync(paths.cert)) {
+            try {
+              const key = getFileContent(paths.key);
+              const cert = getFileContent(paths.cert);
+              secureContexts[domain] = tls.createSecureContext({ key, cert });
+              certCount++;
+            } catch (err) {
+              logger.error(`Failed to load cert for ${domain}`, err as any);
+            }
+          }
+        }
+        logger.info(`Loaded ${certCount} domain scopes in ${Date.now() - start}ms`);
+      }
+
+      httpsOptions.SNICallback = (domain, cb) => {
+        let ctx: tls.SecureContext | undefined = secureContexts[domain];
+        if (!ctx) {
+          // find the closest domain
+          const parts = domain.split('.');
+          while (parts.length > 0 && !ctx) {
+            parts.shift();
+            const parent = parts.join('.');
+            if (parent) ctx = secureContexts[parent];
+          }
+        }
+        // Fallback or exact
+        if (ctx) {
+          cb(null, ctx);
+        } else {
+          // Fallback to default (options.key/cert)
+          cb(null, undefined);
+        }
+      };
     } else {
       logger.warn(
         `Ssl certificate is not defined or doesn't exist, key file: ${sslKeyPath}, certificate file: ${sslCrtPath}`

package/src/models/app-start-props.ts

@@ -7,6 +7,7 @@ export type InitStartProps = {
   httpsPort: number;
   sslKeyPath: string;
   sslCrtPath: string;
+  domainCerts: Record<string, { key: string; cert: string }>;
 };
 
 export type AppStartProps = {