fix script loading error

Update zh-cn.ts to 55ce645

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"minAppVersion": "1.1.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

src/ExcalidrawAutomate.ts

@@ -2854,10 +2854,9 @@ export class ExcalidrawAutomate {
   }  
 };
 
-export async function initExcalidrawAutomate(
+export function initExcalidrawAutomate(
   plugin: ExcalidrawPlugin,
-): Promise<ExcalidrawAutomate> {
-  await initFonts();
+): ExcalidrawAutomate {
   const ea = new ExcalidrawAutomate(plugin);
   //@ts-ignore
   window.ExcalidrawAutomate = ea;
@@ -2892,14 +2891,6 @@ function getFontFamily(id: number):string {
   return getFontFamilyString({fontFamily:id})
 }
 
-export async function initFonts():Promise<void> {
-  /*await excalidrawLib.registerFontsInCSS();
-  const fonts = excalidrawLib.getFontFamilies();
-  for(let i=0;i<fonts.length;i++) {
-    if(fonts[i] !== "Local Font") await (document as any).fonts.load(`16px ${fonts[i]}`);  
-  };*/
-}
-
 export function _measureText(
   newText: string,
   fontSize: number,

src/ExcalidrawData.ts

@@ -1588,6 +1588,7 @@ export class ExcalidrawData {
     .filter(el=>el.type === "image" && el.crop && !el.isDeleted)
     .forEach((el: Mutable<ExcalidrawImageElement>)=>{
       const ef = this.getFile(el.fileId);
+      if(!ef.file) return;
       if(ef.file.extension !== "pdf") return;
       const pageRef = ef.linkParts.original.split("#")?.[1];
       if(!pageRef || !pageRef.startsWith("page=") || pageRef.includes("rect")) return;

src/Scripts.ts

@@ -1,6 +1,7 @@
 import {
   App,
   Instruction,
+  normalizePath,
   TAbstractFile,
   TFile,
   WorkspaceLeaf,
@@ -22,6 +23,7 @@ export type ScriptIconMap = {
 
 export class ScriptEngine {
   private plugin: ExcalidrawPlugin;
+  private app: App;
   private scriptPath: string;
   //https://stackoverflow.com/questions/60218638/how-to-force-re-render-if-map-value-changes
   public scriptIconMap: ScriptIconMap;
@@ -29,6 +31,7 @@ export class ScriptEngine {
 
   constructor(plugin: ExcalidrawPlugin) {
     this.plugin = plugin;
+    this.app = plugin.app;
     this.scriptIconMap = {};
     this.loadScripts();
     this.registerEventHandlers();
@@ -58,7 +61,7 @@ export class ScriptEngine {
     if (!path.endsWith(".svg")) {
       return;
     }
-    const scriptFile = app.vault.getAbstractFileByPath(
+    const scriptFile = this.app.vault.getAbstractFileByPath(
       getIMGFilename(path, "md"),
     );
     if (scriptFile && scriptFile instanceof TFile) {
@@ -107,19 +110,19 @@ export class ScriptEngine {
 
   registerEventHandlers() {
     this.plugin.registerEvent(
-      this.plugin.app.vault.on(
+      this.app.vault.on(
         "delete",
         (file: TFile)=>this.deleteEventHandler(file)
       ),
     );
     this.plugin.registerEvent(
-      this.plugin.app.vault.on(
+      this.app.vault.on(
         "create",
         (file: TFile)=>this.createEventHandler(file)
       ),
     );
     this.plugin.registerEvent(
-      this.plugin.app.vault.on(
+      this.app.vault.on(
         "rename",
         (file: TAbstractFile, oldPath: string)=>this.renameEventHandler(file, oldPath)
       ),
@@ -138,15 +141,16 @@ export class ScriptEngine {
 
   public getListofScripts(): TFile[] {
     this.scriptPath = this.plugin.settings.scriptFolderPath;
-    if (!app.vault.getAbstractFileByPath(this.scriptPath)) {
-      //this.scriptPath = null;
+    if(!this.scriptPath) return;
+    this.scriptPath = normalizePath(this.scriptPath);
+    if (!this.app.vault.getAbstractFileByPath(this.scriptPath)) {
       return;
     }
-    return app.vault
+    return this.app.vault
       .getFiles()
       .filter(
         (f: TFile) =>
-          f.path.startsWith(this.scriptPath) && f.extension === "md",
+          f.path.startsWith(this.scriptPath+"/") && f.extension === "md",
       );
   }
 
@@ -166,7 +170,10 @@ export class ScriptEngine {
     }
 
     const subpath = path.split(`${this.scriptPath}/`)[1];
-    const lastSlash = subpath.lastIndexOf("/");
+    if(!subpath) {
+      console.warn(`ScriptEngine.getScriptName unexpected basename: ${basename}; path: ${path}`)
+    }
+    const lastSlash = subpath?.lastIndexOf("/");
     if (lastSlash > -1) {
       return subpath.substring(0, lastSlash + 1) + basename;
     }
@@ -175,10 +182,10 @@ export class ScriptEngine {
 
   async addScriptIconToMap(scriptPath: string, name: string) {
     const svgFilePath = getIMGFilename(scriptPath, "svg");
-    const file = app.vault.getAbstractFileByPath(svgFilePath);
+    const file = this.app.vault.getAbstractFileByPath(svgFilePath);
     const svgString: string =
       file && file instanceof TFile
-        ? await app.vault.read(file)
+        ? await this.app.vault.read(file)
         : null;
     this.scriptIconMap = {
       ...this.scriptIconMap,
@@ -199,12 +206,12 @@ export class ScriptEngine {
       name: `(Script) ${scriptName}`,
       checkCallback: (checking: boolean) => {
         if (checking) {
-          return Boolean(app.workspace.getActiveViewOfType(ExcalidrawView));
+          return Boolean(this.app.workspace.getActiveViewOfType(ExcalidrawView));
         }
-        const view = app.workspace.getActiveViewOfType(ExcalidrawView);
+        const view = this.app.workspace.getActiveViewOfType(ExcalidrawView);
         if (view) {
           (async()=>{
-            const script = await app.vault.read(f);
+            const script = await this.app.vault.read(f);
             if(script) {
               //remove YAML frontmatter if present
               this.executeScript(view, script, scriptName,f);
@@ -218,7 +225,7 @@ export class ScriptEngine {
   }
 
   unloadScripts() {
-    const scripts = app.vault
+    const scripts = this.app.vault
       .getFiles()
       .filter((f: TFile) => f.path.startsWith(this.scriptPath));
     scripts.forEach((f) => {
@@ -236,11 +243,11 @@ export class ScriptEngine {
 
     const commandId = `${PLUGIN_ID}:${basename}`;
     // @ts-ignore
-    if (!this.plugin.app.commands.commands[commandId]) {
+    if (!this.app.commands.commands[commandId]) {
       return;
     }
     // @ts-ignore
-    delete this.plugin.app.commands.commands[commandId];
+    delete this.app.commands.commands[commandId];
   }
 
   async executeScript(view: ExcalidrawView, script: string, title: string, file: TFile) {
@@ -271,7 +278,7 @@ export class ScriptEngine {
         ScriptEngine.inputPrompt(
           view,
           this.plugin,
-          this.plugin.app,
+          this.app,
           header,
           placeholder,
           value,
@@ -288,7 +295,7 @@ export class ScriptEngine {
         instructions?: Instruction[],
       ) =>
         ScriptEngine.suggester(
-          this.plugin.app,
+          this.app,
           displayItems,
           items,
           hint,
@@ -304,7 +311,7 @@ export class ScriptEngine {
 }
 
   private updateToolPannels() {
-    const excalidrawViews = getExcalidrawViews(this.plugin.app);
+    const excalidrawViews = getExcalidrawViews(this.app);
     excalidrawViews.forEach(excalidrawView => {
       excalidrawView.toolsPanelRef?.current?.updateScriptIconMap(
         this.scriptIconMap,

src/dialogs/Messages.ts

@@ -17,6 +17,10 @@ I develop this plugin as a hobby, spending my free time doing this. If you find
 
 <div class="ex-coffee-div"><a href="https://ko-fi.com/zsolt"><img src="https://storage.ko-fi.com/cdn/kofi6.png?v=6" border="0" alt="Buy Me a Coffee at ko-fi.com"  height=45></a></div>
 `,
+"2.6.4":`
+## Fixed
+- Error saving when cropping images embedded from a URL (not from a file in the Vault) [#2096](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2096)
+`,
 "2.6.3":`
 <div class="excalidraw-videoWrapper"><div>
 <iframe src="https://www.youtube.com/embed/OfUWAvCgbXk" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

src/lang/locale/zh-cn.ts

@@ -6,6 +6,8 @@ import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/
 import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper";
 
 const CJK_FONTS = "CJK Fonts";
+declare const PLUGIN_VERSION:string;
+
 // 简体中文
 export default {
   // main.ts
@@ -870,6 +872,7 @@ FILENAME_HEAD: "文件名",
         对此带来的不便，我深表歉意。
       </p>
     `,
+
   //ObsidianMenu.tsx
   GOTO_FULLSCREEN: "进入全屏模式",
   EXIT_FULLSCREEN: "退出全屏模式",
@@ -958,4 +961,7 @@ FILENAME_HEAD: "文件名",
   IPM_GROUP_PAGES_DESC: "这将把所有页面建立为一个单独的组。如果您在导入后锁定页面，建议使用此方法，因为这样可以更方便地解锁整个组，而不是逐个解锁。",
   IPM_SELECT_PDF: "请选择一个 PDF 文件",
 
-};
+  //Utils.ts
+  UPDATE_AVAILABLE: `Excalidraw 的新版本已在社区插件中可用。\n\n您正在使用 ${PLUGIN_VERSION}。\n最新版本是`,
+  ERROR_PNG_TOO_LARGE: "导出 PNG 时出错 - PNG 文件过大，请尝试较小的分辨率",
+};

src/main.ts

@@ -365,53 +365,132 @@ export default class ExcalidrawPlugin extends Plugin {
     //Compatibility mode with .excalidraw files
     this.registerExtensions(["excalidraw"], VIEW_TYPE_EXCALIDRAW);
 
-    await this.loadSettings({reEnableAutosave:true});
-    const updateSettings = !this.settings.onceOffCompressFlagReset || !this.settings.onceOffGPTVersionReset;
-    if(!this.settings.onceOffCompressFlagReset) {
-      this.settings.compress = true;
-      this.settings.onceOffCompressFlagReset = true;
-    }
-    if(!this.settings.onceOffGPTVersionReset) {
-      if(this.settings.openAIDefaultVisionModel === "gpt-4-vision-preview") {
-        this.settings.openAIDefaultVisionModel = "gpt-4o";
+    try {
+      await this.loadSettings({reEnableAutosave:true});
+      const updateSettings = !this.settings.onceOffCompressFlagReset || !this.settings.onceOffGPTVersionReset;
+      if(!this.settings.onceOffCompressFlagReset) {
+        this.settings.compress = true;
+        this.settings.onceOffCompressFlagReset = true;
       }
+      if(!this.settings.onceOffGPTVersionReset) {
+        if(this.settings.openAIDefaultVisionModel === "gpt-4-vision-preview") {
+          this.settings.openAIDefaultVisionModel = "gpt-4o";
+        }
+      }
+      if(updateSettings) {
+        await this.saveSettings();
+      }
+      this.addSettingTab(new ExcalidrawSettingTab(this.app, this));
+    } catch (e) {
+      new Notice("Error loading plugin settings", 6000);
+      console.error("Error loading plugin settings", e);
+    }
+
+    try {
+      // need it her for ExcaliBrain
+      this.ea = initExcalidrawAutomate(this);
+    } catch (e) {
+      new Notice("Error initializing Excalidraw Automate", 6000);
+      console.error("Error initializing Excalidraw Automate", e);
+    }
+
+    try {
+      //Licat: Are you registering your post processors in onLayoutReady? You should register them in onload instead
+      this.addMarkdownPostProcessor();
+    } catch (e) {
+      new Notice("Error adding markdown post processor", 6000);
+      console.error("Error adding markdown post processor", e);
     }
-    if(updateSettings) {
-      await this.saveSettings();
-    }
-    this.addSettingTab(new ExcalidrawSettingTab(this.app, this));
-    this.ea = await initExcalidrawAutomate(this);
 
-    //Licat: Are you registering your post processors in onLayoutReady? You should register them in onload instead
-    this.addMarkdownPostProcessor();
-    
     this.app.workspace.onLayoutReady(async () => {
-      unpackExcalidraw();
-      excalidrawLib = window.eval.call(window,`(function() {${EXCALIDRAW_PACKAGE};return ExcalidrawLib;})()`);
-      this.packageMap.set(window,{react, reactDOM, excalidrawLib});
-      updateExcalidrawLib();
-      initCompressionWorker();
+      try {
+        unpackExcalidraw();
+        excalidrawLib = window.eval.call(window,`(function() {${EXCALIDRAW_PACKAGE};return ExcalidrawLib;})()`);
+        this.packageMap.set(window,{react, reactDOM, excalidrawLib});
+        updateExcalidrawLib();
+      } catch (e) {
+        new Notice("Error loading the Excalidraw package", 6000);
+        console.error("Error loading the Excalidraw package", e);
+      }
+
+      try {
+        initCompressionWorker();
+      } catch (e) {
+        new Notice("Error initializing compression worker", 6000);
+        console.error("Error initializing compression worker", e);
+      }
+
       this.loadTimestamp = Date.now();
       addIcon(ICON_NAME, EXCALIDRAW_ICON);
       addIcon(SCRIPTENGINE_ICON_NAME, SCRIPTENGINE_ICON);
       addIcon(EXPORT_IMG_ICON_NAME, EXPORT_IMG_ICON);
 
-      this.excalidrawConfig = new ExcalidrawConfig(this);
-      await loadMermaid();
-      this.addThemeObserver();
+      try {
+        this.excalidrawConfig = new ExcalidrawConfig(this);
+      } catch (e) {
+        new Notice("Error initializing Excalidraw config", 6000);
+        console.error("Error initializing Excalidraw config", e);
+      }
 
-      //inspiration taken from kanban:
-      //https://github.com/mgmeyers/obsidian-kanban/blob/44118e25661bff9ebfe54f71ae33805dc88ffa53/src/main.ts#L267
-      this.registerMonkeyPatches();
+      try {
+        await loadMermaid();
+      } catch (e) {
+        new Notice("Error loading Mermaid", 6000);
+        console.error("Error loading Mermaid", e);
+      }
 
-      this.stylesManager = new StylesManager(this);
-      this.scriptEngine = new ScriptEngine(this);
-      await this.initializeFonts();
-      imageCache.initializeDB(this);
+      try {
+        this.addThemeObserver();
+      } catch (e) {
+        new Notice("Error adding theme observer", 6000);
+        console.error("Error adding theme observer", e);
+      }
 
-      this.isReady = true;
-      switchToExcalidraw(this.app);
-      this.switchToExcalidarwAfterLoad();
+      try {
+        //inspiration taken from kanban:
+        //https://github.com/mgmeyers/obsidian-kanban/blob/44118e25661bff9ebfe54f71ae33805dc88ffa53/src/main.ts#L267
+        this.registerMonkeyPatches();
+      } catch (e) {
+        new Notice("Error registering monkey patches", 6000);
+        console.error("Error registering monkey patches", e);
+      }
+
+      try {
+        this.stylesManager = new StylesManager(this);
+      } catch (e) {
+        new Notice("Error initializing styles manager", 6000);
+        console.error("Error initializing styles manager", e);
+      }
+
+      try {
+        this.scriptEngine = new ScriptEngine(this);
+      } catch (e) {
+        new Notice("Error initializing script engine", 6000);
+        console.error("Error initializing script engine", e);
+      }
+
+      try {
+        await this.initializeFonts();
+      } catch (e) {
+        new Notice("Error initializing fonts", 6000);
+        console.error("Error initializing fonts", e);
+      }
+
+      try {
+        imageCache.initializeDB(this);
+      } catch (e) {
+        new Notice("Error initializing image cache", 6000);
+        console.error("Error initializing image cache", e);
+      }
+
+      try {
+        this.isReady = true;
+        switchToExcalidraw(this.app);
+        this.switchToExcalidarwAfterLoad();
+      } catch (e) {
+        new Notice("Error switching views to Excalidraw", 6000);
+        console.error("Error switching views to Excalidraw", e);
+      }
 
       try {
         if (this.settings.showReleaseNotes) {
@@ -431,20 +510,23 @@ export default class ExcalidrawPlugin extends Plugin {
         console.error("Error opening release notes", e);
       }
 
+      //---------------------------------------------------------------------
       //initialization that can happen after Excalidraw views are initialized
-      
+      //---------------------------------------------------------------------      
       try {
         this.registerEventListeners();
       } catch (e) {
         new Notice("Error registering event listeners", 6000);
         console.error("Error registering event listeners", e);
       }
+
       try { 
         this.runStartupScript();
       } catch (e) {
         new Notice("Error running startup script", 6000);
         console.error("Error running startup script", e);
       }
+
       try {
         this.editorHandler = new EditorHandler(this);
         this.editorHandler.setup();
@@ -452,6 +534,7 @@ export default class ExcalidrawPlugin extends Plugin {
         new Notice("Error setting up editor handler", 6000);
         console.error("Error setting up editor handler", e);
       }
+
       try {
         this.registerInstallCodeblockProcessor();
       } catch (e) {
@@ -465,24 +548,28 @@ export default class ExcalidrawPlugin extends Plugin {
         new Notice("Error setting up experimental file type display", 6000);
         console.error("Error setting up experimental file type display", e);
       }
+
       try {
         this.registerCommands();
       } catch (e) {
         new Notice("Error registering commands", 6000);
         console.error("Error registering commands", e);
       }
+
       try {
         this.registerEditorSuggest(new FieldSuggester(this));
       } catch (e) {
         new Notice("Error registering editor suggester", 6000);
         console.error("Error registering editor suggester", e);
       }
+
       try {
         this.setPropertyTypes();
       } catch (e) {
         new Notice("Error setting up property types", 6000);
         console.error("Error setting up property types", e);
       }
+
       try {
         this.taskbone = new Taskbone(this);
       } catch (e) {