feat: consistent sync function (requestUrl) for desktop and mobile

2026-07-29 08:08:34 +08:00 · 2024-11-20 22:19:03 +00:00
parent a573ef728d
commit aac7bc154a
4 changed files with 196 additions and 274 deletions
--- a/src/upload/uploadCommand.ts
+++ b/src/upload/uploadCommand.ts
@@ -50,8 +50,10 @@ export async function uploadCommandNext(
 		const {response} = res;
 		if (response.status === 200) {
 			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
 		} else {
 			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
 		}

 	}
@@ -88,8 +90,10 @@ export async function uploadCommandGeneral(
 		const {response} = res;
 		if (response.status === 200) {
 			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
 		} else {
 			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
 		}

 	}
@@ -124,10 +128,13 @@ export async function uploadCommandCustom(
 		const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);

 		const {response} = res;
+
 		if (response.status === 200) {
 			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
 		} else {
 			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
 		}

 	}
--- a/src/upload/upload_general/Upload2NotionGeneral.ts
+++ b/src/upload/upload_general/Upload2NotionGeneral.ts
@@ -1,11 +1,10 @@
-import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
+import {App, Notice, TFile, requestUrl} from "obsidian";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 import MyPlugin from "src/main";
 import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
 import {UploadBaseGeneral} from "./BaseUpload2NotionGeneral";
 import {updateYamlInfo} from "../updateYaml";
-import fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";

 interface CreatePageResponse {
@@ -142,15 +141,10 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		}

 		console.log(bodyString)
-		console.log(Platform.isDesktopApp)

 		let response: any;
 		let data: any;

-		if (Platform.isMobileApp) {
-			if(childArrLength > 100) {
-				new Notice(i18nConfig["reach-mobile-limit"], 5000);
-			} else {
 		response = await requestUrl({
 			url: `https://api.notion.com/v1/pages`,
 			method: "POST",
@@ -162,31 +156,22 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 				"Notion-Version": "2022-06-28",
 			},
 			body: JSON.stringify(bodyString),
-				});
-			}
-		}
-
-		if (Platform.isDesktopApp) {
-			response = await fetch("https://api.notion.com/v1/pages", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					"Authorization": "Bearer " + notionAPI,
-					"Notion-Version": "2022-06-28",
-				},
-				body: JSON.stringify(bodyString),
+			throw: false
 		});

-			data = await response.json();
+		data = await response.json;

-			if (!response.ok) {
+		// console.log(data)
+		// console.log(response.status)
+
+		if (response.status !== 200) {
 			new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 			console.log(`Error message: \n ${data.message}`);
 		} else {
 			console.log(`Page created: ${data.url}`);
 			console.log(`Page ID: ${data.id}`);
 		}
-
+		//
 		// upload the rest of the blocks
 		if (pushCount > 0) {
 			for (let i = 0; i < pushCount; i++) {
@@ -196,7 +181,8 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {

 				console.log(extraBlocks)

-					const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
+				const extraResponse = await requestUrl({
+					url: `https://api.notion.com/v1/blocks/${data.id}/children`,
 					method: "PATCH",
 					headers: {
 						"Content-Type": "application/json",
@@ -206,9 +192,9 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 					body: JSON.stringify(extraBlocks),
 				});

-					const extraData: any = await extraResponse.json();
+				const extraData: any = await extraResponse.json;

-					if (!extraResponse.ok) {
+				if (extraResponse.status !== 200) {
 					new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 					console.log(`Error message: \n ${extraData.message}`);
 				} else {
@@ -220,7 +206,6 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 				}
 			}
 		}
-		}

 		return {
 			response,
@@ -266,7 +251,8 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {

 		let {response, data} = res;

-		if (Platform.isDesktopApp) {
+		// console.log(response)
+
 		if (response && response.status === 200) {
 			await updateYamlInfo(
 				markdown,
@@ -274,23 +260,9 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 				data,
 				app,
 				this.plugin,
-					this.dbDetails
-				);
-			}
-		}
-
-		if (Platform.isMobileApp) {
-			if (response && response.status === 200) {
-				await updateYamlInfo(
-					markdown,
-					nowFile,
-					response,
-					app,
-					this.plugin,
 				this.dbDetails,
 			);
 		}
-		}

 		return res;
 	}
--- a/src/upload/upload_next/Upload2NotionNext.ts
+++ b/src/upload/upload_next/Upload2NotionNext.ts
@@ -1,12 +1,11 @@
 import {UploadBaseNext} from "./BaseUpload2NotionNext";
-import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
+import {App, Notice, TFile, requestUrl} from "obsidian";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 import MyPlugin from "src/main";
 import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
 import {updateYamlInfo} from "../updateYaml";
 import {LIMITS, paragraph} from "@jxpeng98/martian/src/notion";
-import fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";

 interface CreatePageResponse {
@@ -247,10 +246,6 @@ export class Upload2NotionNext extends UploadBaseNext {
 		let response: any;
 		let data: any;

-		if (Platform.isMobileApp) {
-			if(childArrLength > 100) {
-				new Notice(i18nConfig["reach-mobile-limit"], 5000);
-			} else {
 		response = await requestUrl({
 			url: `https://api.notion.com/v1/pages`,
 			method: "POST",
@@ -262,31 +257,22 @@ export class Upload2NotionNext extends UploadBaseNext {
 				"Notion-Version": "2022-06-28",
 			},
 			body: JSON.stringify(bodyString),
-				});
-			}
-		}
-
-		if (Platform.isDesktopApp) {
-			response = await fetch("https://api.notion.com/v1/pages", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					"Authorization": "Bearer " + notionAPI,
-					"Notion-Version": "2022-06-28",
-				},
-				body: JSON.stringify(bodyString),
+			throw: false
 		});

-			data = await response.json();
+		data = await response.json;

-			if (!response.ok) {
+		// console.log(data)
+		// console.log(response.status)
+
+		if (response.status !== 200) {
 			new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 			console.log(`Error message: \n ${data.message}`);
 		} else {
 			console.log(`Page created: ${data.url}`);
 			console.log(`Page ID: ${data.id}`);
 		}
-
+		//
 		// upload the rest of the blocks
 		if (pushCount > 0) {
 			for (let i = 0; i < pushCount; i++) {
@@ -296,7 +282,8 @@ export class Upload2NotionNext extends UploadBaseNext {

 				console.log(extraBlocks)

-					const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
+				const extraResponse = await requestUrl({
+					url: `https://api.notion.com/v1/blocks/${data.id}/children`,
 					method: "PATCH",
 					headers: {
 						"Content-Type": "application/json",
@@ -306,9 +293,9 @@ export class Upload2NotionNext extends UploadBaseNext {
 					body: JSON.stringify(extraBlocks),
 				});

-					const extraData: any = await extraResponse.json();
+				const extraData: any = await extraResponse.json;

-					if (!extraResponse.ok) {
+				if (extraResponse.status !== 200) {
 					new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 					console.log(`Error message: \n ${extraData.message}`);
 				} else {
@@ -320,7 +307,6 @@ export class Upload2NotionNext extends UploadBaseNext {
 				}
 			}
 		}
-		}

 		return {
 			response,
@@ -416,7 +402,8 @@ export class Upload2NotionNext extends UploadBaseNext {

 		let {response, data} = res;

-		if (Platform.isDesktopApp) {
+		// console.log(response)
+
 		if (response && response.status === 200) {
 			await updateYamlInfo(
 				markdown,
@@ -424,23 +411,9 @@ export class Upload2NotionNext extends UploadBaseNext {
 				data,
 				app,
 				this.plugin,
-					this.dbDetails
-				);
-			}
-		}
-
-		if (Platform.isMobileApp) {
-			if (response && response.status === 200) {
-				await updateYamlInfo(
-					markdown,
-					nowFile,
-					response,
-					app,
-					this.plugin,
 				this.dbDetails,
 			);
 		}
-		}

 		return res;
 	}
--- a/src/upload/upoload_custom/Upload2NotionCustom.ts
+++ b/src/upload/upoload_custom/Upload2NotionCustom.ts
@@ -1,11 +1,10 @@
-import {App, Notice, Platform, TFile, requestUrl} from "obsidian";
+import {App, Notice, TFile, requestUrl} from "obsidian";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 import MyPlugin from "src/main";
 import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
 import {updateYamlInfo} from "../updateYaml";
 import {UploadBaseCustom} from "./BaseUpload2NotionCustom";
-import fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";


@@ -114,15 +113,10 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		}

 		console.log(bodyString)
-		console.log(Platform.isDesktopApp)

 		let response: any;
 		let data: any;

-		if (Platform.isMobileApp) {
-			if(childArrLength > 100) {
-				new Notice(i18nConfig["reach-mobile-limit"], 5000);
-			} else {
 		response = await requestUrl({
 			url: `https://api.notion.com/v1/pages`,
 			method: "POST",
@@ -134,31 +128,22 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 				"Notion-Version": "2022-06-28",
 			},
 			body: JSON.stringify(bodyString),
-				});
-			}
-		}
-
-		if (Platform.isDesktopApp) {
-			 response = await fetch("https://api.notion.com/v1/pages", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-					"Authorization": "Bearer " + notionAPI,
-					"Notion-Version": "2022-06-28",
-				},
-				body: JSON.stringify(bodyString),
+			throw: false
 		});

-			data = await response.json();
+		data = await response.json;

-			if (!response.ok) {
+		// console.log(data)
+		// console.log(response.status)
+
+		if (response.status !== 200) {
 			new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 			console.log(`Error message: \n ${data.message}`);
 		} else {
 			console.log(`Page created: ${data.url}`);
 			console.log(`Page ID: ${data.id}`);
 		}
-
+		//
 		// upload the rest of the blocks
 		if (pushCount > 0) {
 			for (let i = 0; i < pushCount; i++) {
@@ -168,7 +153,8 @@ export class Upload2NotionCustom extends UploadBaseCustom {

 				console.log(extraBlocks)

-					const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
+				const extraResponse = await requestUrl({
+					url: `https://api.notion.com/v1/blocks/${data.id}/children`,
 					method: "PATCH",
 					headers: {
 						"Content-Type": "application/json",
@@ -178,9 +164,9 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 					body: JSON.stringify(extraBlocks),
 				});

-					const extraData: any = await extraResponse.json();
+				const extraData: any = await extraResponse.json;

-					if (!extraResponse.ok) {
+				if (extraResponse.status !== 200) {
 					new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 					console.log(`Error message: \n ${extraData.message}`);
 				} else {
@@ -192,7 +178,6 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 				}
 			}
 		}
-		}

 		return {
 			response, // for status code
@@ -238,7 +223,6 @@ export class Upload2NotionCustom extends UploadBaseCustom {

 		// console.log(response)

-		if (Platform.isDesktopApp) {
 		if (response && response.status === 200) {
 			await updateYamlInfo(
 				markdown,
@@ -246,23 +230,9 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 				data,
 				app,
 				this.plugin,
-					this.dbDetails
-				);
-			}
-		}
-
-		if (Platform.isMobileApp) {
-			if (response && response.status === 200) {
-				await updateYamlInfo(
-					markdown,
-					nowFile,
-					response,
-					app,
-					this.plugin,
 				this.dbDetails,
 			);
 		}
-		}

 		return res;
 	}