internet connection check

helpers/drive.ts

@@ -1,4 +1,4 @@
-import { KyInstance } from "ky";
+import ky, { KyInstance } from "ky";
 import ObsidianGoogleDrive from "main";
 import { getDriveKy } from "./ky";
 
@@ -95,6 +95,7 @@ export const getDriveClient = (t: ObsidianGoogleDrive) => {
 		getChangesStartToken: getChangesStartToken(drive),
 		getChanges: getChanges(drive),
 		batchDelete: batchDelete(drive),
+		checkConnection,
 	};
 };
 
@@ -410,6 +411,15 @@ const getChanges = (drive: KyInstance) => async (startToken: string) => {
 	}[];
 };
 
+export const checkConnection = async () => {
+	try {
+		const result = await ky.get("https://ogd.richardxiong.com/api/ping");
+		return result.ok;
+	} catch {
+		return false;
+	}
+};
+
 export const batchAsyncs = async (
 	requests: (() => Promise<any>)[],
 	batchSize = 10

helpers/ky.ts

@@ -1,6 +1,7 @@
 import ky, { Hooks } from "ky";
 import ObsidianGoogleDrive from "main";
 import { Notice } from "obsidian";
+import { checkConnection } from "./drive";
 
 const getHooks = (t: ObsidianGoogleDrive): Hooks => ({
 	beforeRequest: [
@@ -49,14 +50,21 @@ export const refreshAccessToken = async (t: ObsidianGoogleDrive) => {
 		};
 		return t.accessToken;
 	} catch (e: any) {
+		if (!(await checkConnection())) {
+			return new Notice(
+				"Something is wrong with your internet connection, so we could not fetch a new access token! Once you're back online, please restart Obsidian.",
+				0
+			);
+		}
 		t.settings.refreshToken = "";
 		t.accessToken = {
 			token: "",
 			expiresAt: 0,
 		};
 
 		new Notice(
-			"Something is wrong with your refresh token, please reset it."
+			"Something is wrong with your refresh token, please restart Obsidian and then reset it.",
+			0
 		);
 		await t.saveSettings();
 		return;

helpers/pull.ts

@@ -16,7 +16,7 @@ export const pull = async (
 
 	if (!silenceNotices) {
 		if (t.syncing) return;
-		syncNotice = t.startSync();
+		syncNotice = await t.startSync();
 	}
 
 	const { vault, fileManager } = t.app;

helpers/push.ts

@@ -57,7 +57,7 @@ export const push = async (t: ObsidianGoogleDrive) => {
 
 	if (!proceed) return;
 
-	const syncNotice = t.startSync();
+	const syncNotice = await t.startSync();
 
 	await pull(t, true);
 

helpers/reset.ts

@@ -6,7 +6,7 @@ import { pull } from "./pull";
 export const reset = async (t: ObsidianGoogleDrive) => {
 	if (t.syncing) return;
 
-	const syncNotice = t.startSync();
+	const syncNotice = await t.startSync();
 
 	await pull(t, true);
 

main.ts

@@ -1,4 +1,4 @@
-import { folderMimeType, getDriveClient } from "helpers/drive";
+import { checkConnection, folderMimeType, getDriveClient } from "helpers/drive";
 import { refreshAccessToken } from "helpers/ky";
 import { pull } from "helpers/pull";
 import { push } from "helpers/push";
@@ -149,7 +149,12 @@ export default class ObsidianGoogleDrive extends Plugin {
 		this.handleCreate(file);
 	}
 
-	startSync() {
+	async startSync() {
+		if (!(await checkConnection())) {
+			throw new Notice(
+				"You are not connected to the internet, so you cannot sync right now. Please try syncing once you have connection again."
+			);
+		}
 		this.ribbonIcon.addClass("spin");
 		this.syncing = true;
 		return new Notice("Syncing (0%)", 0);