zotero-plugin-scaffold 0.0.20 → 0.0.22

package/dist/cli.mjs

@@ -24,7 +24,7 @@ import 'chokidar';
 import 'process';
 
 const name = "zotero-plugin-scaffold";
-const version = "0.0.20";
+const version = "0.0.22";
 const description = "A scaffold for Zotero plugin development.";
 const scripts = {
 	dev: "unbuild --stub",

package/dist/index.d.mts

@@ -679,7 +679,6 @@ declare class Serve extends Base {
      */
     prepareDevEnv(): void;
     reload(): void;
-    openDevTool(): void;
     exit(): void;
     private get zoteroBinPath();
     private get profilePath();

package/dist/index.d.ts

@@ -679,7 +679,6 @@ declare class Serve extends Base {
      */
     prepareDevEnv(): void;
     reload(): void;
-    openDevTool(): void;
     exit(): void;
     private get zoteroBinPath();
     private get profilePath();

package/dist/index.mjs

@@ -173,7 +173,13 @@ const defaultConfig = {
     hooks: {}
   },
   server: {
-    startArgs: ["--debugger", "--purgecaches"],
+    startArgs: [
+      "--no-remote",
+      "--start-debugger-server",
+      "--jsdebugger",
+      "--debugger",
+      "--purgecaches"
+    ],
     asProxy: false,
     hooks: {}
   },
@@ -489,6 +495,9 @@ class Release extends Base {
     __publicField$1(this, "client");
     this.isCI = isCI;
     this.client = this.getClient();
+    if (this.isCI) {
+      this.logger.level = 4;
+    }
   }
   /**
    * Runs release
@@ -505,7 +514,9 @@ class Release extends Base {
       if (glob.globSync(`${this.dist}/*.xpi`).length == 0) {
         throw new Error("No xpi file found, are you sure you have run build?");
       }
+      this.logger.info("Uploading XPI...");
       await this.uploadXPI();
+      this.logger.info("Uploading update manifest...");
       await this.uploadUpdateJSON();
     }
     this.logger.success(
@@ -535,21 +546,32 @@ class Release extends Base {
     });
     if (!release)
       throw new Error("Create release failed!");
-    this.uploadAsset(release.id, path.join(this.dist, `${this.xpiName}.xpi`));
+    this.logger.debug("Uploading xpi asset...");
+    await this.uploadAsset(
+      release.id,
+      path.join(this.dist, `${this.xpiName}.xpi`)
+    );
   }
   async getReleaseByTag(tag) {
     return await this.client.rest.repos.getReleaseByTag({
       owner: this.owner,
       repo: this.repo,
       tag
+    }).catch((e) => {
+      this.logger.log(`Release with tag ${tag} not found.`);
+      return void 0;
     }).then((res) => {
-      if (res.status == 200) {
+      if (res && res.status == 200) {
         return res.data;
       }
     });
   }
   async creatRelease(options) {
-    return await this.client.rest.repos.createRelease(options).then((res) => {
+    this.logger.debug("Creating release...", options);
+    return await this.client.rest.repos.createRelease(options).catch((e) => {
+      this.logger.error(e);
+      throw new Error("Create release failed.");
+    }).then((res) => {
       if (res.status == 201) {
         return res.data;
       }
@@ -575,7 +597,8 @@ class Release extends Base {
     const release = await this.getReleaseByTag("release") ?? await this.creatRelease({
       owner: this.owner,
       repo: this.repo,
-      tag_name: "release"
+      tag_name: "release",
+      make_latest: "false"
     });
     if (!release)
       throw new Error("Get or create 'release' failed.");
@@ -614,8 +637,8 @@ class Release extends Base {
       conventionalChangelog({ releaseCount: 2 }, { version: this.version }).on("data", (chunk) => {
         changelog += chunk.toString();
       }).on("end", () => {
-        this.logger.debug("changelog:", changelog);
-        resolve(changelog);
+        this.logger.debug("changelog:", changelog.trim());
+        resolve(changelog.trim());
       }).on("error", (err) => {
         reject(err);
       });
@@ -765,7 +788,6 @@ ${path2} changed`);
    * Starts zotero with plugins pre-installed as proxy file
    */
   async startZotero() {
-    let isZoteroReady = false;
     if (!fs.existsSync(this.zoteroBinPath)) {
       throw new Error("Zotero binary does not exist.");
     }
@@ -774,19 +796,15 @@ ${path2} changed`);
     }
     this.prepareDevEnv();
     const zoteroProcess = spawn(this.zoteroBinPath, [
+      "--no-remote",
+      "--start-debugger-server",
+      "--jsdebugger",
       "--debugger",
       "--purgecaches",
       "-profile",
       this.profilePath
     ]);
     zoteroProcess.stdout?.on("data", (data) => {
-      if (!isZoteroReady && data.toString().includes(`Plugin ${this.id} startup`)) {
-        this.logger.log(data.toString());
-        isZoteroReady = true;
-        setTimeout(() => {
-          this.openDevTool();
-        }, 1e3);
-      }
     });
     zoteroProcess.on("close", (code) => {
       this.logger.info(`Zotero terminated with code ${code}.`);
@@ -810,8 +828,9 @@ ${path2} changed`);
         keepProfileChanges: true,
         args: this.ctx.server.startArgs,
         pref: { "extensions.experiments.enabled": true },
-        browserConsole: true,
-        // devtools: true, // need Zotero upgrade to firefox 115,
+        // Use Zotero's devtools instead
+        browserConsole: false,
+        devtools: false,
         noInput: true
       },
       {
@@ -890,68 +909,6 @@ ${path2} changed`);
     const command = `${startZoteroCmd} -url "${url}"`;
     execSync(command);
   }
-  openDevTool() {
-    this.logger.debug("Open dev tools...");
-    const openDevToolScript = `
-    (async () => {
-    
-    // const { BrowserToolboxLauncher } = ChromeUtils.import(
-    //   "resource://devtools/client/framework/browser-toolbox/Launcher.jsm",
-    // );
-    // BrowserToolboxLauncher.init();
-    // TODO: Use the above code to open the devtool after https://github.com/zotero/zotero/pull/3387
-    
-    Zotero.Prefs.set("devtools.debugger.remote-enabled", true, true);
-    Zotero.Prefs.set("devtools.debugger.remote-port", 6100, true);
-    Zotero.Prefs.set("devtools.debugger.prompt-connection", false, true);
-    Zotero.Prefs.set("devtools.debugger.chrome-debugging-websocket", false, true);
-    
-    env =
-        Services.env ||
-        Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-    
-    env.set("MOZ_BROWSER_TOOLBOX_PORT", 6100);
-    Zotero.openInViewer(
-        "chrome://devtools/content/framework/browser-toolbox/window.html",
-        {
-        onLoad: (doc) => {
-            doc.querySelector("#status-message-container").style.visibility =
-            "collapse";
-            let toolboxBody;
-            waitUntil(
-            () => {
-                toolboxBody = doc
-                .querySelector(".devtools-toolbox-browsertoolbox-iframe")
-                ?.contentDocument?.querySelector(".theme-body");
-                return toolboxBody;
-            },
-            () => {
-                toolboxBody.style = "pointer-events: all !important";
-            }
-            );
-        },
-        }
-    );
-    
-    function waitUntil(condition, callback, interval = 100, timeout = 10000) {
-        const start = Date.now();
-        const intervalId = setInterval(() => {
-        if (condition()) {
-            clearInterval(intervalId);
-            callback();
-        } else if (Date.now() - start > timeout) {
-            clearInterval(intervalId);
-        }
-        }, interval);
-    }  
-    })()`;
-    const url = `zotero://ztoolkit-debug/?run=${encodeURIComponent(
-      openDevToolScript
-    )}`;
-    const startZoteroCmd = `"${this.zoteroBinPath}" --debugger --purgecaches -profile "${this.profilePath}"`;
-    const command = `${startZoteroCmd} -url "${url}"`;
-    execSync(command);
-  }
   exit() {
     console.log("");
     this.logger.info("Server shutdown by user request.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin-scaffold",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "A scaffold for Zotero plugin development.",
   "type": "module",
   "exports": {