artalk 2.2.4 → 2.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artalk",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "backendMinVersion": "2.1.2",
   "license": "LGPL-3.0",
   "description": "A Selfhosted Comment System",

package/src/api/index.ts

@@ -45,7 +45,7 @@ export default class Api {
       content: comment.content,
       rid: comment.rid,
       page_key: comment.page_key,
-      ua: await Utils.getCorrectUserAgent(), // 需要后端支持，获取修正后的 UA (针对 Win11)
+      ua: await Utils.getCorrectUserAgent(), // 需要后端支持，获取修正后的 UA
     }
 
     if (comment.page_title) params.page_title = comment.page_title

package/src/components/editor-plugs/emoticons-plug.ts

@@ -20,22 +20,33 @@ export default class EmoticonsPlug extends EditorPlug {
   public $grpWrap!: HTMLElement
   public $grpSwitcher!: HTMLElement
 
+  public loadingTask: Promise<void>|null = null
+
   constructor (public editor: Editor) {
     super(editor)
 
     this.$el = Utils.createElement(`<div class="atk-editor-plug-emoticons"></div>`)
-
-    this.init()
   }
 
-  async init() {
-    // 数据处理
-    Ui.showLoading(this.$el)
-    this.emoticons = await this.handleData(this.ctx.conf.emoticons)
-    Ui.hideLoading(this.$el)
+  isListLoaded = false
+  isImgLoaded = false
+
+  async loadEmoticonsData() {
+    if (this.isListLoaded) return
+    if (this.loadingTask !== null) {
+      await this.loadingTask
+      return
+    }
 
-    // 初始化元素
-    this.initEmoticonsList()
+    // 数据处理
+    this.loadingTask = (async () => {
+      Ui.showLoading(this.$el)
+      this.emoticons = await this.handleData(this.ctx.conf.emoticons)
+      Ui.hideLoading(this.$el)
+      this.loadingTask = null
+      this.isListLoaded = true
+    })()
+    await this.loadingTask
   }
 
   async handleData(data: any): Promise<any[]> {
@@ -85,7 +96,7 @@ export default class EmoticonsPlug extends EditorPlug {
     // 剔除非法数据
     data = data.filter((item: any) => (typeof item === 'object' && !Array.isArray(item) && !!item && !!item.name))
 
-    console.log(data)
+    // console.log(data)
 
     this.solveNullKey(data)
     this.solveSameKey(data)
@@ -243,10 +254,20 @@ export default class EmoticonsPlug extends EditorPlug {
   }
 
   onShow () {
-    // 延迟执行，防止无法读取高度
-    setTimeout(() => {
-      this.changeListHeight()
-    }, 30)
+    ;(async () => {
+      await this.loadEmoticonsData()
+
+      // 初始化元素
+      if (!this.isImgLoaded) {
+        this.initEmoticonsList()
+        this.isImgLoaded = true
+      }
+
+      // 延迟执行，防止无法读取高度
+      setTimeout(() => {
+        this.changeListHeight()
+      }, 30)
+    })()
   }
 
   onHide () {

package/src/components/editor.ts

@@ -205,6 +205,17 @@ export default class Editor extends Component {
       // 切换按钮
       const btnElem = Utils.createElement(`<span class="atk-plug-btn" data-plug-name="${PlugObj.Name}">${PlugObj.BtnHTML}</span>`)
       this.$plugBtnWrap.appendChild(btnElem)
+
+      // 表情包插件预加载
+      if (PlugObj.Name === 'emoticons') {
+        const emoPlug = new PlugObj(this) as EmoticonsPlug
+        this.plugList[PlugObj.Name] = emoPlug
+
+        window.setTimeout(() => {
+          emoPlug.loadEmoticonsData()
+        }, 1000) // 延迟 1s 加载
+      }
+
       btnElem.addEventListener('click', () => {
         let plug = this.plugList[PlugObj.Name]
         if (!plug) {
@@ -398,7 +409,11 @@ export default class Editor extends Component {
     if (!!this.plugList && !!this.plugList.preview) {
       this.plugList.preview.updateContent()
     }
-    this.adjustTextareaHeight()
+
+    // 延迟执行防止无效
+    window.setTimeout(() => {
+      this.adjustTextareaHeight()
+    }, 80)
   }
 
   clearEditor () {
@@ -568,5 +583,9 @@ export default class Editor extends Component {
     // 取消回复
     if (this.replyComment !== null) this.cancelReply()
   }
+
+  initRemoteEmoticons () {
+
+  }
 }
 

package/src/context.ts

@@ -42,4 +42,5 @@ export default class Context {
   }
 
   public markedInstance!: typeof libMarked
+  public markedReplacers: ((raw: string) => string)[] = []
 }

package/src/lib/detect.ts

@@ -0,0 +1,222 @@
+const win = (window as any) || {}
+const nav = navigator || {}
+
+function Detect (userAgent?: string) {
+  const u = String(userAgent || nav.userAgent)
+  const dest = {
+    os: '',
+    osVersion: '',
+    engine: '',
+    browser: '',
+    device: '',
+    language: '',
+    version: ''
+  }
+
+  // 内核
+  const engineMatch = {
+    Trident: u.includes('Trident') || u.includes('NET CLR'),
+    Presto: u.includes('Presto'),
+    WebKit: u.includes('AppleWebKit'),
+    Gecko: u.includes('Gecko/')
+  }
+
+  // 浏览器
+  const browserMatch = {
+    Safari: u.includes('Safari'),
+    Chrome: u.includes('Chrome') || u.includes('CriOS'),
+    IE: u.includes('MSIE') || u.includes('Trident'),
+    Edge: u.includes('Edge') || u.includes('Edg'),
+    Firefox: u.includes('Firefox') || u.includes('FxiOS'),
+    'Firefox Focus': u.includes('Focus'),
+    Chromium: u.includes('Chromium'),
+    Opera: u.includes('Opera') || u.includes('OPR'),
+    Vivaldi: u.includes('Vivaldi'),
+    Yandex: u.includes('YaBrowser'),
+    Kindle: u.includes('Kindle') || u.includes('Silk/'),
+    360: u.includes('360EE') || u.includes('360SE'),
+    UC: u.includes('UC') || u.includes(' UBrowser'),
+    QQBrowser: u.includes('QQBrowser'),
+    QQ: u.includes('QQ/'),
+    Baidu: u.includes('Baidu') || u.includes('BIDUBrowser'),
+    Maxthon: u.includes('Maxthon'),
+    Sogou: u.includes('MetaSr') || u.includes('Sogou'),
+    LBBROWSER: u.includes('LBBROWSER'),
+    '2345Explorer': u.includes('2345Explorer'),
+    TheWorld: u.includes('TheWorld'),
+    MIUI: u.includes('MiuiBrowser'),
+    Quark: u.includes('Quark'),
+    Qiyu: u.includes('Qiyu'),
+    Wechat: u.includes('MicroMessenger'),
+    Taobao: u.includes('AliApp(TB'),
+    Alipay: u.includes('AliApp(AP'),
+    Weibo: u.includes('Weibo'),
+    Douban: u.includes('com.douban.frodo'),
+    Suning: u.includes('SNEBUY-APP'),
+    iQiYi: u.includes('IqiyiApp'),
+  }
+
+  // 系统或平台
+  const osMatch = {
+    Windows: u.includes('Windows'),
+    Linux: u.includes('Linux') || u.includes('X11'),
+    'macOS': u.includes('Macintosh'),
+    Android: u.includes('Android') || u.includes('Adr'),
+    Ubuntu: u.includes('Ubuntu'),
+    FreeBSD: u.includes('FreeBSD'),
+    Debian: u.includes('Debian'),
+    'Windows Phone': u.includes('IEMobile') || u.includes('Windows Phone'),
+    BlackBerry: u.includes('BlackBerry') || u.includes('RIM'),
+    MeeGo: u.includes('MeeGo'),
+    Symbian: u.includes('Symbian'),
+    iOS: u.includes('like Mac OS X'),
+    'Chrome OS': u.includes('CrOS'),
+    WebOS: u.includes('hpwOS'),
+  }
+
+  // 设备
+  const deviceMatch = {
+    Mobile: u.includes('Mobi') || u.includes('iPh') || u.includes('480'),
+    Tablet: u.includes('Tablet') || u.includes('Pad') || u.includes('Nexus 7')
+  }
+
+  // 修正
+  if (deviceMatch.Mobile) {
+    deviceMatch.Mobile = !(u.includes('iPad'))
+  } else if (browserMatch.Chrome && u.includes('Edg')) {
+    // Chrome 内核的 Edge
+    browserMatch.Chrome = false
+    browserMatch.Edge = true
+  } else if (win.showModalDialog && win.chrome) {
+    browserMatch.Chrome = false
+    browserMatch['360'] = true
+  }
+
+  // 默认设备
+  dest.device = 'PC'
+
+  // 语言
+  dest.language = (() => {
+    const g = ((nav as any).browserLanguage || nav.language)
+    const arr = g.split('-')
+    if (arr[1]) arr[1] = arr[1].toUpperCase()
+    return arr.join('_')
+  })()
+
+  // 应用判断数据
+  const hash = {
+    engine: engineMatch,
+    browser: browserMatch,
+    os: osMatch,
+    device: deviceMatch,
+  }
+  Object.entries(hash).forEach(([type, match]) => {
+    Object.entries(match).forEach(([name, result]) => {
+      if (result === true) dest[type] = name
+    })
+  })
+
+  // 系统版本信息
+  const osVersion = {
+    Windows: () => {
+      const v = u.replace(/^.*Windows NT ([\d.]+);.*$/, '$1')
+      const wvHash = {
+        '6.4': '10',
+        '6.3': '8.1',
+        '6.2': '8',
+        '6.1': '7',
+        '6.0': 'Vista',
+        '5.2': 'XP',
+        '5.1': 'XP',
+        '5.0': '2000',
+        '10.0': '10',
+        '11.0': '11' // 自定的，不是微软官方的判断方法
+      }
+      return wvHash[v] || v
+    },
+    Android: () => u.replace(/^.*Android ([\d.]+);.*$/, '$1'),
+    iOS: () => u.replace(/^.*OS ([\d_]+) like.*$/, '$1').replace(/_/g, '.'),
+    Debian: () => u.replace(/^.*Debian\/([\d.]+).*$/, '$1'),
+    'Windows Phone': () => u.replace(/^.*Windows Phone( OS)? ([\d.]+);.*$/, '$2'),
+    'macOS': () => u.replace(/^.*Mac OS X ([\d_]+).*$/, '$1').replace(/_/g, '.'),
+    WebOS: () => u.replace(/^.*hpwOS\/([\d.]+);.*$/, '$1')
+  }
+
+  dest.osVersion = ''
+  if (osVersion[dest.os]) {
+    dest.osVersion = osVersion[dest.os]()
+    if (dest.osVersion === u) {
+      dest.osVersion = ''
+    }
+  }
+
+  // 浏览器版本信息
+  const version = {
+    Safari: () => u.replace(/^.*Version\/([\d.]+).*$/, '$1'),
+    Chrome: () => u.replace(/^.*Chrome\/([\d.]+).*$/, '$1').replace(/^.*CriOS\/([\d.]+).*$/, '$1'),
+    IE: () => u.replace(/^.*MSIE ([\d.]+).*$/, '$1').replace(/^.*rv:([\d.]+).*$/, '$1'),
+    Edge: () => u.replace(/^.*(Edge|Edg|Edg[A-Z]{1})\/([\d.]+).*$/, '$2'),
+    Firefox: () => u.replace(/^.*Firefox\/([\d.]+).*$/, '$1').replace(/^.*FxiOS\/([\d.]+).*$/, '$1'),
+    'Firefox Focus': () => u.replace(/^.*Focus\/([\d.]+).*$/, '$1'),
+    Chromium: () => u.replace(/^.*Chromium\/([\d.]+).*$/, '$1'),
+    Opera: () => u.replace(/^.*Opera\/([\d.]+).*$/, '$1').replace(/^.*OPR\/([\d.]+).*$/, '$1'),
+    Vivaldi: () => u.replace(/^.*Vivaldi\/([\d.]+).*$/, '$1'),
+    Yandex: () => u.replace(/^.*YaBrowser\/([\d.]+).*$/, '$1'),
+    Kindle: () => u.replace(/^.*Version\/([\d.]+).*$/, '$1'),
+    Maxthon: () => u.replace(/^.*Maxthon\/([\d.]+).*$/, '$1'),
+    QQBrowser: () => u.replace(/^.*QQBrowser\/([\d.]+).*$/, '$1'),
+    QQ: () => u.replace(/^.*QQ\/([\d.]+).*$/, '$1'),
+    Baidu: () => u.replace(/^.*BIDUBrowser[\s/]([\d.]+).*$/, '$1'),
+    UC: () => u.replace(/^.*UC?Browser\/([\d.]+).*$/, '$1'),
+    Sogou: () => u.replace(/^.*SE ([\d.X]+).*$/, '$1').replace(/^.*SogouMobileBrowser\/([\d.]+).*$/, '$1'),
+    '2345Explorer': () => u.replace(/^.*2345Explorer\/([\d.]+).*$/, '$1'),
+    TheWorld: () => u.replace(/^.*TheWorld ([\d.]+).*$/, '$1'),
+    MIUI: () => u.replace(/^.*MiuiBrowser\/([\d.]+).*$/, '$1'),
+    Quark: () => u.replace(/^.*Quark\/([\d.]+).*$/, '$1'),
+    Qiyu: () => u.replace(/^.*Qiyu\/([\d.]+).*$/, '$1'),
+    Wechat: () => u.replace(/^.*MicroMessenger\/([\d.]+).*$/, '$1'),
+    Taobao: () => u.replace(/^.*AliApp\(TB\/([\d.]+).*$/, '$1'),
+    Alipay: () => u.replace(/^.*AliApp\(AP\/([\d.]+).*$/, '$1'),
+    Weibo: () => u.replace(/^.*weibo__([\d.]+).*$/, '$1'),
+    Douban: () => u.replace(/^.*com.douban.frodo\/([\d.]+).*$/, '$1'),
+    Suning: () => u.replace(/^.*SNEBUY-APP([\d.]+).*$/, '$1'),
+    iQiYi: () => u.replace(/^.*IqiyiVersion\/([\d.]+).*$/, '$1'),
+  }
+
+  dest.version = ''
+  if (version[dest.browser]) {
+    dest.version = version[dest.browser]()
+    if (dest.version === u) {
+      dest.version = ''
+    }
+  }
+
+  // 简化版本号
+  /* if (_this.osVersion.indexOf('.')) {
+    _this.osVersion = _this.osVersion.substring(0, _this.osVersion.indexOf('.'))
+  } */
+  if (dest.version.indexOf('.')) {
+    dest.version = dest.version.substring(0, dest.version.indexOf('.'))
+  }
+
+  // 修正
+  if (dest.os === 'iOS' && u.includes('iPad')) {
+    dest.os = 'iPadOS'
+  } else if (dest.browser === 'Edge' && !u.includes('Edg')) {
+    dest.engine = 'EdgeHTML'
+  } else if (dest.browser === 'MIUI') {
+    dest.os = 'Android'
+  } else if (dest.browser === 'Chrome' && Number(dest.version) > 27) {
+    dest.engine = 'Blink'
+  } else if (dest.browser === 'Opera' && Number(dest.version) > 12) {
+    dest.engine = 'Blink'
+  } else if (dest.browser === 'Yandex') {
+    dest.engine = 'Blink'
+  } else if (dest.browser === undefined) {
+    dest.browser = 'Unknow App'
+  }
+
+  return dest
+}
+
+export default Detect

package/src/lib/utils.ts

@@ -143,10 +143,10 @@ export function versionCompare(a: string, b: string) {
 /** 初始化 marked */
 export function initMarked(ctx: Context) {
   const renderer = new libMarked.Renderer()
-  const linkRenderer = renderer.link
+  const orgLinkRenderer = renderer.link
   renderer.link = (href, title, text) => {
     const localLink = href?.startsWith(`${window.location.protocol}//${window.location.hostname}`);
-    const html = linkRenderer.call(renderer as any, href, title, text);
+    const html = orgLinkRenderer.call(renderer as any, href, title, text);
     return html.replace(/^<a /, `<a target="_blank" ${!localLink ? `rel="noreferrer noopener nofollow"` : ''} `);
   }
 
@@ -186,8 +186,9 @@ export function initMarked(ctx: Context) {
 
 /** 解析 markdown */
 export function marked(ctx: Context, src: string): string {
+  // @link https://github.com/markedjs/marked/discussions/1232
   // @link https://gist.github.com/lionel-rowe/bb384465ba4e4c81a9c8dada84167225
-  return insane(ctx.markedInstance.parse(src), {
+  let dest = insane(ctx.markedInstance.parse(src), {
     allowedClasses: {},
     allowedSchemes: ['http', 'https', 'mailto'],
     allowedTags: [
@@ -198,7 +199,7 @@ export function marked(ctx: Context, src: string): string {
     ],
     allowedAttributes: {
       '*': ['title', 'accesskey'],
-      a: ['href', 'name', 'target', 'aria-label'],
+      a: ['href', 'name', 'target', 'aria-label', 'rel'],
       img: ['src', 'alt', 'title', 'atk-emoticon', 'aria-label'],
       // for code highlight
       code: ['class'],
@@ -229,28 +230,45 @@ export function marked(ctx: Context, src: string): string {
       return true
     }
   })
+
+  // 内容替换器
+  ctx.markedReplacers.forEach((replacer) => {
+    if (typeof replacer === 'function') dest = replacer(dest)
+  })
+
+  return dest
 }
 
 /** 获取修正后的 UserAgent */
 export async function getCorrectUserAgent() {
   const uaRaw = navigator.userAgent
-  const uaData = (navigator as any).userAgentData // @link https://web.dev/migrate-to-ua-ch/
-  if (!uaData || !uaData.getHighEntropyValues) {
+  if (!(navigator as any).userAgentData || !(navigator as any).userAgentData.getHighEntropyValues) {
     return uaRaw
   }
 
-  // microsoft f******k you!!!!!
-  // @link https://docs.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
+  // @link https://web.dev/migrate-to-ua-ch/
+  // @link https://web.dev/user-agent-client-hints/
+  const uaData = (navigator as any).userAgentData
   let uaGot: any = null
   try {
     uaGot = await uaData.getHighEntropyValues(["platformVersion"])
   } catch (err) { console.error(err); return uaRaw }
-
-  if (uaData.platform !== "Windows") { return uaRaw }
   const majorPlatformVersion = Number(uaGot.platformVersion.split('.')[0])
-  if (majorPlatformVersion >= 13) {
-    // Win11 样本："Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"
-    return uaRaw.replace(/Windows\W+NT\W+10.0/, 'Windows NT 11.0')
+
+  if (uaData.platform === "Windows") {
+    if (majorPlatformVersion >= 13) { // @link https://docs.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
+      // @date 2022-4-29
+      // Win 11 样本："Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36"
+      return uaRaw.replace(/Windows NT 10.0/, 'Windows NT 11.0')
+    }
+  }
+  if (uaData.platform === "macOS") {
+    if (majorPlatformVersion >= 11) { // 11 => BigSur
+      // @date 2022-4-29
+      // (Intel Chip) macOS 12.3 样本："Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36"
+      // (Arm Chip) macOS 样本："Mozilla/5.0 (Macintosh; ARM Mac OS X 10_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15"
+      return uaRaw.replace(/(Mac OS X \d+_\d+_\d+|Mac OS X)/, `Mac OS X ${uaGot.platformVersion.replace(/\./g, '_')}`)
+    }
   }
 
   return uaRaw