Skip to content

Commit 65e3fc9

Browse files
committed
feat: readable error in frontend
Signed-off-by: SettingDust <[email protected]>
1 parent 83c858d commit 65e3fc9

File tree

7 files changed

+18
-14
lines changed

7 files changed

+18
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "obsidian-web-clipper",
33
"packageManager": "[email protected]",
44
"type": "module",
5-
"version": "1.0.2",
5+
"version": "1.0.3",
66
"scripts": {
77
"ng": "ng",
88
"lint": "cd ./dist && web-ext lint",

src/_locales/en/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108
"message": "Can't connect to server. Please confirm Obsidian is running, installed Local REST API plugin in Obsidian and check url option"
109109
},
110110
"errorNoPermission": {
111-
"message": "Can't get extension permission"
111+
"message": "Can't get extension permission. Please click request permission in options page"
112112
},
113113
"errorNoToken": {
114-
"message": "No or wrong token"
114+
"message": "No or wrong Local REST API token. Please find it in Obsidian settings"
115115
}
116116
}

src/_locales/zh_CN/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@
100100
"message": "无法连接服务器,请确认 Obsidian 已启动,且装有 Local REST API 插件,并检查 URL 设置"
101101
},
102102
"errorNoPermission": {
103-
"message": "无法获取扩展域名访问权限"
103+
"message": "无法获取扩展域名访问权限,请在设置中点击请求权限按钮"
104104
},
105105
"errorNoToken": {
106-
"message": "令牌缺失或错误"
106+
"message": "Local REST API 令牌缺失或错误,请在 Obsidian 设置中查看插件设置"
107107
}
108108
}

src/app/background/background.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ export class BackgroundComponent {
5151
),
5252
catchError((error: unknown) => {
5353
if (sender?.tab?.id) extensionService.message.action(sender.tab.id, 'error', error)
54-
return throwError(() => error)
54+
console.warn(error)
55+
return of(null)
5556
})
5657
)
5758
)

src/content-scripts/error-action.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
import { ActionData } from '../action'
2-
import $background from './background-listener'
3-
4-
$background.message.actionListener('error').subscribe(({ message, respond }) => {
5-
// TODO: popup of error
6-
console.warn('[obsidian-web-clipper:error]', message)
7-
respond()
8-
})
92

103
export type ErrorBackgroundAction = ActionData<
114
{

src/content-scripts/index.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
import './background-listener'
22
import './shortcuts'
3+
import $background from './background-listener'
34

45
console.debug('[obsidian-web-clipper]: Loaded')
6+
7+
$background.message.actionListener('error').subscribe(({ message, respond }) => {
8+
console.warn('[obsidian-web-clipper:error]', message)
9+
const finalMessage = typeof message === 'string' ? message : message?.data?.message
10+
if (finalMessage) {
11+
alert(`[Obsidian Web Clipper] ${finalMessage}`)
12+
}
13+
respond()
14+
})

src/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://raw.githubusercontent.com/PrsPrsBK/ffext-manifest-schema/master/ffext.json",
33
"manifest_version": 2,
44
"name": "__MSG_extensionName__",
5-
"version": "1.0.2",
5+
"version": "1.0.3",
66
"description": "__MSG_extensionDescription__",
77
"permissions": [
88
"tabs",

0 commit comments

Comments
 (0)