1.0.11

Manage plugin loading solely within Lazy Loader

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "lazy-plugins",
 	"name": "Lazy Plugin Loader",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"minAppVersion": "1.6.0",
 	"description": "Load plugins with a delay on startup, so that you can get your app startup down into the sub-second loading time.",
 	"author": "Alan Grainger",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "lazy-plugins",
-	"version": "1.0.10",
+	"version": "1.0.11",
 	"description": "Load plugins with a delay on startup, so that you can get your app startup down into the sub-second loading time.",
 	"main": "main.js",
 	"scripts": {

src/main.ts

@@ -34,34 +34,33 @@ export default class LazyPlugin extends Plugin {
 
   /**
    * Configure and load a plugin based on its startup settings.
-   * This uses Obsidian's enablePluginAndSave() and disablePluginAndSave() functions
-   * to save the configuration state for Obsidian's next start.
    */
   async setPluginStartup (pluginId: string) {
     const obsidian = this.app.plugins
 
     const startupType = this.getPluginStartup(pluginId)
-    const isActiveOnStartup = obsidian.enabledPlugins.has(pluginId)
     const isRunning = obsidian.plugins?.[pluginId]?._loaded
 
+    // Check if the plugin is loaded by Obsidian
+    if (obsidian.enabledPlugins.has(pluginId)) {
+      // Disable it and save, so that plugin loading is handled solely by Lazy Loader
+      // https://github.com/obsidianmd/obsidian-releases/pull/3998#issuecomment-2318012016
+      await obsidian.disablePluginAndSave(pluginId)
+    }
+
     switch (startupType) {
       // For disabled plugins
       case LoadingMethod.disabled:
-        await obsidian.disablePluginAndSave(pluginId)
+        if (isRunning) await obsidian.disablePlugin(pluginId)
         break
       // For instant-start plugins
       case LoadingMethod.instant:
-        if (!isActiveOnStartup && !isRunning) await obsidian.enablePluginAndSave(pluginId)
+        if (!isRunning) await obsidian.enablePlugin(pluginId)
         break
       // For plugins with a delay
       case LoadingMethod.short:
       case LoadingMethod.long:
-        if (isActiveOnStartup) {
-          // Disable and save so that it won't auto-start next time
-          await obsidian.disablePluginAndSave(pluginId)
-          // Immediately re-enable, since the plugin is already active and in-use
-          await obsidian.enablePlugin(pluginId)
-        } else {
+        if (!isRunning) {
           // Start with a delay
           const seconds = startupType === LoadingMethod.short ? this.settings.shortDelaySeconds : this.settings.longDelaySeconds
           // Add a short additional delay to each plugin, for two purposes:
@@ -147,7 +146,7 @@ export default class LazyPlugin extends Plugin {
     // Iterate over the configured plugins
     for (const plugin of this.manifests) {
       const startupType = this.settings.plugins?.[plugin.id]?.startupType
-      if (startupType === LoadingMethod.short || startupType === LoadingMethod.long) {
+      if (startupType !== LoadingMethod.disabled) {
         await this.app.plugins.disablePlugin(plugin.id)
         await this.app.plugins.enablePluginAndSave(plugin.id)
         console.log(`Set ${plugin.id} back to instant start`)

versions.json

@@ -8,5 +8,6 @@
 	"1.0.6": "1.6.0",
 	"1.0.7": "1.6.0",
 	"1.0.9": "1.6.0",
-	"1.0.10": "1.6.0"
+	"1.0.10": "1.6.0",
+	"1.0.11": "1.6.0"
 }