Release 1.1.2 cleanup

Release 1.1.2 cleanup

Author: Vaccarini-Lorenzo

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "ical-obsidian-sync",
 	"name": "iCalSync",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"minAppVersion": "0.15.0",
 	"description": "Synchronize iCalendar with your notes",
 	"author": "Vaccarini Lorenzo",

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -11,19 +11,14 @@
 	"author": "",
 	"license": "MIT",
 	"dependencies": {
-		"@types/cors": "^2.8.13",
 		"@types/node": "^16.11.6",
 		"@types/node-fetch": "^2.6.2",
-		"@types/punycode": "^2.1.0",
 		"@typescript-eslint/eslint-plugin": "^5.43.0",
 		"@typescript-eslint/parser": "5.29.0",
 		"builtin-modules": "3.3.0",
 		"chrono-node": "^2.6.4",
 		"codemirror": "^6.0.1",
-		"crypto": "^1.0.1",
-		"dotenv": "^16.3.1",
 		"electron": "^25.3.2",
-		"electron-clipboard-watcher": "^1.0.1",
 		"esbuild": "0.18.17",
 		"moment-timezone": "^0.5.43",
 		"node-fetch": "^2.6.7",

package.json

@@ -3,7 +3,7 @@ import iCloudMisc from "../iCloudJs/iCloudMisc";
 import {iCloudCalendarEvent} from "../iCloudJs/calendar";
 import {Sentence} from "../model/sentence";
 import iCloudController from "./iCloudController";
-import {Notice} from "obsidian";
+import {Notice, requestUrl, RequestUrlParam} from "obsidian";
 import {appendFileSync, readFileSync, writeFileSync} from "fs";
 import {DateRange} from "../model/dateRange";
 
@@ -133,6 +133,7 @@ class EventController{
 			if (status) new Notice("📅 The event has been synchronized!")
 			else new Notice("🤷 There has been an error synchronizing the event...")
 		}));
+		this.updateCounter();
 	}
 
 	private generateNewUUID(): string {
@@ -160,7 +161,19 @@ class EventController{
 		}
 	}
 
-
+	// This method sends a body-less post request to an internal server to notify the synchronisation request
+	// The purpose is to publish on the README page a badge with the number of synced requests
+	private updateCounter() {
+		const requestUrlParam = {
+			url: "https://icalsynccounter.onrender.com/numSync",
+			method: "POST"
+		}
+		try {
+			requestUrl(requestUrlParam as RequestUrlParam);
+		} catch (e) {
+			console.warn("Error interacting with the counter server", e);
+		}
+	}
 }
 
 const eventController = new EventController();

src/controllers/eventController.ts

@@ -13,12 +13,16 @@ class ICloudController {
 	private _tagHash: Map<number, Event>;
 	private _dataLoadingComplete: boolean;
 	private appSettings: SettingInterface;
+	private maxReconnectAttempt: number;
+	private reconnectAttempt: number;
 
 	constructor() {
 		this._tagHash = new Map<number, Event>();
 		this._pendingTagsBuffer = [];
 		this._calendars = [];
 		this._dataLoadingComplete = false;
+		this.maxReconnectAttempt = 5;
+		this.reconnectAttempt = 0;
 	}
 
 	injectPath(pluginPath: string){
@@ -76,13 +80,32 @@ class ICloudController {
 		return await this._calendarService.postEvent(event.value, calendar.ctag);
 	}
 
+	async awaitReady(){
+		await this._iCloud.awaitReady;
+	}
+
 	isLoggedIn(){
 		return this._iCloud != undefined && (this._iCloud.status == iCloudServiceStatus.Ready || this._iCloud.status == iCloudServiceStatus.Trusted)
 	}
 
 	async getICloudEvents(missedDateRange: DateRange): Promise<iCloudCalendarEvent[]> {
 		return await this._calendarService.events(missedDateRange.start, missedDateRange.end);
 	}
+
+	refreshRequestCookies(requestUrlParams: { url, method, headers, body }){
+		const oldHeader = requestUrlParams.headers;
+		oldHeader.Cookie = this._iCloud.authStore.getHeaders().Cookie;
+		return;
+	}
+
+	checkMaxReconnectAttempt(): boolean{
+		this.reconnectAttempt += 1;
+		return this.reconnectAttempt < this.maxReconnectAttempt;
+	}
+
+	resetReconnectAttempt() {
+		this.reconnectAttempt = 0;
+	}
 }
 
 const iCloudController = new ICloudController();

src/controllers/iCloudController.ts

@@ -24,7 +24,7 @@ class NlpController {
 		this._mainNLP = wink( model );
 		this._secondaryNLP = wink (model);
 		this._customPatterns = [];
-		this._secondaryCustomPatterns = []
+		this._secondaryCustomPatterns = [];
 	}
 
 	injectPath(pluginPath: string){
@@ -56,7 +56,7 @@ class NlpController {
 			{name: "ordinalDateReverse", patterns: [" [|DATE] [DATE|may|march] [|DET] [ORDINAL]"]},
 		);
 		this._customPatterns.push(
-			{name: "timeRange", patterns: ["from [TIME|CARDINAL|NUM] [|NOUN] to [TIME|CARDINAL|NUM] [|NOUN]", "ADP SYM PART SYM"]},
+			{name: "timeRange", patterns: ["from [TIME|CARDINAL|NUM] [|am|pm] to [TIME|CARDINAL|NUM] [|am|pm]", "[TIME|CARDINAL] [-|/] [TIME|CARDINAL]"]},
 			{name: "exactTime", patterns: ["[at|for] [CARDINAL|TIME]"]}
 		)
 		this._customPatterns.push({name: "intentionalVerb", patterns: ["[|AUX] [VERB] [|ADP] [|DET] [NOUN]"]});

src/controllers/nlpController.ts

@@ -68,22 +68,4 @@ export class iCloudAccountDetailsService {
         this.service = service;
         this.serviceUri = serviceUri;
     }
-
-    private _devices;
-    async getDevices(refresh = false): Promise<iCloudDevices> {
-        if (!refresh && this._devices) return this._devices;
-        const response = await iCloudMisc.wrapRequest(this.serviceUri + "/setup/web/device/getDevices", { headers: this.service.authStore.getHeaders() });
-        const json = await response.json();
-        this._devices = json;
-        return this._devices;
-    }
-
-    private _family;
-    async getFamily(refresh = false): Promise<iCloudFamilyInfo> {
-        if (!refresh && this._family) return this._family;
-        const response = await iCloudMisc.wrapRequest(this.serviceUri + "/setup/web/family/getFamilyDetails", { headers: this.service.authStore.getHeaders() });
-        const json = await response.json();
-        this._family = json;
-        return this._family;
-    }
 }

src/iCloudJs/account.ts

@@ -1,5 +1,6 @@
 import {RequestInfo, RequestInit, Response} from "node-fetch";
 import {requestUrl, RequestUrlParam} from "obsidian";
+import iCloudController from "../controllers/iCloudController";
 
 class ICloudMisc {
     private stringifyDateNumber(dateNumber: number): string {
@@ -50,7 +51,25 @@ class ICloudMisc {
 		try{
 			requestUrlResponse = await requestUrl(requestUrlParam as RequestUrlParam);
 		} catch (e){
-			console.warn("Error requestingUrl");
+			console.warn("Error requestingUrl:", e);
+			console.warn(e.code);
+			console.warn(e.toString());
+			if (e.toString() == "Error: Request failed, status 421"){
+				const canTryReconnect = iCloudController.checkMaxReconnectAttempt();
+				if(!canTryReconnect){
+					console.warn("Can't reconnect - max attempts reached");
+					return;
+				}
+				console.warn("Refreshing token...");
+				await iCloudController.tryAuthentication("", "")
+				await iCloudController.awaitReady();
+				iCloudController.resetReconnectAttempt();
+				iCloudController.refreshRequestCookies(requestUrlParam);
+				requestUrlResponse = await requestUrl(requestUrlParam as RequestUrlParam);
+			}
+			else if(e.toString() == "Error: net::ERR_NAME_NOT_RESOLVED"){
+				console.warn("Internet connection error");
+			}
 		}
 
 		const setCookieField = requestUrlResponse.headers["set-cookie"] as any;

src/iCloudJs/iCloudMisc.ts

@@ -9,7 +9,6 @@ import Event from "../model/event";
 import { Misc } from "../misc/misc";
 import iCloudController from "../controllers/iCloudController";
 import { Notice } from "obsidian";
-import nlpController from "../controllers/nlpController";
 
 class NLPPlugin implements PluginValue {
 	decorations: DecorationSet;