hexo-theme-volantis 5.3.0 → 5.4.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [5.4.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.3.2...v5.4.0) (2022-06-09)
+
+
+### Features
+
+* **VolantisRequest:** Fetch, POST, Get ([ea98dbc](https://github.com/volantis-x/hexo-theme-volantis/commit/ea98dbcc4c3a9bfc0bf6de452e0da826276ff29c))
+
+
+### Bug Fixes
+
+* **fcircle:** CDN ([#765](https://github.com/volantis-x/hexo-theme-volantis/issues/765)) ([35a2e97](https://github.com/volantis-x/hexo-theme-volantis/commit/35a2e971da07eb30e4cb9a0fdeaafe74580cbcd0))
+
+### [5.3.2](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.3.1...v5.3.2) (2022-05-24)
+
+
+### Bug Fixes
+
+* **check:** Check environment first ([f5692dd](https://github.com/volantis-x/hexo-theme-volantis/commit/f5692dd862cb0790a656866853e41908b2967de6))
+* **revisioned:** calcFileHash ([1402b9e](https://github.com/volantis-x/hexo-theme-volantis/commit/1402b9ea7747bdcf60e6190b243970567c033528))
+
+### [5.3.1](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.3.0...v5.3.1) (2022-05-23)
+
+
+### Bug Fixes
+
+* **bbtalk:** js config ([4bb7a12](https://github.com/volantis-x/hexo-theme-volantis/commit/4bb7a12a8d1ab384a223b946e7da1f3ecf60c9ac))
+
 ## [5.3.0](https://github.com/volantis-x/hexo-theme-volantis/compare/v5.2.0...v5.3.0) (2022-05-22)
 
 

package/_config.yml

@@ -59,7 +59,7 @@ cdn:
 cdn_version: true
 # volantis static 静态资源文件 npm 包 CDN 地址 (后面加 "/" )
 # https://github.com/volantis-x/volantis-static
-volantis_static_cdn: https://unpkg.com/volantis-static@0.0.1649552113628/
+volantis_static_cdn: https://unpkg.com/volantis-static@0.0.1654736714924/
 ########################################################################
 # 全局页面字符串替换  A => B (可用于临时修改错字等)
 replace:
@@ -841,7 +841,7 @@ plugins:
   bbtalk:
     # Set `plugins: ["bbtalk"]` to enable in front-matter
     # 不支持 Pjax
-    js: https://unpkg.com/bbtalk@0.1.5/dist/bbtalk.min.js # BBtalk.js
+    js: https://unpkg.com/bbtalk@0.1.5/dist/bbtalk.js # BBtalk.js
     appId: 0KzOX4vC7Jsk6vzUGNeEiUaI-gzGzoHsz # your appID
     appKey: HwCiWuxfpvKiLm4teCUgTIba # your appKEY
     serverURLs: https://bbapi.heson10.com # Request Api 域名
@@ -852,10 +852,10 @@ plugins:
   fcircle:
     # Set `plugins: ["fcircle"]` to enable in front-matter
     # 支持 Pjax
-    api: '' # api 地址
-    message: '与主机通讯中……'  # 占位文字
-    css: 'https://cdn.jsdelivr.net/gh/lmm214/immmmm/themes/hello-friend/static/fcircle-beta.css'
-    js: 'https://cdn.jsdelivr.net/gh/lmm214/immmmm/themes/hello-friend/static/fcircle-beta.js'
+    api: https://fcircle-api.example.com/ # api 地址
+    message: 与主机通讯中……  # 占位文字
+    css: volantis-static/libs/fcircle/fcircle.css
+    js: volantis-static/libs/fcircle/fcircle.js
 
   # 消息提示 
   # izitoast@1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-volantis",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Elegant and powerful theme for Hexo.",
   "main": "package.json",
   "scripts": {

package/scripts/events/lib/check-configuration.js

@@ -6,16 +6,14 @@ module.exports =(hexo) => {
       return `title 未配置！
 请在站点配置 _config.yml 中配置 title
 see: https://hexo.io/zh-cn/docs/configuration
-title not configured!
-see: https://hexo.io/zh-cn/docs/configuration`
+title is not configured!`
     }
     if (!config.description) {
       return `description 未配置！
 请在站点配置 _config.yml 中配置 description
 description主要用于SEO，告诉搜索引擎一个关于您站点的简单描述，通常建议在其中包含您网站的关键词。
 see: https://hexo.io/zh-cn/docs/configuration
-description not configured!
-see: https://hexo.io/zh-cn/docs/configuration`
+description is not configured!`
     }
     if (themeConfig?.search?.service===`google`||themeConfig?.search?.service===`algolia`||themeConfig?.search?.service===`azure`||themeConfig?.search?.service===`baidu`) {
       return `原 google, algolia, azure, baidu 站内搜索 系祖传代码, 且文档丢失, 不便后续维护 在 5.0 版本被移除
@@ -29,15 +27,16 @@ see: https://volantis.js.org/v5/theme-settings/#幻灯片背景-视差滚动效
     }
     if ("valinecount" in themeConfig?.article?.body?.top_meta||"valinecount" in themeConfig?.article?.body?.bottom_meta||"valinecount" in themeConfig?.article?.body?.meta_library) {
       return `ValineCount 在 5.0 版本被移除
-ValineCount has been removed in 5.0 version
+ValineCount has been removed in version 5.0
 see: https://volantis.js.org/v5/theme-settings/#文章布局配置`
     }
     if (themeConfig?.comments?.service=="valine"||themeConfig?.comments?.service=="minivaline") {
       return `Valine 在 5.0 版本被移除
-Valine has been removed in 5.0 version
+Valine has been removed in version 5.0
 see: https://volantis.js.org/v5/theme-settings/#选择评论系统`
     }
   } catch (error) {}
+  hexo.log.info(`Check environment configuration success!`);
   return true;
 };
 

package/scripts/events/lib/check-environment.js

@@ -6,12 +6,6 @@ module.exports =(hexo) => {
     hexo.checkEnvironment=1;
     hexo.log.info(`Checking environment configuration...`);
 
-    // Checking configuration
-    let checkConfiguration = require('./check-configuration')(hexo);
-    if (checkConfiguration!==true) {
-      CheckConfError(hexo,checkConfiguration);
-    }
-
     // Checking environment
     exec('node -v', (err, stdout, stderr) => {
       if (err) {
@@ -38,7 +32,11 @@ module.exports =(hexo) => {
               hexo.log.info(`hexo-cli 版本：${stdout}`);
               CheckError(hexo,`hexo-cli 版本过低，请升级至 4.1 以上版本！`);
             }else{
-              hexo.log.info(`Check environment configuration success!`);
+              // Checking configuration
+              let checkConfiguration = require('./check-configuration')(hexo);
+              if (checkConfiguration!==true) {
+                CheckConfError(hexo,checkConfiguration);
+              }
             }
           }
         });

package/scripts/helpers/revisioned.js

@@ -74,9 +74,15 @@ const revisioned = (filePath) => {
 hexo.extend.helper.register("revisioned", revisioned);
 
 const calcFileHash = async (filePath) => {
-  const buffer = await stream2buffer(hexo.route.get(filePath));
-  const fileHash = crypto.createHash("md5").update(buffer).digest('hex').substring(0, 8);
-  return fileHash;
+  if (hexo.route.get(filePath)) {
+    const buffer = await stream2buffer(hexo.route.get(filePath));
+    const fileHash = crypto.createHash("md5").update(buffer).digest('hex').substring(0, 8);
+    return fileHash;
+  } else {
+    // 随机生成 hash
+    return crypto.randomBytes(16).toString('hex').substring(0, 8);
+  }
+
 };
 
 const replaceRevisionPlaceholder = async () => {
@@ -84,75 +90,78 @@ const replaceRevisionPlaceholder = async () => {
   if (!hexo.theme.config.cdn_version) {
     return;
   }
-
-  const options = hexo.config.new_revision || {};
-  const include = options.include || [];
-
-  const hashPromiseMap = {};
-  const hashMap = {};
-  const doHash = (filePath) =>
-    calcFileHash(filePath).then((hash) => {
-      hashMap[filePath] = hash;
-    });
-
-  await Promise.all(
-    hexo.route.list().map(async (path) => {
-      const [, , extension] = parseFilePath(path);
-      if (![".css", ".js", ".html"].includes(extension)) {
-        return;
-      }
-
-      let fileContent = await readFileAsString(path);
-
-      const regexp = /\.!!revision:([^\)]+?)!!/g;
-      const matchResult = [...fileContent.matchAll(regexp)];
-      if (matchResult.length) {
-        const hashTaskList = [];
-
-        // 异步获取文件 hash
-        matchResult.forEach((group) => {
-          const filePath = group[1];
-          if (!(filePath in hashPromiseMap)) {
-            hashPromiseMap[filePath] = doHash(filePath);
-          }
-          hashTaskList.push(hashPromiseMap[filePath]);
-        });
-
-        // 等待全部 hash 完成
-        await Promise.all(hashTaskList);
-
-        // 替换 placeholder
-        fileContent = fileContent.replace(regexp, function (match, filePath) {
-          if (!(filePath in hashMap)) {
-            throw new Error("file hash not computed");
+  try {
+    const options = hexo.config.new_revision || {};
+    const include = options.include || [];
+  
+    const hashPromiseMap = {};
+    const hashMap = {};
+    const doHash = (filePath) =>
+      calcFileHash(filePath).then((hash) => {
+        hashMap[filePath] = hash;
+      });
+  
+    await Promise.all(
+      hexo.route.list().map(async (path) => {
+        const [, , extension] = parseFilePath(path);
+        if (![".css", ".js", ".html"].includes(extension)) {
+          return;
+        }
+  
+        let fileContent = await readFileAsString(path);
+  
+        const regexp = /\.!!revision:([^\)]+?)!!/g;
+        const matchResult = [...fileContent.matchAll(regexp)];
+        if (matchResult.length) {
+          const hashTaskList = [];
+  
+          // 异步获取文件 hash
+          matchResult.forEach((group) => {
+            const filePath = group[1];
+            if (!(filePath in hashPromiseMap)) {
+              hashPromiseMap[filePath] = doHash(filePath);
+            }
+            hashTaskList.push(hashPromiseMap[filePath]);
+          });
+  
+          // 等待全部 hash 完成
+          await Promise.all(hashTaskList);
+  
+          // 替换 placeholder
+          fileContent = fileContent.replace(regexp, function (match, filePath) {
+            if (!(filePath in hashMap)) {
+              throw new Error("file hash not computed");
+            }
+            return "." + hashMap[filePath];
+          });
+  
+          hexo.route.set(path, fileContent);
+        }
+      })
+    );
+  
+    await Promise.all(
+      hexo.route.list().map(async (path) => {
+        for (let i = 0, len = include.length; i < len; i++) {
+          if (minimatch(path, include[i])) {
+            return doHash(path);
           }
-          return "." + hashMap[filePath];
-        });
-
-        hexo.route.set(path, fileContent);
-      }
-    })
-  );
-
-  await Promise.all(
-    hexo.route.list().map(async (path) => {
-      for (let i = 0, len = include.length; i < len; i++) {
-        if (minimatch(path, include[i])) {
-          return doHash(path);
         }
-      }
-    })
-  );
-
-  await Promise.all(
-    Object.keys(hashMap).map(async (filePath) => {
-      hexo.route.set(
-        getRevisionedFilePath(filePath, hashMap[filePath]),
-        await readFileAsBuffer(filePath)
-      );
-      hexo.route.remove(filePath);
-    })
-  );
+      })
+    );
+  
+    await Promise.all(
+      Object.keys(hashMap).map(async (filePath) => {
+        hexo.route.set(
+          getRevisionedFilePath(filePath, hashMap[filePath]),
+          await readFileAsBuffer(filePath)
+        );
+        hexo.route.remove(filePath);
+      })
+    );
+  } catch (error) {
+    
+  }
 };
 
-hexo.extend.filter.register("after_generate", replaceRevisionPlaceholder,999999999999999999999999999999999999);
+hexo.extend.filter.register("after_generate", replaceRevisionPlaceholder,9999);

package/source/js/app.js

@@ -67,7 +67,7 @@ const VolantisApp = (() => {
   }
 
   fn.event = () => {
-    volantis.dom.$(document.getElementById("scroll-down")).on('click', function () {
+    volantis.dom.$(document.getElementById("scroll-down"))?.on('click', function () {
       fn.scrolltoElement(volantis.dom.bodyAnchor);
     });
 
@@ -1126,3 +1126,47 @@ const DOMController = {
   }
 }
 Object.freeze(DOMController);
+
+const VolantisRequest = {
+  timeoutFetch: (url, ms, requestInit) => {
+    const controller = new AbortController()
+    requestInit.signal?.addEventListener('abort', () => controller.abort())
+    let promise = fetch(url, { ...requestInit, signal: controller.signal })
+    if (ms > 0) {
+      const timer = setTimeout(() => controller.abort(), ms)
+      promise.finally(() => { clearTimeout(timer) })
+    }
+    promise = promise.catch((err) => {
+      throw ((err || {}).name === 'AbortError') ? new Error(`Fetch timeout: ${url}`) : err
+    })
+    return promise
+  },
+
+  Fetch: async (url, requestInit, timeout = 15000) => {
+    const resp = await VolantisRequest.timeoutFetch(url, timeout, requestInit);
+    if (!resp.ok) throw new Error(`Fetch error: ${url} | ${resp.status}`);
+    let json = await resp.json()
+    if (!json.success) throw json
+    return json
+  },
+
+  POST: async (url, data) => {
+    const requestInit = {
+      method: 'POST',
+    }
+    if (data) {
+      const formData = new FormData();
+      Object.keys(data).forEach(key => formData.append(key, String(data[key])))
+      requestInit.body = formData;
+    }
+    const json = await VolantisRequest.Fetch(url, requestInit)
+    return json.data;
+  },
+
+  Get: async (url, data) => {
+    const json = await VolantisRequest.Fetch(url + (data ? (`?${new URLSearchParams(data)}`) : ''), {
+      method: 'GET'
+    })
+  }
+}
+Object.freeze(VolantisRequest);