@equicord/publish-browser-extension 4.0.1 → 4.0.3

package/dist/cli.js

@@ -1,10 +1,10 @@
-import { d as chromeStatus, n as submit, t as init, u as chromeSetDeployPercentage } from "./init-CL9ikrQH.js";
+import { d as chromeStatus, n as submit, t as init, u as chromeSetDeployPercentage } from "./init-CB96xhAw.js";
 import { cac } from "cac";
 import { consola as consola$1 } from "consola";
 import { config } from "dotenv";
 
 //#region package.json
-var version = "4.0.1";
+var version = "4.0.3";
 
 //#endregion
 //#region src/cli.ts

package/dist/index.d.ts

@@ -203,6 +203,12 @@ declare class FirefoxAddonStore implements Store {
   ensureZipsExist(): Promise<void>;
   submit(dryRun?: boolean): Promise<void>;
   private uploadAndPollValidation;
+  /**
+   * Ensure the extension id is wrapped in curly braces, that's what the addon store API is expecting
+   * @example
+   * "test" -> "{test}"
+   */
+  private get wrappedExtensionId();
 }
 //#endregion
 //#region src/edge/edge-api.d.ts

package/dist/index.js

@@ -1,3 +1,3 @@
-import { a as FirefoxAddonStoreOptions, c as EdgeAddonStoreOptions, d as chromeStatus, f as ChromeWebStore, i as FirefoxAddonStore, l as EdgeApi, m as CwsApi, n as submit, o as AddonsApi, p as ChromeWebStoreOptions, r as InlineConfig, s as EdgeAddonStore, t as init, u as chromeSetDeployPercentage } from "./init-CL9ikrQH.js";
+import { a as FirefoxAddonStoreOptions, c as EdgeAddonStoreOptions, d as chromeStatus, f as ChromeWebStore, i as FirefoxAddonStore, l as EdgeApi, m as CwsApi, n as submit, o as AddonsApi, p as ChromeWebStoreOptions, r as InlineConfig, s as EdgeAddonStore, t as init, u as chromeSetDeployPercentage } from "./init-CB96xhAw.js";
 
 export { AddonsApi, ChromeWebStore, ChromeWebStoreOptions, CwsApi, EdgeAddonStore, EdgeAddonStoreOptions, EdgeApi, FirefoxAddonStore, FirefoxAddonStoreOptions, InlineConfig, chromeSetDeployPercentage, chromeStatus, init, submit };

package/dist/{init-CL9ikrQH.js → init-CB96xhAw.js}

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { Listr } from "listr2";
-import { createFetch, ofetch } from "ofetch";
+import { createFetch } from "ofetch";
 import { z } from "zod/v4";
 import fs, { copyFile, readFile, writeFile } from "node:fs/promises";
 import consola, { consola as consola$1 } from "consola";
@@ -9,6 +9,7 @@ import { FormData } from "formdata-node";
 import { fileFromPath } from "formdata-node/file-from-path";
 import { FormDataEncoder } from "form-data-encoder";
 import { Readable } from "node:stream";
+import http from "http";
 
 //#region rolldown:runtime
 var __create = Object.create;
@@ -38,7 +39,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region src/utils/fetch.ts
-const fetch = createFetch({ defaults: { onResponseError: (ctx) => {
+const fetch$1 = createFetch({ defaults: { onResponseError: (ctx) => {
 	console.log("Request:", ctx.request);
 	console.log("Response:", JSON.stringify(ctx.response, null, 2));
 } } });
@@ -70,7 +71,7 @@ var CwsApi = class {
 	}
 	async uploadZip(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		return fetch(this.uploadEndpoint(params.extensionId), {
+		return fetch$1(this.uploadEndpoint(params.extensionId), {
 			method: "POST",
 			body: Bun.file(params.zipFile),
 			headers: {
@@ -85,7 +86,7 @@ var CwsApi = class {
 		if (params.publishType) body.publishType = params.publishType;
 		if (params.deployPercentage != null) body.deployInfos = [{ deployPercentage: params.deployPercentage }];
 		if (params.skipReview != null) body.skipReview = params.skipReview;
-		return fetch(this.publishEndpoint(params.extensionId), {
+		return fetch$1(this.publishEndpoint(params.extensionId), {
 			method: "POST",
 			headers: {
 				Authorization,
@@ -96,21 +97,21 @@ var CwsApi = class {
 	}
 	async fetchStatus(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		return fetch(this.fetchStatusEndpoint(params.extensionId), {
+		return fetch$1(this.fetchStatusEndpoint(params.extensionId), {
 			method: "GET",
 			headers: { Authorization }
 		});
 	}
 	async cancelSubmission(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		await fetch(this.cancelSubmissionEndpoint(params.extensionId), {
+		await fetch$1(this.cancelSubmissionEndpoint(params.extensionId), {
 			method: "POST",
 			headers: { Authorization }
 		});
 	}
 	async setPublishedDeployPercentage(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		await fetch(this.setDeployPercentageEndpoint(params.extensionId), {
+		await fetch$1(this.setDeployPercentageEndpoint(params.extensionId), {
 			method: "POST",
 			headers: {
 				Authorization,
@@ -120,7 +121,7 @@ var CwsApi = class {
 		});
 	}
 	getToken() {
-		return fetch(this.tokenEndpoint(), {
+		return fetch$1(this.tokenEndpoint(), {
 			method: "POST",
 			body: JSON.stringify({
 				client_id: this.options.clientId,
@@ -255,7 +256,7 @@ var EdgeApi = class {
 	async uploadDraft(params) {
 		const endpoint = `https://api.addons.microsoftedge.microsoft.com/v1/products/${params.productId}/submissions/draft/package`;
 		const file = fs$1.createReadStream(params.zipFile);
-		const operationId = (await fetch.raw(endpoint, {
+		const operationId = (await fetch$1.raw(endpoint, {
 			method: "POST",
 			body: file,
 			headers: {
@@ -270,14 +271,14 @@ var EdgeApi = class {
 	* Docs: https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/api/using-addons-api#checking-the-status-of-a-package-upload
 	*/
 	uploadDraftOperation(params) {
-		return fetch(`https://api.addons.microsoftedge.microsoft.com/v1/products/${params.productId}/submissions/draft/package/operations/${params.operationId}`, { headers: this.getAuthHeaders(params.token) });
+		return fetch$1(`https://api.addons.microsoftedge.microsoft.com/v1/products/${params.productId}/submissions/draft/package/operations/${params.operationId}`, { headers: this.getAuthHeaders(params.token) });
 	}
 	/**
 	* Docs: https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/api/using-addons-api#publishing-the-submission
 	*/
 	async publish(params) {
 		const endpoint = `https://api.addons.microsoftedge.microsoft.com/v1/products/${params.productId}/submissions`;
-		const res = await fetch.raw(endpoint, {
+		const res = await fetch$1.raw(endpoint, {
 			method: "POST",
 			body: JSON.stringify({}),
 			headers: this.getAuthHeaders(params.token)
@@ -3835,7 +3836,7 @@ var AddonsApi = class {
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#detail
 	*/
 	details(params) {
-		return fetch(this.addonDetailEndpoint(params.extensionId).href, { headers: { Authorization: this.getAuthHeader() } });
+		return fetch$1(this.addonDetailEndpoint(params.extensionId).href, { headers: { Authorization: this.getAuthHeader() } });
 	}
 	/**
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#upload-create
@@ -3846,7 +3847,7 @@ var AddonsApi = class {
 		form.set("channel", params.channel);
 		form.set("upload", await fileFromPath(params.file));
 		const encoder = new FormDataEncoder(form);
-		return await fetch(endpoint.href, {
+		return await fetch$1(endpoint.href, {
 			method: "POST",
 			body: Readable.from(encoder),
 			headers: {
@@ -3859,7 +3860,7 @@ var AddonsApi = class {
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#upload-detail
 	*/
 	uploadDetail(params) {
-		return fetch(this.addonsUploadDetailsEndpoint(params.uuid).href, { headers: { Authorization: this.getAuthHeader() } });
+		return fetch$1(this.addonsUploadDetailsEndpoint(params.uuid).href, { headers: { Authorization: this.getAuthHeader() } });
 	}
 	async versionCreate(params) {
 		const endpoint = this.addonVersionCreateEndpoint(params.extensionId);
@@ -3868,7 +3869,7 @@ var AddonsApi = class {
 		if (params.sourceFile) form.set("source", await fileFromPath(params.sourceFile));
 		else form.set("source", "");
 		const encoder = new FormDataEncoder(form);
-		return await fetch(endpoint.href, {
+		return await fetch$1(endpoint.href, {
 			method: "POST",
 			body: Readable.from(encoder),
 			headers: {
@@ -3926,7 +3927,7 @@ var FirefoxAddonStore = class {
 	}
 	async submit(dryRun) {
 		this.setStatus("Getting addon details");
-		const addon = await this.api.details({ extensionId: this.options.extensionId });
+		const addon = await this.api.details({ extensionId: this.wrappedExtensionId });
 		if (dryRun) {
 			this.setStatus("DRY RUN: Skipped upload and publishing");
 			return;
@@ -3934,7 +3935,7 @@ var FirefoxAddonStore = class {
 		const upload = await withTimeout(this.uploadAndPollValidation(5e3), 10 * 6e4);
 		this.setStatus("Submitting new version");
 		const version = await this.api.versionCreate({
-			extensionId: this.options.extensionId,
+			extensionId: this.wrappedExtensionId,
 			sourceFile: this.options.sourcesZip,
 			uploadUuid: upload.uuid
 		});
@@ -3957,6 +3958,18 @@ var FirefoxAddonStore = class {
 		}
 		return details;
 	}
+	/**
+	* Ensure the extension id is wrapped in curly braces, that's what the addon store API is expecting
+	* @example
+	* "test" -> "{test}"
+	*/
+	get wrappedExtensionId() {
+		let id = this.options.extensionId;
+		if (id.includes("@")) return id;
+		if (!id.startsWith("{")) id = "{" + id;
+		if (!id.endsWith("}")) id += "}";
+		return id;
+	}
 };
 
 //#endregion
@@ -4111,42 +4124,41 @@ async function submit(config) {
 const envFile = ".env.submit";
 async function generateRefreshTokenViaOAuth(clientId, clientSecret) {
 	let resolveCode;
-	const codePromise = new Promise((resolve) => {
-		resolveCode = resolve;
-	});
-	const server = Bun.serve({
-		port: 0,
-		fetch(req) {
-			const code$1 = new URL(req.url).searchParams.get("code");
-			if (code$1) {
-				resolveCode(code$1);
-				return new Response("Success! You can close this tab. <script>window.close()<\/script>", { headers: { "Content-Type": "text/html" } });
-			}
-			return new Response("No code found", { status: 400 });
+	const codePromise = new Promise((resolve) => resolveCode = resolve);
+	const server = http.createServer((req, res) => {
+		const code$1 = new URL(req.url || "", `http://localhost`).searchParams.get("code");
+		if (code$1) {
+			resolveCode(code$1);
+			res.writeHead(200, { "Content-Type": "text/html" });
+			res.end("Success! You can close this tab. <script>window.close()<\/script>");
+			server.close();
+		} else {
+			res.writeHead(400);
+			res.end("No code found");
 		}
 	});
-	const serverUrl = `http://127.0.0.1:${server.port}`;
-	const authUrl = new URL("https://accounts.google.com/o/oauth2/auth");
-	authUrl.searchParams.set("response_type", "code");
-	authUrl.searchParams.set("access_type", "offline");
-	authUrl.searchParams.set("client_id", clientId);
-	authUrl.searchParams.set("scope", "https://www.googleapis.com/auth/chromewebstore");
-	authUrl.searchParams.set("redirect_uri", serverUrl);
-	consola$1.info("Open this URL in your browser to authorize:");
-	consola$1.log(authUrl.href);
-	consola$1.info("Waiting for authorization...");
+	server.listen(0, () => {
+		const redirectUri = `http://127.0.0.1:${server.address().port}`;
+		const authUrl = new URL("https://accounts.google.com/o/oauth2/auth");
+		authUrl.searchParams.set("response_type", "code");
+		authUrl.searchParams.set("access_type", "offline");
+		authUrl.searchParams.set("client_id", clientId);
+		authUrl.searchParams.set("scope", "https://www.googleapis.com/auth/chromewebstore");
+		authUrl.searchParams.set("redirect_uri", redirectUri);
+		console.log("Open this URL in your browser to authorize:");
+		console.log(authUrl.href);
+	});
 	const code = await codePromise;
-	server.stop();
-	return (await ofetch("https://accounts.google.com/o/oauth2/token", {
+	return (await (await fetch("https://accounts.google.com/o/oauth2/token", {
 		method: "POST",
-		body: new URLSearchParams([
-			["client_id", clientId],
-			["client_secret", clientSecret],
-			["code", code],
-			["grant_type", "authorization_code"],
-			["redirect_uri", serverUrl]
-		])
-	})).refresh_token;
+		body: new URLSearchParams({
+			client_id: clientId,
+			client_secret: clientSecret,
+			code,
+			grant_type: "authorization_code",
+			redirect_uri: `http://127.0.0.1:${server.address().port}`
+		})
+	})).json()).refresh_token;
 }
 async function init(config) {
 	consola$1.info(`Initialize or update an existing \`${envFile}\` file.`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@equicord/publish-browser-extension",
   "description": "Easily publish web extensions to their stores",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "packageManager": "bun@1.3.4",
   "type": "module",
   "scripts": {
@@ -24,6 +24,7 @@
     "dotenv": "^17.2.3",
     "form-data-encoder": "^4.1.0",
     "formdata-node": "^6.0.3",
+    "http": "^0.0.1-security",
     "listr2": "^8.3.3",
     "ofetch": "^1.4.1",
     "zod": "^3.25.76 || ^4.0.0"