fix: 修复插件检查服务时没有使用 baseUrl 的错误

rxliuli · Jan 5, 2023 · 549aff5 · 549aff5
1 parent 190e33f
commit 549aff5
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 115 deletions.
diff --git a/apps/joplin-vscode-plugin/package.json b/apps/joplin-vscode-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joplin-vscode-plugin",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "%package.description%",
   "homepage": "https://joplin-utils.rxliuli.com/zh/joplin-vscode-plugin/",
   "repository": {

diff --git a/apps/joplin-vscode-plugin/src/config/AppConfig.ts b/apps/joplin-vscode-plugin/src/config/AppConfig.ts
@@ -1,3 +1,4 @@
+import { config } from 'joplin-api'
 import * as vscode from 'vscode'
 
 export enum SortNotesTypeEnum {
@@ -22,13 +23,15 @@ export class AppConfig {
    * reload joplin for vscode config
    */
   loadConfig() {
-    const config = vscode.workspace.getConfiguration('joplin')
-    this.token = config.token
-    this.baseUrl = config.baseUrl
-    this.deleteConfirm = config.deleteConfirm
-    this.sortNotes = config.sortNotes
-    this.sortNotesType = config.sortNotesType
-    this.sortOrder = config.sortOrder
+    const c = vscode.workspace.getConfiguration('joplin')
+    this.token = c.token
+    this.baseUrl = c.baseUrl
+    this.deleteConfirm = c.deleteConfirm
+    this.sortNotes = c.sortNotes
+    this.sortNotesType = c.sortNotesType
+    this.sortOrder = c.sortOrder
+    config.baseUrl = this.baseUrl
+    config.token = this.token!
     if (process.env.DEBUG) {
       console.log(
         'loadConfig: ',

diff --git a/apps/joplin-vscode-plugin/src/extension.ts b/apps/joplin-vscode-plugin/src/extension.ts
@@ -3,7 +3,7 @@
 import * as vscode from 'vscode'
 import { NoteExplorerProvider } from './model/NoteExplorerProvider'
 import { JoplinNoteCommandService } from './service/JoplinNoteCommandService'
-import { TypeEnum } from 'joplin-api'
+import { config, TypeEnum } from 'joplin-api'
 import { appConfig } from './config/AppConfig'
 import { HandlerService } from './service/HandlerService'
 import { checkJoplinServer } from './util/checkJoplinServer'
@@ -36,6 +36,7 @@ export async function activate(context: vscode.ExtensionContext) {
   logger
     .add(new transports.File({ filename: path.resolve(logPath, 'error.log'), level: 'error' }))
     .add(new transports.File({ filename: path.resolve(logPath, 'combined.log') }))
+  logger.info(`joplin config, baseUrl: ${config.baseUrl}, token: ${typeof config.token}`)
   await init()
   if (!(await checkJoplinServer())) {
     return

diff --git a/apps/joplin-vscode-plugin/src/service/HandlerService.ts b/apps/joplin-vscode-plugin/src/service/HandlerService.ts
@@ -1,9 +1,8 @@
 import * as vscode from 'vscode'
 import { TextDocument, Uri } from 'vscode'
-import { noteApi, resourceApi, TypeEnum } from 'joplin-api'
+import { noteApi, resourceApi } from 'joplin-api'
 import { parse } from 'querystring'
 import { JoplinNoteCommandService } from './JoplinNoteCommandService'
-import { JoplinTreeItem } from '../model/JoplinTreeItem'
 import { JoplinNoteUtil } from '../util/JoplinNoteUtil'
 import { OpenFileService } from '../util/OpenFileService'
 import { safePromise } from '../util/safePromise'
@@ -35,13 +34,13 @@ export class HandlerService {
       if (!noteId) {
         return
       }
-      console.log('close note: ', noteId)
+      logger.info(`close note, noteId: ${noteId}, fileName: ${path.basename(e.fileName)}`)
       await remove(e.fileName)
       GlobalContext.openNoteMap.delete(noteId)
       GlobalContext.openNoteResourceMap.delete(noteId)
     } else if (GlobalContext.openResourceMap.has(e.uri.fsPath)) {
       const resourceId = GlobalContext.openResourceMap.get(e.fileName)!
-      console.log('close resourceId: ', resourceId)
+      logger.info(`close resource, id: ${resourceId}, fileName: ${path.basename(e.fileName)}`)
       await remove(e.fileName)
       GlobalContext.openResourceMap.delete(resourceId)
     }

diff --git a/apps/joplin-vscode-plugin/src/service/JoplinNoteCommandService.ts b/apps/joplin-vscode-plugin/src/service/JoplinNoteCommandService.ts
@@ -226,7 +226,7 @@ export class JoplinNoteCommandService {
     const note = await noteApi.get(item.id, ['body', 'title'])
     const content = (note.title.startsWith('# ') ? '' : '# ') + note.title + '\n\n' + note.body
     await writeFile(tempNotePath, content)
-    logger.info('openNote write tempFile: ' + tempNotePath)
+    logger.info('openNote write tempFile: ' + path.basename(tempNotePath))
     GlobalContext.openNoteMap.set(item.id, tempNotePath)
     GlobalContext.openNoteResourceMap.set(item.id, await noteApi.resourcesById(item.id))
     await vscode.commands.executeCommand('vscode.open', vscode.Uri.file(tempNotePath))

diff --git a/apps/joplin-vscode-plugin/src/util/checkJoplinServer.ts b/apps/joplin-vscode-plugin/src/util/checkJoplinServer.ts
@@ -10,6 +10,10 @@ export async function checkJoplinServer() {
     vscode.window.showErrorMessage(
       `Joplin's token/port is set incorrectly, unable to access Joplin service! Are you sure it is running and active?`,
     )
+  if (!appConfig.token) {
+    vscode.window.showInformationMessage('Please configure joplin token first, and then restart VSCode!')
+    return false
+  }
   try {
     if (!(await joplinApi.ping())) {
       errMsg()
@@ -21,9 +25,6 @@ export async function checkJoplinServer() {
     console.log('Error message: \n', e)
     return false
   }
-  if (!appConfig.token) {
-    vscode.window.showInformationMessage('Please configure joplin token first, and then restart VSCode!')
-    return false
-  }
+
   return true
 }
diff --git a/libs/vite-plugin-chrome-extension-dist-firefox/package.json b/libs/vite-plugin-chrome-extension-dist-firefox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@liuli-util/vite-plugin-chrome-extension-dist-firefox",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "type": "module",
   "exports": {

diff --git a/libs/vite-plugin-chrome-extension-dist-firefox/src/manifest.json b/libs/vite-plugin-chrome-extension-dist-firefox/src/manifest.json
diff --git a/...vite-plugin-chrome-extension-dist-firefox/src/utils/__tests__/convertManifest3To2.test.ts b/...vite-plugin-chrome-extension-dist-firefox/src/utils/__tests__/convertManifest3To2.test.ts
@@ -1,64 +1,84 @@
 import { expect, it } from 'vitest'
 import { convertManifest3To2 } from '../convertManifest3To2'
 
-const v3 = {
-  name: 'Joplin Search Integration',
-  version: '0.2.1',
-  description: 'When using search, related Joplin notes are also displayed in the search results.',
-  manifest_version: 3,
-  background: {
-    service_worker: 'background.js',
-  },
-  content_scripts: [
-    {
-      matches: ['<all_urls>'],
-      js: ['content-scripts/main.js'],
+it('convertManifestChromeToFirefox', () => {
+  expect(
+    convertManifest3To2({
+      name: 'Joplin Search Integration',
+      version: '0.2.1',
+      description: 'When using search, related Joplin notes are also displayed in the search results.',
+      manifest_version: 3,
+      background: {
+        service_worker: 'background.js',
+      },
+      content_scripts: [
+        {
+          matches: ['<all_urls>'],
+          js: ['content-scripts/main.js'],
+        },
+      ],
+      action: {
+        default_popup: 'popup/index.html',
+      },
+      host_permissions: ['http://localhost:27583/*', 'http://localhost:41184/*'],
+      permissions: ['storage'],
+      icons: {
+        '16': 'assets/icon-16.png',
+        '32': 'assets/icon-32.png',
+        '48': 'assets/icon-48.png',
+        '128': 'assets/icon-128.png',
+      },
+      options_page: 'options/index.html',
+    }),
+  ).deep.eq({
+    name: 'Joplin Search Integration',
+    version: '0.2.1',
+    description: 'When using search, related Joplin notes are also displayed in the search results.',
+    manifest_version: 2,
+    background: {
+      scripts: ['background.js'],
     },
-  ],
-  action: {
-    default_popup: 'popup/index.html',
-  },
-  host_permissions: ['http://localhost:27583/*', 'http://localhost:41184/*'],
-  permissions: ['storage'],
-  icons: {
-    '16': 'assets/icon-16.png',
-    '32': 'assets/icon-32.png',
-    '48': 'assets/icon-48.png',
-    '128': 'assets/icon-128.png',
-  },
-  options_page: 'options/index.html',
-}
-
-const v2 = {
-  name: 'Joplin Search Integration',
-  version: '0.2.1',
-  description: 'When using search, related Joplin notes are also displayed in the search results.',
-  manifest_version: 2,
-  background: {
-    scripts: ['background.js'],
-  },
-  content_scripts: [
-    {
-      matches: ['<all_urls>'],
-      js: ['content-scripts/main.js'],
+    content_scripts: [
+      {
+        matches: ['<all_urls>'],
+        js: ['content-scripts/main.js'],
+      },
+    ],
+    browser_action: {
+      default_popup: 'popup/index.html',
+    },
+    permissions: ['storage', 'http://localhost:27583/*', 'http://localhost:41184/*', '<all_urls>'],
+    icons: {
+      '16': 'assets/icon-16.png',
+      '32': 'assets/icon-32.png',
+      '48': 'assets/icon-48.png',
+      '128': 'assets/icon-128.png',
+    },
+    options_ui: {
+      page: 'options/index.html',
+      browser_style: true,
     },
-  ],
-  browser_action: {
-    default_popup: 'popup/index.html',
-  },
-  permissions: ['storage', 'http://localhost:27583/*', 'http://localhost:41184/*', '<all_urls>'],
-  icons: {
-    '16': 'assets/icon-16.png',
-    '32': 'assets/icon-32.png',
-    '48': 'assets/icon-48.png',
-    '128': 'assets/icon-128.png',
-  },
-  options_ui: {
-    page: 'options/index.html',
-    browser_style: true,
-  },
-}
+  })
+})
 
-it('convertManifestChromeToFirefox', () => {
-  expect(convertManifest3To2(v3)).deep.eq(v2)
+it('basic', () => {
+  expect(
+    convertManifest3To2({
+      name: 'Joplin Search Integration',
+      version: '0.2.1',
+      description: 'When using search, related Joplin notes are also displayed in the search results.',
+      manifest_version: 3,
+      background: {
+        service_worker: 'background.js',
+      },
+    }),
+  ).deep.eq({
+    name: 'Joplin Search Integration',
+    version: '0.2.1',
+    description: 'When using search, related Joplin notes are also displayed in the search results.',
+    manifest_version: 2,
+    background: {
+      scripts: ['background.js'],
+    },
+  })
 })
diff --git a/libs/vite-plugin-chrome-extension-dist-firefox/src/utils/convertManifest3To2.ts b/libs/vite-plugin-chrome-extension-dist-firefox/src/utils/convertManifest3To2.ts
@@ -1,18 +1,23 @@
-import manifest3 from '../manifest.json'
-
-export function convertManifest3To2(manifest: typeof manifest3) {
+export function convertManifest3To2(manifest: any) {
   const { background, action, manifest_version, host_permissions, permissions, options_page, ...other } = manifest
-  return {
-    ...other,
-    background: {
+  const r = other as any
+  r.manifest_version = 2
+  if (background.service_worker) {
+    r.background = {
       scripts: [background.service_worker],
-    },
-    browser_action: action,
-    manifest_version: 2,
-    permissions: [...permissions, ...(host_permissions ? [...host_permissions, '<all_urls>'] : [])],
-    options_ui: {
+    }
+  }
+  if (options_page) {
+    r.options_ui = {
       page: options_page,
       browser_style: true,
-    },
+    }
+  }
+  if (action) {
+    r.browser_action = action
+  }
+  if (permissions) {
+    r.permissions = [...permissions, ...(host_permissions ? [...host_permissions, '<all_urls>'] : [])]
   }
+  return r
 }