@equicord/publish-browser-extension 4.0.3 → 4.0.5

package/dist/cli.js

@@ -1,10 +1,10 @@
-import { d as chromeStatus, n as submit, t as init, u as chromeSetDeployPercentage } from "./init-CB96xhAw.js";
+import { d as chromeStatus, n as submit, t as init, u as chromeSetDeployPercentage } from "./init-CeaZntzI.js";
 import { cac } from "cac";
 import { consola as consola$1 } from "consola";
 import { config } from "dotenv";
 
 //#region package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 //#endregion
 //#region src/cli.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-CB96xhAw.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-CeaZntzI.js";
 
 export { AddonsApi, ChromeWebStore, ChromeWebStoreOptions, CwsApi, EdgeAddonStore, EdgeAddonStoreOptions, EdgeApi, FirefoxAddonStore, FirefoxAddonStoreOptions, InlineConfig, chromeSetDeployPercentage, chromeStatus, init, submit };

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

@@ -1,15 +1,14 @@
 import { createRequire } from "node:module";
 import { Listr } from "listr2";
-import { createFetch } from "ofetch";
+import { fileFromPath } from "formdata-node/file-from-path";
+import { createFetch, ofetch } from "ofetch";
 import { z } from "zod/v4";
 import fs, { copyFile, readFile, writeFile } from "node:fs/promises";
 import consola, { consola as consola$1 } from "consola";
 import fs$1 from "fs";
-import { FormData } from "formdata-node";
-import { fileFromPath } from "formdata-node/file-from-path";
+import { FormData as FormData$1 } from "formdata-node";
 import { FormDataEncoder } from "form-data-encoder";
 import { Readable } from "node:stream";
-import http from "http";
 
 //#region rolldown:runtime
 var __create = Object.create;
@@ -39,7 +38,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region src/utils/fetch.ts
-const fetch$1 = createFetch({ defaults: { onResponseError: (ctx) => {
+const fetch = createFetch({ defaults: { onResponseError: (ctx) => {
 	console.log("Request:", ctx.request);
 	console.log("Response:", JSON.stringify(ctx.response, null, 2));
 } } });
@@ -71,9 +70,12 @@ var CwsApi = class {
 	}
 	async uploadZip(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		return fetch$1(this.uploadEndpoint(params.extensionId), {
+		const form = new FormData();
+		const file = await fileFromPath(params.zipFile);
+		form.append("image", file);
+		return fetch(this.uploadEndpoint(params.extensionId), {
 			method: "POST",
-			body: Bun.file(params.zipFile),
+			body: form,
 			headers: {
 				Authorization,
 				"X-Goog-Upload-Protocol": "raw"
@@ -86,7 +88,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$1(this.publishEndpoint(params.extensionId), {
+		return fetch(this.publishEndpoint(params.extensionId), {
 			method: "POST",
 			headers: {
 				Authorization,
@@ -97,21 +99,21 @@ var CwsApi = class {
 	}
 	async fetchStatus(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		return fetch$1(this.fetchStatusEndpoint(params.extensionId), {
+		return fetch(this.fetchStatusEndpoint(params.extensionId), {
 			method: "GET",
 			headers: { Authorization }
 		});
 	}
 	async cancelSubmission(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		await fetch$1(this.cancelSubmissionEndpoint(params.extensionId), {
+		await fetch(this.cancelSubmissionEndpoint(params.extensionId), {
 			method: "POST",
 			headers: { Authorization }
 		});
 	}
 	async setPublishedDeployPercentage(params) {
 		const Authorization = this.getAuthHeader(params.token);
-		await fetch$1(this.setDeployPercentageEndpoint(params.extensionId), {
+		await fetch(this.setDeployPercentageEndpoint(params.extensionId), {
 			method: "POST",
 			headers: {
 				Authorization,
@@ -121,7 +123,7 @@ var CwsApi = class {
 		});
 	}
 	getToken() {
-		return fetch$1(this.tokenEndpoint(), {
+		return fetch(this.tokenEndpoint(), {
 			method: "POST",
 			body: JSON.stringify({
 				client_id: this.options.clientId,
@@ -256,7 +258,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$1.raw(endpoint, {
+		const operationId = (await fetch.raw(endpoint, {
 			method: "POST",
 			body: file,
 			headers: {
@@ -271,14 +273,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$1(`https://api.addons.microsoftedge.microsoft.com/v1/products/${params.productId}/submissions/draft/package/operations/${params.operationId}`, { headers: this.getAuthHeaders(params.token) });
+		return fetch(`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$1.raw(endpoint, {
+		const res = await fetch.raw(endpoint, {
 			method: "POST",
 			body: JSON.stringify({}),
 			headers: this.getAuthHeaders(params.token)
@@ -3836,18 +3838,18 @@ var AddonsApi = class {
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#detail
 	*/
 	details(params) {
-		return fetch$1(this.addonDetailEndpoint(params.extensionId).href, { headers: { Authorization: this.getAuthHeader() } });
+		return fetch(this.addonDetailEndpoint(params.extensionId).href, { headers: { Authorization: this.getAuthHeader() } });
 	}
 	/**
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#upload-create
 	*/
 	async uploadCreate(params) {
 		const endpoint = this.addonsUploadCreateEndpoint();
-		const form = new FormData();
+		const form = new FormData$1();
 		form.set("channel", params.channel);
 		form.set("upload", await fileFromPath(params.file));
 		const encoder = new FormDataEncoder(form);
-		return await fetch$1(endpoint.href, {
+		return await fetch(endpoint.href, {
 			method: "POST",
 			body: Readable.from(encoder),
 			headers: {
@@ -3860,16 +3862,16 @@ var AddonsApi = class {
 	* Docs: https://addons-server.readthedocs.io/en/latest/topics/api/addons.html#upload-detail
 	*/
 	uploadDetail(params) {
-		return fetch$1(this.addonsUploadDetailsEndpoint(params.uuid).href, { headers: { Authorization: this.getAuthHeader() } });
+		return fetch(this.addonsUploadDetailsEndpoint(params.uuid).href, { headers: { Authorization: this.getAuthHeader() } });
 	}
 	async versionCreate(params) {
 		const endpoint = this.addonVersionCreateEndpoint(params.extensionId);
-		const form = new FormData();
+		const form = new FormData$1();
 		form.set("upload", params.uploadUuid);
 		if (params.sourceFile) form.set("source", await fileFromPath(params.sourceFile));
 		else form.set("source", "");
 		const encoder = new FormDataEncoder(form);
-		return await fetch$1(endpoint.href, {
+		return await fetch(endpoint.href, {
 			method: "POST",
 			body: Readable.from(encoder),
 			headers: {
@@ -4122,44 +4124,6 @@ async function submit(config) {
 //#endregion
 //#region src/init.ts
 const envFile = ".env.submit";
-async function generateRefreshTokenViaOAuth(clientId, clientSecret) {
-	let resolveCode;
-	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");
-		}
-	});
-	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;
-	return (await (await fetch("https://accounts.google.com/o/oauth2/token", {
-		method: "POST",
-		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.`);
 	const previousConfig = resolveConfig(config);
@@ -4223,7 +4187,22 @@ async function initChrome(previousOptions) {
 	const clientSecret = await prompt("Enter your client secret:", { type: "text" }, previousOptions?.clientSecret);
 	entries.push(["CHROME_CLIENT_SECRET", clientSecret]);
 	if (await prompt("Generate new refresh token?", { type: "confirm" })) {
-		const refreshToken = await generateRefreshTokenViaOAuth(clientId, clientSecret);
+		const authCodeUrl = `https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromewebstore&client_id=${clientId}&redirect_uri=urn:ietf:wg:oauth:2.0:oob`;
+		consola$1.log(authCodeUrl);
+		const authCode = await consola$1.prompt("Open the above URL, login, and enter the auth code:", {
+			type: "text",
+			required: true
+		});
+		const data = new URLSearchParams();
+		data.set("client_id", clientId);
+		data.set("client_secret", clientSecret);
+		data.set("code", authCode);
+		data.set("grant_type", "authorization_code");
+		data.set("redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
+		const refreshToken = (await ofetch(`https://accounts.google.com/o/oauth2/token`, {
+			method: "POST",
+			body: data
+		})).refresh_token;
 		consola$1.info(`Refresh token: \`${refreshToken}\``);
 		entries.push(["CHROME_REFRESH_TOKEN", refreshToken]);
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@equicord/publish-browser-extension",
   "description": "Easily publish web extensions to their stores",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "packageManager": "bun@1.3.4",
   "type": "module",
   "scripts": {
@@ -24,7 +24,6 @@
     "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"