Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-27 10:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/pull/16717

Browse source
This commit is contained in:
Vanessa 2025-12-29 12:29:16 +08:00
parent c243fea81c
commit 9585375961
2 changed files with 42 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

69
app/src/plugin/index.ts
View file

@ -259,47 +259,31 @@ export class Plugin {
}
public loadData(storageName: string) {
if (storageName.includes("/") || storageName.includes("\\")) {
console.error(`plugin ${this.name} loadData failed: storageName cannot contain path separators`);
return Promise.resolve(this.data[storageName]);
}
if (typeof this.data[storageName] === "undefined") {
this.data[storageName] = "";
}
return new Promise((resolve) => {
fetchPost("/api/file/getFile", {path: `/data/storage/petal/${this.name}/${storageName}`}, (response) => {
if (response.code !== 404 && response.code !== 403) {
this.data[storageName] = response;
}
return new Promise((resolve, reject) => {
fetchPost("/api/file/getFile", {
path: `/data/storage/petal/${this.name}/${storageName.replace(/[\/\\]+/g, "")}`
}, (response) => {
this.data[storageName] = response;
resolve(this.data[storageName]);
}, null, (response) => {
reject(response);
});
});
}
public saveData(storageName: string, data: any) {
if (storageName.includes("/") || storageName.includes("\\")) {
console.error(`plugin ${this.name} saveData failed: storageName cannot contain path separators`);
return Promise.resolve({
code: -1,
msg: "storageName cannot contain path separators",
data: null
} as IWebSocketData);
}
this.data[storageName] = data;
if (window.siyuan.config.readonly || window.siyuan.isPublish) {
console.warn(`plugin ${this.name} saveData failed: Readonly mode or publish mode`);
return Promise.resolve({
return Promise.reject({
code: 403,
msg: "Readonly mode or publish mode",
data: null
} as IWebSocketData);
});
}
return new Promise((resolve) => {
const pathString = `/data/storage/petal/${this.name}/${storageName}`;
return new Promise((resolve, reject) => {
const pathString = `/data/storage/petal/${this.name}/${storageName.replace(/[\/\\]+/g, "")}`;
let file: File;
try {
if (typeof data === "object") {
@ -310,12 +294,11 @@ export class Plugin {
file = new File([new Blob([data])], pathString.split("/").pop());
}
} catch (e) {
console.error(`plugin ${this.name} saveData failed:`, e);
resolve({
code: -1,
reject({
code: 400,
msg: e instanceof Error ? e.message : String(e),
data: null
} as IWebSocketData);
});
return;
}
const formData = new FormData();
@ -323,29 +306,15 @@ export class Plugin {
formData.append("file", file);
formData.append("isDir", "false");
fetchPost("/api/file/putFile", formData, (response) => {
if (typeof response === "object" && response.code !== 0) {
console.error(`plugin ${this.name} saveData failed:`, response);
}
this.data[storageName] = data;
resolve(response);
});
});
}
public removeData(storageName: string) {
if (storageName.includes("/") || storageName.includes("\\")) {
console.error(`plugin ${this.name} removeData failed: storageName cannot contain path separators`);
return Promise.resolve({
code: -1,
msg: "storageName cannot contain path separators",
data: null
} as IWebSocketData);
}
delete this.data[storageName];
if (window.siyuan.config.readonly || window.siyuan.isPublish) {
console.warn(`plugin ${this.name} removeData failed: Readonly mode or publish mode`);
return Promise.resolve({
return Promise.reject({
code: 403,
msg: "Readonly mode or publish mode",
data: null
@ -356,10 +325,8 @@ export class Plugin {
if (!this.data) {
this.data = {};
}
fetchPost("/api/file/removeFile", {path: `/data/storage/petal/${this.name}/${storageName}`}, (response) => {
if (response.code !== 0 && response.code !== 404) {
console.error(`plugin ${this.name} removeData failed:`, response);
}
fetchPost("/api/file/removeFile", {path: `/data/storage/petal/${this.name}/${storageName.replace(/[\/\\]+/g, "")}`}, (response) => {
delete this.data[storageName];
resolve(response);
});
});

32
app/src/util/fetch.ts
View file

@ -5,7 +5,12 @@ import {ipcRenderer} from "electron";
import {processMessage} from "./processMessage";
import {kernelError} from "../dialog/processSystem";
export const fetchPost = (url: string, data?: any, cb?: (response: IWebSocketData) => void, headers?: IObject) => {
export const fetchPost = (
url: string,
data?: any,
cb?: (response: IWebSocketData) => void,
headers?: IObject,
failCallback?: (response: IWebSocketData) => void,) => {
const init: RequestInit = {
method: "POST",
};
@ -41,14 +46,25 @@ export const fetchPost = (url: string, data?: any, cb?: (response: IWebSocketDat
msg: response.statusText,
code: -response.status,
};
case 401:
// 返回鉴权失败的话直接刷新页面，避免用户在当前页面操作 https://github.com/siyuan-note/siyuan/issues/15163
setTimeout(() => {
window.location.reload();
}, 3000);
return {
data: null,
msg: response.statusText,
code: -response.status,
};
case 202:
// /api/file/getFile 接口返回202时表示文件没有正常读取
failCallback({
data: null,
msg: response.statusText,
code: response.status,
});
return;
default:
if (401 == response.status) {
// 返回鉴权失败的话直接刷新页面，避免用户在当前页面操作 https://github.com/siyuan-note/siyuan/issues/15163
setTimeout(() => {
window.location.reload();
}, 3000);
}
if (response.headers.get("content-type")?.indexOf("application/json") > -1) {
return response.json();
} else {