koishi-plugin-rocom 1.0.6 → 1.0.7

package/lib/render.js

@@ -60,36 +60,53 @@ class Renderer {
         this.resPath = resPath;
     }
     resourceUrl(relativePath) {
-        return (0, node_url_1.pathToFileURL)(node_path_1.default.join(this.getResourceRoot(), relativePath)).href;
+        return (0, node_url_1.pathToFileURL)(node_path_1.default.join(this.getPreferredResourceRoot(), relativePath)).href;
     }
-    getResourceRoot() {
+    getPreferredResourceRoot() {
         const builtRoot = node_path_1.default.join(this.resPath, 'lib');
         if (node_fs_1.default.existsSync(node_path_1.default.join(builtRoot, 'render-templates')))
             return builtRoot;
         return node_path_1.default.join(this.resPath, 'src');
     }
-    getTemplateRoot() {
-        return node_path_1.default.join(this.getResourceRoot(), 'render-templates');
+    getTemplateCandidateRoots() {
+        const roots = [
+            node_path_1.default.join(this.resPath, 'lib'),
+            node_path_1.default.join(this.resPath, 'src'),
+        ];
+        return Array.from(new Set(roots));
     }
-    getTemplatePath(templateName) {
-        const directHtmlPath = node_path_1.default.join(this.getTemplateRoot(), `${templateName}.html`);
-        if (node_fs_1.default.existsSync(directHtmlPath))
-            return directHtmlPath;
-        return node_path_1.default.join(this.getTemplateRoot(), templateName, 'index.html');
+    resolveTemplatePath(templateName) {
+        for (const root of this.getTemplateCandidateRoots()) {
+            const templateRoot = node_path_1.default.join(root, 'render-templates');
+            const directHtmlPath = node_path_1.default.join(templateRoot, `${templateName}.html`);
+            if (node_fs_1.default.existsSync(directHtmlPath)) {
+                return { templatePath: directHtmlPath, resourceRoot: root };
+            }
+            const indexHtmlPath = node_path_1.default.join(templateRoot, templateName, 'index.html');
+            if (node_fs_1.default.existsSync(indexHtmlPath)) {
+                return { templatePath: indexHtmlPath, resourceRoot: root };
+            }
+        }
+        return null;
     }
     getStylePath(templateName) {
-        return node_path_1.default.join(this.getTemplateRoot(), templateName, 'style.css');
+        const resolved = this.resolveTemplatePath(templateName);
+        if (!resolved)
+            return '';
+        return node_path_1.default.join(resolved.resourceRoot, 'render-templates', templateName, 'style.css');
     }
     async renderHtml(ctx, templateName, data) {
         try {
-            const templatePath = this.getTemplatePath(templateName);
-            if (!node_fs_1.default.existsSync(templatePath)) {
-                logger.error(`template file missing: ${templatePath}`);
+            const resolvedTemplate = this.resolveTemplatePath(templateName);
+            if (!resolvedTemplate) {
+                const checked = this.getTemplateCandidateRoots().map(root => node_path_1.default.join(root, 'render-templates', templateName));
+                logger.error(`template file missing: ${checked.join(' | ')}`);
                 return null;
             }
+            const { templatePath, resourceRoot } = resolvedTemplate;
             const templateContent = node_fs_1.default.readFileSync(templatePath, 'utf-8');
             const normalizedTemplateContent = normalizeTemplateResourcePaths(templateContent);
-            const resPathUrl = toDirectoryFileUrl(this.getResourceRoot());
+            const resPathUrl = toDirectoryFileUrl(resourceRoot);
             const renderData = { ...data, _res_path: resPathUrl, pluResPath: resPathUrl };
             const html = template.render(normalizedTemplateContent, renderData);
             if (!ctx.puppeteer?.page) {
@@ -153,6 +170,8 @@ class Renderer {
                     '.student-page',
                     '.merchant-page',
                     '.home-page',
+                    '.pet-panel-page',
+                    '.pet-detail-page',
                 ];
                 let target = null;
                 for (const selector of selectors) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-rocom",
   "description": "洛克王国查询与订阅插件",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/staytomorrow/koishi-plugin-rocom",