hexo-theme-volantis 5.8.1 → 6.0.0

package/layout/_partial/scripts/global.ejs

@@ -1,51 +1,109 @@
 <script>
   /************这个文件存放不需要重载的全局变量和全局函数*********/
-  window.volantis = {}; // volantis 全局变量
-  volantis.debug = "<%- theme.debug %>"; // 调试模式
-  volantis.dom = {}; // 页面Dom see: /source/js/app.js etc.
+  // window.volantis = {}; // volantis 全局变量
+/**
+ * 内存安全的全局 volantis 对象实现
+ * 特性：
+ * 1. 支持 window.volantis.xxx = yyy 直观赋值语法
+ * 2. 基于 WeakMap 存储数据，自动回收内存
+ * 3. 支持属性枚举（如 Object.keys(window.volantis)）
+ * 4. 支持删除属性（delete window.volantis.xxx）
+ */
+(function initializeVolantis() {
+  // 1. 初始化 WeakMap 存储实际数据（键：volantisProxy 实例，值：属性键值对）
+  const volantisDataStore = new WeakMap();
 
-  volantis.GLOBAL_CONFIG ={
-    debug: <%- JSON.stringify(theme.debug) %>,
-    cdn: <%- JSON.stringify(theme.cdn.map) %>,
-    default: <%- JSON.stringify(theme.default) %>,
-    lastupdate: new Date(<%- theme.getStartTime %>),
-    sidebar: {
-      for_page: <%- JSON.stringify(theme.sidebar.for_page) %>,
-      for_post: <%- JSON.stringify(theme.sidebar.for_post) %>,
-      webinfo: {
-        lastupd: {
-          enable: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.lastupd.enable) %>,
-          friendlyShow: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.lastupd.friendlyShow) %>
-        },
-        runtime: {
-          data: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.runtime.data) %>,
-          unit: <%- JSON.stringify(theme.sidebar.widget_library.webinfo.type.runtime.unit) %>
-        }
+  // 2. 创建 Proxy 代理处理属性访问
+  const volantisProxy = new Proxy({}, {
+    /**
+     * 拦截属性读取（如 window.volantis.dom）
+     * @param {Object} target - 代理目标对象（仅作为占位符，不存储数据）
+     * @param {string} prop - 访问的属性名
+     * @returns {any} 属性值或 undefined
+     */
+    get(target, prop) {
+      const data = volantisDataStore.get(volantisProxy);
+      return data?.[prop]; // 使用可选链避免数据未初始化时的错误
+    },
+
+    /**
+     * 拦截属性赋值（如 window.volantis.dom = "a"）
+     * @param {Object} target - 代理目标对象
+     * @param {string} prop - 赋值的属性名
+     * @param {any} value - 赋值的属性值
+     * @returns {boolean} 赋值是否成功
+     */
+    set(target, prop, value) {
+      // 初始化数据容器（若不存在）
+      if (!volantisDataStore.has(volantisProxy)) {
+        volantisDataStore.set(volantisProxy, Object.create(null)); // 使用无原型对象避免原型污染
+      }
+      // 存储属性值
+      const data = volantisDataStore.get(volantisProxy);
+      data[prop] = value;
+      return true; // 符合 Proxy 规范，返回成功标志
+    },
+
+    /**
+     * 拦截属性删除（如 delete window.volantis.dom）
+     * @param {Object} target - 代理目标对象
+     * @param {string} prop - 要删除的属性名
+     * @returns {boolean} 删除是否成功
+     */
+    deleteProperty(target, prop) {
+      const data = volantisDataStore.get(volantisProxy);
+      if (!data || !Object.prototype.hasOwnProperty.call(data, prop)) {
+        return false; // 属性不存在，删除失败
+      }
+      delete data[prop];
+      // 若数据为空，清理 WeakMap 条目（优化内存回收）
+      if (Object.keys(data).length === 0) {
+        volantisDataStore.delete(volantisProxy);
       }
+      return true;
     },
-    plugins: {
-      message: <%- JSON.stringify(theme.plugins.message) %>,
-      fancybox: <%- JSON.stringify(theme.plugins.fancybox) %>,
-      <% if(theme.plugins.aplayer.enable) { %>
-      aplayer: {
-        id: <%- JSON.stringify(theme.plugins.aplayer.id) %>,
-        enable:<%- JSON.stringify(theme.plugins.aplayer.enable) %>
-      },
-      <% } %>
-      <% if(theme.rightmenu.enable) { %>
-      rightmenu: {
-        faicon: <%- JSON.stringify(theme.rightmenu.faicon) %>,
-        layout: <%- JSON.stringify(theme.rightmenu.layout) %>,
-        music_alwaysShow: <%- JSON.stringify(theme.rightmenu.music.alwaysShow) %>,
-        customPicUrl: <%- JSON.stringify(theme.rightmenu.customPicUrl) %>
-      },
-      <% } %>
-      <% if(theme.rightmenus.enable) { %>
-      rightmenus: <%- JSON.stringify(theme.rightmenus) %>
-      <% } %>
+
+    /**
+     * 拦截属性枚举（如 Object.keys(window.volantis)）
+     * @param {Object} target - 代理目标对象
+     * @returns {string[]} 可枚举的属性名数组
+     */
+    ownKeys(target) {
+      const data = volantisDataStore.get(volantisProxy);
+      return data ? Object.keys(data) : [];
+    },
+
+    /**
+     * 拦截属性描述符查询（如 Object.getOwnPropertyDescriptor）
+     * @param {Object} target - 代理目标对象
+     * @param {string} prop - 属性名
+     * @returns {PropertyDescriptor|undefined} 属性描述符
+     */
+    getOwnPropertyDescriptor(target, prop) {
+      const data = volantisDataStore.get(volantisProxy);
+      if (!data || !Object.prototype.hasOwnProperty.call(data, prop)) {
+        return undefined;
+      }
+      return {
+        value: data[prop],
+        writable: true,
+        enumerable: true,
+        configurable: true
+      };
     }
-  }
+  });
+
+  // 3. 挂载到 window 对象，暴露全局访问入口
+  Object.defineProperty(window, 'volantis', {
+    value: volantisProxy,
+    writable: true, // 允许后续手动设置为 null 触发清理
+    configurable: true,
+    enumerable: true
+  });
 
+})();
+  volantis.debug = "<%- theme.debug %>"; // 调试模式
+  volantis.dom = {}; // 页面Dom see: /source/js/app.js etc.
   /******************** volantis.EventListener ********************************/
   // 事件监听器 see: /source/js/app.js
   volantis.EventListener = {}
@@ -62,7 +120,8 @@
     volantis.EventListener.list.forEach(function (i) {
       i.ele.removeEventListener(i.type, i.f, false)
     })
-    volantis.EventListener.list = []
+    volantis.EventListener.list = null;
+    volantis.EventListener.list = [];
   }
   /******************** volantis.dom.$ ********************************/
   // 注：这里没有选择器，也没有forEach一次只处理一个dom，这里重新封装主题常用的dom方法，返回的是dom对象，对象包含了以下方法，同时保留dom的原生API
@@ -147,18 +206,18 @@
     this.push = (fn, name, setRequestAnimationFrame = true) => {
       let myfn = fn
       if (setRequestAnimationFrame) {
-        myfn = ()=>{
+        myfn = () => {
           volantis.requestAnimationFrame(fn)
         }
       }
       var f = new Item(myfn, name);
       this.list.push(f);
     };
-    this.remove = (name) =>{
+    this.remove = (name) => {
       for (let index = 0; index < this.list.length; index++) {
         const e = this.list[index];
         if (e.name == name) {
-          this.list.splice(index,1);
+          this.list.splice(index, 1);
         }
       }
     }
@@ -280,7 +339,7 @@
   volantis.import = {
     jQuery: () => {
       if (typeof jQuery == "undefined") {
-        return volantis.js("<%- theme.plugins.jquery %>")
+        return volantis.js("<%- theme.cdn.jquery %>")
       } else {
         return new Promise(resolve => {
           resolve()
@@ -291,19 +350,19 @@
   /********************** requestAnimationFrame ********************************/
   // 1、requestAnimationFrame 会把每一帧中的所有 DOM 操作集中起来，在一次重绘或回流中就完成，并且重绘或回流的时间间隔紧紧跟随浏览器的刷新频率，一般来说，这个频率为每秒60帧。
   // 2、在隐藏或不可见的元素中，requestAnimationFrame 将不会进行重绘或回流，这当然就意味着更少的的 cpu，gpu 和内存使用量。
-  volantis.requestAnimationFrame = (fn)=>{
+  volantis.requestAnimationFrame = (fn) => {
     if (!window.requestAnimationFrame) {
       window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame;
     }
     window.requestAnimationFrame(fn)
   }
   /************************ layoutHelper *****************************************/
-  volantis.layoutHelper = (helper, html, opt)=>{
-    opt = Object.assign({clean:false, pjax:true}, opt)
+  volantis.layoutHelper = (helper, html, opt) => {
+    opt = Object.assign({ clean: false, pjax: true }, opt)
     function myhelper(helper, html, clean) {
       volantis.tempDiv = document.createElement("div");
       volantis.tempDiv.innerHTML = html;
-      let layoutHelper = document.querySelector("#layoutHelper-"+helper)
+      let layoutHelper = document.querySelector("#layoutHelper-" + helper)
       if (layoutHelper) {
         if (clean) {
           layoutHelper.innerHTML = ""
@@ -313,9 +372,9 @@
     }
     myhelper(helper, html, opt.clean)
     if (opt.pjax) {
-      volantis.pjax.push(()=>{
+      volantis.pjax.push(() => {
         myhelper(helper, html, opt.clean)
-      },"layoutHelper-"+helper)
+      }, "layoutHelper-" + helper)
     }
   }
   /****************************** 滚动事件处理 ****************************************/
@@ -327,7 +386,7 @@
     push: volantis.scroll.engine.push,
   });
   // 滚动条距离顶部的距离
-  volantis.scroll.getScrollTop = () =>{
+  volantis.scroll.getScrollTop = () => {
     let scrollPos;
     if (window.pageYOffset) {
       scrollPos = window.pageYOffset;
@@ -338,6 +397,23 @@
     }
     return scrollPos;
   }
+  volantis.scroll.scrollHeight = function () {
+    return Math.max(
+      document.body.scrollHeight,
+      document.documentElement.scrollHeight,
+    )
+  }
+  volantis.scroll.offsetHeight = function () {
+    return Math.max(
+      document.body.offsetHeight,
+      document.documentElement.offsetHeight,
+      document.body.clientHeight,
+      document.documentElement.clientHeight
+    )
+  }
+  volantis.scroll.progress = function () {
+    return volantis.scroll.getScrollTop() / (volantis.scroll.scrollHeight() - volantis.scroll.offsetHeight())
+  }
   // 使用 requestAnimationFrame 处理滚动事件
   // `volantis.scroll.del` 中存储了一个数值, 该数值检测一定时间间隔内滚动条滚动的位移, 数值的检测频率是浏览器的刷新频率. 数值为正数时, 表示向下滚动. 数值为负数时, 表示向上滚动.
   volantis.scroll.handleScrollEvents = () => {
@@ -353,9 +429,9 @@
         //   console.log("向上滚动");
         // }
         // 注销过期的unengine未滚动事件
-        volantis.scroll.unengine.list=[]
+        volantis.scroll.unengine.list = []
         volantis.scroll.engine.start();
-      }else{
+      } else {
         volantis.scroll.unengine.start();
       }
       volantis.requestAnimationFrame(loop)
@@ -399,22 +475,22 @@
         }
         volantis.scroll.unengine.push(() => {
           let me = ele.getBoundingClientRect().top
-          if(!(me >= -option.observerDic && me <= option.observerDic)){
+          if (!(me >= -option.observerDic && me <= option.observerDic)) {
             volantis.scroll.to(ele, option)
           }
           volantis.scroll.unengine.remove("unengineObserver")
-        },"unengineObserver")
-      },1000)
+        }, "unengineObserver")
+      }, 1000)
     }
   }
   /********************** Content Visibility ********************************/
   // 见 source/css/first.styl 如果遇到任何问题 删除 .post-story 即可
   // 一个元素被声明 content-visibility 属性后 如果元素不在 viewport 中 浏览器不会计算其后代元素样式和属性 从而节省 Style & Layout 耗时
   // content-visibility 的副作用: 锚点失效 等等(实验初期 暂不明确), 使用此方法清除样式
-  volantis.cleanContentVisibility = ()=>{
+  volantis.cleanContentVisibility = () => {
     if (document.querySelector(".post-story")) {
       console.log("cleanContentVisibility");
-      document.querySelectorAll(".post-story").forEach(e=>{
+      document.querySelectorAll(".post-story").forEach(e => {
         e.classList.remove("post-story")
       })
     }
@@ -433,3 +509,4 @@
   }
   /******************************************************************************/
 </script>
+<%- partial('./config') %>

package/layout/_partial/scripts/index.ejs

@@ -13,27 +13,23 @@
 
 <script>
   <% if (theme.plugins.fontawesome) { %>
-  volantis.css("<%- theme.plugins.fontawesome %>");
+  volantis.css("<%- theme.cdn.fontawesome %>");
   <% } %>
   <% if (theme.plugins.fontawesome_animation.enable) { %>
-  volantis.css("<%- theme.plugins.fontawesome_animation.css %>");
+  volantis.css("<%- theme.cdn['font-awesome-animation'] %>");
   <% } %>
   <% if (theme.plugins.nodewaves.enable) { %>
-  volantis.css("<%- theme.plugins.nodewaves.css %>");
+  volantis.css("<%- theme.cdn.nodewaves_css %>");
   <% } %>
 </script>
 
 <!-- required -->
 <% if (theme.plugins.globalJquery) { %>
-  <%- js(theme.plugins.jquery) %>
+  <%- js(theme.cdn.jquery) %>
 <% } %>
 
 <!-- internal -->
-<%- js(theme.cdn.map.js.app) %>
-
-<% if (theme.rightmenu.enable) { %>
-  <%- partial('../../_plugins/rightmenu/layout') %>
-<% } %>
+<script src="<%- theme.cdn.volantis_app %>"></script>
 
 <% if (theme.rightmenus.enable) { %>
   <%- partial('../../_plugins/rightmenus/layout') %>
@@ -56,11 +52,11 @@
   <%- partial('../../_plugins/preload/script') %>
 <% } %>
 
-<% if (theme.plugins.scrollreveal.enable && theme.plugins.scrollreveal.js) { %>
+<% if (theme.plugins.scrollreveal.enable) { %>
    <%- partial('../../_plugins/scrollreveal/script') %>
 <% } %>
 
-<% if (theme.plugins.aplayer && theme.plugins.aplayer.enable && theme.plugins.aplayer.js) { %>
+<% if (theme.plugins.aplayer && theme.plugins.aplayer.enable) { %>
   <%- partial('../../_plugins/aplayer/script') %>
 <% } %>
 
@@ -86,8 +82,8 @@
 
 
 
-<% if (theme.analytics.busuanzi) { %>
-  <script defer src="<%- theme.analytics.busuanzi %>" data-pjax></script>
+<% if (theme.plugins.busuanzi.enable) { %>
+  <script defer src="<%- theme.cdn.busuanzi %>" data-pjax></script>
 <% } %>
 
 <!-- optional -->
@@ -100,17 +96,13 @@
 <% } %>
 
 <% if (theme.plugins.comment_typing.enable) { %>
-  <%- js(theme.plugins.comment_typing.js) %>
+  <%- js(theme.cdn.comment_typing) %>
 <% } %>
 
 <% if (theme.plugins.code_highlight) { %>
   <%- partial('../../_plugins/highlight/script') %>
 <% } %>
 
-<% if (theme.analytics && theme.analytics.leancloud && theme.analytics.leancloud.app_id) { %>
-  <%- partial('../../_plugins/analytics/LCCounter') %>
-<% } %>
-
 <% if (config.google_analytics_key || config.baidu_analytics_key || config.tencent_aegis_id || config.v6_51_la || config.perf_51_la) { %>
   <%- partial('../../_plugins/analytics/script') %>
 <% } %>
@@ -127,6 +119,10 @@
   <%- partial('../../_plugins/swiper/script') %>
 <% } %>
 
+<% if (theme.plugins.pace.enable) { %>
+  <%- partial('../../_plugins/pace/script') %>
+<% } %>
+
 <!-- pjax 标签必须存在于所有页面 否则 pjax error -->
 <pjax>
 <% if (page.plugins) { %>
@@ -134,15 +130,12 @@
 <% } %>
 </pjax>
 
-<%- partial('toc') %>
+<%- partial('../../_plugins/toc/script') %>
 
 <% if (theme.content_visibility) { %>
-  <%- partial('content-visibility-scroll-fix') %>
+  <%- partial('../../_plugins/content-visibility/script') %>
 <% } %>
 
 <%- partial('../../_plugins/slow-network/script') %>
 
-<% if (theme.structured_data && theme.structured_data.enable) { %>
-  <%- structured_data() %>
-<% } %>
 

package/layout/_plugins/_page_plugins/artitalk/index.ejs

@@ -3,7 +3,7 @@
 </script>
 <script>
   volantis.import.jQuery().then(()=>{
-    volantis.js("<%= theme.plugins.artitalk.js %>").then(()=>{
+    volantis.js("<%= theme.cdn.artitalk %>").then(()=>{
       new Artitalk(Object.assign(<%- JSON.stringify(theme.plugins.artitalk) %>, {}))
     })
   })

package/layout/_plugins/_page_plugins/bbtalk/index.ejs

@@ -3,7 +3,7 @@
 </script>
 <script>
   volantis.import.jQuery().then(()=>{
-    volantis.js("<%= theme.plugins.bbtalk.js %>").then(()=>{
+    volantis.js("<%= theme.cdn.bbtalk %>").then(()=>{
       bbtalk.init(Object.assign(<%- JSON.stringify(theme.plugins.bbtalk) %>, {}))
     })
   })

package/layout/_plugins/_page_plugins/fcircle/index.ejs

@@ -1,12 +1,13 @@
 <script>
-  volantis.layoutHelper("page-plugins",`<div class="post-content"><div id="cf-container"><%- theme.plugins.fcircle.message %></div></div>`,{pjax:false}) // 外层有 pjax 标签
+    volantis.layoutHelper("page-plugins", `<div id="hexo-circle-of-friends-root"></div>`, { pjax: false }) // 外层有 pjax 标签
 </script>
-<script type="text/javascript">
-    var fdataUser = {
-        apiurl: '<%- theme.plugins.fcircle.api %>'
+<script>
+    let UserConfig = {
+        private_api_url: '<%- theme.plugins.fcircle.private_api_url %>',
+        page_turning_number: '<%- theme.plugins.fcircle.page_turning_number %>',
+        error_img: '<%- theme.plugins.fcircle.error_img%>',
+        sort_rule: '<%- theme.plugins.fcircle.sort_rule %>'
     }
 </script>
-<link rel="stylesheet" href="<%- theme.plugins.fcircle.css %>">
-<script type="text/javascript"
-    src="<%- theme.plugins.fcircle.js %>">
-</script>
+<script type="text/javascript" src="<%- theme.plugins.fcircle.app %>"></script>
+<script type="text/javascript" src="<%- theme.plugins.fcircle.bundle %>"></script>

package/layout/_plugins/_page_plugins/katex/index.ejs

@@ -1,13 +1,13 @@
 <script>
   // https://www.micdz.cn/article/katex-on-volantis/
   if (typeof renderMathInElement == "undefined") {
-    volantis.css("<%= theme.plugins.katex.css %>")
+    volantis.css("<%= theme.cdn.katex_css %>")
     function pjax_katex() {
-      volantis.js("<%= theme.plugins.katex.render %>").then(()=>{
+      volantis.js("<%= theme.cdn.katex_render %>").then(()=>{
         renderMathInElement(document.body);
       })
     }
-    volantis.js("<%= theme.plugins.katex.js %>").then(pjax_katex)
+    volantis.js("<%= theme.cdn.katex_js %>").then(pjax_katex)
     volantis.pjax.push(pjax_katex)
   }
 </script>

package/layout/_plugins/_page_plugins/mathjax/index.ejs

@@ -38,7 +38,7 @@
     };
     (function () {
       var script = document.createElement('script');
-      script.src = "<%= theme.plugins.mathjax %>";
+      script.src = "<%= theme.cdn.mathjax %>";
       script.defer = true;
       document.head.appendChild(script);
     })();

package/layout/_plugins/aplayer/layout.ejs

@@ -2,29 +2,37 @@
 let aplayer = theme.plugins.aplayer;
 %>
 <% if (theme.plugins.aplayer.enable == true) { %>
-  <% if (post && post.music) { %>
-    <meting-js
-      mini='true'
-      volume='<%- post.music.volume || aplayer.volume %>'
-      loop='<%- post.music.loop || aplayer.loop %>'
-      order='<%- post.music.order || aplayer.order %>'
-      server='<%- post.music.server || aplayer.server %>'
-      type='<%- post.music.type || aplayer.type %>'
-      id='<%- post.music.id || aplayer.id %>'>
-    </meting-js>
+  <% if (aplayer.source == "meting") { %>
+    <% if (post && post.music) { %>
+      <meting-js
+        mini='true'
+        volume='<%- post.music.volume || aplayer.volume %>'
+        loop='<%- post.music.loop || aplayer.loop %>'
+        order='<%- post.music.order || aplayer.order %>'
+        server='<%- post.music.server || aplayer.server %>'
+        type='<%- post.music.type || aplayer.type %>'
+        id='<%- post.music.id || aplayer.id %>'>
+      </meting-js>
+    <% } else { %>
+      <meting-js
+        theme='<%- aplayer.theme %>'
+        autoplay='<%- aplayer.autoplay %>'
+        volume='<%- aplayer.volume %>'
+        loop='<%- aplayer.loop %>'
+        order='<%- aplayer.order %>'
+        fixed='<%- aplayer.fixed %>'
+        list-max-height='<%- aplayer.list_max_height %>'
+        server='<%- aplayer.server %>'
+        type='<%- aplayer.type %>'
+        id='<%- aplayer.id %>'
+        list-folded='<%- aplayer.list_folded %>'>
+      </meting-js>
+    <% } %>
   <% } else { %>
-    <meting-js
-      theme='<%- aplayer.theme %>'
-      autoplay='<%- aplayer.autoplay %>'
-      volume='<%- aplayer.volume %>'
-      loop='<%- aplayer.loop %>'
-      order='<%- aplayer.order %>'
-      fixed='<%- aplayer.fixed %>'
-      list-max-height='<%- aplayer.list_max_height %>'
-      server='<%- aplayer.server %>'
-      type='<%- aplayer.type %>'
-      id='<%- aplayer.id %>'
-      list-folded='<%- aplayer.list_folded %>'>
-    </meting-js>
+    <% if (post && post.music) { %>
+      <div class="aplayer-local-min"></div>
+    <% } else { %>
+      <div class="aplayer-local"></div>
+    <% } %>
   <% } %>
 <% } %>