Merge branch 'release/3.62.2'

Author: purocean

README.md

@@ -76,9 +76,9 @@ For more information on how to use the following functions, please see [characte
 
 ## Changelogs
 
-### [v3.62.1](https://github.com/purocean/yn/releases/tag/v3.62.1) 2023-10-08
+### [v3.62.2](https://github.com/purocean/yn/releases/tag/v3.62.2) 2023-10-08
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-win-x64-3.62.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-mac-arm64-3.62.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-mac-x64-3.62.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-linux-x86_64-3.62.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-linux-amd64-3.62.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-win-x64-3.62.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-mac-arm64-3.62.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-mac-x64-3.62.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-linux-x86_64-3.62.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-linux-amd64-3.62.2.deb)
 
 1. feat: sidebar document outline supports folding and expansion
 2. feat: supports offline activation of premium version

README_ZH-CN.md

@@ -76,9 +76,9 @@
 
 ## 更新日志
 
-### [v3.62.1](https://github.com/purocean/yn/releases/tag/v3.62.1) 2023-10-08
+### [v3.62.2](https://github.com/purocean/yn/releases/tag/v3.62.2) 2023-10-08
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-win-x64-3.62.1.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-mac-arm64-3.62.1.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-mac-x64-3.62.1.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-linux-x86_64-3.62.1.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.62.1/Yank-Note-linux-amd64-3.62.1.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-win-x64-3.62.2.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-mac-arm64-3.62.2.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-mac-x64-3.62.2.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-linux-x86_64-3.62.2.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.62.2/Yank-Note-linux-amd64-3.62.2.deb)
 
 1. feat: 侧栏文档大纲支持折叠展开
 2. feat: 支持离线激活高级版

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "3.62.1",
+  "version": "3.62.2",
   "description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
   "main": "dist/main/app.js",
   "license": "AGPL-3.0",

src/main/server/premium.ts

@@ -1,4 +1,4 @@
-import { AppLicenseClient } from 'app-license'
+import { AppLicenseClient, decodeDevice } from 'app-license'
 import request from 'request'
 import { API_BASE_URL, PREMIUM_PUBLIC_KEY } from '../../share/misc'
 import { getAction } from '../action'
@@ -65,6 +65,14 @@ export function upgradeLicense (payload: {oldLicense: string, locale: string}) {
   return fetchApi('/upgrade-license', payload)
 }
 
+export async function checkDevice (payload: { device: string }) {
+  const device = decodeDevice(await genDeviceString())
+  const _device = decodeDevice(payload.device)
+  if (device.id !== _device.id || device.platform !== _device.platform) {
+    throw new Error('INVALID_LICENSE')
+  }
+}
+
 export function genDeviceString () {
   return client.genDeviceString()
 }

src/renderer/components/Premium.vue

@@ -116,7 +116,7 @@
         </div>
         <div class="offline-input-wrapper">
           <input readonly :value="machineCode" />
-          <button class="primary small input-copy-btn" @click="copyMachineCode">Copy</button>
+          <button v-if="machineCode" class="primary small input-copy-btn" @click="copyMachineCode">Copy</button>
         </div>
         <div class="code-label">
           Activation Token
@@ -226,7 +226,8 @@ export default defineComponent({
 
       devices.value = data.map(x => {
         const item = decodeDevice(x)
-        const isCurrent = token.device === x
+        const device = decodeDevice(token.device)
+        const isCurrent = device.id === item.id && device.platform === item.platform
         return {
           isCurrent,
           label: `[${item.platform}] ${item.hostname} ` +
@@ -368,6 +369,7 @@ export default defineComponent({
 
     watch(tab, () => {
       offline.value = false
+      activationToken.value = ''
     })
 
     watchEffect(async () => {

src/renderer/others/premium.ts

@@ -25,6 +25,7 @@ type Payload = {
   addDevice: { licenseId: string }
   fetchDevices: { licenseId: string }
   upgradeLicense: { oldLicense: string, locale: string }
+  checkDevice: { device: string }
   genDeviceString: {},
 }
 
@@ -142,7 +143,7 @@ export function showPremium (tab?: PremiumTab) {
   ga.logEvent('yn_premium_show', { purchased: getPurchased() })
 }
 
-export function getLicenseToken (throwError = false) {
+export function getLicenseToken () {
   logger.debug('getLicenseToken')
   try {
     const tokenStr = getSetting('license')
@@ -167,10 +168,6 @@ export function getLicenseToken (throwError = false) {
 
     return syncCacheLicenseToken(token)
   } catch (error) {
-    if (throwError) {
-      throw error
-    }
-
     logger.error('getLicenseToken', error)
   }
 
@@ -217,11 +214,21 @@ async function setLicense (licenseId: string) {
   }
 }
 
+async function checkDevice (device: string) {
+  try {
+    await requestApi('checkDevice', { device })
+  } catch (error) {
+    cleanLicense()
+    throw error
+  }
+}
+
 export async function refreshLicense (opts?: { throwError?: boolean }) {
   logger.debug('refreshLicense', opts)
   try {
     const token = getLicenseToken()
     if (token) {
+      await checkDevice(token.device)
       await setLicense(token.licenseId)
     }
   } catch (error) {
@@ -242,7 +249,12 @@ export async function activateLicense (licenseId: string) {
 export async function activateByTokenString (tokenString: string) {
   logger.debug('activateByToken', tokenString)
   await setSetting('license', tokenPrefix + tokenString)
-  getLicenseToken(true)
+  const token = getLicenseToken()
+  if (token) {
+    await checkDevice(token.device)
+  } else {
+    throw new Error('INVALID_LICENSE')
+  }
 }
 
 function checkLicenseStatus () {