web-ext 7.12.0 → 8.1.0

package/lib/util/manifest.js

@@ -51,7 +51,7 @@ export default async function getValidatedManifest(sourceDir) {
 export function getManifestId(manifestData) {
   const manifestApps = [manifestData.browser_specific_settings, manifestData.applications];
   for (const apps of manifestApps) {
-    // If both bss and applicants contains a defined gecko property,
+    // If both bss and applications contain a defined gecko property,
     // we prefer bss even if the id property isn't available.
     // This match what Firefox does in this particular scenario, see
     // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488

package/lib/util/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","names":["path","fs","parseJSON","stripBom","stripJsonComments","InvalidManifest","createLogger","log","import","meta","url","getValidatedManifest","sourceDir","manifestFile","join","debug","manifestContents","readFile","encoding","error","manifestData","errors","name","push","version","applications","gecko","length","getManifestId","manifestApps","browser_specific_settings","apps","id","undefined"],"sources":["../../src/util/manifest.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport { fs } from 'mz';\nimport parseJSON from 'parse-json';\nimport stripBom from 'strip-bom';\nimport stripJsonComments from 'strip-json-comments';\n\nimport { InvalidManifest } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// getValidatedManifest helper types and implementation\n\nexport type ExtensionManifestApplications = {|\n  gecko?: {|\n    id?: string,\n    strict_min_version?: string,\n    strict_max_version?: string,\n    update_url?: string,\n  |},\n|};\n\nexport type ExtensionManifest = {|\n  name: string,\n  version: string,\n  default_locale?: string,\n  applications?: ExtensionManifestApplications,\n  browser_specific_settings?: ExtensionManifestApplications,\n  permissions?: Array<string>,\n|};\n\nexport default async function getValidatedManifest(\n  sourceDir: string\n): Promise<ExtensionManifest> {\n  const manifestFile = path.join(sourceDir, 'manifest.json');\n  log.debug(`Validating manifest at ${manifestFile}`);\n\n  let manifestContents;\n\n  try {\n    manifestContents = await fs.readFile(manifestFile, { encoding: 'utf-8' });\n  } catch (error) {\n    throw new InvalidManifest(\n      `Could not read manifest.json file at ${manifestFile}: ${error}`\n    );\n  }\n\n  manifestContents = stripBom(manifestContents);\n\n  let manifestData;\n\n  try {\n    manifestData = parseJSON(stripJsonComments(manifestContents));\n  } catch (error) {\n    throw new InvalidManifest(\n      `Error parsing manifest.json file at ${manifestFile}: ${error}`\n    );\n  }\n\n  const errors = [];\n  // This is just some basic validation of what web-ext needs, not\n  // what Firefox will need to run the extension.\n  // TODO: integrate with the addons-linter for actual validation.\n  if (!manifestData.name) {\n    errors.push('missing \"name\" property');\n  }\n  if (!manifestData.version) {\n    errors.push('missing \"version\" property');\n  }\n\n  if (manifestData.applications && !manifestData.applications.gecko) {\n    // Since the applications property only applies to gecko, make\n    // sure 'gecko' exists when 'applications' is defined. This should\n    // make introspection of gecko properties easier.\n    errors.push('missing \"applications.gecko\" property');\n  }\n\n  if (errors.length) {\n    throw new InvalidManifest(\n      `Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`\n    );\n  }\n\n  return manifestData;\n}\n\nexport function getManifestId(manifestData: ExtensionManifest): string | void {\n  const manifestApps = [\n    manifestData.browser_specific_settings,\n    manifestData.applications,\n  ];\n  for (const apps of manifestApps) {\n    // If both bss and applicants contains a defined gecko property,\n    // we prefer bss even if the id property isn't available.\n    // This match what Firefox does in this particular scenario, see\n    // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488\n    if (apps?.gecko) {\n      return apps.gecko.id;\n    }\n  }\n\n  return undefined;\n}\n"],"mappings":"AACA,OAAOA,IAAI,MAAM,MAAM;AAEvB,SAASC,EAAE,QAAQ,IAAI;AACvB,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,QAAQ,MAAM,WAAW;AAChC,OAAOC,iBAAiB,MAAM,qBAAqB;AAEnD,SAASC,eAAe,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;;AAEzC;;AAoBA,eAAe,eAAeC,oBAAoBA,CAChDC,SAAiB,EACW;EAC5B,MAAMC,YAAY,GAAGb,IAAI,CAACc,IAAI,CAACF,SAAS,EAAE,eAAe,CAAC;EAC1DL,GAAG,CAACQ,KAAK,CAAE,0BAAyBF,YAAa,EAAC,CAAC;EAEnD,IAAIG,gBAAgB;EAEpB,IAAI;IACFA,gBAAgB,GAAG,MAAMf,EAAE,CAACgB,QAAQ,CAACJ,YAAY,EAAE;MAAEK,QAAQ,EAAE;IAAQ,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACtB,wCAAuCQ,YAAa,KAAIM,KAAM,EACjE,CAAC;EACH;EAEAH,gBAAgB,GAAGb,QAAQ,CAACa,gBAAgB,CAAC;EAE7C,IAAII,YAAY;EAEhB,IAAI;IACFA,YAAY,GAAGlB,SAAS,CAACE,iBAAiB,CAACY,gBAAgB,CAAC,CAAC;EAC/D,CAAC,CAAC,OAAOG,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACtB,uCAAsCQ,YAAa,KAAIM,KAAM,EAChE,CAAC;EACH;EAEA,MAAME,MAAM,GAAG,EAAE;EACjB;EACA;EACA;EACA,IAAI,CAACD,YAAY,CAACE,IAAI,EAAE;IACtBD,MAAM,CAACE,IAAI,CAAC,yBAAyB,CAAC;EACxC;EACA,IAAI,CAACH,YAAY,CAACI,OAAO,EAAE;IACzBH,MAAM,CAACE,IAAI,CAAC,4BAA4B,CAAC;EAC3C;EAEA,IAAIH,YAAY,CAACK,YAAY,IAAI,CAACL,YAAY,CAACK,YAAY,CAACC,KAAK,EAAE;IACjE;IACA;IACA;IACAL,MAAM,CAACE,IAAI,CAAC,uCAAuC,CAAC;EACtD;EAEA,IAAIF,MAAM,CAACM,MAAM,EAAE;IACjB,MAAM,IAAItB,eAAe,CACtB,eAAcQ,YAAa,gBAAeQ,MAAM,CAACP,IAAI,CAAC,IAAI,CAAE,EAC/D,CAAC;EACH;EAEA,OAAOM,YAAY;AACrB;AAEA,OAAO,SAASQ,aAAaA,CAACR,YAA+B,EAAiB;EAC5E,MAAMS,YAAY,GAAG,CACnBT,YAAY,CAACU,yBAAyB,EACtCV,YAAY,CAACK,YAAY,CAC1B;EACD,KAAK,MAAMM,IAAI,IAAIF,YAAY,EAAE;IAC/B;IACA;IACA;IACA;IACA,IAAIE,IAAI,aAAJA,IAAI,eAAJA,IAAI,CAAEL,KAAK,EAAE;MACf,OAAOK,IAAI,CAACL,KAAK,CAACM,EAAE;IACtB;EACF;EAEA,OAAOC,SAAS;AAClB"}
+{"version":3,"file":"manifest.js","names":["path","fs","parseJSON","stripBom","stripJsonComments","InvalidManifest","createLogger","log","import","meta","url","getValidatedManifest","sourceDir","manifestFile","join","debug","manifestContents","readFile","encoding","error","manifestData","errors","name","push","version","applications","gecko","length","getManifestId","manifestApps","browser_specific_settings","apps","id","undefined"],"sources":["../../src/util/manifest.js"],"sourcesContent":["import path from 'path';\n\nimport { fs } from 'mz';\nimport parseJSON from 'parse-json';\nimport stripBom from 'strip-bom';\nimport stripJsonComments from 'strip-json-comments';\n\nimport { InvalidManifest } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// getValidatedManifest helper types and implementation\n\nexport default async function getValidatedManifest(sourceDir) {\n  const manifestFile = path.join(sourceDir, 'manifest.json');\n  log.debug(`Validating manifest at ${manifestFile}`);\n\n  let manifestContents;\n\n  try {\n    manifestContents = await fs.readFile(manifestFile, { encoding: 'utf-8' });\n  } catch (error) {\n    throw new InvalidManifest(\n      `Could not read manifest.json file at ${manifestFile}: ${error}`,\n    );\n  }\n\n  manifestContents = stripBom(manifestContents);\n\n  let manifestData;\n\n  try {\n    manifestData = parseJSON(stripJsonComments(manifestContents));\n  } catch (error) {\n    throw new InvalidManifest(\n      `Error parsing manifest.json file at ${manifestFile}: ${error}`,\n    );\n  }\n\n  const errors = [];\n  // This is just some basic validation of what web-ext needs, not\n  // what Firefox will need to run the extension.\n  // TODO: integrate with the addons-linter for actual validation.\n  if (!manifestData.name) {\n    errors.push('missing \"name\" property');\n  }\n  if (!manifestData.version) {\n    errors.push('missing \"version\" property');\n  }\n\n  if (manifestData.applications && !manifestData.applications.gecko) {\n    // Since the applications property only applies to gecko, make\n    // sure 'gecko' exists when 'applications' is defined. This should\n    // make introspection of gecko properties easier.\n    errors.push('missing \"applications.gecko\" property');\n  }\n\n  if (errors.length) {\n    throw new InvalidManifest(\n      `Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`,\n    );\n  }\n\n  return manifestData;\n}\n\nexport function getManifestId(manifestData) {\n  const manifestApps = [\n    manifestData.browser_specific_settings,\n    manifestData.applications,\n  ];\n  for (const apps of manifestApps) {\n    // If both bss and applications contain a defined gecko property,\n    // we prefer bss even if the id property isn't available.\n    // This match what Firefox does in this particular scenario, see\n    // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488\n    if (apps?.gecko) {\n      return apps.gecko.id;\n    }\n  }\n\n  return undefined;\n}\n"],"mappings":"AAAA,OAAOA,IAAI,MAAM,MAAM;AAEvB,SAASC,EAAE,QAAQ,IAAI;AACvB,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,QAAQ,MAAM,WAAW;AAChC,OAAOC,iBAAiB,MAAM,qBAAqB;AAEnD,SAASC,eAAe,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;;AAEzC;;AAEA,eAAe,eAAeC,oBAAoBA,CAACC,SAAS,EAAE;EAC5D,MAAMC,YAAY,GAAGb,IAAI,CAACc,IAAI,CAACF,SAAS,EAAE,eAAe,CAAC;EAC1DL,GAAG,CAACQ,KAAK,CAAC,0BAA0BF,YAAY,EAAE,CAAC;EAEnD,IAAIG,gBAAgB;EAEpB,IAAI;IACFA,gBAAgB,GAAG,MAAMf,EAAE,CAACgB,QAAQ,CAACJ,YAAY,EAAE;MAAEK,QAAQ,EAAE;IAAQ,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACvB,wCAAwCQ,YAAY,KAAKM,KAAK,EAChE,CAAC;EACH;EAEAH,gBAAgB,GAAGb,QAAQ,CAACa,gBAAgB,CAAC;EAE7C,IAAII,YAAY;EAEhB,IAAI;IACFA,YAAY,GAAGlB,SAAS,CAACE,iBAAiB,CAACY,gBAAgB,CAAC,CAAC;EAC/D,CAAC,CAAC,OAAOG,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACvB,uCAAuCQ,YAAY,KAAKM,KAAK,EAC/D,CAAC;EACH;EAEA,MAAME,MAAM,GAAG,EAAE;EACjB;EACA;EACA;EACA,IAAI,CAACD,YAAY,CAACE,IAAI,EAAE;IACtBD,MAAM,CAACE,IAAI,CAAC,yBAAyB,CAAC;EACxC;EACA,IAAI,CAACH,YAAY,CAACI,OAAO,EAAE;IACzBH,MAAM,CAACE,IAAI,CAAC,4BAA4B,CAAC;EAC3C;EAEA,IAAIH,YAAY,CAACK,YAAY,IAAI,CAACL,YAAY,CAACK,YAAY,CAACC,KAAK,EAAE;IACjE;IACA;IACA;IACAL,MAAM,CAACE,IAAI,CAAC,uCAAuC,CAAC;EACtD;EAEA,IAAIF,MAAM,CAACM,MAAM,EAAE;IACjB,MAAM,IAAItB,eAAe,CACvB,eAAeQ,YAAY,gBAAgBQ,MAAM,CAACP,IAAI,CAAC,IAAI,CAAC,EAC9D,CAAC;EACH;EAEA,OAAOM,YAAY;AACrB;AAEA,OAAO,SAASQ,aAAaA,CAACR,YAAY,EAAE;EAC1C,MAAMS,YAAY,GAAG,CACnBT,YAAY,CAACU,yBAAyB,EACtCV,YAAY,CAACK,YAAY,CAC1B;EACD,KAAK,MAAMM,IAAI,IAAIF,YAAY,EAAE;IAC/B;IACA;IACA;IACA;IACA,IAAIE,IAAI,aAAJA,IAAI,eAAJA,IAAI,CAAEL,KAAK,EAAE;MACf,OAAOK,IAAI,CAACL,KAAK,CAACM,EAAE;IACtB;EACF;EAEA,OAAOC,SAAS;AAClB","ignoreList":[]}

package/lib/util/promisify.js

@@ -1,11 +1,4 @@
 import { promisify } from 'util';
-
-// promisify.custom is missing from the node types know to flow,
-// and it triggers flow-check errors if used directly.
-// By using the value exported here, flow-check passes successfully
-// using a single FLOW_IGNORE suppress comment.
-
-// $FlowIgnore: promisify.custom is missing in flow type signatures.
 export const promisifyCustom = promisify.custom;
 
 /*

package/lib/util/promisify.js.map

@@ -1 +1 @@
-{"version":3,"file":"promisify.js","names":["promisify","promisifyCustom","custom","multiArgsPromisedFn","fn","callerArgs","Promise","resolve","reject","err","rest"],"sources":["../../src/util/promisify.js"],"sourcesContent":["/* @flow */\n\nimport { promisify } from 'util';\n\n// promisify.custom is missing from the node types know to flow,\n// and it triggers flow-check errors if used directly.\n// By using the value exported here, flow-check passes successfully\n// using a single FLOW_IGNORE suppress comment.\n\n// $FlowIgnore: promisify.custom is missing in flow type signatures.\nexport const promisifyCustom = promisify.custom;\n\n/*\n * A small promisify helper to make it easier to customize a\n * function promisified (using the 'util' module available in\n * nodejs >= 8) to resolve to an array of results:\n *\n *    import {promisify} from 'util';\n *    import {multiArgsPromisedFn} from '../util/promisify';\n *\n *    aCallbackBasedFn[promisify.custom] = multiArgsPromisedFn(tmp.dir);\n *    ...\n */\nexport function multiArgsPromisedFn(fn: Function): Function {\n  return (...callerArgs: Array<any>): Promise<any> => {\n    return new Promise((resolve, reject) => {\n      fn(...callerArgs, (err, ...rest) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(rest);\n        }\n      });\n    });\n  };\n}\n"],"mappings":"AAEA,SAASA,SAAS,QAAQ,MAAM;;AAEhC;AACA;AACA;AACA;;AAEA;AACA,OAAO,MAAMC,eAAe,GAAGD,SAAS,CAACE,MAAM;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAACC,EAAY,EAAY;EAC1D,OAAO,CAAC,GAAGC,UAAsB,KAAmB;IAClD,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtCJ,EAAE,CAAC,GAAGC,UAAU,EAAE,CAACI,GAAG,EAAE,GAAGC,IAAI,KAAK;QAClC,IAAID,GAAG,EAAE;UACPD,MAAM,CAACC,GAAG,CAAC;QACb,CAAC,MAAM;UACLF,OAAO,CAACG,IAAI,CAAC;QACf;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC;AACH"}
+{"version":3,"file":"promisify.js","names":["promisify","promisifyCustom","custom","multiArgsPromisedFn","fn","callerArgs","Promise","resolve","reject","err","rest"],"sources":["../../src/util/promisify.js"],"sourcesContent":["import { promisify } from 'util';\n\nexport const promisifyCustom = promisify.custom;\n\n/*\n * A small promisify helper to make it easier to customize a\n * function promisified (using the 'util' module available in\n * nodejs >= 8) to resolve to an array of results:\n *\n *    import {promisify} from 'util';\n *    import {multiArgsPromisedFn} from '../util/promisify';\n *\n *    aCallbackBasedFn[promisify.custom] = multiArgsPromisedFn(tmp.dir);\n *    ...\n */\nexport function multiArgsPromisedFn(fn) {\n  return (...callerArgs) => {\n    return new Promise((resolve, reject) => {\n      fn(...callerArgs, (err, ...rest) => {\n        if (err) {\n          reject(err);\n        } else {\n          resolve(rest);\n        }\n      });\n    });\n  };\n}\n"],"mappings":"AAAA,SAASA,SAAS,QAAQ,MAAM;AAEhC,OAAO,MAAMC,eAAe,GAAGD,SAAS,CAACE,MAAM;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAACC,EAAE,EAAE;EACtC,OAAO,CAAC,GAAGC,UAAU,KAAK;IACxB,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtCJ,EAAE,CAAC,GAAGC,UAAU,EAAE,CAACI,GAAG,EAAE,GAAGC,IAAI,KAAK;QAClC,IAAID,GAAG,EAAE;UACPD,MAAM,CAACC,GAAG,CAAC;QACb,CAAC,MAAM;UACLF,OAAO,CAACG,IAAI,CAAC;QACf;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC;AACH","ignoreList":[]}

package/lib/util/stdin.js

@@ -1,9 +1,7 @@
 export function isTTY(stream) {
-  // $FlowFixMe: flow complains that stream may not provide isTTY as a property.
   return stream.isTTY;
 }
 export function setRawMode(stream, rawMode) {
-  // $FlowFixMe: flow complains that stdin may not provide setRawMode.
   stream.setRawMode(rawMode);
 }
 //# sourceMappingURL=stdin.js.map

package/lib/util/stdin.js.map

@@ -1 +1 @@
-{"version":3,"file":"stdin.js","names":["isTTY","stream","setRawMode","rawMode"],"sources":["../../src/util/stdin.js"],"sourcesContent":["/* @flow */\n\nimport type { Readable } from 'stream';\n\nexport function isTTY(stream: Readable): boolean {\n  // $FlowFixMe: flow complains that stream may not provide isTTY as a property.\n  return stream.isTTY;\n}\n\nexport function setRawMode(stream: Readable, rawMode: boolean) {\n  // $FlowFixMe: flow complains that stdin may not provide setRawMode.\n  stream.setRawMode(rawMode);\n}\n"],"mappings":"AAIA,OAAO,SAASA,KAAKA,CAACC,MAAgB,EAAW;EAC/C;EACA,OAAOA,MAAM,CAACD,KAAK;AACrB;AAEA,OAAO,SAASE,UAAUA,CAACD,MAAgB,EAAEE,OAAgB,EAAE;EAC7D;EACAF,MAAM,CAACC,UAAU,CAACC,OAAO,CAAC;AAC5B"}
+{"version":3,"file":"stdin.js","names":["isTTY","stream","setRawMode","rawMode"],"sources":["../../src/util/stdin.js"],"sourcesContent":["export function isTTY(stream) {\n  return stream.isTTY;\n}\n\nexport function setRawMode(stream, rawMode) {\n  stream.setRawMode(rawMode);\n}\n"],"mappings":"AAAA,OAAO,SAASA,KAAKA,CAACC,MAAM,EAAE;EAC5B,OAAOA,MAAM,CAACD,KAAK;AACrB;AAEA,OAAO,SAASE,UAAUA,CAACD,MAAM,EAAEE,OAAO,EAAE;EAC1CF,MAAM,CAACC,UAAU,CAACC,OAAO,CAAC;AAC5B","ignoreList":[]}

package/lib/util/submit-addon.js

@@ -1,12 +1,16 @@
+import { createHash } from 'crypto';
 import { createWriteStream, promises as fsPromises } from 'fs';
-import { pipeline } from 'stream';
-import { promisify } from 'util';
+import { promises as streamPromises } from 'stream';
 
 // eslint-disable-next-line no-shadow
-import fetch, { FormData, fileFromSync, Response } from 'node-fetch';
+import fetch, { FormData, fileFromSync } from 'node-fetch';
 import { SignJWT } from 'jose';
+import JSZip from 'jszip';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { isErrorWithCode } from '../errors.js';
 import { createLogger } from './../util/logger.js';
 const log = createLogger(import.meta.url);
+export const defaultAsyncFsReadFile = fsPromises.readFile;
 export class JwtApiAuth {
   #apiKey;
   #apiSecret;
@@ -37,8 +41,18 @@ export class JwtApiAuth {
   }
 }
 export default class Client {
+  apiAuth;
+  apiProxy;
+  apiUr;
+  validationCheckInterval;
+  validationCheckTimeout;
+  approvalCheckInterval;
+  approvalCheckTimeout;
+  downloadDir;
+  userAgentString;
   constructor({
     apiAuth,
+    apiProxy,
     baseUrl,
     validationCheckInterval = 1000,
     validationCheckTimeout = 300000,
@@ -50,6 +64,9 @@ export default class Client {
     userAgentString
   }) {
     this.apiAuth = apiAuth;
+    if (apiProxy) {
+      this.apiProxy = apiProxy;
+    }
     if (!baseUrl.pathname.endsWith('/')) {
       baseUrl = new URL(baseUrl.href);
       baseUrl.pathname += '/';
@@ -68,12 +85,14 @@ export default class Client {
   nodeFetch(url, {
     method,
     headers,
-    body
+    body,
+    agent
   }) {
     return fetch(url, {
       method,
       headers,
-      body
+      body,
+      agent
     });
   }
   async doUploadSubmit(xpiPath, channel) {
@@ -83,19 +102,23 @@ export default class Client {
     formData.set('upload', this.fileFromSync(xpiPath));
     const {
       uuid
-    } = await this.fetchJson(url, 'POST', formData);
+    } = await this.fetchJson(url, 'POST', formData, 'Upload failed');
     return this.waitForValidation(uuid);
   }
-  waitRetry(successFunc, checkUrl, checkInterval, abortInterval, context) {
+  waitRetry(successFunc, checkUrl, checkInterval, abortInterval, context, editUrl = null) {
     let checkTimeout;
     return new Promise((resolve, reject) => {
       const abortTimeout = setTimeout(() => {
         clearTimeout(checkTimeout);
-        reject(new Error(`${context}: timeout.`));
+        let errorMessage = `${context}: timeout exceeded.`;
+        if (editUrl) {
+          errorMessage += ` When approved the signed XPI file can be downloaded from ${editUrl}`;
+        }
+        reject(new Error(errorMessage));
       }, abortInterval);
       const pollStatus = async () => {
         try {
-          const responseData = await this.fetchJson(checkUrl, 'GET', undefined, 'Getting details failed.');
+          const responseData = await this.fetchJson(checkUrl, 'GET', undefined, 'Getting details failed');
           const success = successFunc(responseData);
           if (success) {
             clearTimeout(abortTimeout);
@@ -113,17 +136,16 @@ export default class Client {
     });
   }
   waitForValidation(uuid) {
-    log.info('Waiting for Validation...');
+    log.info('Waiting for validation...');
     return this.waitRetry(detailResponseData => {
       if (!detailResponseData.processed) {
         return null;
       }
-      log.info('Validation results:', detailResponseData.validation);
+      log.debug('Validation results:', detailResponseData.validation);
       if (detailResponseData.valid) {
         return detailResponseData.uuid;
       }
-      log.info('Validation failed.');
-      throw new Error('Validation failed, open the following URL for more information: ' + `${detailResponseData.url}`);
+      throw new Error(['Validation failed:\n', JSON.stringify(detailResponseData.validation, null, 2)].join(''));
     }, new URL(`upload/${uuid}/`, this.apiUrl), this.validationCheckInterval, this.validationCheckTimeout, 'Validation');
   }
   async doNewAddonSubmit(uuid, metaDataJson) {
@@ -135,7 +157,7 @@ export default class Client {
         ...metaDataJson.version
       }
     };
-    return this.fetchJson(url, 'POST', JSON.stringify(jsonData));
+    return this.fetchJson(url, 'POST', JSON.stringify(jsonData), 'Submission failed (1)');
   }
   doNewAddonOrVersionSubmit(addonId, uuid, metaDataJson) {
     const url = new URL(`addon/${addonId}/`, this.apiUrl);
@@ -146,10 +168,38 @@ export default class Client {
         ...metaDataJson.version
       }
     };
-    return this.fetch(url, 'PUT', JSON.stringify(jsonData));
+    return this.fetchJson(url, 'PUT', JSON.stringify(jsonData), 'Submission failed (2)');
   }
-  waitForApproval(addonId, versionId) {
-    log.info('Waiting for Approval...');
+  async doFormDataPatch(data, addonId, versionId) {
+    const patchUrl = new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl);
+    try {
+      const formData = new FormData();
+      for (const field in data) {
+        formData.set(field, data[field]);
+      }
+      const response = await this.fetch(patchUrl, 'PATCH', formData);
+      if (!response.ok) {
+        throw new Error(`response status was ${response.status}`);
+      }
+    } catch (error) {
+      log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);
+      throw new Error(`Uploading ${Object.keys(data)} failed`);
+    }
+  }
+  async doAfterSubmit(addonId, newVersionId, editUrl, patchData) {
+    if (patchData && patchData.version) {
+      log.info(`Submitting ${Object.keys(patchData.version)} to version`);
+      await this.doFormDataPatch(patchData.version, addonId, newVersionId);
+    }
+    if (this.approvalCheckTimeout === 0) {
+      log.info(['Waiting for approval and download of signed XPI skipped.', `When approved the signed XPI file can be downloaded from ${editUrl}`].join(' '));
+      return this.returnResult(addonId);
+    }
+    const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId, editUrl));
+    return this.downloadSignedFile(fileUrl, addonId);
+  }
+  waitForApproval(addonId, versionId, editUrl) {
+    log.info('Waiting for approval...');
     return this.waitRetry(detailResponseData => {
       const {
         file
@@ -158,7 +208,7 @@ export default class Client {
         return file.url;
       }
       return null;
-    }, new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl), this.approvalCheckInterval, this.approvalCheckTimeout, 'Approval');
+    }, new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl), this.approvalCheckInterval, this.approvalCheckTimeout, 'Approval', editUrl);
   }
   async fetchJson(url, method = 'GET', body, errorMsg = 'Bad Request') {
     const response = await this.fetch(url, method, body);
@@ -167,13 +217,12 @@ export default class Client {
     }
     const data = await response.json();
     if (!response.ok) {
-      log.info('Server Response:', data);
-      throw new Error(`${errorMsg}: ${response.statusText || response.status}.`);
+      throw new Error([`${errorMsg}: ${response.statusText || response.status}`, JSON.stringify(data, null, 2)].join('\n'));
     }
     return data;
   }
   async fetch(url, method = 'GET', body) {
-    log.info(`Fetching URL: ${url.href}`);
+    log.debug(`${method}ing URL: ${url.href}`);
     let headers = {
       Authorization: await this.apiAuth.getAuthHeader(),
       Accept: 'application/json',
@@ -185,12 +234,23 @@ export default class Client {
         'Content-Type': 'application/json'
       };
     }
+    let agent;
+    if (this.apiProxy) {
+      agent = new HttpsProxyAgent(this.apiProxy);
+    }
     return this.nodeFetch(url, {
       method,
       body,
-      headers
+      headers,
+      agent
     });
   }
+  returnResult(addonId, downloadedFiles) {
+    return {
+      id: addonId,
+      downloadedFiles
+    };
+  }
   async downloadSignedFile(fileUrl, addonId) {
     const filename = fileUrl.pathname.split('/').pop(); // get the name from fileUrl
     const dest = `${this.downloadDir}/${filename}`;
@@ -204,54 +264,102 @@ export default class Client {
       log.info(`Download of signed xpi failed: ${error}.`);
       throw new Error(`Downloading ${filename} failed`);
     }
-    return {
-      id: addonId,
-      downloadedFiles: [filename]
-    };
+    log.info(`Signed xpi downloaded: ${dest}`);
+    return this.returnResult(addonId, [filename]);
   }
   async saveToFile(contents, destPath) {
-    return promisify(pipeline)(contents, createWriteStream(destPath));
+    return streamPromises.pipeline(contents, createWriteStream(destPath));
+  }
+
+  /*
+  This function aims to quickly hash the contents of the zip file that's being uploaded,
+  to compare it to the previous zip file that was uploaded, so we can skip the upload for
+  efficiency.
+   CRCs are used from the zip to avoid having to extract and hash  all the files.
+   Two zips that have different byte contents in their files must have a different hash;
+  but returning a different hash when the contents are the same in some cases is acceptable
+  - a false mismatch does not result in lost data.
+  */
+  async hashXpiCrcs(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {
+    const zip = await JSZip.loadAsync(asyncFsReadFile(filePath, {
+      createFolders: true
+    }));
+    const hash = createHash('sha256');
+    const entries = [];
+    zip.forEach((relativePath, entry) => {
+      var _entry$_data;
+      let path = relativePath.replace(/\/+$/, '');
+      if (entry.dir) {
+        path += '/';
+      }
+      // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0
+      entries.push({
+        path,
+        crc32: ((_entry$_data = entry._data) === null || _entry$_data === void 0 ? void 0 : _entry$_data.crc32) || 0
+      });
+    });
+    entries.sort((a, b) => a.path === b.path ? 0 : a.path > b.path ? 1 : -1);
+    hash.update(JSON.stringify(entries));
+    return hash.digest('hex');
   }
-  async postNewAddon(xpiPath, channel, savedIdPath, metaDataJson, saveIdToFileFunc = saveIdToFile) {
-    const uploadUuid = await this.doUploadSubmit(xpiPath, channel);
-    const versionObject = channel === 'listed' ? 'current_version' : 'latest_unlisted_version';
+  async getPreviousUuidOrUploadXpi(xpiPath, channel, savedUploadUuidPath, saveUploadUuidToFileFunc = saveUploadUuidToFile, getUploadUuidFromFileFunc = getUploadUuidFromFile) {
+    const [{
+      uploadUuid: previousUuid,
+      channel: previousChannel,
+      xpiCrcHash: previousHash
+    }, xpiCrcHash] = await Promise.all([getUploadUuidFromFileFunc(savedUploadUuidPath), this.hashXpiCrcs(xpiPath)]);
+    let uploadUuid;
+    if (previousChannel !== channel || xpiCrcHash !== previousHash) {
+      uploadUuid = await this.doUploadSubmit(xpiPath, channel);
+      await saveUploadUuidToFileFunc(savedUploadUuidPath, {
+        uploadUuid,
+        channel,
+        xpiCrcHash
+      });
+    } else {
+      uploadUuid = previousUuid;
+    }
+    return uploadUuid;
+  }
+  async postNewAddon(uploadUuid, savedIdPath, metaDataJson, patchData, saveIdToFileFunc = saveIdToFile) {
     const {
       guid: addonId,
-      [versionObject]: {
-        id: newVersionId
+      version: {
+        id: newVersionId,
+        edit_url: editUrl
       }
     } = await this.doNewAddonSubmit(uploadUuid, metaDataJson);
     await saveIdToFileFunc(savedIdPath, addonId);
     log.info(`Generated extension ID: ${addonId}.`);
     log.info('You must add the following to your manifest:');
     log.info(`"browser_specific_settings": {"gecko": {"id": "${addonId}"}}`);
-    const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));
-    return this.downloadSignedFile(fileUrl, addonId);
+    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);
   }
-  async putVersion(xpiPath, channel, addonId, metaDataJson) {
-    const uploadUuid = await this.doUploadSubmit(xpiPath, channel);
-    await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);
-    const url = new URL(`addon/${addonId}/versions/?filter=all_with_unlisted`, this.apiUrl);
+  async putVersion(uploadUuid, addonId, metaDataJson, patchData) {
     const {
-      results: [{
-        id: newVersionId
-      }]
-    } = await this.fetchJson(url);
-    const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));
-    return this.downloadSignedFile(fileUrl, addonId);
+      version: {
+        id: newVersionId,
+        edit_url: editUrl
+      }
+    } = await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);
+    return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);
   }
 }
 export async function signAddon({
   apiKey,
   apiSecret,
+  apiProxy,
   amoBaseUrl,
-  timeout,
+  validationCheckTimeout,
+  approvalCheckTimeout,
   id,
   xpiPath,
   downloadDir,
   channel,
   savedIdPath,
+  savedUploadUuidPath,
   metaDataJson = {},
+  submissionSource,
   userAgentString,
   SubmitClient = Client,
   ApiAuthClass = JwtApiAuth
@@ -259,7 +367,7 @@ export async function signAddon({
   try {
     const stats = await fsPromises.stat(xpiPath);
     if (!stats.isFile()) {
-      throw new Error(`not a file: ${xpiPath}`);
+      throw new Error('not a file');
     }
   } catch (statError) {
     throw new Error(`error with ${xpiPath}: ${statError}`);
@@ -275,22 +383,78 @@ export async function signAddon({
       apiKey,
       apiSecret
     }),
+    apiProxy,
     baseUrl,
-    validationCheckTimeout: timeout,
-    approvalCheckTimeout: timeout,
+    validationCheckTimeout,
+    approvalCheckTimeout,
     downloadDir,
     userAgentString
   });
+  const uploadUuid = await client.getPreviousUuidOrUploadXpi(xpiPath, channel, savedUploadUuidPath);
+  const patchData = {};
+  // if we have a source file we need to upload we patch after the create
+  if (submissionSource) {
+    try {
+      const stats2 = await fsPromises.stat(submissionSource);
+      if (!stats2.isFile()) {
+        throw new Error('not a file');
+      }
+    } catch (statError) {
+      throw new Error(`error with ${submissionSource}: ${statError}`);
+    }
+    patchData.version = {
+      source: client.fileFromSync(submissionSource)
+    };
+  }
 
   // We specifically need to know if `id` has not been passed as a parameter because
   // it's the indication that a new add-on should be created, rather than a new version.
   if (id === undefined) {
-    return client.postNewAddon(xpiPath, channel, savedIdPath, metaDataJson);
+    return client.postNewAddon(uploadUuid, savedIdPath, metaDataJson, patchData);
   }
-  return client.putVersion(xpiPath, channel, id, metaDataJson);
+  return client.putVersion(uploadUuid, id, metaDataJson, patchData);
 }
 export async function saveIdToFile(filePath, id) {
   await fsPromises.writeFile(filePath, ['# This file was created by https://github.com/mozilla/web-ext', '# Your auto-generated extension ID for addons.mozilla.org is:', id.toString()].join('\n'));
   log.debug(`Saved auto-generated ID ${id} to ${filePath}`);
 }
+export async function saveUploadUuidToFile(filePath, {
+  uploadUuid,
+  channel,
+  xpiCrcHash
+}) {
+  await fsPromises.writeFile(filePath, JSON.stringify({
+    uploadUuid,
+    channel,
+    xpiCrcHash
+  }));
+  log.debug(`Saved upload UUID ${uploadUuid}, xpi crc hash ${xpiCrcHash}, and channel ${channel} to ${filePath}`);
+}
+export async function getUploadUuidFromFile(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {
+  try {
+    const content = await asyncFsReadFile(filePath, 'utf-8');
+    const {
+      uploadUuid,
+      channel,
+      xpiCrcHash
+    } = JSON.parse(content);
+    log.debug(`Found upload uuid:${uploadUuid}, channel:${channel}, hash:${xpiCrcHash} in ${filePath}`);
+    return {
+      uploadUuid,
+      channel,
+      xpiCrcHash
+    };
+  } catch (error) {
+    if (isErrorWithCode('ENOENT', error)) {
+      log.debug(`No upload uuid file found at: ${filePath}`);
+    } else {
+      log.debug(`Invalid upload uuid file contents in ${filePath}: ${error}`);
+    }
+  }
+  return {
+    uploadUuid: '',
+    channel: '',
+    xpiCrcHash: ''
+  };
+}
 //# sourceMappingURL=submit-addon.js.map