wgt-node-utils 1.2.67 → 1.2.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgt-node-utils",
-  "version": "1.2.67",
+  "version": "1.2.69",
   "description": "WGT工具类包",
   "main": "dist/bundle.js",
   "scripts": {

package/src/index.js

@@ -882,7 +882,7 @@ class wgtNodeUtils {
     seoFun = ({ url, name, image, author, aggregateRating, description, hostname, languageList, lang, title, type, applicationCategory, genre,time }) => {
         const pathWithoutLang = url ? url.replace(/(https?:\/\/[^/]+)\/en\b/, "$1") : '/';
         const seoRenderLdJson = this.renderLdJson({ pathWithoutLang, name, image, author, aggregateRating, description, hostname, type, languageList, applicationCategory, genre,time });
-        const seoRenderAlternateLink = this.renderAlternateLink({ languageList, url, pathWithoutLang });
+        const seoRenderAlternateLink = this.renderAlternateLink({ languageList, url, pathWithoutLang, lang });
         const seoraphAndTwitterFun = this.graphAndTwitterFun({ image, url, title, hostname, description, lang, pathWithoutLang });
         const seoContent = {
             seoRenderLdJson,
@@ -912,11 +912,6 @@ class wgtNodeUtils {
         * @param genre: 游戏所属分类
     */
     renderLdJson = ({ url, name, image, author, aggregateRating, description, hostname, type, languageList, applicationCategory, genre, time }) => {
-        if (!url || !name) {
-            console.warn('renderLdJson: missing required fields (url, name)');
-            return null;
-        }
-
         const currentType = type || 'WebApplication';
         const inLanguage = languageList ? languageList.map(item => item.code) : [];
         const organizationUrl = `https://${hostname}`;
@@ -980,14 +975,18 @@ class wgtNodeUtils {
      * @param {Array} languageList - 语言列表
      * @param {string} url - 页面URL
      */
-    renderAlternateLink = ({ languageList, url, pathWithoutLang }) => {
+    renderAlternateLink = ({ languageList, url, pathWithoutLang, lang }) => {
         const languageLinkList = languageList.map(item => ({
             rel: 'alternate',
             hrefLang: item.code === 'en' ? 'en' : item.code,
             href: item.code === 'en' ? pathWithoutLang : url.replace(/(https?:\/\/[^/]+)\/en(?=\/|$)/, `$1/${item.code}`)
         }));
         languageLinkList.push({ rel: 'alternate', hrefLang: 'x-default', href: pathWithoutLang });
-        languageLinkList.push({ rel: 'canonical', href: pathWithoutLang });
+        // canonical 指向当前语言的实际 URL，非英语语言需替换为对应语言路径
+        const canonicalUrl = (lang && lang !== 'en')
+            ? url.replace(/(https?:\/\/[^/]+)\/en(?=\/|$)/, `$1/${lang}`)
+            : pathWithoutLang;
+        languageLinkList.push({ rel: 'canonical', href: canonicalUrl });
         return languageLinkList
     }
     // Open Graph 和 Twitter Card 站外引流触点