web-ext 10.3.0 → 10.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/lib/cmd/build.js.map +1 -1
  2. package/lib/cmd/docs.js.map +1 -1
  3. package/lib/cmd/dump-config.js.map +1 -1
  4. package/lib/cmd/index.js.map +1 -1
  5. package/lib/cmd/lint.js +2 -0
  6. package/lib/cmd/lint.js.map +1 -1
  7. package/lib/cmd/run.js.map +1 -1
  8. package/lib/cmd/sign.js.map +1 -1
  9. package/lib/config.js.map +1 -1
  10. package/lib/errors.js.map +1 -1
  11. package/lib/extension-runners/chromium.js +1 -2
  12. package/lib/extension-runners/chromium.js.map +1 -1
  13. package/lib/extension-runners/firefox-android.js.map +1 -1
  14. package/lib/extension-runners/firefox-desktop.js.map +1 -1
  15. package/lib/extension-runners/index.js.map +1 -1
  16. package/lib/firefox/index.js.map +1 -1
  17. package/lib/firefox/package-identifiers.js.map +1 -1
  18. package/lib/firefox/preferences.js.map +1 -1
  19. package/lib/firefox/rdp-client.js +2 -2
  20. package/lib/firefox/rdp-client.js.map +1 -1
  21. package/lib/firefox/remote.js.map +1 -1
  22. package/lib/main.js.map +1 -1
  23. package/lib/program.js +6 -1
  24. package/lib/program.js.map +1 -1
  25. package/lib/util/adb.js.map +1 -1
  26. package/lib/util/artifacts.js.map +1 -1
  27. package/lib/util/expand-prefs.js.map +1 -1
  28. package/lib/util/file-exists.js.map +1 -1
  29. package/lib/util/file-filter.js.map +1 -1
  30. package/lib/util/is-directory.js.map +1 -1
  31. package/lib/util/logger.js.map +1 -1
  32. package/lib/util/manifest.js +1 -1
  33. package/lib/util/manifest.js.map +1 -1
  34. package/lib/util/promisify.js.map +1 -1
  35. package/lib/util/stdin.js.map +1 -1
  36. package/lib/util/submit-addon.js +6 -3
  37. package/lib/util/submit-addon.js.map +1 -1
  38. package/lib/util/temp-dir.js.map +1 -1
  39. package/lib/util/updates.js.map +1 -1
  40. package/lib/watcher.js.map +1 -1
  41. package/package.json +15 -22
@@ -1 +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":["import path from 'path';\nimport fs from 'fs/promises';\n\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;AACvB,OAAOC,EAAE,MAAM,aAAa;AAE5B,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":[]}
1
+ {"version":3,"file":"manifest.js","names":[],"sources":["../../src/util/manifest.js"],"sourcesContent":["import path from 'path';\nimport fs from 'fs/promises';\n\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,OAAO,IAAI,MAAM,MAAM;AACvB,OAAO,EAAE,MAAM,aAAa;AAE5B,OAAO,SAAS,MAAM,YAAY;AAClC,OAAO,QAAQ,MAAM,WAAW;AAChC,OAAO,iBAAiB,MAAM,qBAAqB;AAEnD,SAAS,eAAe,QAAQ,cAAc;AAC9C,SAAS,YAAY,QAAQ,aAAa;AAE1C,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;AAEzC;;AAEA,eAAe,eAAe,oBAAoB,CAAC,SAAS,EAAE;EAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC;EAC1D,GAAG,CAAC,KAAK,CAAC,0BAA0B,YAAY,EAAE,CAAC;EAEnD,IAAI,gBAAgB;EAEpB,IAAI;IACF,gBAAgB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE;MAAE,QAAQ,EAAE;IAAQ,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAO,KAAK,EAAE;IACd,MAAM,IAAI,eAAe,CACvB,wCAAwC,YAAY,KAAK,KAAK,EAChE,CAAC;EACH;EAEA,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAAC;EAE7C,IAAI,YAAY;EAEhB,IAAI;IACF,YAAY,GAAG,SAAS,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;EAC/D,CAAC,CAAC,OAAO,KAAK,EAAE;IACd,MAAM,IAAI,eAAe,CACvB,uCAAuC,YAAY,KAAK,KAAK,EAC/D,CAAC;EACH;EAEA,MAAM,MAAM,GAAG,EAAE;EACjB;EACA;EACA;EACA,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;IACtB,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC;EACxC;EACA,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IACzB,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC;EAC3C;EAEA,IAAI,YAAY,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,EAAE;IACjE;IACA;IACA;IACA,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC;EACtD;EAEA,IAAI,MAAM,CAAC,MAAM,EAAE;IACjB,MAAM,IAAI,eAAe,CACvB,eAAe,YAAY,gBAAgB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9D,CAAC;EACH;EAEA,OAAO,YAAY;AACrB;AAEA,OAAO,SAAS,aAAa,CAAC,YAAY,EAAE;EAC1C,MAAM,YAAY,GAAG,CACnB,YAAY,CAAC,yBAAyB,EACtC,YAAY,CAAC,YAAY,CAC1B;EACD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;IAC/B;IACA;IACA;IACA;IACA,IAAI,IAAI,EAAE,KAAK,EAAE;MACf,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE;IACtB;EACF;EAEA,OAAO,SAAS;AAClB","ignoreList":[]}
@@ -1 +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":["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":[]}
1
+ {"version":3,"file":"promisify.js","names":[],"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,SAAS,SAAS,QAAQ,MAAM;AAEhC,OAAO,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM;;AAE/C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAS,mBAAmB,CAAC,EAAE,EAAE;EACtC,OAAO,CAAC,GAAG,UAAU,KAAK;IACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;MACtC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK;QAClC,IAAI,GAAG,EAAE;UACP,MAAM,CAAC,GAAG,CAAC;QACb,CAAC,MAAM;UACL,OAAO,CAAC,IAAI,CAAC;QACf;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC;AACH","ignoreList":[]}
@@ -1 +1 @@
1
- {"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":[]}
1
+ {"version":3,"file":"stdin.js","names":[],"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,SAAS,KAAK,CAAC,MAAM,EAAE;EAC5B,OAAO,MAAM,CAAC,KAAK;AACrB;AAEA,OAAO,SAAS,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE;EAC1C,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;AAC5B","ignoreList":[]}
@@ -195,8 +195,12 @@ export default class Client {
195
195
  formData.set(field, data[field]);
196
196
  }
197
197
  const response = await this.fetch(patchUrl, 'PATCH', formData);
198
+ if (response.status < 200 || response.status >= 500) {
199
+ throw new Error(`Patch request failed: ${response.statusText || response.status}.`);
200
+ }
198
201
  if (!response.ok) {
199
- throw new Error(`response status was ${response.status}`);
202
+ const responseData = await response.json();
203
+ throw new Error([`Patch request failed: ${response.statusText || response.status}:\n`, JSON.stringify(responseData, null, 2)].join('\n'));
200
204
  }
201
205
  } catch (error) {
202
206
  log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);
@@ -304,7 +308,6 @@ export default class Client {
304
308
  const hash = createHash('sha256');
305
309
  const entries = [];
306
310
  zip.forEach((relativePath, entry) => {
307
- var _entry$_data;
308
311
  let path = relativePath.replace(/\/+$/, '');
309
312
  if (entry.dir) {
310
313
  path += '/';
@@ -312,7 +315,7 @@ export default class Client {
312
315
  // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0
313
316
  entries.push({
314
317
  path,
315
- crc32: ((_entry$_data = entry._data) === null || _entry$_data === void 0 ? void 0 : _entry$_data.crc32) || 0
318
+ crc32: entry._data?.crc32 || 0
316
319
  });
317
320
  });
318
321
  entries.sort((a, b) => a.path === b.path ? 0 : a.path > b.path ? 1 : -1);
@@ -1 +1 @@
1
- {"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","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","fileFromSync","filePath","fileData","File","global","fd","FormData","set","Blob","get","nodeFetch","method","headers","body","agent","fetch","doUploadSubmit","xpiPath","channel","formData","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\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 // eslint-disable-next-line no-shadow -- File is in Node v20.0.0+.\n let File = global.File;\n // TODO: Use the File global directly without the fallback when we drop\n // support for Node versions before v20.\n if (typeof File === 'undefined') {\n // Even without File being public, its interface and constructor could\n // be accessed indirectly from the FormData interface. According to the\n // FormData spec (that Node.js implements, via undici), the entry value\n // of a FormData is always a scalar value or a File:\n // https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#form-entry-value\n const fd = new FormData();\n fd.set('x', new Blob([]));\n File = fd.get('x').constructor;\n }\n return new File([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 {\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":[]}
1
+ {"version":3,"file":"submit-addon.js","names":[],"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\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 // eslint-disable-next-line no-shadow -- File is in Node v20.0.0+.\n let File = global.File;\n // TODO: Use the File global directly without the fallback when we drop\n // support for Node versions before v20.\n if (typeof File === 'undefined') {\n // Even without File being public, its interface and constructor could\n // be accessed indirectly from the FormData interface. According to the\n // FormData spec (that Node.js implements, via undici), the entry value\n // of a FormData is always a scalar value or a File:\n // https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#form-entry-value\n const fd = new FormData();\n fd.set('x', new Blob([]));\n File = fd.get('x').constructor;\n }\n return new File([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.status < 200 || response.status >= 500) {\n throw new Error(\n `Patch request failed: ${response.statusText || response.status}.`,\n );\n }\n\n if (!response.ok) {\n const responseData = await response.json();\n throw new Error(\n [\n `Patch request failed: ${response.statusText || response.status}:\\n`,\n JSON.stringify(responseData, null, 2),\n ].join('\\n'),\n );\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 {\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":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"temp-dir.js","names":["promisify","tmp","createLogger","multiArgsPromisedFn","promisifyCustom","log","import","meta","url","dir","createTempDir","withTempDir","makePromise","tmpDir","TempDir","create","then","catch","errorHandler","successHandler","_path","_removeTempDir","constructor","undefined","prefix","unsafeCleanup","tmpPath","removeTempDir","Promise","resolve","reject","next","err","debug","path","Error","error","remove","promiseResult"],"sources":["../../src/util/temp-dir.js"],"sourcesContent":["import { promisify } from 'util';\n\nimport tmp from 'tmp';\n\nimport { createLogger } from './logger.js';\nimport { multiArgsPromisedFn, promisifyCustom } from './promisify.js';\n\nconst log = createLogger(import.meta.url);\n\ntmp.dir[promisifyCustom] = multiArgsPromisedFn(tmp.dir);\n\nconst createTempDir = promisify(tmp.dir);\n\n/*\n * Work with a self-destructing temporary directory in a promise chain.\n *\n * The directory will be destroyed when the promise chain is finished\n * (whether there was an error or not).\n *\n * Usage:\n *\n * withTempDir(\n * (tmpDir) =>\n * doSomething(tmpDir.path())\n * .then(...)\n * );\n *\n */\nexport function withTempDir(makePromise) {\n const tmpDir = new TempDir();\n return tmpDir\n .create()\n .then(() => {\n return makePromise(tmpDir);\n })\n .catch(tmpDir.errorHandler())\n .then(tmpDir.successHandler());\n}\n\n/*\n * Work with a self-destructing temporary directory object.\n *\n * It is safer to use withTempDir() instead but if you know\n * what you're doing you can use it directly like:\n *\n * let tmpDir = new TempDir();\n * tmpDir.create()\n * .then(() => {\n * // work with tmpDir.path()\n * })\n * .catch(tmpDir.errorHandler())\n * .then(tmpDir.successHandler());\n *\n */\nexport class TempDir {\n _path;\n _removeTempDir;\n\n constructor() {\n this._path = undefined;\n this._removeTempDir = undefined;\n }\n\n /*\n * Returns a promise that is fulfilled when the temp directory has\n * been created.\n */\n create() {\n return createTempDir({\n prefix: 'tmp-web-ext-',\n // This allows us to remove a non-empty tmp dir.\n unsafeCleanup: true,\n }).then(([tmpPath, removeTempDir]) => {\n this._path = tmpPath;\n this._removeTempDir = () =>\n new Promise((resolve, reject) => {\n // `removeTempDir` parameter is a `next` callback which\n // is called once the dir has been removed.\n const next = (err) => (err ? reject(err) : resolve());\n removeTempDir(next);\n });\n log.debug(`Created temporary directory: ${this.path()}`);\n return this;\n });\n }\n\n /*\n * Get the absolute path of the temp directory.\n */\n path() {\n if (!this._path) {\n throw new Error('You cannot access path() before calling create()');\n }\n return this._path;\n }\n\n /*\n * Returns a callback that will catch an error, remove\n * the temporary directory, and throw the error.\n *\n * This is intended for use in a promise like\n * Promise().catch(tmp.errorHandler())\n */\n errorHandler() {\n return async (error) => {\n await this.remove();\n throw error;\n };\n }\n\n /*\n * Returns a callback that will remove the temporary direcotry.\n *\n * This is intended for use in a promise like\n * Promise().then(tmp.successHandler())\n */\n successHandler() {\n return async (promiseResult) => {\n await this.remove();\n return promiseResult;\n };\n }\n\n /*\n * Remove the temp directory.\n */\n remove() {\n if (!this._removeTempDir) {\n return;\n }\n log.debug(`Removing temporary directory: ${this.path()}`);\n return this._removeTempDir && this._removeTempDir();\n }\n}\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"temp-dir.js","names":[],"sources":["../../src/util/temp-dir.js"],"sourcesContent":["import { promisify } from 'util';\n\nimport tmp from 'tmp';\n\nimport { createLogger } from './logger.js';\nimport { multiArgsPromisedFn, promisifyCustom } from './promisify.js';\n\nconst log = createLogger(import.meta.url);\n\ntmp.dir[promisifyCustom] = multiArgsPromisedFn(tmp.dir);\n\nconst createTempDir = promisify(tmp.dir);\n\n/*\n * Work with a self-destructing temporary directory in a promise chain.\n *\n * The directory will be destroyed when the promise chain is finished\n * (whether there was an error or not).\n *\n * Usage:\n *\n * withTempDir(\n * (tmpDir) =>\n * doSomething(tmpDir.path())\n * .then(...)\n * );\n *\n */\nexport function withTempDir(makePromise) {\n const tmpDir = new TempDir();\n return tmpDir\n .create()\n .then(() => {\n return makePromise(tmpDir);\n })\n .catch(tmpDir.errorHandler())\n .then(tmpDir.successHandler());\n}\n\n/*\n * Work with a self-destructing temporary directory object.\n *\n * It is safer to use withTempDir() instead but if you know\n * what you're doing you can use it directly like:\n *\n * let tmpDir = new TempDir();\n * tmpDir.create()\n * .then(() => {\n * // work with tmpDir.path()\n * })\n * .catch(tmpDir.errorHandler())\n * .then(tmpDir.successHandler());\n *\n */\nexport class TempDir {\n _path;\n _removeTempDir;\n\n constructor() {\n this._path = undefined;\n this._removeTempDir = undefined;\n }\n\n /*\n * Returns a promise that is fulfilled when the temp directory has\n * been created.\n */\n create() {\n return createTempDir({\n prefix: 'tmp-web-ext-',\n // This allows us to remove a non-empty tmp dir.\n unsafeCleanup: true,\n }).then(([tmpPath, removeTempDir]) => {\n this._path = tmpPath;\n this._removeTempDir = () =>\n new Promise((resolve, reject) => {\n // `removeTempDir` parameter is a `next` callback which\n // is called once the dir has been removed.\n const next = (err) => (err ? reject(err) : resolve());\n removeTempDir(next);\n });\n log.debug(`Created temporary directory: ${this.path()}`);\n return this;\n });\n }\n\n /*\n * Get the absolute path of the temp directory.\n */\n path() {\n if (!this._path) {\n throw new Error('You cannot access path() before calling create()');\n }\n return this._path;\n }\n\n /*\n * Returns a callback that will catch an error, remove\n * the temporary directory, and throw the error.\n *\n * This is intended for use in a promise like\n * Promise().catch(tmp.errorHandler())\n */\n errorHandler() {\n return async (error) => {\n await this.remove();\n throw error;\n };\n }\n\n /*\n * Returns a callback that will remove the temporary direcotry.\n *\n * This is intended for use in a promise like\n * Promise().then(tmp.successHandler())\n */\n successHandler() {\n return async (promiseResult) => {\n await this.remove();\n return promiseResult;\n };\n }\n\n /*\n * Remove the temp directory.\n */\n remove() {\n if (!this._removeTempDir) {\n return;\n }\n log.debug(`Removing temporary directory: ${this.path()}`);\n return this._removeTempDir && this._removeTempDir();\n }\n}\n"],"mappings":"AAAA,SAAS,SAAS,QAAQ,MAAM;AAEhC,OAAO,GAAG,MAAM,KAAK;AAErB,SAAS,YAAY,QAAQ,aAAa;AAC1C,SAAS,mBAAmB,EAAE,eAAe,QAAQ,gBAAgB;AAErE,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAEzC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC;AAEvD,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;;AAExC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAS,WAAW,CAAC,WAAW,EAAE;EACvC,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,CAAC;EAC5B,OAAO,MAAM,CACV,MAAM,CAAC,CAAC,CACR,IAAI,CAAC,MAAM;IACV,OAAO,WAAW,CAAC,MAAM,CAAC;EAC5B,CAAC,CAAC,CACD,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAC5B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;AAClC;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAM,OAAO,CAAC;EACnB,KAAK;EACL,cAAc;EAEd,WAAW,GAAG;IACZ,IAAI,CAAC,KAAK,GAAG,SAAS;IACtB,IAAI,CAAC,cAAc,GAAG,SAAS;EACjC;;EAEA;AACF;AACA;AACA;EACE,MAAM,GAAG;IACP,OAAO,aAAa,CAAC;MACnB,MAAM,EAAE,cAAc;MACtB;MACA,aAAa,EAAE;IACjB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK;MACpC,IAAI,CAAC,KAAK,GAAG,OAAO;MACpB,IAAI,CAAC,cAAc,GAAG,MACpB,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;QAC/B;QACA;QACA,MAAM,IAAI,GAAI,GAAG,IAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAE;QACrD,aAAa,CAAC,IAAI,CAAC;MACrB,CAAC,CAAC;MACJ,GAAG,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;MACxD,OAAO,IAAI;IACb,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACE,IAAI,GAAG;IACL,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;MACf,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC;IACrE;IACA,OAAO,IAAI,CAAC,KAAK;EACnB;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACE,YAAY,GAAG;IACb,OAAO,MAAO,KAAK,IAAK;MACtB,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;MACnB,MAAM,KAAK;IACb,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,cAAc,GAAG;IACf,OAAO,MAAO,aAAa,IAAK;MAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;MACnB,OAAO,aAAa;IACtB,CAAC;EACH;;EAEA;AACF;AACA;EACE,MAAM,GAAG;IACP,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;MACxB;IACF;IACA,GAAG,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;IACzD,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC;EACrD;AACF","ignoreList":[]}
@@ -1 +1 @@
1
- {"version":3,"file":"updates.js","names":["defaultUpdateNotifier","checkForUpdates","version","updateNotifier","pkg","name","updateCheckInterval","notify"],"sources":["../../src/util/updates.js"],"sourcesContent":["import defaultUpdateNotifier from 'update-notifier';\n\nexport function checkForUpdates({\n version,\n updateNotifier = defaultUpdateNotifier,\n}) {\n const pkg = { name: 'web-ext', version };\n\n updateNotifier({\n pkg,\n updateCheckInterval: 1000 * 60 * 60 * 24 * 3, // 3 days,\n }).notify();\n}\n"],"mappings":"AAAA,OAAOA,qBAAqB,MAAM,iBAAiB;AAEnD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,OAAO;EACPC,cAAc,GAAGH;AACnB,CAAC,EAAE;EACD,MAAMI,GAAG,GAAG;IAAEC,IAAI,EAAE,SAAS;IAAEH;EAAQ,CAAC;EAExCC,cAAc,CAAC;IACbC,GAAG;IACHE,mBAAmB,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAE;EAChD,CAAC,CAAC,CAACC,MAAM,CAAC,CAAC;AACb","ignoreList":[]}
1
+ {"version":3,"file":"updates.js","names":[],"sources":["../../src/util/updates.js"],"sourcesContent":["import defaultUpdateNotifier from 'update-notifier';\n\nexport function checkForUpdates({\n version,\n updateNotifier = defaultUpdateNotifier,\n}) {\n const pkg = { name: 'web-ext', version };\n\n updateNotifier({\n pkg,\n updateCheckInterval: 1000 * 60 * 60 * 24 * 3, // 3 days,\n }).notify();\n}\n"],"mappings":"AAAA,OAAO,qBAAqB,MAAM,iBAAiB;AAEnD,OAAO,SAAS,eAAe,CAAC;EAC9B,OAAO;EACP,cAAc,GAAG;AACnB,CAAC,EAAE;EACD,MAAM,GAAG,GAAG;IAAE,IAAI,EAAE,SAAS;IAAE;EAAQ,CAAC;EAExC,cAAc,CAAC;IACb,GAAG;IACH,mBAAmB,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAE;EAChD,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACb","ignoreList":[]}
@@ -1 +1 @@
1
- {"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":[]}
1
+ {"version":3,"file":"watcher.js","names":[],"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":"AAAA,SAAS,UAAU,EAAE,SAAS,QAAQ,IAAI;AAE1C,OAAO,SAAS,MAAM,WAAW;AACjC,OAAO,QAAQ,MAAM,UAAU;AAE/B,SAAS,UAAU,QAAQ,aAAa;AACxC,SAAS,YAAY,QAAQ,kBAAkB;AAE/C,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;AAEzC;;AAEA,eAAe,SAAS,cAAc,CAAC;EACrC,SAAS;EACT,SAAS;EACT,YAAY;EACZ,YAAY;EACZ,QAAQ;EACR,eAAe;EACf,YAAY,GAAG;AACjB,CAAC,EAAE;EACD;EACA;EACA;EACA,MAAM,OAAO,GACX,YAAY,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,GACxC,YAAY,CAAC,GAAG,CAAE,EAAE,IAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,GAChD,YAAY;;EAElB;EACA,MAAM,OAAO,GAAG,OAAO,GAAG,IAAI,SAAS,CAAC;IAAE;EAAQ,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,CAAC;;EAEtE;EACA,MAAM,kBAAkB,GAAG,KAAK;EAChC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,YAAY,EAAE,kBAAkB,CAAC;EAE/D,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAG,QAAQ,IAAK;IACjC,gBAAgB,CAAC;MAAE,YAAY;MAAE,QAAQ;MAAE,QAAQ;MAAE;IAAgB,CAAC,CAAC;EACzE,CAAC,CAAC;EAEF,GAAG,CAAC,KAAK,CACP,YAAY,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,cACzD,CAAC;EAED,MAAM,WAAW,GAAG,EAAE;EACtB,MAAM,YAAY,GAAG,EAAE;EAEvB,IAAI,SAAS,EAAE;IACb,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;MAChC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE;QACzD,MAAM,IAAI,UAAU,CAClB,8BAA8B,GAAG,IAAI,QAAQ,kBAC/C,CAAC;MACH;MAEA,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC7B;EACF,CAAC,MAAM;IACL,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC;EAC7B;EAEA,OAAO,CAAC,KAAK,CAAC;IACZ,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,WAAW;IACxB,OAAO,EAAE,EAAE;IACX,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC;EACtB,CAAC,CAAC;;EAEF;EACA;EACA,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;EAC3C,OAAO,OAAO;AAChB;;AAEA;;AAEA,OAAO,SAAS,gBAAgB,CAAC;EAC/B,YAAY;EACZ,QAAQ;EACR,QAAQ;EACR;AACF,CAAC,EAAE;EACD,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE;IACtE,GAAG,CAAC,KAAK,CAAC,uBAAuB,QAAQ,EAAE,CAAC;EAC9C,CAAC,MAAM;IACL,GAAG,CAAC,KAAK,CAAC,YAAY,QAAQ,EAAE,CAAC;IACjC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;IAChE,QAAQ,CAAC,CAAC;EACZ;AACF","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "web-ext",
3
- "version": "10.3.0",
3
+ "version": "10.5.0",
4
4
  "description": "A command line tool to help build, run, and test web extensions",
5
5
  "type": "module",
6
6
  "main": "index.js",
@@ -30,9 +30,6 @@
30
30
  "test-functional": "node scripts/test-functional",
31
31
  "audit-deps": "node ./scripts/audit-deps",
32
32
  "changelog": "npx conventional-changelog-cli -p angular -u",
33
- "changelog-lint": "commitlint --from master",
34
- "changelog-lint-from-stdin": "commitlint",
35
- "github-pr-title-lint": "node ./scripts/github-pr-title-lint",
36
33
  "gen-contributing-toc": "npx doctoc CONTRIBUTING.md",
37
34
  "prettier": "prettier --write '**'",
38
35
  "prettier-ci": "prettier --list-different '**' || (echo '\n\nThis failure means you did not run `npm run prettier-dev` before committing\n\n' && exit 1)",
@@ -59,16 +56,16 @@
59
56
  "opera"
60
57
  ],
61
58
  "dependencies": {
62
- "@babel/runtime": "7.29.2",
59
+ "@babel/runtime": "8.0.0",
63
60
  "@devicefarmer/adbkit": "3.3.8",
64
- "addons-linter": "10.6.0",
61
+ "addons-linter": "10.8.0",
65
62
  "camelcase": "8.0.0",
66
63
  "chrome-launcher": "1.2.0",
67
64
  "debounce": "1.2.1",
68
65
  "decamelize": "6.0.1",
69
66
  "es6-error": "4.1.1",
70
67
  "firefox-profile": "4.7.0",
71
- "fx-runner": "1.4.0",
68
+ "fx-runner": "1.5.0",
72
69
  "https-proxy-agent": "^7.0.0",
73
70
  "jose": "5.9.6",
74
71
  "jszip": "3.10.1",
@@ -80,25 +77,22 @@
80
77
  "source-map-support": "0.5.21",
81
78
  "strip-bom": "5.0.0",
82
79
  "strip-json-comments": "5.0.3",
83
- "tmp": "0.2.6",
80
+ "tmp": "0.2.7",
84
81
  "update-notifier": "7.3.1",
85
- "watchpack": "2.5.1",
82
+ "watchpack": "2.5.2",
86
83
  "yargs": "17.7.2",
87
84
  "zip-dir": "2.0.0"
88
85
  },
89
86
  "devDependencies": {
90
- "@babel/cli": "7.28.6",
91
- "@babel/core": "7.29.0",
92
- "@babel/eslint-parser": "7.28.6",
93
- "@babel/preset-env": "7.29.5",
94
- "@babel/register": "7.29.3",
95
- "@commitlint/cli": "21.0.1",
96
- "@commitlint/config-conventional": "21.0.1",
87
+ "@babel/cli": "8.0.1",
88
+ "@babel/core": "8.0.1",
89
+ "@babel/eslint-parser": "8.0.1",
90
+ "@babel/preset-env": "8.0.2",
91
+ "@babel/register": "8.0.1",
97
92
  "@eslint/compat": "2.1.0",
98
93
  "@eslint/eslintrc": "3.3.5",
99
94
  "@eslint/js": "9.39.2",
100
95
  "babel-plugin-istanbul": "8.0.0",
101
- "babel-plugin-transform-inline-environment-variables": "0.4.4",
102
96
  "chai": "6.2.2",
103
97
  "chai-as-promised": "8.0.2",
104
98
  "copy-dir": "1.3.0",
@@ -107,13 +101,12 @@
107
101
  "deepcopy": "2.1.0",
108
102
  "eslint": "9.39.0",
109
103
  "eslint-plugin-import": "2.32.0",
110
- "fs-extra": "11.3.5",
104
+ "fs-extra": "11.3.6",
111
105
  "git-rev-sync": "3.0.2",
112
- "globals": "17.6.0",
113
- "html-entities": "2.6.0",
114
- "mocha": "11.7.5",
106
+ "globals": "17.7.0",
107
+ "mocha": "11.7.6",
115
108
  "nyc": "18.0.0",
116
- "prettier": "3.8.3",
109
+ "prettier": "3.9.4",
117
110
  "pretty-quick": "4.2.2",
118
111
  "prettyjson": "1.2.5",
119
112
  "shelljs": "0.8.5",