web-ext 8.2.0 → 8.4.0

package/lib/util/submit-addon.js

@@ -1,9 +1,7 @@
+import { basename } from 'path';
 import { createHash } from 'crypto';
-import { createWriteStream, promises as fsPromises } from 'fs';
+import { createWriteStream, promises as fsPromises, readFileSync } from 'fs';
 import { promises as streamPromises } from 'stream';
-
-// eslint-disable-next-line no-shadow
-import fetch, { FormData, fileFromSync } from 'node-fetch';
 import { SignJWT } from 'jose';
 import JSZip from 'jszip';
 import { HttpsProxyAgent } from 'https-proxy-agent';
@@ -11,6 +9,26 @@ import { isErrorWithCode } from '../errors.js';
 import { createLogger } from './../util/logger.js';
 const log = createLogger(import.meta.url);
 export const defaultAsyncFsReadFile = fsPromises.readFile;
+
+// Used by fileFromSync method to make sure the form-data entry will
+// include a filename derived from the file path.
+//
+// TODO: Get rid of this hack when we will bump the web-ext nodejs
+// version required to nodejs v20 (where the native File constructor
+// exists).
+export class FileBlob extends Blob {
+  #name = '';
+  constructor(fileBits, fileName, options) {
+    super(fileBits, options);
+    this.#name = String(fileName);
+  }
+  get name() {
+    return this.#name;
+  }
+  get [Symbol.toStringTag]() {
+    return 'File';
+  }
+}
 export class JwtApiAuth {
   #apiKey;
   #apiSecret;
@@ -61,7 +79,7 @@ export default class Client {
     approvalCheckTimeout = 900000,
     // 15 minutes.
     downloadDir = process.cwd(),
-    userAgentString
+    userAgentString = 'web-ext-lib'
   }) {
     this.apiAuth = apiAuth;
     if (apiProxy) {
@@ -79,8 +97,13 @@ export default class Client {
     this.downloadDir = downloadDir;
     this.userAgentString = userAgentString;
   }
-  fileFromSync(path) {
-    return fileFromSync(path);
+  fileFromSync(filePath) {
+    // create a File blob from a file path, and ensure it to have the file path basename
+    // as the associated filename, the AMO server API will be checking it on the form-data
+    // submitted and fail with the error message:
+    // "Unsupported file type, please upload a supported file (.crx, .xpi, .zip)."
+    const fileData = readFileSync(filePath);
+    return new FileBlob([fileData], basename(filePath));
   }
   nodeFetch(url, {
     method,
@@ -360,7 +383,7 @@ export async function signAddon({
   savedUploadUuidPath,
   metaDataJson = {},
   submissionSource,
-  userAgentString,
+  userAgentString = 'web-ext-lib',
   SubmitClient = Client,
   ApiAuthClass = JwtApiAuth
 }) {

package/lib/util/submit-addon.js.map

@@ -1 +1 @@
-{"version":3,"file":"submit-addon.js","names":["createHash","createWriteStream","promises","fsPromises","streamPromises","fetch","FormData","fileFromSync","SignJWT","JSZip","HttpsProxyAgent","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsReadFile","readFile","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","constructor","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","apiProxy","apiUr","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","userAgentString","baseUrl","process","cwd","pathname","endsWith","URL","href","apiUrl","path","nodeFetch","method","headers","body","agent","doUploadSubmit","xpiPath","channel","formData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","editUrl","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","errorMessage","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","debug","validation","valid","JSON","stringify","join","doNewAddonSubmit","metaDataJson","jsonData","version","upload","doNewAddonOrVersionSubmit","addonId","doFormDataPatch","data","versionId","patchUrl","field","response","ok","status","error","warn","Object","keys","doAfterSubmit","newVersionId","patchData","returnResult","fileUrl","waitForApproval","downloadSignedFile","file","errorMsg","statusText","json","Authorization","Accept","downloadedFiles","id","filename","split","pop","dest","saveToFile","contents","destPath","pipeline","hashXpiCrcs","filePath","asyncFsReadFile","zip","loadAsync","createFolders","hash","entries","forEach","relativePath","entry","_entry$_data","replace","dir","push","crc32","_data","sort","a","b","update","digest","getPreviousUuidOrUploadXpi","savedUploadUuidPath","saveUploadUuidToFileFunc","saveUploadUuidToFile","getUploadUuidFromFileFunc","getUploadUuidFromFile","uploadUuid","previousUuid","previousChannel","xpiCrcHash","previousHash","all","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","guid","edit_url","putVersion","signAddon","amoBaseUrl","submissionSource","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","stats2","source","writeFile","toString","content","parse"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["import { createHash } from 'crypto';\nimport { createWriteStream, promises as fsPromises } from 'fs';\nimport { promises as streamPromises } from 'stream';\n\n// eslint-disable-next-line no-shadow\nimport fetch, { FormData, fileFromSync } from 'node-fetch';\nimport { SignJWT } from 'jose';\nimport JSZip from 'jszip';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\n\nimport { isErrorWithCode } from '../errors.js';\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport const defaultAsyncFsReadFile = fsPromises.readFile;\n\nexport class JwtApiAuth {\n  #apiKey;\n  #apiSecret;\n  #apiJwtExpiresIn;\n\n  constructor({\n    apiKey,\n    apiSecret,\n    apiJwtExpiresIn = 60 * 5, // 5 minutes\n  }) {\n    this.#apiKey = apiKey;\n    this.#apiSecret = apiSecret;\n    this.#apiJwtExpiresIn = apiJwtExpiresIn;\n  }\n\n  async signJWT() {\n    return (\n      new SignJWT({ iss: this.#apiKey })\n        .setProtectedHeader({ alg: 'HS256' })\n        .setIssuedAt()\n        // jose expects either:\n        // a number, which is treated an absolute timestamp - so must be after now, or\n        // a string, which is parsed as a relative time from now.\n        .setExpirationTime(`${this.#apiJwtExpiresIn}seconds`)\n        .sign(Uint8Array.from(Buffer.from(this.#apiSecret, 'utf8')))\n    );\n  }\n\n  async getAuthHeader() {\n    const authToken = await this.signJWT();\n    return `JWT ${authToken}`;\n  }\n}\n\nexport default class Client {\n  apiAuth;\n  apiProxy;\n  apiUr;\n  validationCheckInterval;\n  validationCheckTimeout;\n  approvalCheckInterval;\n  approvalCheckTimeout;\n  downloadDir;\n  userAgentString;\n\n  constructor({\n    apiAuth,\n    apiProxy,\n    baseUrl,\n    validationCheckInterval = 1000,\n    validationCheckTimeout = 300000, // 5 minutes.\n    approvalCheckInterval = 1000,\n    approvalCheckTimeout = 900000, // 15 minutes.\n    downloadDir = process.cwd(),\n    userAgentString,\n  }) {\n    this.apiAuth = apiAuth;\n    if (apiProxy) {\n      this.apiProxy = apiProxy;\n    }\n    if (!baseUrl.pathname.endsWith('/')) {\n      baseUrl = new URL(baseUrl.href);\n      baseUrl.pathname += '/';\n    }\n    this.apiUrl = new URL('addons/', baseUrl);\n    this.validationCheckInterval = validationCheckInterval;\n    this.validationCheckTimeout = validationCheckTimeout;\n    this.approvalCheckInterval = approvalCheckInterval;\n    this.approvalCheckTimeout = approvalCheckTimeout;\n    this.downloadDir = downloadDir;\n    this.userAgentString = userAgentString;\n  }\n\n  fileFromSync(path) {\n    return fileFromSync(path);\n  }\n\n  nodeFetch(url, { method, headers, body, agent }) {\n    return fetch(url, { method, headers, body, agent });\n  }\n\n  async doUploadSubmit(xpiPath, channel) {\n    const url = new URL('upload/', this.apiUrl);\n    const formData = new FormData();\n    formData.set('channel', channel);\n    formData.set('upload', this.fileFromSync(xpiPath));\n    const { uuid } = await this.fetchJson(\n      url,\n      'POST',\n      formData,\n      'Upload failed',\n    );\n    return this.waitForValidation(uuid);\n  }\n\n  waitRetry(\n    successFunc,\n    checkUrl,\n    checkInterval,\n    abortInterval,\n    context,\n    editUrl = null,\n  ) {\n    let checkTimeout;\n\n    return new Promise((resolve, reject) => {\n      const abortTimeout = setTimeout(() => {\n        clearTimeout(checkTimeout);\n\n        let errorMessage = `${context}: timeout exceeded.`;\n        if (editUrl) {\n          errorMessage += ` When approved the signed XPI file can be downloaded from ${editUrl}`;\n        }\n\n        reject(new Error(errorMessage));\n      }, abortInterval);\n\n      const pollStatus = async () => {\n        try {\n          const responseData = await this.fetchJson(\n            checkUrl,\n            'GET',\n            undefined,\n            'Getting details failed',\n          );\n\n          const success = successFunc(responseData);\n          if (success) {\n            clearTimeout(abortTimeout);\n            resolve(success);\n          } else {\n            // Still in progress, so wait for a while and try again.\n            checkTimeout = setTimeout(pollStatus, checkInterval);\n          }\n        } catch (err) {\n          clearTimeout(abortTimeout);\n          reject(err);\n        }\n      };\n\n      pollStatus();\n    });\n  }\n\n  waitForValidation(uuid) {\n    log.info('Waiting for validation...');\n    return this.waitRetry(\n      (detailResponseData) => {\n        if (!detailResponseData.processed) {\n          return null;\n        }\n\n        log.debug('Validation results:', detailResponseData.validation);\n        if (detailResponseData.valid) {\n          return detailResponseData.uuid;\n        }\n\n        throw new Error(\n          [\n            'Validation failed:\\n',\n            JSON.stringify(detailResponseData.validation, null, 2),\n          ].join(''),\n        );\n      },\n      new URL(`upload/${uuid}/`, this.apiUrl),\n      this.validationCheckInterval,\n      this.validationCheckTimeout,\n      'Validation',\n    );\n  }\n\n  async doNewAddonSubmit(uuid, metaDataJson) {\n    const url = new URL('addon/', this.apiUrl);\n    const jsonData = {\n      ...metaDataJson,\n      version: { upload: uuid, ...metaDataJson.version },\n    };\n    return this.fetchJson(\n      url,\n      'POST',\n      JSON.stringify(jsonData),\n      'Submission failed (1)',\n    );\n  }\n\n  doNewAddonOrVersionSubmit(addonId, uuid, metaDataJson) {\n    const url = new URL(`addon/${addonId}/`, this.apiUrl);\n    const jsonData = {\n      ...metaDataJson,\n      version: { upload: uuid, ...metaDataJson.version },\n    };\n    return this.fetchJson(\n      url,\n      'PUT',\n      JSON.stringify(jsonData),\n      'Submission failed (2)',\n    );\n  }\n\n  async doFormDataPatch(data, addonId, versionId) {\n    const patchUrl = new URL(\n      `addon/${addonId}/versions/${versionId}/`,\n      this.apiUrl,\n    );\n    try {\n      const formData = new FormData();\n      for (const field in data) {\n        formData.set(field, data[field]);\n      }\n\n      const response = await this.fetch(patchUrl, 'PATCH', formData);\n      if (!response.ok) {\n        throw new Error(`response status was ${response.status}`);\n      }\n    } catch (error) {\n      log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);\n      throw new Error(`Uploading ${Object.keys(data)} failed`);\n    }\n  }\n\n  async doAfterSubmit(addonId, newVersionId, editUrl, patchData) {\n    if (patchData && patchData.version) {\n      log.info(`Submitting ${Object.keys(patchData.version)} to version`);\n      await this.doFormDataPatch(patchData.version, addonId, newVersionId);\n    }\n\n    if (this.approvalCheckTimeout === 0) {\n      log.info(\n        [\n          'Waiting for approval and download of signed XPI skipped.',\n          `When approved the signed XPI file can be downloaded from ${editUrl}`,\n        ].join(' '),\n      );\n      return this.returnResult(addonId);\n    }\n\n    const fileUrl = new URL(\n      await this.waitForApproval(addonId, newVersionId, editUrl),\n    );\n    return this.downloadSignedFile(fileUrl, addonId);\n  }\n\n  waitForApproval(addonId, versionId, editUrl) {\n    log.info('Waiting for approval...');\n    return this.waitRetry(\n      (detailResponseData) => {\n        const { file } = detailResponseData;\n        if (file && file.status === 'public') {\n          return file.url;\n        }\n\n        return null;\n      },\n      new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl),\n      this.approvalCheckInterval,\n      this.approvalCheckTimeout,\n      'Approval',\n      editUrl,\n    );\n  }\n\n  async fetchJson(url, method = 'GET', body, errorMsg = 'Bad Request') {\n    const response = await this.fetch(url, method, body);\n    if (response.status < 200 || response.status >= 500) {\n      throw new Error(\n        `${errorMsg}: ${response.statusText || response.status}.`,\n      );\n    }\n    const data = await response.json();\n\n    if (!response.ok) {\n      throw new Error(\n        [\n          `${errorMsg}: ${response.statusText || response.status}`,\n          JSON.stringify(data, null, 2),\n        ].join('\\n'),\n      );\n    }\n    return data;\n  }\n\n  async fetch(url, method = 'GET', body) {\n    log.debug(`${method}ing URL: ${url.href}`);\n    let headers = {\n      Authorization: await this.apiAuth.getAuthHeader(),\n      Accept: 'application/json',\n      'User-Agent': this.userAgentString,\n    };\n    if (typeof body === 'string') {\n      headers = {\n        ...headers,\n        'Content-Type': 'application/json',\n      };\n    }\n    let agent;\n    if (this.apiProxy) {\n      agent = new HttpsProxyAgent(this.apiProxy);\n    }\n    return this.nodeFetch(url, { method, body, headers, agent });\n  }\n\n  returnResult(addonId, downloadedFiles) {\n    return {\n      id: addonId,\n      downloadedFiles,\n    };\n  }\n\n  async downloadSignedFile(fileUrl, addonId) {\n    const filename = fileUrl.pathname.split('/').pop(); // get the name from fileUrl\n    const dest = `${this.downloadDir}/${filename}`;\n    try {\n      const response = await this.fetch(fileUrl);\n      if (!response.ok || !response.body) {\n        throw new Error(`response status was ${response.status}`);\n      }\n      await this.saveToFile(response.body, dest);\n    } catch (error) {\n      log.info(`Download of signed xpi failed: ${error}.`);\n      throw new Error(`Downloading ${filename} failed`);\n    }\n    log.info(`Signed xpi downloaded: ${dest}`);\n    return this.returnResult(addonId, [filename]);\n  }\n\n  async saveToFile(contents, destPath) {\n    return streamPromises.pipeline(contents, createWriteStream(destPath));\n  }\n\n  /*\n  This function aims to quickly hash the contents of the zip file that's being uploaded,\n  to compare it to the previous zip file that was uploaded, so we can skip the upload for\n  efficiency.\n\n  CRCs are used from the zip to avoid having to extract and hash  all the files.\n\n  Two zips that have different byte contents in their files must have a different hash;\n  but returning a different hash when the contents are the same in some cases is acceptable\n  - a false mismatch does not result in lost data.\n  */\n  async hashXpiCrcs(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {\n    const zip = await JSZip.loadAsync(\n      asyncFsReadFile(filePath, { createFolders: true }),\n    );\n    const hash = createHash('sha256');\n    const entries = [];\n    zip.forEach((relativePath, entry) => {\n      let path = relativePath.replace(/\\/+$/, '');\n      if (entry.dir) {\n        path += '/';\n      }\n      // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0\n      entries.push({ path, crc32: entry._data?.crc32 || 0 });\n    });\n    entries.sort((a, b) => (a.path === b.path ? 0 : a.path > b.path ? 1 : -1));\n    hash.update(JSON.stringify(entries));\n    return hash.digest('hex');\n  }\n\n  async getPreviousUuidOrUploadXpi(\n    xpiPath,\n    channel,\n    savedUploadUuidPath,\n    saveUploadUuidToFileFunc = saveUploadUuidToFile,\n    getUploadUuidFromFileFunc = getUploadUuidFromFile,\n  ) {\n    const [\n      {\n        uploadUuid: previousUuid,\n        channel: previousChannel,\n        xpiCrcHash: previousHash,\n      },\n      xpiCrcHash,\n    ] = await Promise.all([\n      getUploadUuidFromFileFunc(savedUploadUuidPath),\n      this.hashXpiCrcs(xpiPath),\n    ]);\n\n    let uploadUuid;\n    if (previousChannel !== channel || xpiCrcHash !== previousHash) {\n      uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n      await saveUploadUuidToFileFunc(savedUploadUuidPath, {\n        uploadUuid,\n        channel,\n        xpiCrcHash,\n      });\n    } else {\n      uploadUuid = previousUuid;\n    }\n    return uploadUuid;\n  }\n\n  async postNewAddon(\n    uploadUuid,\n    savedIdPath,\n    metaDataJson,\n    patchData,\n    saveIdToFileFunc = saveIdToFile,\n  ) {\n    const {\n      guid: addonId,\n      version: { id: newVersionId, edit_url: editUrl },\n    } = await this.doNewAddonSubmit(uploadUuid, metaDataJson);\n\n    await saveIdToFileFunc(savedIdPath, addonId);\n    log.info(`Generated extension ID: ${addonId}.`);\n    log.info('You must add the following to your manifest:');\n    log.info(`\"browser_specific_settings\": {\"gecko\": {\"id\": \"${addonId}\"}}`);\n\n    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n  }\n\n  async putVersion(uploadUuid, addonId, metaDataJson, patchData) {\n    const {\n      version: { id: newVersionId, edit_url: editUrl },\n    } = await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n  }\n}\n\nexport async function signAddon({\n  apiKey,\n  apiSecret,\n  apiProxy,\n  amoBaseUrl,\n  validationCheckTimeout,\n  approvalCheckTimeout,\n  id,\n  xpiPath,\n  downloadDir,\n  channel,\n  savedIdPath,\n  savedUploadUuidPath,\n  metaDataJson = {},\n  submissionSource,\n  userAgentString,\n  SubmitClient = Client,\n  ApiAuthClass = JwtApiAuth,\n}) {\n  try {\n    const stats = await fsPromises.stat(xpiPath);\n\n    if (!stats.isFile()) {\n      throw new Error('not a file');\n    }\n  } catch (statError) {\n    throw new Error(`error with ${xpiPath}: ${statError}`);\n  }\n\n  let baseUrl;\n  try {\n    baseUrl = new URL(amoBaseUrl);\n  } catch (err) {\n    throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n  }\n\n  const client = new SubmitClient({\n    apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n    apiProxy,\n    baseUrl,\n    validationCheckTimeout,\n    approvalCheckTimeout,\n    downloadDir,\n    userAgentString,\n  });\n  const uploadUuid = await client.getPreviousUuidOrUploadXpi(\n    xpiPath,\n    channel,\n    savedUploadUuidPath,\n  );\n  const patchData = {};\n  // if we have a source file we need to upload we patch after the create\n  if (submissionSource) {\n    try {\n      const stats2 = await fsPromises.stat(submissionSource);\n\n      if (!stats2.isFile()) {\n        throw new Error('not a file');\n      }\n    } catch (statError) {\n      throw new Error(`error with ${submissionSource}: ${statError}`);\n    }\n    patchData.version = { source: client.fileFromSync(submissionSource) };\n  }\n\n  // We specifically need to know if `id` has not been passed as a parameter because\n  // it's the indication that a new add-on should be created, rather than a new version.\n  if (id === undefined) {\n    return client.postNewAddon(\n      uploadUuid,\n      savedIdPath,\n      metaDataJson,\n      patchData,\n    );\n  }\n\n  return client.putVersion(uploadUuid, id, metaDataJson, patchData);\n}\n\nexport async function saveIdToFile(filePath, id) {\n  await fsPromises.writeFile(\n    filePath,\n    [\n      '# This file was created by https://github.com/mozilla/web-ext',\n      '# Your auto-generated extension ID for addons.mozilla.org is:',\n      id.toString(),\n    ].join('\\n'),\n  );\n\n  log.debug(`Saved auto-generated ID ${id} to ${filePath}`);\n}\n\nexport async function saveUploadUuidToFile(\n  filePath,\n  { uploadUuid, channel, xpiCrcHash },\n) {\n  await fsPromises.writeFile(\n    filePath,\n    JSON.stringify({ uploadUuid, channel, xpiCrcHash }),\n  );\n  log.debug(\n    `Saved upload UUID ${uploadUuid}, xpi crc hash ${xpiCrcHash}, and channel ${channel} to ${filePath}`,\n  );\n}\n\nexport async function getUploadUuidFromFile(\n  filePath,\n  asyncFsReadFile = defaultAsyncFsReadFile,\n) {\n  try {\n    const content = await asyncFsReadFile(filePath, 'utf-8');\n    const { uploadUuid, channel, xpiCrcHash } = JSON.parse(content);\n    log.debug(\n      `Found upload uuid:${uploadUuid}, channel:${channel}, hash:${xpiCrcHash} in ${filePath}`,\n    );\n    return { uploadUuid, channel, xpiCrcHash };\n  } catch (error) {\n    if (isErrorWithCode('ENOENT', error)) {\n      log.debug(`No upload uuid file found at: ${filePath}`);\n    } else {\n      log.debug(`Invalid upload uuid file contents in ${filePath}: ${error}`);\n    }\n  }\n\n  return { uploadUuid: '', channel: '', xpiCrcHash: '' };\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"submit-addon.js","names":["basename","createHash","createWriteStream","promises","fsPromises","readFileSync","streamPromises","SignJWT","JSZip","HttpsProxyAgent","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsReadFile","readFile","FileBlob","Blob","name","constructor","fileBits","fileName","options","String","Symbol","toStringTag","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","apiProxy","apiUr","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","userAgentString","baseUrl","process","cwd","pathname","endsWith","URL","href","apiUrl","fileFromSync","filePath","fileData","nodeFetch","method","headers","body","agent","fetch","doUploadSubmit","xpiPath","channel","formData","FormData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","editUrl","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","errorMessage","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","debug","validation","valid","JSON","stringify","join","doNewAddonSubmit","metaDataJson","jsonData","version","upload","doNewAddonOrVersionSubmit","addonId","doFormDataPatch","data","versionId","patchUrl","field","response","ok","status","error","warn","Object","keys","doAfterSubmit","newVersionId","patchData","returnResult","fileUrl","waitForApproval","downloadSignedFile","file","errorMsg","statusText","json","Authorization","Accept","downloadedFiles","id","filename","split","pop","dest","saveToFile","contents","destPath","pipeline","hashXpiCrcs","asyncFsReadFile","zip","loadAsync","createFolders","hash","entries","forEach","relativePath","entry","_entry$_data","path","replace","dir","push","crc32","_data","sort","a","b","update","digest","getPreviousUuidOrUploadXpi","savedUploadUuidPath","saveUploadUuidToFileFunc","saveUploadUuidToFile","getUploadUuidFromFileFunc","getUploadUuidFromFile","uploadUuid","previousUuid","previousChannel","xpiCrcHash","previousHash","all","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","guid","edit_url","putVersion","signAddon","amoBaseUrl","submissionSource","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","stats2","source","writeFile","toString","content","parse"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["import { basename } from 'path';\nimport { createHash } from 'crypto';\nimport { createWriteStream, promises as fsPromises, readFileSync } from 'fs';\nimport { promises as streamPromises } from 'stream';\n\nimport { SignJWT } from 'jose';\nimport JSZip from 'jszip';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\n\nimport { isErrorWithCode } from '../errors.js';\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport const defaultAsyncFsReadFile = fsPromises.readFile;\n\n// Used by fileFromSync method to make sure the form-data entry will\n// include a filename derived from the file path.\n//\n// TODO: Get rid of this hack when we will bump the web-ext nodejs\n// version required to nodejs v20 (where the native File constructor\n// exists).\nexport class FileBlob extends Blob {\n  #name = '';\n\n  constructor(fileBits, fileName, options) {\n    super(fileBits, options);\n    this.#name = String(fileName);\n  }\n\n  get name() {\n    return this.#name;\n  }\n\n  get [Symbol.toStringTag]() {\n    return 'File';\n  }\n}\n\nexport class JwtApiAuth {\n  #apiKey;\n  #apiSecret;\n  #apiJwtExpiresIn;\n\n  constructor({\n    apiKey,\n    apiSecret,\n    apiJwtExpiresIn = 60 * 5, // 5 minutes\n  }) {\n    this.#apiKey = apiKey;\n    this.#apiSecret = apiSecret;\n    this.#apiJwtExpiresIn = apiJwtExpiresIn;\n  }\n\n  async signJWT() {\n    return (\n      new SignJWT({ iss: this.#apiKey })\n        .setProtectedHeader({ alg: 'HS256' })\n        .setIssuedAt()\n        // jose expects either:\n        // a number, which is treated an absolute timestamp - so must be after now, or\n        // a string, which is parsed as a relative time from now.\n        .setExpirationTime(`${this.#apiJwtExpiresIn}seconds`)\n        .sign(Uint8Array.from(Buffer.from(this.#apiSecret, 'utf8')))\n    );\n  }\n\n  async getAuthHeader() {\n    const authToken = await this.signJWT();\n    return `JWT ${authToken}`;\n  }\n}\n\nexport default class Client {\n  apiAuth;\n  apiProxy;\n  apiUr;\n  validationCheckInterval;\n  validationCheckTimeout;\n  approvalCheckInterval;\n  approvalCheckTimeout;\n  downloadDir;\n  userAgentString;\n\n  constructor({\n    apiAuth,\n    apiProxy,\n    baseUrl,\n    validationCheckInterval = 1000,\n    validationCheckTimeout = 300000, // 5 minutes.\n    approvalCheckInterval = 1000,\n    approvalCheckTimeout = 900000, // 15 minutes.\n    downloadDir = process.cwd(),\n    userAgentString = 'web-ext-lib',\n  }) {\n    this.apiAuth = apiAuth;\n    if (apiProxy) {\n      this.apiProxy = apiProxy;\n    }\n    if (!baseUrl.pathname.endsWith('/')) {\n      baseUrl = new URL(baseUrl.href);\n      baseUrl.pathname += '/';\n    }\n    this.apiUrl = new URL('addons/', baseUrl);\n    this.validationCheckInterval = validationCheckInterval;\n    this.validationCheckTimeout = validationCheckTimeout;\n    this.approvalCheckInterval = approvalCheckInterval;\n    this.approvalCheckTimeout = approvalCheckTimeout;\n    this.downloadDir = downloadDir;\n    this.userAgentString = userAgentString;\n  }\n\n  fileFromSync(filePath) {\n    // create a File blob from a file path, and ensure it to have the file path basename\n    // as the associated filename, the AMO server API will be checking it on the form-data\n    // submitted and fail with the error message:\n    // \"Unsupported file type, please upload a supported file (.crx, .xpi, .zip).\"\n    const fileData = readFileSync(filePath);\n    return new FileBlob([fileData], basename(filePath));\n  }\n\n  nodeFetch(url, { method, headers, body, agent }) {\n    return fetch(url, { method, headers, body, agent });\n  }\n\n  async doUploadSubmit(xpiPath, channel) {\n    const url = new URL('upload/', this.apiUrl);\n    const formData = new FormData();\n    formData.set('channel', channel);\n    formData.set('upload', this.fileFromSync(xpiPath));\n    const { uuid } = await this.fetchJson(\n      url,\n      'POST',\n      formData,\n      'Upload failed',\n    );\n    return this.waitForValidation(uuid);\n  }\n\n  waitRetry(\n    successFunc,\n    checkUrl,\n    checkInterval,\n    abortInterval,\n    context,\n    editUrl = null,\n  ) {\n    let checkTimeout;\n\n    return new Promise((resolve, reject) => {\n      const abortTimeout = setTimeout(() => {\n        clearTimeout(checkTimeout);\n\n        let errorMessage = `${context}: timeout exceeded.`;\n        if (editUrl) {\n          errorMessage += ` When approved the signed XPI file can be downloaded from ${editUrl}`;\n        }\n\n        reject(new Error(errorMessage));\n      }, abortInterval);\n\n      const pollStatus = async () => {\n        try {\n          const responseData = await this.fetchJson(\n            checkUrl,\n            'GET',\n            undefined,\n            'Getting details failed',\n          );\n\n          const success = successFunc(responseData);\n          if (success) {\n            clearTimeout(abortTimeout);\n            resolve(success);\n          } else {\n            // Still in progress, so wait for a while and try again.\n            checkTimeout = setTimeout(pollStatus, checkInterval);\n          }\n        } catch (err) {\n          clearTimeout(abortTimeout);\n          reject(err);\n        }\n      };\n\n      pollStatus();\n    });\n  }\n\n  waitForValidation(uuid) {\n    log.info('Waiting for validation...');\n    return this.waitRetry(\n      (detailResponseData) => {\n        if (!detailResponseData.processed) {\n          return null;\n        }\n\n        log.debug('Validation results:', detailResponseData.validation);\n        if (detailResponseData.valid) {\n          return detailResponseData.uuid;\n        }\n\n        throw new Error(\n          [\n            'Validation failed:\\n',\n            JSON.stringify(detailResponseData.validation, null, 2),\n          ].join(''),\n        );\n      },\n      new URL(`upload/${uuid}/`, this.apiUrl),\n      this.validationCheckInterval,\n      this.validationCheckTimeout,\n      'Validation',\n    );\n  }\n\n  async doNewAddonSubmit(uuid, metaDataJson) {\n    const url = new URL('addon/', this.apiUrl);\n    const jsonData = {\n      ...metaDataJson,\n      version: { upload: uuid, ...metaDataJson.version },\n    };\n    return this.fetchJson(\n      url,\n      'POST',\n      JSON.stringify(jsonData),\n      'Submission failed (1)',\n    );\n  }\n\n  doNewAddonOrVersionSubmit(addonId, uuid, metaDataJson) {\n    const url = new URL(`addon/${addonId}/`, this.apiUrl);\n    const jsonData = {\n      ...metaDataJson,\n      version: { upload: uuid, ...metaDataJson.version },\n    };\n    return this.fetchJson(\n      url,\n      'PUT',\n      JSON.stringify(jsonData),\n      'Submission failed (2)',\n    );\n  }\n\n  async doFormDataPatch(data, addonId, versionId) {\n    const patchUrl = new URL(\n      `addon/${addonId}/versions/${versionId}/`,\n      this.apiUrl,\n    );\n    try {\n      const formData = new FormData();\n      for (const field in data) {\n        formData.set(field, data[field]);\n      }\n\n      const response = await this.fetch(patchUrl, 'PATCH', formData);\n      if (!response.ok) {\n        throw new Error(`response status was ${response.status}`);\n      }\n    } catch (error) {\n      log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);\n      throw new Error(`Uploading ${Object.keys(data)} failed`);\n    }\n  }\n\n  async doAfterSubmit(addonId, newVersionId, editUrl, patchData) {\n    if (patchData && patchData.version) {\n      log.info(`Submitting ${Object.keys(patchData.version)} to version`);\n      await this.doFormDataPatch(patchData.version, addonId, newVersionId);\n    }\n\n    if (this.approvalCheckTimeout === 0) {\n      log.info(\n        [\n          'Waiting for approval and download of signed XPI skipped.',\n          `When approved the signed XPI file can be downloaded from ${editUrl}`,\n        ].join(' '),\n      );\n      return this.returnResult(addonId);\n    }\n\n    const fileUrl = new URL(\n      await this.waitForApproval(addonId, newVersionId, editUrl),\n    );\n    return this.downloadSignedFile(fileUrl, addonId);\n  }\n\n  waitForApproval(addonId, versionId, editUrl) {\n    log.info('Waiting for approval...');\n    return this.waitRetry(\n      (detailResponseData) => {\n        const { file } = detailResponseData;\n        if (file && file.status === 'public') {\n          return file.url;\n        }\n\n        return null;\n      },\n      new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl),\n      this.approvalCheckInterval,\n      this.approvalCheckTimeout,\n      'Approval',\n      editUrl,\n    );\n  }\n\n  async fetchJson(url, method = 'GET', body, errorMsg = 'Bad Request') {\n    const response = await this.fetch(url, method, body);\n    if (response.status < 200 || response.status >= 500) {\n      throw new Error(\n        `${errorMsg}: ${response.statusText || response.status}.`,\n      );\n    }\n    const data = await response.json();\n\n    if (!response.ok) {\n      throw new Error(\n        [\n          `${errorMsg}: ${response.statusText || response.status}`,\n          JSON.stringify(data, null, 2),\n        ].join('\\n'),\n      );\n    }\n    return data;\n  }\n\n  async fetch(url, method = 'GET', body) {\n    log.debug(`${method}ing URL: ${url.href}`);\n    let headers = {\n      Authorization: await this.apiAuth.getAuthHeader(),\n      Accept: 'application/json',\n      'User-Agent': this.userAgentString,\n    };\n    if (typeof body === 'string') {\n      headers = {\n        ...headers,\n        'Content-Type': 'application/json',\n      };\n    }\n    let agent;\n    if (this.apiProxy) {\n      agent = new HttpsProxyAgent(this.apiProxy);\n    }\n    return this.nodeFetch(url, { method, body, headers, agent });\n  }\n\n  returnResult(addonId, downloadedFiles) {\n    return {\n      id: addonId,\n      downloadedFiles,\n    };\n  }\n\n  async downloadSignedFile(fileUrl, addonId) {\n    const filename = fileUrl.pathname.split('/').pop(); // get the name from fileUrl\n    const dest = `${this.downloadDir}/${filename}`;\n    try {\n      const response = await this.fetch(fileUrl);\n      if (!response.ok || !response.body) {\n        throw new Error(`response status was ${response.status}`);\n      }\n      await this.saveToFile(response.body, dest);\n    } catch (error) {\n      log.info(`Download of signed xpi failed: ${error}.`);\n      throw new Error(`Downloading ${filename} failed`);\n    }\n    log.info(`Signed xpi downloaded: ${dest}`);\n    return this.returnResult(addonId, [filename]);\n  }\n\n  async saveToFile(contents, destPath) {\n    return streamPromises.pipeline(contents, createWriteStream(destPath));\n  }\n\n  /*\n  This function aims to quickly hash the contents of the zip file that's being uploaded,\n  to compare it to the previous zip file that was uploaded, so we can skip the upload for\n  efficiency.\n\n  CRCs are used from the zip to avoid having to extract and hash  all the files.\n\n  Two zips that have different byte contents in their files must have a different hash;\n  but returning a different hash when the contents are the same in some cases is acceptable\n  - a false mismatch does not result in lost data.\n  */\n  async hashXpiCrcs(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {\n    const zip = await JSZip.loadAsync(\n      asyncFsReadFile(filePath, { createFolders: true }),\n    );\n    const hash = createHash('sha256');\n    const entries = [];\n    zip.forEach((relativePath, entry) => {\n      let path = relativePath.replace(/\\/+$/, '');\n      if (entry.dir) {\n        path += '/';\n      }\n      // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0\n      entries.push({ path, crc32: entry._data?.crc32 || 0 });\n    });\n    entries.sort((a, b) => (a.path === b.path ? 0 : a.path > b.path ? 1 : -1));\n    hash.update(JSON.stringify(entries));\n    return hash.digest('hex');\n  }\n\n  async getPreviousUuidOrUploadXpi(\n    xpiPath,\n    channel,\n    savedUploadUuidPath,\n    saveUploadUuidToFileFunc = saveUploadUuidToFile,\n    getUploadUuidFromFileFunc = getUploadUuidFromFile,\n  ) {\n    const [\n      {\n        uploadUuid: previousUuid,\n        channel: previousChannel,\n        xpiCrcHash: previousHash,\n      },\n      xpiCrcHash,\n    ] = await Promise.all([\n      getUploadUuidFromFileFunc(savedUploadUuidPath),\n      this.hashXpiCrcs(xpiPath),\n    ]);\n\n    let uploadUuid;\n    if (previousChannel !== channel || xpiCrcHash !== previousHash) {\n      uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n      await saveUploadUuidToFileFunc(savedUploadUuidPath, {\n        uploadUuid,\n        channel,\n        xpiCrcHash,\n      });\n    } else {\n      uploadUuid = previousUuid;\n    }\n    return uploadUuid;\n  }\n\n  async postNewAddon(\n    uploadUuid,\n    savedIdPath,\n    metaDataJson,\n    patchData,\n    saveIdToFileFunc = saveIdToFile,\n  ) {\n    const {\n      guid: addonId,\n      version: { id: newVersionId, edit_url: editUrl },\n    } = await this.doNewAddonSubmit(uploadUuid, metaDataJson);\n\n    await saveIdToFileFunc(savedIdPath, addonId);\n    log.info(`Generated extension ID: ${addonId}.`);\n    log.info('You must add the following to your manifest:');\n    log.info(`\"browser_specific_settings\": {\"gecko\": {\"id\": \"${addonId}\"}}`);\n\n    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n  }\n\n  async putVersion(uploadUuid, addonId, metaDataJson, patchData) {\n    const {\n      version: { id: newVersionId, edit_url: editUrl },\n    } = await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n  }\n}\n\nexport async function signAddon({\n  apiKey,\n  apiSecret,\n  apiProxy,\n  amoBaseUrl,\n  validationCheckTimeout,\n  approvalCheckTimeout,\n  id,\n  xpiPath,\n  downloadDir,\n  channel,\n  savedIdPath,\n  savedUploadUuidPath,\n  metaDataJson = {},\n  submissionSource,\n  userAgentString = 'web-ext-lib',\n  SubmitClient = Client,\n  ApiAuthClass = JwtApiAuth,\n}) {\n  try {\n    const stats = await fsPromises.stat(xpiPath);\n\n    if (!stats.isFile()) {\n      throw new Error('not a file');\n    }\n  } catch (statError) {\n    throw new Error(`error with ${xpiPath}: ${statError}`);\n  }\n\n  let baseUrl;\n  try {\n    baseUrl = new URL(amoBaseUrl);\n  } catch (err) {\n    throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n  }\n\n  const client = new SubmitClient({\n    apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n    apiProxy,\n    baseUrl,\n    validationCheckTimeout,\n    approvalCheckTimeout,\n    downloadDir,\n    userAgentString,\n  });\n  const uploadUuid = await client.getPreviousUuidOrUploadXpi(\n    xpiPath,\n    channel,\n    savedUploadUuidPath,\n  );\n  const patchData = {};\n  // if we have a source file we need to upload we patch after the create\n  if (submissionSource) {\n    try {\n      const stats2 = await fsPromises.stat(submissionSource);\n\n      if (!stats2.isFile()) {\n        throw new Error('not a file');\n      }\n    } catch (statError) {\n      throw new Error(`error with ${submissionSource}: ${statError}`);\n    }\n    patchData.version = { source: client.fileFromSync(submissionSource) };\n  }\n\n  // We specifically need to know if `id` has not been passed as a parameter because\n  // it's the indication that a new add-on should be created, rather than a new version.\n  if (id === undefined) {\n    return client.postNewAddon(\n      uploadUuid,\n      savedIdPath,\n      metaDataJson,\n      patchData,\n    );\n  }\n\n  return client.putVersion(uploadUuid, id, metaDataJson, patchData);\n}\n\nexport async function saveIdToFile(filePath, id) {\n  await fsPromises.writeFile(\n    filePath,\n    [\n      '# This file was created by https://github.com/mozilla/web-ext',\n      '# Your auto-generated extension ID for addons.mozilla.org is:',\n      id.toString(),\n    ].join('\\n'),\n  );\n\n  log.debug(`Saved auto-generated ID ${id} to ${filePath}`);\n}\n\nexport async function saveUploadUuidToFile(\n  filePath,\n  { uploadUuid, channel, xpiCrcHash },\n) {\n  await fsPromises.writeFile(\n    filePath,\n    JSON.stringify({ uploadUuid, channel, xpiCrcHash }),\n  );\n  log.debug(\n    `Saved upload UUID ${uploadUuid}, xpi crc hash ${xpiCrcHash}, and channel ${channel} to ${filePath}`,\n  );\n}\n\nexport async function getUploadUuidFromFile(\n  filePath,\n  asyncFsReadFile = defaultAsyncFsReadFile,\n) {\n  try {\n    const content = await asyncFsReadFile(filePath, 'utf-8');\n    const { uploadUuid, channel, xpiCrcHash } = JSON.parse(content);\n    log.debug(\n      `Found upload uuid:${uploadUuid}, channel:${channel}, hash:${xpiCrcHash} in ${filePath}`,\n    );\n    return { uploadUuid, channel, xpiCrcHash };\n  } catch (error) {\n    if (isErrorWithCode('ENOENT', error)) {\n      log.debug(`No upload uuid file found at: ${filePath}`);\n    } else {\n      log.debug(`Invalid upload uuid file contents in ${filePath}: ${error}`);\n    }\n  }\n\n  return { uploadUuid: '', channel: '', xpiCrcHash: '' };\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/watcher.js

@@ -1,4 +1,4 @@
-import { fs } from 'mz';
+import { existsSync, lstatSync } from 'fs';
 import Watchpack from 'watchpack';
 import debounce from 'debounce';
 import { UsageError } from './errors.js';
@@ -42,7 +42,7 @@ export default function onSourceChange({
   const watchedFiles = [];
   if (watchFile) {
     for (const filePath of watchFile) {
-      if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {
+      if (existsSync(filePath) && !lstatSync(filePath).isFile()) {
         throw new UsageError('Invalid --watch-file value: ' + `"${filePath}" is not a file.`);
       }
       watchedFiles.push(filePath);

package/lib/watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.js","names":["fs","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","existsSync","lstatSync","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["import { fs } from 'mz';\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport { createLogger } from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// onSourceChange types and implementation\n\nexport default function onSourceChange({\n  sourceDir,\n  watchFile,\n  watchIgnored,\n  artifactsDir,\n  onChange,\n  shouldWatchFile,\n  debounceTime = 500,\n}) {\n  // When running on Windows, transform the ignored paths and globs\n  // as Watchpack does translate the changed files path internally\n  // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n  const ignored =\n    watchIgnored && process.platform === 'win32'\n      ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n      : watchIgnored;\n\n  // TODO: For network disks, we would need to add {poll: true}.\n  const watcher = ignored ? new Watchpack({ ignored }) : new Watchpack();\n\n  // Allow multiple files to be changed before reloading the extension\n  const executeImmediately = false;\n  onChange = debounce(onChange, debounceTime, executeImmediately);\n\n  watcher.on('change', (filePath) => {\n    proxyFileChanges({ artifactsDir, onChange, filePath, shouldWatchFile });\n  });\n\n  log.debug(\n    `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`,\n  );\n\n  const watchedDirs = [];\n  const watchedFiles = [];\n\n  if (watchFile) {\n    for (const filePath of watchFile) {\n      if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {\n        throw new UsageError(\n          'Invalid --watch-file value: ' + `\"${filePath}\" is not a file.`,\n        );\n      }\n\n      watchedFiles.push(filePath);\n    }\n  } else {\n    watchedDirs.push(sourceDir);\n  }\n\n  watcher.watch({\n    files: watchedFiles,\n    directories: watchedDirs,\n    missing: [],\n    startTime: Date.now(),\n  });\n\n  // TODO: support interrupting the watcher on Windows.\n  // https://github.com/mozilla/web-ext/issues/225\n  process.on('SIGINT', () => watcher.close());\n  return watcher;\n}\n\n// proxyFileChanges types and implementation.\n\nexport function proxyFileChanges({\n  artifactsDir,\n  onChange,\n  filePath,\n  shouldWatchFile,\n}) {\n  if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {\n    log.debug(`Ignoring change to: ${filePath}`);\n  } else {\n    log.debug(`Changed: ${filePath}`);\n    log.debug(`Last change detection: ${new Date().toTimeString()}`);\n    onChange();\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"watcher.js","names":["existsSync","lstatSync","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["import { existsSync, lstatSync } from 'fs';\n\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport { createLogger } from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// onSourceChange types and implementation\n\nexport default function onSourceChange({\n  sourceDir,\n  watchFile,\n  watchIgnored,\n  artifactsDir,\n  onChange,\n  shouldWatchFile,\n  debounceTime = 500,\n}) {\n  // When running on Windows, transform the ignored paths and globs\n  // as Watchpack does translate the changed files path internally\n  // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n  const ignored =\n    watchIgnored && process.platform === 'win32'\n      ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n      : watchIgnored;\n\n  // TODO: For network disks, we would need to add {poll: true}.\n  const watcher = ignored ? new Watchpack({ ignored }) : new Watchpack();\n\n  // Allow multiple files to be changed before reloading the extension\n  const executeImmediately = false;\n  onChange = debounce(onChange, debounceTime, executeImmediately);\n\n  watcher.on('change', (filePath) => {\n    proxyFileChanges({ artifactsDir, onChange, filePath, shouldWatchFile });\n  });\n\n  log.debug(\n    `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`,\n  );\n\n  const watchedDirs = [];\n  const watchedFiles = [];\n\n  if (watchFile) {\n    for (const filePath of watchFile) {\n      if (existsSync(filePath) && !lstatSync(filePath).isFile()) {\n        throw new UsageError(\n          'Invalid --watch-file value: ' + `\"${filePath}\" is not a file.`,\n        );\n      }\n\n      watchedFiles.push(filePath);\n    }\n  } else {\n    watchedDirs.push(sourceDir);\n  }\n\n  watcher.watch({\n    files: watchedFiles,\n    directories: watchedDirs,\n    missing: [],\n    startTime: Date.now(),\n  });\n\n  // TODO: support interrupting the watcher on Windows.\n  // https://github.com/mozilla/web-ext/issues/225\n  process.on('SIGINT', () => watcher.close());\n  return watcher;\n}\n\n// proxyFileChanges types and implementation.\n\nexport function proxyFileChanges({\n  artifactsDir,\n  onChange,\n  filePath,\n  shouldWatchFile,\n}) {\n  if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {\n    log.debug(`Ignoring change to: ${filePath}`);\n  } else {\n    log.debug(`Changed: ${filePath}`);\n    log.debug(`Last change detection: ${new Date().toTimeString()}`);\n    onChange();\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "web-ext",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "description": "A command line tool to help build, run, and test web extensions",
   "type": "module",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
     "./util/adb": "./lib/util/adb.js",
-    "./util/logger": "./lib/util/logger.js"
+    "./util/logger": "./lib/util/logger.js",
+    "./util/submit-addon": "./lib/util/submit-addon.js"
   },
   "files": [
     "index.js",
@@ -58,67 +59,64 @@
     "opera"
   ],
   "dependencies": {
-    "@babel/runtime": "7.24.7",
-    "@devicefarmer/adbkit": "3.2.6",
-    "addons-linter": "6.31.1",
-    "bunyan": "1.8.15",
+    "@babel/runtime": "7.26.7",
+    "@devicefarmer/adbkit": "3.3.8",
+    "addons-linter": "7.8.0",
     "camelcase": "8.0.0",
-    "chrome-launcher": "0.15.1",
+    "chrome-launcher": "1.1.2",
     "debounce": "1.2.1",
     "decamelize": "6.0.0",
     "es6-error": "4.1.1",
-    "firefox-profile": "4.6.0",
-    "fs-extra": "11.2.0",
+    "firefox-profile": "4.7.0",
     "fx-runner": "1.4.0",
     "https-proxy-agent": "^7.0.0",
-    "jose": "5.4.1",
+    "jose": "5.9.6",
     "jszip": "3.10.1",
-    "mkdirp": "3.0.1",
     "multimatch": "6.0.0",
-    "mz": "2.7.0",
-    "node-fetch": "3.3.2",
     "node-notifier": "10.0.1",
     "open": "9.1.0",
     "parse-json": "7.1.1",
+    "pino": "9.4.0",
     "promise-toolbox": "0.21.0",
     "source-map-support": "0.5.21",
     "strip-bom": "5.0.0",
     "strip-json-comments": "5.0.1",
     "tmp": "0.2.3",
-    "update-notifier": "6.0.2",
-    "watchpack": "2.4.1",
-    "ws": "8.17.1",
+    "update-notifier": "7.3.1",
+    "watchpack": "2.4.2",
+    "ws": "8.18.0",
     "yargs": "17.7.2",
     "zip-dir": "2.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.24.7",
-    "@babel/core": "7.24.7",
-    "@babel/eslint-parser": "7.24.7",
-    "@babel/preset-env": "7.24.7",
-    "@babel/register": "7.24.6",
-    "@commitlint/cli": "19.3.0",
-    "@commitlint/config-conventional": "19.2.2",
-    "babel-plugin-istanbul": "6.1.1",
+    "@babel/cli": "7.26.4",
+    "@babel/core": "7.26.7",
+    "@babel/eslint-parser": "7.26.5",
+    "@babel/preset-env": "7.26.7",
+    "@babel/register": "7.25.9",
+    "@commitlint/cli": "19.7.1",
+    "@commitlint/config-conventional": "19.7.1",
+    "babel-plugin-istanbul": "7.0.0",
     "babel-plugin-transform-inline-environment-variables": "0.4.4",
-    "chai": "4.3.10",
-    "chai-as-promised": "8.0.0",
+    "chai": "5.1.2",
+    "chai-as-promised": "8.0.1",
     "copy-dir": "1.3.0",
     "crc-32": "1.2.2",
     "cross-env": "7.0.3",
     "deepcopy": "2.1.0",
     "eslint": "8.57.0",
     "eslint-plugin-async-await": "0.0.0",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.31.0",
+    "fs-extra": "11.3.0",
     "git-rev-sync": "3.0.2",
     "html-entities": "2.5.2",
-    "mocha": "10.4.0",
-    "nyc": "17.0.0",
-    "prettier": "3.3.2",
+    "mocha": "11.1.0",
+    "nyc": "17.1.0",
+    "prettier": "3.4.2",
     "pretty-quick": "4.0.0",
     "prettyjson": "1.2.5",
     "shelljs": "0.8.5",
-    "sinon": "18.0.0",
+    "sinon": "19.0.2",
     "testdouble": "3.20.2",
     "yauzl": "2.10.0"
   },