jekyll-zeta 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f046288eef53805a767c724de29307eda5dd49b28c88e6de1d75c2d6a5eccb
-  data.tar.gz: a9e9362923d0d6603d985ca6df5499e8bae782cb05abaf77da17447a4abe56dc
+  metadata.gz: 1c09659ecef1d43a946ea10de25c69095436f9487cea5dc0b331a6d736cdea5e
+  data.tar.gz: a87673d297775cfd505948aa86292609bd5bbd59188ce8165a771fc013ee99f3
 SHA512:
-  metadata.gz: 7f8b8a1a201b88c4550d1f7d29a71738bac20b4554da4b7d20823ba4ad12dd6b4f1f8d8eebe127e8d4609df7fb12dfdebd2d2bd79cdb85eb53f8fd97dfdb8e82
-  data.tar.gz: 20df7c3f1be88b3946ad2ac5721b6c27c8e244773c807a6dcff047b6235bc34dcd81dfc6bd655d70b54b7260e3a0f6d16ce3abfabe85874f38430d8a5e7d8525
+  metadata.gz: c30589f4a0f83c10ef0bee30b60f8c50ccf03dbfe42381cfd2139d3f11244012ce08a4641fae04b91456e6828156239216bf65bd7562b32fd04677161aac66e3
+  data.tar.gz: 92ca3edb079fde72c27ab8c0c0abdadddc09ed81c9aecd7b289895793e05f72525ac34be280ee48a9ceb295e232bdc9d3bc17cfc9ba1c92f79cd8650de879e13

data/_includes/encrypt_page.js

@@ -0,0 +1,17 @@
+function _InitEnc(e,t,n,c,o){!function(){const a=crypto.subtle,r=e,i=t.substring(3),d=base64js.decode(i);d.subarray(0,12),d.subarray(12);async function l(e,t,n){
+if(e.length<8)throw n&&(n.count=e.length),"err";let c=0;for(let t=0;t<4;t++)c|=(e[t]^e[t+4]^t)<<8*(3-t);if(n&&(n.count=c),e.length<c)return;let o=e.slice(4,20),r=e.slice(20,c)
+;var i=await a.importKey("raw",t,{name:"AES-CTR"},!1,["decrypt"]),d={name:"AES-CTR",counter:o,length:64};try{let e=await a.decrypt(d,i,r);return new Uint8Array(e)}catch(e){throw e}}
+async function s(o,r){var i="";if(r)i=u();else{var d=e+o+e;i=await async function(e){var t=(new TextEncoder).encode(e),n=await a.importKey("raw",t,"PBKDF2",!1,["deriveBits"]);let c={name:"PBKDF2",
+hash:"SHA-256",iterations:12345,salt:(new TextEncoder).encode("this is a salt string 20221019")};return await a.deriveBits(c,n,256)}(d)}if(0!=i.length)try{let e=await async function(e){
+const t=c.split("."),o=t[0],a=t[1],r=base64js.decode(a),i=base64js.decode(n);let d=null,s=0,u=0;for(;s++<400&&!(u>=i.length);){let t=i.slice(u);try{let n={count:0},c=await l(t,e,n);if(u+=n.count,c){
+let e=await l(r,c);if((new TextDecoder).decode(e)==o){d=c;break}}}catch(e){}}return d}(i);if(!e)throw"error psw";var s=await async function(e,t){const n=e,c=base64js.decode(n);return await l(c,t)
+}(t,e),m=(new TextDecoder).decode(s);y(i),document.getElementById("encrypted").style.display="none",document.getElementById("decrypted").style.display="block",
+document.getElementById("decryptContent").innerHTML=m;const o=window._after_dec_fun;o&&"function"==typeof o&&o(),setTimeout((function(){var e=document.createEvent("Event");e.initEvent("load",!0,!0)
+;var t=document.createEvent("Event");t.initEvent("DOMContentLoaded",!0,!0),window.dispatchEvent(e),window.dispatchEvent(t)}),100)}catch(e){
+document.getElementById("passwordinput").classList.add("errPsw"),setTimeout((()=>{document.getElementById("passwordinput").classList.remove("errPsw")}),500)}}
+document.getElementById("DecryptBtn").onclick=function(){s(document.getElementById("passwordinput").value)},document.getElementById("EncryptBtn").onclick=function(){
+document.getElementById("encrypted").style.display="block",document.getElementById("decrypted").style.display="none",document.getElementById("decryptContent").innerHTML=":)",m()
+;const e=window._after_enc_fun;e&&"function"==typeof e&&e()},document.getElementById("ClearBtn1").onclick=function(){localStorage.clear(),document.getElementById("passwordinput").value=""},
+document.getElementById("ClearBtn2").onclick=function(){localStorage.clear()};const u=o?function(){}:function(){var e=r,t=localStorage.getItem(e);return t?base64js.decode(t):null
+},y=o?function(e){}:function(e){var t=r,n=new Uint8Array(e),c=base64js.encode(n);return localStorage.setItem(t,c)},m=o?function(){}:function(){var e=r;localStorage.removeItem(e)};var w=u();w&&s(w,!0)
+}()}

data/_includes/encrypted.html

@@ -54,252 +54,26 @@
     </script>
     <script src="//cdn.jsdelivr.net/gh/vitock/jsdelivr@0.1.2/js/base64js.js"></script>
     <script>
-        
-function uint8ArrayToHex(uint8Array) {
-  return Array.from(uint8Array)
-    .map(byte => byte.toString(16).padStart(2, '0'))  // 转换每个字节为2位16进制
-    .join('');  // 连接成字符串
-}
-
- 
-
-    {%- assign HEXKEY = '' | rand_bytes:32 %}
-    const contentEnc = '{{ content | encrypt_content_v2:HEXKEY }}';
-    
-        !function(){
-
-            const substl = crypto.subtle
-            const preFix = '{{encid}}';
-            const encid = preFix
-            const encryptedContent = contentEnc;
-            const base64str = encryptedContent.substring(3)
-            const bfMsg = base64js.decode(base64str)
-            const bfIv = bfMsg.subarray(0,12)
-            const bfCipher = bfMsg.subarray(12)
-            
-            async function genKey(psw){
-                var keyRaw = new TextEncoder().encode(psw)
-                var key = await substl.importKey('raw',keyRaw,'PBKDF2',false,["deriveBits"])
-                const salt = 'this is a salt string 20221019'
-                let pbkdf2  = {
-                    name:"PBKDF2",hash: "SHA-256",iterations: 12345,salt: new TextEncoder().encode(salt)
-                }
-                return  await substl.deriveBits(pbkdf2,key,256);
-            }
-
-        async function decryptRaw(bf,key,outV){
-            if(bf.length < 8){
-                if(outV){
-                     outV.count = bf.length
-                }
-                throw 'err'
-            }
-            let count = 0;
-            for (let i  = 0; i  < 4; i ++) {
-                count |= ((bf[i] ^ bf[i + 4] ^ i) << ((3 - i) * 8))
-            }
-
-            if(outV){
-                outV.count = count
-            }
-            if (bf.length < count) {
-                return
-            }
-
-            let bfIv = bf.slice(4,20)
-            let bfCipher = bf.slice(20,count )
-   
-            var aeskey = {
-                name:"AES-CTR",
-            }
-            var keyObj = await substl.importKey('raw',key,aeskey,false,['decrypt'])
-            var aesDec= {name: "AES-CTR",counter:bfIv,length:64};
-            try{
-                let bfDec  = await substl.decrypt(aesDec,keyObj,bfCipher)
-                return  new  Uint8Array(bfDec)
-            }catch (error) {
-                throw error
-            }
-             
-        }
- 
-        async function decryptBase64Msg(msg64,key){
-            const base64str = msg64;
-            const bfMsg = base64js.decode(base64str)
-            return await decryptRaw(bfMsg,key)
-
-        }
-        async function checkKey(key){
-            const keyData  = "{{ '' | encrypt_key:page,HEXKEY ,encid}}";
-             {% assign TestData = HEXKEY | gen_test_data_forkey %}
-            const arrTest = '{{ TestData }}'.split('.');
-            const testData = arrTest[0];
-            const testDataEnc = arrTest[1];
-            const bfTestData = base64js.decode(testDataEnc)
-
-
-            const bfKeyData = base64js.decode(keyData)
-            let keyBf = null
-            let C  = 0;
-            let sum = 0;
-            while (C ++ < 400 ) {
-                if (sum >= bfKeyData.length ) {
-                    break
-                }
-                let bfSub = bfKeyData.slice(sum)
-                
-                try {
-                    let outV = {count:0}
-                    let d = await decryptRaw(bfSub,key,outV)
-
-                    sum += outV.count
-                    if (d) {
-                        let dec = await decryptRaw(bfTestData,d)
-                        let s =  new TextDecoder().decode(dec) 
-                        if(s == testData){
-                            keyBf = d;
-                            break;
-                        }
-                    }else{
-                       
-                    }
-                    
-                    
-                } catch (error) {
-                     
-                }
-            }
-             
-            return keyBf
-        }
- 
-        async function decrypt (key0,isCached){
-            // const key = Uint8Array([...]); // 32 bytes key
-            var key  = ''
-            if(isCached){
-                key = readKey()
-            }
-            else{
-                var keyS = preFix + key0 +  preFix
-                key = await genKey(keyS)
-            }
-            if (key.length == 0) {
-                return
-            }
-            try {
-                let keyBf = await checkKey(key)
-                if(!keyBf){
-                    throw 'error psw'
-                }
-                var bfDec  = await decryptBase64Msg(contentEnc,keyBf)
-                var plain = new TextDecoder().decode(bfDec);
-                setKey(key)
-                document.getElementById("encrypted").style.display = 'none'
-                // / show decrypted 
-    
-                document.getElementById("decrypted").style.display = 'block'
-                document.getElementById("decryptContent").innerHTML = plain
+        {% include encrypt_page.js %}
 
-                const DECFUN = window['_after_dec_fun']
-                    
-                if (DECFUN && typeof DECFUN == 'function') {
-                    DECFUN()
-                }
-                setTimeout(function(){
-                    var loadevent = document.createEvent("Event")
-                    loadevent.initEvent("load", true, true)
-    
-                    var DOMContentLoaded_event = document.createEvent("Event")
-                    DOMContentLoaded_event.initEvent("DOMContentLoaded", true, true)
-    
-                    window.dispatchEvent(loadevent)
-                    window.dispatchEvent(DOMContentLoaded_event)
-
-                    
-    
-                }, 100);
-            } catch (error) {
-                console.log(error)
-                // alert("wrong password.")
-                document.getElementById('passwordinput').classList.add('errPsw');
-                setTimeout(() => {
-                    document.getElementById('passwordinput').classList.remove('errPsw')
-                }, 500);
-            }
-        }
-        
-        document.getElementById("DecryptBtn").onclick = function(){
-            var key = document.getElementById("passwordinput").value
-            decrypt(key);        
-        }
-    
-        document.getElementById("EncryptBtn").onclick = function(){
-            /// hide input
-            document.getElementById("encrypted").style.display = 'block'
-            // / show decrypted 
-            document.getElementById("decrypted").style.display = "none"
-            document.getElementById('decryptContent').innerHTML = ':)'
-    
-            clearKey()
 
-            const ENCFUN = window['_after_enc_fun']
-            if (ENCFUN && typeof ENCFUN == 'function') {
-                ENCFUN()
-            }
-        }
+        /******************************************************************/
 
-     
 
-        document.getElementById("ClearBtn1").onclick = function(){
-            localStorage.clear();
-            document.getElementById('passwordinput').value = ''
-        }
-        document.getElementById("ClearBtn2").onclick = function(){
-            localStorage.clear();
-        }
+        {%- assign HEXKEY = '' | rand_bytes:32 %}
+        {% assign TestData = HEXKEY | gen_test_data_forkey %}
 
         
-
-        
-    
-        {% if site.theme_config.forbid_cache_password %}
-        function readKey(){
-        }
-        function setKey(value){
-        }
-        function clearKey() {
-        }
-        {% else %}
-            function readKey(){
-                var key = encid;
-                var v = localStorage.getItem(key)
-                if (v) {
-                    return base64js.decode(v)
-                }else{
-                    return null
-                }
-            }
-            function setKey(value){
-                var key = encid
-                var arr = new Uint8Array(value)
-                var b64 = base64js.encode(arr)
-                return localStorage.setItem(key,b64)
-            }
-            function clearKey() {
-                var key = encid
-                localStorage.removeItem(key)
-            }
-            var cachekey = readKey()
-            if(cachekey){
-                decrypt(cachekey,true)
-            }
-
-        {% endif %}
-        
-        
- 
-    }()
-    
-    
+        const contentEnc = '{{ content | encrypt_content_v2:HEXKEY }}';
+        const keyData  = '{{ '' | encrypt_key:page,HEXKEY ,encid}}';
+        const TestData = '{{ TestData }}'
+        const preFix = '{{encid}}';
+        {% if site.theme_config.forbid_cache_password -%}
+        const forbid_cache_password = true;
+        {% else -%}
+        const forbid_cache_password = false;
+        {%- endif %}
+
+        _InitEnc(preFix,contentEnc,keyData,TestData,forbid_cache_password)
     </script>
     

data/_includes/getPostData.js

@@ -1,128 +1,6 @@
-;function hm_getPostData( endYear ,_allyearurl) {
-  endYear = ('' + endYear).substring(0,4)
-
-  let arr = _allyearurl.split("/");
-  arr.pop();
-  const jsonUrlBase = arr.join("/");
-
-  var GDATA = window['__GDATA__'] 
-  if (!GDATA) {
-    GDATA = {}
-    window['__GDATA__'] 
-  }
-
-
-  let queue  = window._y_queue || []
-  window._y_queue = queue;
-
- 
-  function getAllYearCfg(){
- 
-    
-    if (GDATA['_allYear']) {
-      return GDATA['_allYear'];
-    }
-
-    if (window._isFetchAllYearData == 1) {
-      return new Promise(r=>{
-        queue.push(r);
-      })
-    }
-
-    
-    window._isFetchAllYearData = 1;
-    return fetch(_allyearurl)
-      .then((r) => r.json())
-      .then(d => { 
-        window._isFetchAllYearData = 0;
-        if (queue.length) {
-          queue.forEach(calback=>{calback(d)});
-          queue.length = 0;
-        }
-        GDATA['_allYear'] = d ;return d ;})
-  }
-
-  function getYearData(year) {
-    year = '' + year
-
-    if(GDATA[year]){
-      return GDATA[year]
-    }
-
-    let queueFlgKey = '_singleyearFlg' + year
-    let queueArrKey = '_singleyearQueue' + year
-    if (GDATA[queueFlgKey] == 1) {
-      // console.log('put in queue',year,Math.random())
-      let arrQueue = GDATA[queueArrKey]
-      if (!arrQueue) {
-        arrQueue = []
-        GDATA[queueArrKey] = arrQueue;
-      }
-      
-      return  new Promise(r=>{
-        arrQueue.push(r);
-      });
-    }
-
-
-    GDATA[queueFlgKey] = 1;
-    // console.log('RealQuery',year,Math.random())
-    return fetch(`${jsonUrlBase}/${year}.json`)
-      .then((r) => r.json())
-      .then(d=>{
-        GDATA[queueFlgKey] = 0 ;GDATA[year] = d; 
-        let queue = GDATA[queueArrKey];
-        // console.log('queryFinish',year)
-        if(queue && queue.length){
-          queue.forEach(cb=>{
-            // console.log('queryFinishQueue',year,queue.length,Math.random());
-            cb(d);})
-          queue.length = 0;
-          GDATA[queueArrKey] = undefined
-        }
-
-        return d})
-      .catch((e) => {
-        return null;
-      });
-  }
-
-  function _getAllData() {
-    let year = "" +  endYear
-    let preYear = "" + (Number(year) - 1);
-    return getAllYearCfg()
-      .then((d) => {
-        let yearCfg = d;
-       
-        let arr = [];
-        if (yearCfg[year]) {
-          arr.push(getYearData(year));
-        }
-
-        if (yearCfg[preYear]) {
-          arr.push(getYearData(preYear));
-        }
-        return Promise.all(arr).then((alldata) => {
-          let combineData = {};
-          let d1 = alldata[0];
-          let d2 = alldata[1];
- 
- 
-
-          if(d1 && d1.year){
-            combineData[d1.year] = d1
-          }
-
-          if(d2 && d2.year){
-            combineData[d2.year] = d2
-          }
-
-          return Promise.resolve(combineData)
-        });
-      });
-  }
-
-
-  return _getAllData()
- 
-};
+function hm_getPostData(e,t){e=(""+e).substring(0,4);let n=t.split("/");n.pop();const r=n.join("/");var l=window.__GDATA__;l||(l={},window.__GDATA__);let a=window._y_queue||[];function i(e){
+if(l[e=""+e])return l[e];let t="_singleyearFlg"+e,n="_singleyearQueue"+e;if(1==l[t]){let e=l[n];return e||(e=[],l[n]=e),new Promise((t=>{e.push(t)}))}return l[t]=1,
+fetch(`${r}/${e}.json`).then((e=>e.json())).then((r=>{l[t]=0,l[e]=r;let a=l[n];return a&&a.length&&(a.forEach((e=>{e(r)})),a.length=0,l[n]=void 0),r})).catch((e=>null))}return window._y_queue=a,
+function(){let n=""+e,r=""+(Number(n)-1);return(l._allYear?l._allYear:1==window._isFetchAllYearData?new Promise((e=>{a.push(e)})):(window._isFetchAllYearData=1,
+fetch(t).then((e=>e.json())).then((e=>(window._isFetchAllYearData=0,a.length&&(a.forEach((t=>{t(e)})),a.length=0),l._allYear=e,e))))).then((e=>{let t=e,l=[];return t[n]&&l.push(i(n)),
+t[r]&&l.push(i(r)),Promise.all(l).then((e=>{let t={},n=e[0],r=e[1];return n&&n.year&&(t[n.year]=n),r&&r.year&&(t[r.year]=r),Promise.resolve(t)}))}))}()}