Merge pull request #35 from jxpeng98/mobile-fail-to-start

feat: separate mobile sync from desktop version

.gitignore

@@ -21,3 +21,6 @@ data.json
 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
 .history
+
+# local data
+local-data

CHANGELOG.md

@@ -1,8 +1,4 @@
-## Features
+## Fix
-
-- Support WebP format images. 支持 WebP 格式图片。
-- Support sync with long notes. 支持长文章同步。
-
-Long articles or notes have been split into multiple parts, and the parts are synchronized in order.
-长文章同步是通过将长文章或笔记拆分为多个部分，按顺序同步这些部分。
 
+- Fix code block not being highlighted in Notion after syncing.
+- 修复代码块同步之后，在 Notion 中未高亮的问题。

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "share-to-notionnext",
   "name": "Share to NotionNext",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "minAppVersion": "0.0.1",
   "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
   "author": "EasyChris, jxpeng98",

package.json

@@ -1,8 +1,8 @@
 {
   "name": "share-to-notionnext",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "type": "module",
-  "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
+  "description": "Share files to any Notion database using the Notion API, originally created by EasyChris/obsidian-to-notion.",
   "main": "main.js",
   "scripts": {
     "dev": "node esbuild.config.mjs",
@@ -27,7 +27,6 @@
     "@jxpeng98/martian": "^1.2.7",
     "https-proxy-agent": "^7.0.2",
     "node-fetch": "^3.3.2",
-    "process": "^0.11.10",
     "remark-math": "^6.0.0",
     "yaml": "^2.3.4",
     "yaml-front-matter": "^4.1.1"

src/lang/locale/en.ts

@@ -79,4 +79,5 @@ export const en = {
 	BlockUploaded: "All blocks uploaded",
 	ExtraBlockUploaded: "Extra blocks uploaded",
 	CheckConsole: "Check the console for more information \n opt+cmd+i/ctrl+shift+i",
+	"reach-mobile-limit": "The number of blocks exceeds the limit of 100, please use the desktop plugin",
 }

src/upload/uploadCommand.ts

@@ -76,6 +76,9 @@ export async function uploadCommandGeneral(
 
 	const {markDownData, nowFile, cover, tags} = await getNowFileMarkdownContentGeneral(app, settings)
 
+	new Notice(`Start upload ${nowFile.basename}`);
+	console.log(`Start upload ${nowFile.basename}`);
+
 	if (markDownData) {
 		const {basename} = nowFile;
 
@@ -111,6 +114,9 @@ export async function uploadCommandCustom(
 
 	const {markDownData, nowFile, cover, customValues} = await getNowFileMarkdownContentCustom(app, dbDetails)
 
+	new Notice(`Start upload ${nowFile.basename}`);
+	console.log(`Start upload ${nowFile.basename}`);
+
 	if (markDownData) {
 		const {basename} = nowFile;
 

src/upload/upload_general/Upload2NotionGeneral.ts

@@ -1,8 +1,6 @@
-import {App, Notice, TFile} from "obsidian";
+import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
-import {Client} from "@notionhq/client";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
-// import * as yaml from "yaml"
 import MyPlugin from "src/main";
 import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
 import {UploadBaseGeneral} from "./BaseUpload2NotionGeneral";
@@ -10,6 +8,11 @@ import {updateYamlInfo} from "../updateYaml";
 import fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";
 
+interface CreatePageResponse {
+	response: any;
+	data: any;
+}
+
 export class Upload2NotionGeneral extends UploadBaseGeneral {
 	settings: PluginSettings;
 	dbDetails: DatabaseDetails;
@@ -48,7 +51,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		cover: string,
 		tags: string[],
 		childArr: any,
-	) {
+	): Promise<CreatePageResponse> {
 
 		const {
 			databaseID,
@@ -58,6 +61,19 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 			notionAPI
 		} = this.dbDetails;
 
+		// remove the annotations from the childArr if type is code block
+		childArr.forEach((block: any) => {
+				if (block.type === "code") {
+					block.code.rich_text.forEach((item: any) => {
+							if (item.type === "text" && item.annotations) {
+								delete item.annotations;
+							}
+						}
+					);
+				}
+			}
+		);
+
 		// check the length of the childArr and split it into chunks of 100
 		const childArrLength = childArr.length;
 		let extraArr: any[] = [];
@@ -126,8 +142,32 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		}
 
 		console.log(bodyString)
+		console.log(Platform.isDesktopApp)
 
-		const response = await fetch("https://api.notion.com/v1/pages", {
+		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",
+					headers: {
+						"Content-Type": "application/json",
+						// 'User-Agent': 'obsidian.md',
+						Authorization:
+							"Bearer " + notionAPI,
+						"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",
@@ -137,10 +177,11 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 				body: JSON.stringify(bodyString),
 			});
 
-		const data: any = await response.json();
+			data = await response.json();
 
 			if (!response.ok) {
 				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}`);
@@ -179,10 +220,11 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 					}
 				}
 			}
+		}
 
 		return {
-			response, // for status code
+			response,
-			data // for id and url
+			data
 		}
 	}
 
@@ -203,11 +245,11 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		const yamlContent: any = yamlFrontMatter.loadFront(markdown);
 		const __content = yamlContent.__content;
 		const file2Block = markdownToBlocks(__content, options);
-		const frontmasster =
+		const frontMatter =
 			app.metadataCache.getFileCache(nowFile)?.frontmatter;
 		const {abName} = this.dbDetails
 		const notionIDKey = `NotionID-${abName}`;
-		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+		const notionID = frontMatter ? frontMatter[notionIDKey] : null;
 
 
 		if (notionID) {
@@ -224,10 +266,30 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 
 		let {response, data} = res;
 
-		// console.log(response)
+		if (Platform.isDesktopApp) {
-
 			if (response && response.status === 200) {
-			await updateYamlInfo(markdown, nowFile, data, app, this.plugin, this.dbDetails);
+				await updateYamlInfo(
+					markdown,
+					nowFile,
+					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;

src/upload/upload_next/Upload2NotionNext.ts

@@ -1,16 +1,19 @@
 import {UploadBaseNext} from "./BaseUpload2NotionNext";
-import {App, Notice, TFile} from "obsidian";
+import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
-import {Client} from "@notionhq/client";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
-// import * as yaml from "yaml"
 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 fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";
 
+interface CreatePageResponse {
+	response: any;
+	data: any;
+}
+
 export class Upload2NotionNext extends UploadBaseNext {
 	settings: PluginSettings;
 	dbDetails: DatabaseDetails;
@@ -79,9 +82,22 @@ export class Upload2NotionNext extends UploadBaseNext {
 		favicon: string,
 		datetime: string,
 		childArr: any,
-	) {
+	): Promise<CreatePageResponse> {
 		const {databaseID, notionAPI} = this.dbDetails;
 
+		// remove the annotations from the childArr if type is code block
+		childArr.forEach((block: any) => {
+				if (block.type === "code") {
+					block.code.rich_text.forEach((item: any) => {
+							if (item.type === "text" && item.annotations) {
+								delete item.annotations;
+							}
+						}
+					);
+				}
+			}
+		);
+
 		// check the length of the childArr
 		// if it is too long, split it into multiple pages
 		const childArrLength = childArr.length;
@@ -228,19 +244,41 @@ export class Upload2NotionNext extends UploadBaseNext {
 
 		console.log(bodyString);
 
-		const response = await fetch("https://api.notion.com/v1/pages", {
+		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",
 					headers: {
 						"Content-Type": "application/json",
-				Authorization: "Bearer " + notionAPI,
+						// 'User-Agent': 'obsidian.md',
+						Authorization:
+							"Bearer " + notionAPI,
+						"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),
 			});
 
-		const data: any = await response.json();
+			data = await response.json();
 
-		// can use response.ok or response.status === 200
 			if (!response.ok) {
 				new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
 				console.log(`Error message: \n ${data.message}`);
@@ -249,18 +287,16 @@ export class Upload2NotionNext extends UploadBaseNext {
 				console.log(`Page ID: ${data.id}`);
 			}
 
-		// if the childArr is over 100, patch the rest of the blocks append to the page
+			// upload the rest of the blocks
 			if (pushCount > 0) {
 				for (let i = 0; i < pushCount; i++) {
 					const extraBlocks = {
-					children: extraArr[i]
+						children: extraArr[i],
-				}
+					};
 
 					console.log(extraBlocks)
 
-				const extraResponse = await fetch(
+					const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
-					`https://api.notion.com/v1/blocks/${data.id}/children`,
-					{
 						method: "PATCH",
 						headers: {
 							"Content-Type": "application/json",
@@ -273,10 +309,7 @@ export class Upload2NotionNext extends UploadBaseNext {
 					const extraData: any = await extraResponse.json();
 
 					if (!extraResponse.ok) {
-					new Notice(
+						new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
-						`Extra Block: Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`,
-						5000,
-					);
 						console.log(`Error message: \n ${extraData.message}`);
 					} else {
 						console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${data.id}`);
@@ -287,10 +320,11 @@ export class Upload2NotionNext extends UploadBaseNext {
 					}
 				}
 			}
+		}
 
 		return {
-			response, // for status code
+			response,
-			data, // for id and url
+			data
 		};
 	}
 
@@ -382,6 +416,7 @@ export class Upload2NotionNext extends UploadBaseNext {
 
 		let {response, data} = res;
 
+		if (Platform.isDesktopApp) {
 			if (response && response.status === 200) {
 				await updateYamlInfo(
 					markdown,
@@ -389,9 +424,23 @@ 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;
 	}

src/upload/upoload_custom/Upload2NotionCustom.ts

@@ -1,7 +1,6 @@
-import {App, Notice, TFile} from "obsidian";
+import {App, Notice, Platform, TFile, requestUrl} from "obsidian";
 import {markdownToBlocks} from "@jxpeng98/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
-// import * as yaml from "yaml"
 import MyPlugin from "src/main";
 import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
 import {updateYamlInfo} from "../updateYaml";
@@ -10,6 +9,11 @@ import fetch from 'node-fetch';
 import {i18nConfig} from "../../lang/I18n";
 
 
+interface CreatePageResponse {
+	response: any;
+	data: any;
+}
+
 export class Upload2NotionCustom extends UploadBaseCustom {
 	settings: PluginSettings;
 	dbDetails: DatabaseDetails;
@@ -46,7 +50,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		cover: string,
 		customValues: Record<string, string>,
 		childArr: any,
-	) {
+	): Promise<CreatePageResponse> {
 
 		const {
 			databaseID,
@@ -54,6 +58,19 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 			notionAPI
 		} = this.dbDetails;
 
+		// remove the annotations from the childArr if type is code block
+		childArr.forEach((block: any) => {
+			if (block.type === "code") {
+				block.code.rich_text.forEach((item: any) => {
+						if (item.type === "text" && item.annotations) {
+							delete item.annotations;
+						}
+					}
+				);
+			}
+		}
+		);
+
 		// check the length of the childArr and split it into chunks of 100
 		const childArrLength = childArr.length;
 		let extraArr: any[] = [];
@@ -97,8 +114,32 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		}
 
 		console.log(bodyString)
+		console.log(Platform.isDesktopApp)
 
-		const response = await fetch("https://api.notion.com/v1/pages", {
+		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",
+					headers: {
+						"Content-Type": "application/json",
+						// 'User-Agent': 'obsidian.md',
+						Authorization:
+							"Bearer " + notionAPI,
+						"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",
@@ -108,7 +149,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 				body: JSON.stringify(bodyString),
 			});
 
-		const data: any = await response.json();
+			data = await response.json();
 
 			if (!response.ok) {
 				new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
@@ -151,6 +192,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 					}
 				}
 			}
+		}
 
 		return {
 			response, // for status code
@@ -196,8 +238,30 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 
 		// console.log(response)
 
+		if (Platform.isDesktopApp) {
 			if (response && response.status === 200) {
-			await updateYamlInfo(markdown, nowFile, data, app, this.plugin, this.dbDetails);
+				await updateYamlInfo(
+					markdown,
+					nowFile,
+					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;

yarn.lock

@@ -460,6 +460,14 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+cors@^2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 data-uri-to-buffer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
@@ -714,6 +722,11 @@ katex@^0.16.0:
   dependencies:
     commander "^8.3.0"
 
+ky@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/ky/-/ky-1.7.2.tgz#b97d9b997ba51ff1e152f0815d3d27b86513eb1c"
+  integrity sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==
+
 longest-streak@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
@@ -1215,6 +1228,11 @@ node-fetch@^3.3.2:
     fetch-blob "^3.1.4"
     formdata-polyfill "^4.0.10"
 
+object-assign@^4:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
 obsidian@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/obsidian/-/obsidian-1.6.6.tgz#d45c4021c291765e1b77ed4a1c645e562ff6e77f"
@@ -1245,11 +1263,6 @@ picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -1446,6 +1459,11 @@ unist-util-visit@^5.0.0:
     unist-util-is "^6.0.0"
     unist-util-visit-parents "^6.0.0"
 
+vary@^1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+
 vfile-message@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"