hexo-adsense 1.0.21 → 1.0.25

package/lib/source/article-ads.js

@@ -1,270 +1 @@
-/**
- * Browser processor
- */
-
-const isBrowser = new Function("try {return this===window;}catch(e){ return false;}");
-
-/**
- * @type {import("../src/config")}
- */
-const hexoAdsenseConfig = JSON.parse(document.getElementById("hexo-adsense-config").textContent);
-//console.log(hexoAdsenseConfig);
-
-/**
- * Insert after element
- * @param {HTMLElement} newElement
- * @param {HTMLElement} oldElement
- */
-function insertAfter(newElement, oldElement) {
-  if (oldElement && newElement) {
-    let parent = oldElement.parentNode;
-    if (parent.lastChild == oldElement) {
-      parent.appendChild(newElement);
-    } else {
-      parent.insertBefore(newElement, oldElement.nextSibling);
-    }
-  } else {
-    console.error("cannot insert element");
-  }
-}
-
-/**
- * Replace elements with new
- * @param {HTMLElement} newElement
- * @param {HTMLElement} oldElement
- */
-function replaceWith(newElement, oldElement) {
-  if (!oldElement.parentNode) {
-    console.log(oldElement, "parent null");
-    let d = document.createElement("div");
-    d.appendChild(oldElement);
-  } else {
-    //console.log(oldElement.parentNode.tagName);
-    oldElement.parentNode.replaceChild(newElement, oldElement);
-  }
-  /*
-  try {
-    oldElement.parentNode.replaceChild(newElement, oldElement);
-  } catch (e) {}
-  */
-}
-
-let createElementFromHTML = function (htmlString) {
-  if (htmlString instanceof HTMLElement) {
-    return htmlString;
-  }
-  var div = document.createElement("div");
-  div.innerHTML = htmlString.trim();
-
-  // Change this to div.childNodes to support multiple top-level nodes
-  return div.firstChild;
-};
-
-function oldMethod() {
-  let article = document.getElementsByTagName("article");
-  let adscont = document.getElementById("hexo-adsense-ads-content");
-  if (adscont && adscont.length) {
-    if (article && article.length) {
-      let linebreak = article.item(0).getElementsByTagName("br");
-      if (linebreak.length > 0) {
-        return replaceWith(adscont, linebreak.item(0));
-      }
-
-      let headings = article.item(0).querySelectorAll("h2,h3,h4,h5");
-      if (headings && headings.length > 0) {
-        return insertAfter(adscont, headings.item(0));
-      }
-    }
-  }
-}
-
-/**
- * random number between min and max
- */
-function ranumb(min, max) {
-  // min and max included
-  return Math.floor(Math.random() * (max - min + 1) + min);
-}
-
-function newMethod() {
-  const adshide = document.getElementById("hexo-adsense-hidden");
-  let adscont = adshide.querySelectorAll('[hexo-adsense="ads-content"]');
-  const article = document.querySelectorAll("article");
-  if (article.length > 0 && adscont.length > 0) {
-    /**
-     * @type {HTMLElement}
-     */
-    let ads;
-    if (article.length == 1) {
-      console.log("webpage is post");
-      let targetArticle = article.item(0);
-
-      // prioritize hexo-adsense-fill before auto ads on other elements
-      const ads_fill = targetArticle.querySelectorAll("*[hexo-adsense-fill]");
-      if (ads_fill.length > 0) {
-        for (let index = 0; index < ads_fill.length; index++) {
-          const toFill = ads_fill[index];
-          if (typeof adscont[index] !== "undefined") {
-            toFill.appendChild(adscont[index]);
-          }
-        }
-      }
-
-      // the rest of the ads will show automatically after headers, pre elements
-      adscont = adshide.querySelectorAll('[hexo-adsense="ads-content"]');
-      //console.log(adscont.length, "ads left");
-      if (adscont.length > 0) {
-        const headers = targetArticle.querySelectorAll("h1,h2,h3,h4,h5,h6,pre");
-        if (headers.length > 0) {
-          // generate index of headers
-          let headers_index = Array.apply(null, { length: headers.length }).map(Number.call, Number);
-          //console.log(headers_index);
-          for (let index = 0; index < adscont.length; index++) {
-            ads = adscont[index];
-            const rheaders = shuffleArr2(headers_index);
-            // pick a random index
-            const rheader = rheaders.next().value;
-            if (typeof rheader === "number") {
-              const header = headers.item(rheader);
-              insertAfter(createElementFromHTML(ads), header);
-            }
-          }
-        }
-      }
-
-      // the rest of the ads will show automatically to linebreak elements
-      adscont = adshide.querySelectorAll('[hexo-adsense="ads-content"]');
-      if (adscont.length > 0) {
-        const linebreaks = targetArticle.querySelectorAll("br,hr");
-        if (linebreaks.length > 0) {
-          // generate index of linebreaks
-          let linebreaks_index = Array.apply(null, { length: linebreaks.length }).map(Number.call, Number);
-          //console.log(linebreaks_index);
-          // randomize linebreaks index
-          const rlinebreaks = shuffleArr2(linebreaks_index);
-          for (let index = 0; index < adscont.length; index++) {
-            ads = adscont[index];
-            // pick a random index
-            const rlinebreak = rlinebreaks.next().value;
-            if (typeof rlinebreak == "number") {
-              const linebreak = linebreaks.item(rlinebreak);
-              if (
-                ["blockquote", "img", "a", "pre", "code", "em", "strong", "i", "u"].includes(
-                  linebreak.parentNode.tagName.toLowerCase()
-                )
-              ) {
-                index--;
-                continue;
-              }
-              //console.log(linebreak.tagName);
-              replaceWith(createElementFromHTML(ads), linebreak);
-            }
-          }
-        }
-      }
-    } else {
-      console.log("webpage is not post");
-      // generate index of articles
-      let articles_index = Array.apply(null, { length: article.length }).map(Number.call, Number);
-      // randomize linebreaks index
-      const rArticles = shuffleArr2(articles_index);
-      for (let index = 0; index < adscont.length; index++) {
-        ads = adscont[index];
-        // pick a random index
-        const rArticle = rArticles.next().value;
-        if (typeof rArticle == "number") {
-          //console.log("adsense display to article index", rArticle);
-          const pickArticle = article.item(rArticle);
-          pickArticle.appendChild(createElementFromHTML(ads));
-        }
-      }
-    }
-
-    // summon adsbygoogle.push()
-    adsensePush();
-  }
-}
-
-function eventMethod() {
-  document.addEventListener("DOMContentLoaded", function () {
-    // we look for the jump break
-    var _moreElm = document.querySelector("a[name=more]");
-
-    // here is your adsense code
-    var _adsenseCode = " [replace this with code from the last step] ";
-
-    // This inserts the ad inside of the blog post
-    _moreElm.insertAdjacentHTML("afterend", '<div class="adsense-after-break">' + _adsenseCode + "</div>");
-
-    // Initialize the ads here
-    (adsbygoogle = window.adsbygoogle || []).push({});
-  });
-}
-
-/**
- * Shuffle Array
- * @param {any[]} array
- * @see {@link https://stackoverflow.com/a/18806417}
- * @returns
- */
-function shuffleArr(array) {
-  var i = array.length,
-    j = 0,
-    temp;
-
-  while (i--) {
-    j = Math.floor(Math.random() * (i + 1));
-
-    // swap randomly chosen element with current element
-    temp = array[i];
-    array[i] = array[j];
-    array[j] = temp;
-  }
-
-  return array;
-}
-
-/**
- * Next generation of non-repeated randomizer
- * @see {@link shuffleArr}
- * @param {any[]} array
- */
-function* shuffleArr2(array) {
-  var i = array.length;
-
-  while (i--) {
-    yield array.splice(Math.floor(Math.random() * (i + 1)), 1)[0];
-  }
-}
-
-function adsensePush() {
-  for (let index = 0; index < document.querySelectorAll('[hexo-adsense="ads-content"]').length; index++) {
-    (adsbygoogle = window.adsbygoogle || []).push({
-      google_ad_client: hexoAdsenseConfig.pub,
-    });
-  }
-}
-
-if (!isBrowser()) {
-  module.exports = {
-    replaceWith,
-    insertAfter,
-  };
-} else {
-  window.__tcfapi = (command, parameter, callback) => {
-    if (command === "checkConsent") {
-      callback(true);
-    }
-    if (command === "addEventListener") {
-      callback({ eventStatus: "tcloaded", gdprApplies: false }, true);
-    }
-  };
-
-  if (typeof document.addEventListener == "function") {
-    document.addEventListener("DOMContentLoaded", newMethod);
-  } else if (typeof window.attachEvent == "function") {
-    window.attachEvent("onload", newMethod);
-  } else {
-    window.onload = newMethod;
-  }
-}
+const isBrowser=new Function("try {return this===window;}catch(e){ return false;}"),hexoAdsenseConfig=JSON.parse(document.getElementById("hexo-adsense-config").textContent);function insertAfter(e,t){if(t&&e){let n=t.parentNode;n.lastChild==t?n.appendChild(e):n.insertBefore(e,t.nextSibling)}else console.error("cannot insert element")}function replaceWith(e,t){if(t.parentNode)t.parentNode.replaceChild(e,t);else{console.log(t,"parent null"),document.createElement("div").appendChild(t)}}let createElementFromHTML=function(e){if(e instanceof HTMLElement)return e;var t=document.createElement("div");return t.innerHTML=e.trim(),t.firstChild};function oldMethod(){let e=document.getElementsByTagName("article"),t=document.getElementById("hexo-adsense-ads-content");if(t&&t.length&&e&&e.length){let n=e.item(0).getElementsByTagName("br");if(n.length>0)return replaceWith(t,n.item(0));let o=e.item(0).querySelectorAll("h2,h3,h4,h5");if(o&&o.length>0)return insertAfter(t,o.item(0))}}function ranumb(e,t){return Math.floor(Math.random()*(t-e+1)+e)}function newMethod(){const e=document.getElementById("hexo-adsense-hidden");let t=e.querySelectorAll('[hexo-adsense="ads-content"]');const n=document.querySelectorAll("article");if(n.length>0&&t.length>0){let o;if(1==n.length){console.log("webpage is post");let l=n.item(0);const r=l.querySelectorAll("*[hexo-adsense-fill]");if(r.length>0)for(let e=0;e<r.length;e++){const n=r[e];void 0!==t[e]&&n.appendChild(t[e])}if(t=e.querySelectorAll('[hexo-adsense="ads-content"]'),t.length>0){const e=l.querySelectorAll("h1,h2,h3,h4,h5,h6,pre");if(e.length>0){let n=Array.apply(null,{length:e.length}).map(Number.call,Number);for(let l=0;l<t.length;l++){o=t[l];const r=shuffleArr2(n).next().value;if("number"==typeof r){const t=e.item(r);insertAfter(createElementFromHTML(o),t)}}}}if(t=e.querySelectorAll('[hexo-adsense="ads-content"]'),t.length>0){const e=l.querySelectorAll("br,hr");if(e.length>0){const n=shuffleArr2(Array.apply(null,{length:e.length}).map(Number.call,Number));for(let l=0;l<t.length;l++){o=t[l];const r=n.next().value;if("number"==typeof r){const t=e.item(r);if(["blockquote","img","a","pre","code","em","strong","i","u"].includes(t.parentNode.tagName.toLowerCase())){l--;continue}replaceWith(createElementFromHTML(o),t)}}}}}else{console.log("webpage is not post");const e=shuffleArr2(Array.apply(null,{length:n.length}).map(Number.call,Number));for(let l=0;l<t.length;l++){o=t[l];const r=e.next().value;if("number"==typeof r){n.item(r).appendChild(createElementFromHTML(o))}}}adsensePush()}}function eventMethod(){document.addEventListener("DOMContentLoaded",(function(){document.querySelector("a[name=more]").insertAdjacentHTML("afterend",'<div class="adsense-after-break"> [replace this with code from the last step] </div>'),(adsbygoogle=window.adsbygoogle||[]).push({})}))}function shuffleArr(e){for(var t,n=e.length,o=0;n--;)o=Math.floor(Math.random()*(n+1)),t=e[n],e[n]=e[o],e[o]=t;return e}function*shuffleArr2(e){for(var t=e.length;t--;)yield e.splice(Math.floor(Math.random()*(t+1)),1)[0]}function adsensePush(){for(let e=0;e<document.querySelectorAll('[hexo-adsense="ads-content"]').length;e++)(adsbygoogle=window.adsbygoogle||[]).push({google_ad_client:hexoAdsenseConfig.pub})}isBrowser()?(window.__tcfapi=(e,t,n)=>{"checkConsent"===e&&n(!0),"addEventListener"===e&&n({eventStatus:"tcloaded",gdprApplies:!1},!0)},"function"==typeof document.addEventListener?document.addEventListener("DOMContentLoaded",newMethod):"function"==typeof window.attachEvent?window.attachEvent("onload",newMethod):window.onload=newMethod):module.exports={replaceWith:replaceWith,insertAfter:insertAfter};

package/lib/source/blogger-redirect.html

@@ -1,14 +1 @@
-<script type="text/javascript">
-  // <![CDATA[
-  if (window.location.host == "web-manajemen.blogspot.com") {
-    let href = window.location.href;
-    let url = new URL(href);
-    //console.log(url);
-    //console.log(url.toString());
-    url.host = "www.webmanajemen.com";
-    url.hostname = "www.webmanajemen.com";
-    let newhref = url.protocol + "//" + url.host + url.pathname + url.search + url.hash;
-    window.location.replace(newhref);
-  }
-  // ]]>
-</script>
+<script type="text/javascript">if("web-manajemen.blogspot.com"==window.location.host){let o=window.location.href,e=new URL(o);e.host="www.webmanajemen.com",e.hostname="www.webmanajemen.com";let w=e.protocol+"//"+e.host+e.pathname+e.search+e.hash;window.location.replace(w)}</script>

package/lib/source/https.js

@@ -1,4 +1 @@
-const LOCAL_DOMAINS = ["localhost", "127.0.0.1", "0.0.0.0"];
-if (!LOCAL_DOMAINS.includes(window.location.hostname) && location.protocol && location.protocol !== "https:") {
-  location.replace(`https:${location.href.substring(location.protocol.length)}`);
-}
+const LOCAL_DOMAINS=["localhost","127.0.0.1","0.0.0.0"];!LOCAL_DOMAINS.includes(window.location.hostname)&&location.protocol&&"https:"!==location.protocol&&location.replace(`https:${location.href.substring(location.protocol.length)}`);

package/lib/src/article-ads.d.ts

@@ -9,7 +9,7 @@ declare function articleAds(files: string[], hexo: Hexo): string[];
  * @param {object} data
  * @param {string} content
  */
-export function after_render_html(content: string, data: object): any;
+export function after_render_html(content: string, data: object): string;
 /**
  * inject ads after_post_render event
  * @example

package/lib/src/article-ads.js

@@ -120,7 +120,7 @@ function filter_adshtml(hexo) {
  * @param {Hexo} hexo hexo instances
  * @returns content html string
  */
-var filter_patterns = memoize(function (content, source_path, hexo) {
+var filter_patterns = function (content, source_path, hexo) {
     var _a;
     var options = require("./config")(hexo);
     var excluded = utils.isIgnore(source_path, options.exclude, hexo);
@@ -142,7 +142,7 @@ var filter_patterns = memoize(function (content, source_path, hexo) {
         content: content,
         excluded: excluded
     };
-});
+};
 /**
  * inject ads after_post_render event
  * @example
@@ -215,9 +215,9 @@ function processAdsHtml(content, adshtml, hexo) {
         // add pagead if global _config.yml adsense disabled {adsense.enable: false}
         // prevent duplicate onpage adsense in </head>
         if (!options.enable) {
-            content = content.replace(/<\/head\>/gm, "<script async src=\"//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=" + options.pub + "\" crossorigin=\"anonymous\"></script>");
+            content = content.replace(/<\/head>/gm, "<script async src=\"//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=" + options.pub + "\" crossorigin=\"anonymous\"></script>");
         }
-        content = content.replace(/<\/body\>/gm, replacement(adshtml) + "</body>");
+        content = content.replace(/<\/body>/gm, replacement(adshtml) + "</body>");
     }
     return content;
 }
@@ -256,11 +256,11 @@ function after_render_html(content, data) {
     var hexo = this;
     var options = require("./config")(hexo);
     var page;
-    if (data.hasOwnProperty("post")) {
+    if (data.post) {
         data.type = "post";
         page = data.post;
     }
-    else if (data.hasOwnProperty("page")) {
+    else if (data.page) {
         data.type = "page";
         page = data.page;
     }

package/lib/src/config.d.ts

@@ -1,20 +1,13 @@
-declare function _exports(hexo: any): {
-    /**
-     * Enable adsense
-     */
-    enable: boolean;
-    article_ads: string[];
-    /**
-     * Adsense ca-pub
-     */
-    pub: string;
-    adblock: boolean;
-    https: boolean;
-    field: string;
-    exclude: string[];
-    /**
-     * is development mode?
-     */
-    development: boolean;
-};
+declare function _exports(hexo: Hexo): typeof defaultConfig;
 export = _exports;
+import Hexo = require("hexo");
+declare namespace defaultConfig {
+    const enable: boolean;
+    const article_ads: string[];
+    const pub: string;
+    const adblock: boolean;
+    const https: boolean;
+    const field: string;
+    const exclude: string[];
+    const development: boolean;
+}

package/lib/src/config.js

@@ -2,8 +2,6 @@
 /* global hexo */
 var Hexo = require("hexo");
 var assign = require("object-assign");
-var memoize = require("underscore").memoize;
-var checkLocalHost = require("./checkLocalHost");
 var defaultConfig = {
     /**
      * Enable adsense
@@ -30,15 +28,15 @@ var defaultConfig = {
  * @param {Hexo} hexo
  * @returns {typeof defaultConfig}
  */
-module.exports = memoize(function (hexo) {
+module.exports = function (hexo) {
     if (hexo && typeof hexo.config.adsense != "undefined") {
         /**
          * @type {typeof defaultConfig}
          */
         var c = assign(defaultConfig, hexo.config.adsense);
         c.development = defaultConfig.development = require("../packages/hexo-cli-extras/lib/env").isDev(hexo);
-        //console.log(c);
+        ///////////console.log(c);
         return c;
     }
     return defaultConfig;
-});
+};

package/lib/src/utils.d.ts

@@ -12,12 +12,20 @@ export function memoize(fn: any, debug: any): typeof import('underscore').memoiz
  * @param {any} obj
  */
 export function dump(filename: string, ...obj: any): any;
-export function isIgnore(path0: any, exclude: any, hexo: any): boolean;
+/**
+ *
+ * @param {string} path0
+ * @param {string[]|string} exclude
+ * @param {Hexo} hexo
+ * @returns
+ */
+export function isIgnore(path0: string, exclude: string[] | string, hexo: Hexo): boolean;
 declare function randomInt(min: any, max: any): number;
 export function streamToString(stream: any): Promise<any>;
 export function isFileChanged(filePath: any): any;
 export function getFileCache(filePath: any, defaultData: any): any;
 export function setFileCache(filePath: any, newData: any): void;
 export function setHexo(inHexo: any): void;
+import Hexo = require("hexo");
 import Promise = require("bluebird");
 export { randomInt as randInt };

package/lib/src/utils.js

@@ -28,7 +28,7 @@ function setHexo(inHexo) {
  * @param {Hexo} hexo
  * @returns
  */
-var isIgnore = underscore.memoize(function (path0, exclude, hexo) {
+var isIgnore = function (path0, exclude, hexo) {
     if (exclude && !Array.isArray(exclude))
         exclude = [exclude];
     if (path0 && exclude && exclude.length) {
@@ -48,7 +48,7 @@ var isIgnore = underscore.memoize(function (path0, exclude, hexo) {
         }
     }
     return false;
-});
+};
 function streamToString(stream) {
     return new Promise(function (resolve, reject) {
         var chunks = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-adsense",
-  "version": "1.0.21",
+  "version": "1.0.25",
   "description": "Hexo adsense support",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -8,10 +8,11 @@
     "lint": "eslint --ext .js,.jsx,.ts,.d.ts,.tsx ./",
     "lint:fix": "eslint --fix --ext .js,.jsx,.ts,.d.ts,.tsx ./",
     "copy-files": "copyfiles -u 1 source/**/*.{html,css,js} lib/source/",
-    "build": "rm -rf lib && tsc && npm run copy-files"
+    "build": "rm -rf lib && gulp"
   },
   "files": [
     "lib",
+    "packages",
     "*.md"
   ],
   "keywords": [
@@ -37,14 +38,28 @@
     "md5-file": "^4.0.0",
     "minimatch": "^3.0.4",
     "moment": "^2.29.1",
+    "node-html-parser": "^5.1.0",
     "object-assign": "^4.1.1",
     "underscore": "^1.13.1"
   },
   "devDependencies": {
-    "@types/jsdom": "^16.2.13",
+    "@types/gulp-sourcemaps": "^0.0.35",
+    "@typescript-eslint/parser": "^4.33.0",
     "copyfiles": "github:calvinmetcalf/copyfiles",
+    "del": "^6.0.0",
     "eslint": "^7.32.0",
-    "eslint-plugin-ejs": "^0.0.2",
-    "jsdom": "^18.0.1"
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-prettier": "^4.0.0",
+    "gulp": "^4.0.2",
+    "gulp-autoprefixer": "^8.0.0",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-html-minifier-terser": "^6.0.1",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-terser": "^2.1.0",
+    "jsdom": "^18.0.1",
+    "prettier": "2.4.1",
+    "terser": "^5.10.0",
+    "typescript": "^4.4.4"
   }
 }

package/packages/hexo-cli-extras/.eslintrc

@@ -0,0 +1,13 @@
+{
+    "extends": "eslint:recommended",
+    "rules": {
+        "comma-dangle": 0,
+        "no-console": 0
+    },
+    "env": {
+        "node": true
+    },
+    "globals": {
+        "hexo": true
+    }
+}

package/packages/hexo-cli-extras/LICENSE.md

@@ -0,0 +1,20 @@
+Copyright (c) 2015 Gregory Scheerlinck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+