web-ext 7.6.2 → 7.8.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 (36) hide show
  1. package/lib/cmd/build.js +2 -0
  2. package/lib/cmd/build.js.map +1 -1
  3. package/lib/cmd/lint.js +2 -0
  4. package/lib/cmd/lint.js.map +1 -1
  5. package/lib/cmd/run.js.map +1 -1
  6. package/lib/cmd/sign.js +3 -0
  7. package/lib/cmd/sign.js.map +1 -1
  8. package/lib/config.js.map +1 -1
  9. package/lib/extension-runners/chromium.js.map +1 -1
  10. package/lib/extension-runners/firefox-android.js.map +1 -1
  11. package/lib/extension-runners/firefox-desktop.js +2 -0
  12. package/lib/extension-runners/firefox-desktop.js.map +1 -1
  13. package/lib/extension-runners/index.js.map +1 -1
  14. package/lib/firefox/index.js +4 -0
  15. package/lib/firefox/index.js.map +1 -1
  16. package/lib/firefox/preferences.js.map +1 -1
  17. package/lib/firefox/rdp-client.js.map +1 -1
  18. package/lib/firefox/remote.js +3 -0
  19. package/lib/firefox/remote.js.map +1 -1
  20. package/lib/program.js +3 -0
  21. package/lib/program.js.map +1 -1
  22. package/lib/util/adb.js +0 -3
  23. package/lib/util/adb.js.map +1 -1
  24. package/lib/util/artifacts.js.map +1 -1
  25. package/lib/util/desktop-notifier.js.map +1 -1
  26. package/lib/util/file-exists.js.map +1 -1
  27. package/lib/util/file-filter.js.map +1 -1
  28. package/lib/util/is-directory.js.map +1 -1
  29. package/lib/util/logger.js +2 -0
  30. package/lib/util/logger.js.map +1 -1
  31. package/lib/util/manifest.js.map +1 -1
  32. package/lib/util/submit-addon.js.map +1 -1
  33. package/lib/util/temp-dir.js.map +1 -1
  34. package/lib/util/updates.js.map +1 -1
  35. package/lib/watcher.js.map +1 -1
  36. package/package.json +3 -3
package/lib/util/artifacts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"artifacts.js","names":["fs","defaultAsyncMkdirp","UsageError","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsAccess","access","bind","prepareArtifactsDir","artifactsDir","asyncMkdirp","asyncFsAccess","stats","stat","isDirectory","W_OK","accessErr","error","debug","mkdirErr"],"sources":["../../src/util/artifacts.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\nimport defaultAsyncMkdirp from 'mkdirp';\n\nimport { UsageError, isErrorWithCode } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\nconst defaultAsyncFsAccess: typeof fs.access = fs.access.bind(fs);\n\ntype PrepareArtifactsDirOptions = {\n asyncMkdirp?: typeof defaultAsyncMkdirp,\n asyncFsAccess?: typeof defaultAsyncFsAccess,\n};\n\nexport async function prepareArtifactsDir(\n artifactsDir: string,\n {\n asyncMkdirp = defaultAsyncMkdirp,\n asyncFsAccess = defaultAsyncFsAccess,\n }: PrepareArtifactsDirOptions = {}\n): Promise<string> {\n try {\n const stats = await fs.stat(artifactsDir);\n if (!stats.isDirectory()) {\n throw new UsageError(\n `--artifacts-dir=\"${artifactsDir}\" exists but it is not a directory.`\n );\n }\n // If the artifactsDir already exists, check that we have the write permissions on it.\n try {\n await asyncFsAccess(artifactsDir, fs.W_OK);\n } catch (accessErr) {\n if (isErrorWithCode('EACCES', accessErr)) {\n throw new UsageError(\n `--artifacts-dir=\"${artifactsDir}\" exists but the user lacks ` +\n 'permissions on it.'\n );\n } else {\n throw accessErr;\n }\n }\n } catch (error) {\n if (isErrorWithCode('EACCES', error)) {\n // Handle errors when the artifactsDir cannot be accessed.\n throw new UsageError(\n `Cannot access --artifacts-dir=\"${artifactsDir}\" because the user ` +\n `lacks permissions: ${error}`\n );\n } else if (isErrorWithCode('ENOENT', error)) {\n // Create the artifact dir if it doesn't exist yet.\n try {\n log.debug(`Creating artifacts directory: ${artifactsDir}`);\n await asyncMkdirp(artifactsDir);\n } catch (mkdirErr) {\n if (isErrorWithCode('EACCES', mkdirErr)) {\n // Handle errors when the artifactsDir cannot be created for lack of permissions.\n throw new UsageError(\n `Cannot create --artifacts-dir=\"${artifactsDir}\" because the ` +\n `user lacks permissions: ${mkdirErr}`\n );\n } else {\n throw mkdirErr;\n }\n }\n } else {\n throw error;\n }\n }\n\n return artifactsDir;\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AACvB,OAAOC,kBAAkB,MAAM,QAAQ;AAEvC,SAASC,UAAU,EAAEC,eAAe,QAAQ,cAAc;AAC1D,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAEzC,MAAMC,oBAAsC,GAAGT,EAAE,CAACU,MAAM,CAACC,IAAI,CAACX,EAAE,CAAC;AAOjE,OAAO,eAAeY,mBAAmBA,CACvCC,YAAoB,EACpB;EACEC,WAAW,GAAGb,kBAAkB;EAChCc,aAAa,GAAGN;AACU,CAAC,GAAG,CAAC,CAAC,EACjB;EACjB,IAAI;IACF,MAAMO,KAAK,GAAG,MAAMhB,EAAE,CAACiB,IAAI,CAACJ,YAAY,CAAC;IACzC,IAAI,CAACG,KAAK,CAACE,WAAW,EAAE,EAAE;MACxB,MAAM,IAAIhB,UAAU,CACjB,oBAAmBW,YAAa,qCAAoC,CACtE;IACH;IACA;IACA,IAAI;MACF,MAAME,aAAa,CAACF,YAAY,EAAEb,EAAE,CAACmB,IAAI,CAAC;IAC5C,CAAC,CAAC,OAAOC,SAAS,EAAE;MAClB,IAAIjB,eAAe,CAAC,QAAQ,EAAEiB,SAAS,CAAC,EAAE;QACxC,MAAM,IAAIlB,UAAU,CACjB,oBAAmBW,YAAa,8BAA6B,GAC5D,oBAAoB,CACvB;MACH,CAAC,MAAM;QACL,MAAMO,SAAS;MACjB;IACF;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MACpC;MACA,MAAM,IAAInB,UAAU,CACjB,kCAAiCW,YAAa,qBAAoB,GAChE,sBAAqBQ,KAAM,EAAC,CAChC;IACH,CAAC,MAAM,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MAC3C;MACA,IAAI;QACFhB,GAAG,CAACiB,KAAK,CAAE,iCAAgCT,YAAa,EAAC,CAAC;QAC1D,MAAMC,WAAW,CAACD,YAAY,CAAC;MACjC,CAAC,CAAC,OAAOU,QAAQ,EAAE;QACjB,IAAIpB,eAAe,CAAC,QAAQ,EAAEoB,QAAQ,CAAC,EAAE;UACvC;UACA,MAAM,IAAIrB,UAAU,CACjB,kCAAiCW,YAAa,gBAAe,GAC3D,2BAA0BU,QAAS,EAAC,CACxC;QACH,CAAC,MAAM;UACL,MAAMA,QAAQ;QAChB;MACF;IACF,CAAC,MAAM;MACL,MAAMF,KAAK;IACb;EACF;EAEA,OAAOR,YAAY;AACrB"}
1
+ {"version":3,"file":"artifacts.js","names":["fs","defaultAsyncMkdirp","UsageError","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsAccess","access","bind","prepareArtifactsDir","artifactsDir","asyncMkdirp","asyncFsAccess","stats","stat","isDirectory","W_OK","accessErr","error","debug","mkdirErr"],"sources":["../../src/util/artifacts.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\nimport defaultAsyncMkdirp from 'mkdirp';\n\nimport { UsageError, isErrorWithCode } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\nconst defaultAsyncFsAccess: typeof fs.access = fs.access.bind(fs);\n\ntype PrepareArtifactsDirOptions = {\n asyncMkdirp?: typeof defaultAsyncMkdirp,\n asyncFsAccess?: typeof defaultAsyncFsAccess,\n};\n\nexport async function prepareArtifactsDir(\n artifactsDir: string,\n {\n asyncMkdirp = defaultAsyncMkdirp,\n asyncFsAccess = defaultAsyncFsAccess,\n }: PrepareArtifactsDirOptions = {}\n): Promise<string> {\n try {\n const stats = await fs.stat(artifactsDir);\n if (!stats.isDirectory()) {\n throw new UsageError(\n `--artifacts-dir=\"${artifactsDir}\" exists but it is not a directory.`\n );\n }\n // If the artifactsDir already exists, check that we have the write permissions on it.\n try {\n await asyncFsAccess(artifactsDir, fs.W_OK);\n } catch (accessErr) {\n if (isErrorWithCode('EACCES', accessErr)) {\n throw new UsageError(\n `--artifacts-dir=\"${artifactsDir}\" exists but the user lacks ` +\n 'permissions on it.'\n );\n } else {\n throw accessErr;\n }\n }\n } catch (error) {\n if (isErrorWithCode('EACCES', error)) {\n // Handle errors when the artifactsDir cannot be accessed.\n throw new UsageError(\n `Cannot access --artifacts-dir=\"${artifactsDir}\" because the user ` +\n `lacks permissions: ${error}`\n );\n } else if (isErrorWithCode('ENOENT', error)) {\n // Create the artifact dir if it doesn't exist yet.\n try {\n log.debug(`Creating artifacts directory: ${artifactsDir}`);\n await asyncMkdirp(artifactsDir);\n } catch (mkdirErr) {\n if (isErrorWithCode('EACCES', mkdirErr)) {\n // Handle errors when the artifactsDir cannot be created for lack of permissions.\n throw new UsageError(\n `Cannot create --artifacts-dir=\"${artifactsDir}\" because the ` +\n `user lacks permissions: ${mkdirErr}`\n );\n } else {\n throw mkdirErr;\n }\n }\n } else {\n throw error;\n }\n }\n\n return artifactsDir;\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AACvB,OAAOC,kBAAkB,MAAM,QAAQ;AAEvC,SAASC,UAAU,EAAEC,eAAe,QAAQ,cAAc;AAC1D,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAEzC,MAAMC,oBAAsC,GAAGT,EAAE,CAACU,MAAM,CAACC,IAAI,CAACX,EAAE,CAAC;AAOjE,OAAO,eAAeY,mBAAmBA,CACvCC,YAAoB,EACpB;EACEC,WAAW,GAAGb,kBAAkB;EAChCc,aAAa,GAAGN;AACU,CAAC,GAAG,CAAC,CAAC,EACjB;EACjB,IAAI;IACF,MAAMO,KAAK,GAAG,MAAMhB,EAAE,CAACiB,IAAI,CAACJ,YAAY,CAAC;IACzC,IAAI,CAACG,KAAK,CAACE,WAAW,CAAC,CAAC,EAAE;MACxB,MAAM,IAAIhB,UAAU,CACjB,oBAAmBW,YAAa,qCACnC,CAAC;IACH;IACA;IACA,IAAI;MACF,MAAME,aAAa,CAACF,YAAY,EAAEb,EAAE,CAACmB,IAAI,CAAC;IAC5C,CAAC,CAAC,OAAOC,SAAS,EAAE;MAClB,IAAIjB,eAAe,CAAC,QAAQ,EAAEiB,SAAS,CAAC,EAAE;QACxC,MAAM,IAAIlB,UAAU,CACjB,oBAAmBW,YAAa,8BAA6B,GAC5D,oBACJ,CAAC;MACH,CAAC,MAAM;QACL,MAAMO,SAAS;MACjB;IACF;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MACpC;MACA,MAAM,IAAInB,UAAU,CACjB,kCAAiCW,YAAa,qBAAoB,GAChE,sBAAqBQ,KAAM,EAChC,CAAC;IACH,CAAC,MAAM,IAAIlB,eAAe,CAAC,QAAQ,EAAEkB,KAAK,CAAC,EAAE;MAC3C;MACA,IAAI;QACFhB,GAAG,CAACiB,KAAK,CAAE,iCAAgCT,YAAa,EAAC,CAAC;QAC1D,MAAMC,WAAW,CAACD,YAAY,CAAC;MACjC,CAAC,CAAC,OAAOU,QAAQ,EAAE;QACjB,IAAIpB,eAAe,CAAC,QAAQ,EAAEoB,QAAQ,CAAC,EAAE;UACvC;UACA,MAAM,IAAIrB,UAAU,CACjB,kCAAiCW,YAAa,gBAAe,GAC3D,2BAA0BU,QAAS,EACxC,CAAC;QACH,CAAC,MAAM;UACL,MAAMA,QAAQ;QAChB;MACF;IACF,CAAC,MAAM;MACL,MAAMF,KAAK;IACb;EACF;EAEA,OAAOR,YAAY;AACrB"}
package/lib/util/desktop-notifier.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"desktop-notifier.js","names":["defaultNotifier","createLogger","defaultLog","import","meta","url","showDesktopNotification","title","message","icon","notifier","log","Promise","resolve","reject","notify","err","res","debug"],"sources":["../../src/util/desktop-notifier.js"],"sourcesContent":["/* @flow */\nimport defaultNotifier from 'node-notifier';\n\nimport { createLogger } from './logger.js';\nimport type { Logger } from './logger';\n\nconst defaultLog = createLogger(import.meta.url);\n\nexport type DesktopNotificationsParams = {|\n title: string,\n message: string,\n icon?: string,\n|};\n\nexport type DesktopNotificationsOptions = {\n notifier?: typeof defaultNotifier,\n log?: Logger,\n};\n\nexport function showDesktopNotification(\n { title, message, icon }: DesktopNotificationsParams,\n {\n notifier = defaultNotifier,\n log = defaultLog,\n }: DesktopNotificationsOptions = {}\n): Promise<void> {\n return new Promise((resolve, reject) => {\n notifier.notify({ title, message, icon }, (err, res) => {\n if (err) {\n log.debug(\n `Desktop notifier error: ${err.message},` + ` response: ${res}`\n );\n reject(err);\n } else {\n resolve();\n }\n });\n });\n}\n"],"mappings":"AACA,OAAOA,eAAe,MAAM,eAAe;AAE3C,SAASC,YAAY,QAAQ,aAAa;AAG1C,MAAMC,UAAU,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAahD,OAAO,SAASC,uBAAuBA,CACrC;EAAEC,KAAK;EAAEC,OAAO;EAAEC;AAAiC,CAAC,EACpD;EACEC,QAAQ,GAAGV,eAAe;EAC1BW,GAAG,GAAGT;AACqB,CAAC,GAAG,CAAC,CAAC,EACpB;EACf,OAAO,IAAIU,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCJ,QAAQ,CAACK,MAAM,CAAC;MAAER,KAAK;MAAEC,OAAO;MAAEC;IAAK,CAAC,EAAE,CAACO,GAAG,EAAEC,GAAG,KAAK;MACtD,IAAID,GAAG,EAAE;QACPL,GAAG,CAACO,KAAK,CACN,2BAA0BF,GAAG,CAACR,OAAQ,GAAE,GAAI,cAAaS,GAAI,EAAC,CAChE;QACDH,MAAM,CAACE,GAAG,CAAC;MACb,CAAC,MAAM;QACLH,OAAO,EAAE;MACX;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ"}
1
+ {"version":3,"file":"desktop-notifier.js","names":["defaultNotifier","createLogger","defaultLog","import","meta","url","showDesktopNotification","title","message","icon","notifier","log","Promise","resolve","reject","notify","err","res","debug"],"sources":["../../src/util/desktop-notifier.js"],"sourcesContent":["/* @flow */\nimport defaultNotifier from 'node-notifier';\n\nimport { createLogger } from './logger.js';\nimport type { Logger } from './logger';\n\nconst defaultLog = createLogger(import.meta.url);\n\nexport type DesktopNotificationsParams = {|\n title: string,\n message: string,\n icon?: string,\n|};\n\nexport type DesktopNotificationsOptions = {\n notifier?: typeof defaultNotifier,\n log?: Logger,\n};\n\nexport function showDesktopNotification(\n { title, message, icon }: DesktopNotificationsParams,\n {\n notifier = defaultNotifier,\n log = defaultLog,\n }: DesktopNotificationsOptions = {}\n): Promise<void> {\n return new Promise((resolve, reject) => {\n notifier.notify({ title, message, icon }, (err, res) => {\n if (err) {\n log.debug(\n `Desktop notifier error: ${err.message},` + ` response: ${res}`\n );\n reject(err);\n } else {\n resolve();\n }\n });\n });\n}\n"],"mappings":"AACA,OAAOA,eAAe,MAAM,eAAe;AAE3C,SAASC,YAAY,QAAQ,aAAa;AAG1C,MAAMC,UAAU,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAahD,OAAO,SAASC,uBAAuBA,CACrC;EAAEC,KAAK;EAAEC,OAAO;EAAEC;AAAiC,CAAC,EACpD;EACEC,QAAQ,GAAGV,eAAe;EAC1BW,GAAG,GAAGT;AACqB,CAAC,GAAG,CAAC,CAAC,EACpB;EACf,OAAO,IAAIU,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCJ,QAAQ,CAACK,MAAM,CAAC;MAAER,KAAK;MAAEC,OAAO;MAAEC;IAAK,CAAC,EAAE,CAACO,GAAG,EAAEC,GAAG,KAAK;MACtD,IAAID,GAAG,EAAE;QACPL,GAAG,CAACO,KAAK,CACN,2BAA0BF,GAAG,CAACR,OAAQ,GAAE,GAAI,cAAaS,GAAI,EAChE,CAAC;QACDH,MAAM,CAACE,GAAG,CAAC;MACb,CAAC,MAAM;QACLH,OAAO,CAAC,CAAC;MACX;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ"}
package/lib/util/file-exists.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"file-exists.js","names":["fs","isErrorWithCode","fileExists","path","fileIsReadable","f","access","constants","R_OK","stat","isFile","error"],"sources":["../../src/util/file-exists.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\n\nimport { isErrorWithCode } from '../errors.js';\n\ntype FileExistsOptions = {\n fileIsReadable: (filePath: string) => Promise<boolean>,\n};\n\n/*\n * Resolves true if the path is a readable file.\n *\n * Usage:\n *\n * const exists = await fileExists(filePath);\n * if (exists) {\n * // ...\n * }\n *\n * */\nexport default async function fileExists(\n path: string,\n {\n fileIsReadable = (f) => fs.access(f, fs.constants.R_OK),\n }: FileExistsOptions = {}\n): Promise<boolean> {\n try {\n await fileIsReadable(path);\n const stat = await fs.stat(path);\n return stat.isFile();\n } catch (error) {\n if (isErrorWithCode(['EACCES', 'ENOENT'], error)) {\n return false;\n }\n throw error;\n }\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AAEvB,SAASC,eAAe,QAAQ,cAAc;AAM9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,eAAeC,UAAUA,CACtCC,IAAY,EACZ;EACEC,cAAc,GAAIC,CAAC,IAAKL,EAAE,CAACM,MAAM,CAACD,CAAC,EAAEL,EAAE,CAACO,SAAS,CAACC,IAAI;AACrC,CAAC,GAAG,CAAC,CAAC,EACP;EAClB,IAAI;IACF,MAAMJ,cAAc,CAACD,IAAI,CAAC;IAC1B,MAAMM,IAAI,GAAG,MAAMT,EAAE,CAACS,IAAI,CAACN,IAAI,CAAC;IAChC,OAAOM,IAAI,CAACC,MAAM,EAAE;EACtB,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIV,eAAe,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAEU,KAAK,CAAC,EAAE;MAChD,OAAO,KAAK;IACd;IACA,MAAMA,KAAK;EACb;AACF"}
1
+ {"version":3,"file":"file-exists.js","names":["fs","isErrorWithCode","fileExists","path","fileIsReadable","f","access","constants","R_OK","stat","isFile","error"],"sources":["../../src/util/file-exists.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\n\nimport { isErrorWithCode } from '../errors.js';\n\ntype FileExistsOptions = {\n fileIsReadable: (filePath: string) => Promise<boolean>,\n};\n\n/*\n * Resolves true if the path is a readable file.\n *\n * Usage:\n *\n * const exists = await fileExists(filePath);\n * if (exists) {\n * // ...\n * }\n *\n * */\nexport default async function fileExists(\n path: string,\n {\n fileIsReadable = (f) => fs.access(f, fs.constants.R_OK),\n }: FileExistsOptions = {}\n): Promise<boolean> {\n try {\n await fileIsReadable(path);\n const stat = await fs.stat(path);\n return stat.isFile();\n } catch (error) {\n if (isErrorWithCode(['EACCES', 'ENOENT'], error)) {\n return false;\n }\n throw error;\n }\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AAEvB,SAASC,eAAe,QAAQ,cAAc;AAM9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,eAAeC,UAAUA,CACtCC,IAAY,EACZ;EACEC,cAAc,GAAIC,CAAC,IAAKL,EAAE,CAACM,MAAM,CAACD,CAAC,EAAEL,EAAE,CAACO,SAAS,CAACC,IAAI;AACrC,CAAC,GAAG,CAAC,CAAC,EACP;EAClB,IAAI;IACF,MAAMJ,cAAc,CAACD,IAAI,CAAC;IAC1B,MAAMM,IAAI,GAAG,MAAMT,EAAE,CAACS,IAAI,CAACN,IAAI,CAAC;IAChC,OAAOM,IAAI,CAACC,MAAM,CAAC,CAAC;EACtB,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAIV,eAAe,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAEU,KAAK,CAAC,EAAE;MAChD,OAAO,KAAK;IACd;IACA,MAAMA,KAAK;EACb;AACF"}
package/lib/util/file-filter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"file-filter.js","names":["path","multimatch","createLogger","log","import","meta","url","isSubPath","src","target","relate","relative","startsWith","sep","FileFilter","constructor","baseIgnoredPatterns","ignoreFiles","sourceDir","artifactsDir","resolve","filesToIgnore","addToIgnoreList","debug","join","resolveWithSourceDir","file","resolvedPath","files","charAt","resolvedFile","substr","push","wantFile","filePath","matches","length","createFileFilter","params"],"sources":["../../src/util/file-filter.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport multimatch from 'multimatch';\n\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// check if target is a sub directory of src\nexport const isSubPath = (src: string, target: string): boolean => {\n const relate = path.relative(src, target);\n // same dir\n if (!relate) {\n return false;\n }\n if (relate === '..') {\n return false;\n }\n return !relate.startsWith(`..${path.sep}`);\n};\n\n// FileFilter types and implementation.\n\nexport type FileFilterOptions = {\n baseIgnoredPatterns?: Array<string>,\n ignoreFiles?: Array<string>,\n sourceDir: string,\n artifactsDir?: string,\n};\n\n/*\n * Allows or ignores files.\n */\nexport class FileFilter {\n filesToIgnore: Array<string>;\n sourceDir: string;\n\n constructor({\n baseIgnoredPatterns = [\n '**/*.xpi',\n '**/*.zip',\n '**/.*', // any hidden file and folder\n '**/.*/**/*', // and the content inside hidden folder\n '**/node_modules',\n '**/node_modules/**/*',\n ],\n ignoreFiles = [],\n sourceDir,\n artifactsDir,\n }: FileFilterOptions = {}) {\n sourceDir = path.resolve(sourceDir);\n\n this.filesToIgnore = [];\n this.sourceDir = sourceDir;\n\n this.addToIgnoreList(baseIgnoredPatterns);\n if (ignoreFiles) {\n this.addToIgnoreList(ignoreFiles);\n }\n if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {\n artifactsDir = path.resolve(artifactsDir);\n log.debug(\n `Ignoring artifacts directory \"${artifactsDir}\" ` +\n 'and all its subdirectories'\n );\n this.addToIgnoreList([artifactsDir, path.join(artifactsDir, '**', '*')]);\n }\n }\n\n /**\n * Resolve relative path to absolute path with sourceDir.\n */\n resolveWithSourceDir(file: string): string {\n const resolvedPath = path.resolve(this.sourceDir, file);\n log.debug(\n `Resolved path ${file} with sourceDir ${this.sourceDir} ` +\n `to ${resolvedPath}`\n );\n return resolvedPath;\n }\n\n /**\n * Insert more files into filesToIgnore array.\n */\n addToIgnoreList(files: Array<string>) {\n for (const file of files) {\n if (file.charAt(0) === '!') {\n const resolvedFile = this.resolveWithSourceDir(file.substr(1));\n this.filesToIgnore.push(`!${resolvedFile}`);\n } else {\n this.filesToIgnore.push(this.resolveWithSourceDir(file));\n }\n }\n }\n\n /*\n * Returns true if the file is wanted.\n *\n * If filePath does not start with a slash, it will be treated as a path\n * relative to sourceDir when matching it against all configured\n * ignore-patterns.\n *\n * Example: this is called by zipdir as wantFile(filePath) for each\n * file in the folder that is being archived.\n */\n wantFile(filePath: string): boolean {\n const resolvedPath = this.resolveWithSourceDir(filePath);\n const matches = multimatch(resolvedPath, this.filesToIgnore);\n if (matches.length > 0) {\n log.debug(`FileFilter: ignoring file ${resolvedPath}`);\n return false;\n }\n return true;\n }\n}\n\n// a helper function to make mocking easier\n\nexport const createFileFilter = (params: FileFilterOptions): FileFilter =>\n new FileFilter(params);\n\nexport type FileFilterCreatorFn = typeof createFileFilter;\n"],"mappings":"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"}
1
+ {"version":3,"file":"file-filter.js","names":["path","multimatch","createLogger","log","import","meta","url","isSubPath","src","target","relate","relative","startsWith","sep","FileFilter","constructor","baseIgnoredPatterns","ignoreFiles","sourceDir","artifactsDir","resolve","filesToIgnore","addToIgnoreList","debug","join","resolveWithSourceDir","file","resolvedPath","files","charAt","resolvedFile","substr","push","wantFile","filePath","matches","length","createFileFilter","params"],"sources":["../../src/util/file-filter.js"],"sourcesContent":["/* @flow */\nimport path from 'path';\n\nimport multimatch from 'multimatch';\n\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// check if target is a sub directory of src\nexport const isSubPath = (src: string, target: string): boolean => {\n const relate = path.relative(src, target);\n // same dir\n if (!relate) {\n return false;\n }\n if (relate === '..') {\n return false;\n }\n return !relate.startsWith(`..${path.sep}`);\n};\n\n// FileFilter types and implementation.\n\nexport type FileFilterOptions = {\n baseIgnoredPatterns?: Array<string>,\n ignoreFiles?: Array<string>,\n sourceDir: string,\n artifactsDir?: string,\n};\n\n/*\n * Allows or ignores files.\n */\nexport class FileFilter {\n filesToIgnore: Array<string>;\n sourceDir: string;\n\n constructor({\n baseIgnoredPatterns = [\n '**/*.xpi',\n '**/*.zip',\n '**/.*', // any hidden file and folder\n '**/.*/**/*', // and the content inside hidden folder\n '**/node_modules',\n '**/node_modules/**/*',\n ],\n ignoreFiles = [],\n sourceDir,\n artifactsDir,\n }: FileFilterOptions = {}) {\n sourceDir = path.resolve(sourceDir);\n\n this.filesToIgnore = [];\n this.sourceDir = sourceDir;\n\n this.addToIgnoreList(baseIgnoredPatterns);\n if (ignoreFiles) {\n this.addToIgnoreList(ignoreFiles);\n }\n if (artifactsDir && isSubPath(sourceDir, artifactsDir)) {\n artifactsDir = path.resolve(artifactsDir);\n log.debug(\n `Ignoring artifacts directory \"${artifactsDir}\" ` +\n 'and all its subdirectories'\n );\n this.addToIgnoreList([artifactsDir, path.join(artifactsDir, '**', '*')]);\n }\n }\n\n /**\n * Resolve relative path to absolute path with sourceDir.\n */\n resolveWithSourceDir(file: string): string {\n const resolvedPath = path.resolve(this.sourceDir, file);\n log.debug(\n `Resolved path ${file} with sourceDir ${this.sourceDir} ` +\n `to ${resolvedPath}`\n );\n return resolvedPath;\n }\n\n /**\n * Insert more files into filesToIgnore array.\n */\n addToIgnoreList(files: Array<string>) {\n for (const file of files) {\n if (file.charAt(0) === '!') {\n const resolvedFile = this.resolveWithSourceDir(file.substr(1));\n this.filesToIgnore.push(`!${resolvedFile}`);\n } else {\n this.filesToIgnore.push(this.resolveWithSourceDir(file));\n }\n }\n }\n\n /*\n * Returns true if the file is wanted.\n *\n * If filePath does not start with a slash, it will be treated as a path\n * relative to sourceDir when matching it against all configured\n * ignore-patterns.\n *\n * Example: this is called by zipdir as wantFile(filePath) for each\n * file in the folder that is being archived.\n */\n wantFile(filePath: string): boolean {\n const resolvedPath = this.resolveWithSourceDir(filePath);\n const matches = multimatch(resolvedPath, this.filesToIgnore);\n if (matches.length > 0) {\n log.debug(`FileFilter: ignoring file ${resolvedPath}`);\n return false;\n }\n return true;\n }\n}\n\n// a helper function to make mocking easier\n\nexport const createFileFilter = (params: FileFilterOptions): FileFilter =>\n new FileFilter(params);\n\nexport type FileFilterCreatorFn = typeof createFileFilter;\n"],"mappings":"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"}
package/lib/util/is-directory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\n\nimport { onlyErrorsWithCode } from '../errors.js';\n\n/*\n * Resolves true if the path is a readable directory.\n *\n * Usage:\n *\n * isDirectory('/some/path')\n * .then((dirExists) => {\n * // dirExists will be true or false.\n * });\n *\n * */\nexport default function isDirectory(path: string): Promise<boolean> {\n return fs\n .stat(path)\n .then((stats) => stats.isDirectory())\n .catch(\n onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {\n return false;\n })\n );\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AAEvB,SAASC,kBAAkB,QAAQ,cAAc;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASC,WAAWA,CAACC,IAAY,EAAoB;EAClE,OAAOH,EAAE,CACNI,IAAI,CAACD,IAAI,CAAC,CACVE,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACJ,WAAW,EAAE,CAAC,CACpCK,KAAK,CACJN,kBAAkB,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM;IAC9C,OAAO,KAAK;EACd,CAAC,CAAC,CACH;AACL"}
1
+ {"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\n\nimport { onlyErrorsWithCode } from '../errors.js';\n\n/*\n * Resolves true if the path is a readable directory.\n *\n * Usage:\n *\n * isDirectory('/some/path')\n * .then((dirExists) => {\n * // dirExists will be true or false.\n * });\n *\n * */\nexport default function isDirectory(path: string): Promise<boolean> {\n return fs\n .stat(path)\n .then((stats) => stats.isDirectory())\n .catch(\n onlyErrorsWithCode(['ENOENT', 'ENOTDIR'], () => {\n return false;\n })\n );\n}\n"],"mappings":"AACA,SAASA,EAAE,QAAQ,IAAI;AAEvB,SAASC,kBAAkB,QAAQ,cAAc;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASC,WAAWA,CAACC,IAAY,EAAoB;EAClE,OAAOH,EAAE,CACNI,IAAI,CAACD,IAAI,CAAC,CACVE,IAAI,CAAEC,KAAK,IAAKA,KAAK,CAACJ,WAAW,CAAC,CAAC,CAAC,CACpCK,KAAK,CACJN,kBAAkB,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM;IAC9C,OAAO,KAAK;EACd,CAAC,CACH,CAAC;AACL"}
package/lib/util/logger.js CHANGED
@@ -3,6 +3,8 @@ import bunyan, { nameFromLevel, createLogger as defaultLogCreator } from 'bunyan
3
3
 
4
4
  // Bunyan-related Flow types
5
5
 
6
+ // ConsoleStream types and implementation.
7
+
6
8
  export class ConsoleStream {
7
9
  constructor({
8
10
  verbose = false
package/lib/util/logger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","names":["fileURLToPath","bunyan","nameFromLevel","createLogger","defaultLogCreator","ConsoleStream","constructor","verbose","isCapturing","capturedMessages","format","name","msg","level","prefix","makeVerbose","write","packet","localProcess","process","thisLevel","TRACE","INFO","push","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","moduleURL","createBunyanLog","replace","streams","type","stream"],"sources":["../../src/util/logger.js"],"sourcesContent":["/* @flow */\nimport { fileURLToPath } from 'url';\n\nimport bunyan, {\n nameFromLevel,\n createLogger as defaultLogCreator,\n} from 'bunyan';\n\n// Bunyan-related Flow types\n\nexport type TRACE = 10;\nexport type DEBUG = 20;\nexport type INFO = 30;\nexport type WARN = 40;\nexport type ERROR = 50;\nexport type FATAL = 60;\n\nexport type BunyanLogLevel = TRACE | DEBUG | INFO | WARN | ERROR | FATAL;\n\nexport type BunyanLogEntry = {|\n name: string,\n msg: string,\n level: BunyanLogLevel,\n|};\n\nexport type Logger = {\n debug: (msg: string, ...args: any) => void,\n error: (msg: string, ...args: any) => void,\n info: (msg: string, ...args: any) => void,\n warn: (msg: string, ...args: any) => void,\n};\n\n// ConsoleStream types and implementation.\n\nexport type ConsoleStreamParams = {\n verbose?: boolean,\n};\n\nexport type ConsoleOptions = {\n localProcess?: typeof process,\n};\n\nexport class ConsoleStream {\n verbose: boolean;\n isCapturing: boolean;\n capturedMessages: Array<string>;\n\n constructor({ verbose = false }: ConsoleStreamParams = {}) {\n this.verbose = verbose;\n this.isCapturing = false;\n this.capturedMessages = [];\n }\n\n format({ name, msg, level }: BunyanLogEntry): string {\n const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';\n return `${prefix}${msg}\\n`;\n }\n\n makeVerbose() {\n this.verbose = true;\n }\n\n write(\n packet: BunyanLogEntry,\n { localProcess = process }: ConsoleOptions = {}\n ): void {\n const thisLevel: BunyanLogLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;\n if (packet.level >= thisLevel) {\n const msg = this.format(packet);\n if (this.isCapturing) {\n this.capturedMessages.push(msg);\n } else {\n localProcess.stdout.write(msg);\n }\n }\n }\n\n startCapturing() {\n this.isCapturing = true;\n }\n\n stopCapturing() {\n this.isCapturing = false;\n this.capturedMessages = [];\n }\n\n flushCapturedLogs({ localProcess = process }: ConsoleOptions = {}) {\n for (const msg of this.capturedMessages) {\n localProcess.stdout.write(msg);\n }\n this.capturedMessages = [];\n }\n}\n\nexport const consoleStream: ConsoleStream = new ConsoleStream();\n\n// createLogger types and implementation.\n\nexport type BunyanStreamConfig = {\n type: string,\n stream: ConsoleStream,\n};\n\nexport type CreateBunyanLogParams = {\n name: string,\n level: BunyanLogLevel,\n streams: Array<BunyanStreamConfig>,\n};\n\nexport type CreateBunyanLogFn = (params: CreateBunyanLogParams) => Logger;\n\nexport type CreateLoggerOptions = {\n createBunyanLog: CreateBunyanLogFn,\n};\n\nexport function createLogger(\n moduleURL?: string,\n { createBunyanLog = defaultLogCreator }: CreateLoggerOptions = {}\n): Logger {\n return createBunyanLog({\n // Strip the leading src/ from file names (which is in all file names) to\n // make the name less redundant.\n name: moduleURL\n ? fileURLToPath(moduleURL).replace(/^src\\//, '')\n : 'unknown-module',\n // Capture all log levels and let the stream filter them.\n level: bunyan.TRACE,\n streams: [\n {\n type: 'raw',\n stream: consoleStream,\n },\n ],\n });\n}\n"],"mappings":"AACA,SAASA,aAAa,QAAQ,KAAK;AAEnC,OAAOC,MAAM,IACXC,aAAa,EACbC,YAAY,IAAIC,iBAAiB,QAC5B,QAAQ;;AAEf;;AAkCA,OAAO,MAAMC,aAAa,CAAC;EAKzBC,WAAWA,CAAC;IAAEC,OAAO,GAAG;EAA2B,CAAC,GAAG,CAAC,CAAC,EAAE;IACzD,IAAI,CAACA,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAC,MAAMA,CAAC;IAAEC,IAAI;IAAEC,GAAG;IAAEC;EAAsB,CAAC,EAAU;IACnD,MAAMC,MAAM,GAAG,IAAI,CAACP,OAAO,GAAI,IAAGI,IAAK,KAAIT,aAAa,CAACW,KAAK,CAAE,IAAG,GAAG,EAAE;IACxE,OAAQ,GAAEC,MAAO,GAAEF,GAAI,IAAG;EAC5B;EAEAG,WAAWA,CAAA,EAAG;IACZ,IAAI,CAACR,OAAO,GAAG,IAAI;EACrB;EAEAS,KAAKA,CACHC,MAAsB,EACtB;IAAEC,YAAY,GAAGC;EAAwB,CAAC,GAAG,CAAC,CAAC,EACzC;IACN,MAAMC,SAAyB,GAAG,IAAI,CAACb,OAAO,GAAGN,MAAM,CAACoB,KAAK,GAAGpB,MAAM,CAACqB,IAAI;IAC3E,IAAIL,MAAM,CAACJ,KAAK,IAAIO,SAAS,EAAE;MAC7B,MAAMR,GAAG,GAAG,IAAI,CAACF,MAAM,CAACO,MAAM,CAAC;MAC/B,IAAI,IAAI,CAACT,WAAW,EAAE;QACpB,IAAI,CAACC,gBAAgB,CAACc,IAAI,CAACX,GAAG,CAAC;MACjC,CAAC,MAAM;QACLM,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;MAChC;IACF;EACF;EAEAa,cAAcA,CAAA,EAAG;IACf,IAAI,CAACjB,WAAW,GAAG,IAAI;EACzB;EAEAkB,aAAaA,CAAA,EAAG;IACd,IAAI,CAAClB,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAkB,iBAAiBA,CAAC;IAAET,YAAY,GAAGC;EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;IACjE,KAAK,MAAMP,GAAG,IAAI,IAAI,CAACH,gBAAgB,EAAE;MACvCS,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;IAChC;IACA,IAAI,CAACH,gBAAgB,GAAG,EAAE;EAC5B;AACF;AAEA,OAAO,MAAMmB,aAA4B,GAAG,IAAIvB,aAAa,EAAE;;AAE/D;;AAmBA,OAAO,SAASF,YAAYA,CAC1B0B,SAAkB,EAClB;EAAEC,eAAe,GAAG1B;AAAuC,CAAC,GAAG,CAAC,CAAC,EACzD;EACR,OAAO0B,eAAe,CAAC;IACrB;IACA;IACAnB,IAAI,EAAEkB,SAAS,GACX7B,aAAa,CAAC6B,SAAS,CAAC,CAACE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAC9C,gBAAgB;IACpB;IACAlB,KAAK,EAAEZ,MAAM,CAACoB,KAAK;IACnBW,OAAO,EAAE,CACP;MACEC,IAAI,EAAE,KAAK;MACXC,MAAM,EAAEN;IACV,CAAC;EAEL,CAAC,CAAC;AACJ"}
1
+ {"version":3,"file":"logger.js","names":["fileURLToPath","bunyan","nameFromLevel","createLogger","defaultLogCreator","ConsoleStream","constructor","verbose","isCapturing","capturedMessages","format","name","msg","level","prefix","makeVerbose","write","packet","localProcess","process","thisLevel","TRACE","INFO","push","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","moduleURL","createBunyanLog","replace","streams","type","stream"],"sources":["../../src/util/logger.js"],"sourcesContent":["/* @flow */\nimport { fileURLToPath } from 'url';\n\nimport bunyan, {\n nameFromLevel,\n createLogger as defaultLogCreator,\n} from 'bunyan';\n\n// Bunyan-related Flow types\n\nexport type TRACE = 10;\nexport type DEBUG = 20;\nexport type INFO = 30;\nexport type WARN = 40;\nexport type ERROR = 50;\nexport type FATAL = 60;\n\nexport type BunyanLogLevel = TRACE | DEBUG | INFO | WARN | ERROR | FATAL;\n\nexport type BunyanLogEntry = {|\n name: string,\n msg: string,\n level: BunyanLogLevel,\n|};\n\nexport type Logger = {\n debug: (msg: string, ...args: any) => void,\n error: (msg: string, ...args: any) => void,\n info: (msg: string, ...args: any) => void,\n warn: (msg: string, ...args: any) => void,\n};\n\n// ConsoleStream types and implementation.\n\nexport type ConsoleStreamParams = {\n verbose?: boolean,\n};\n\nexport type ConsoleOptions = {\n localProcess?: typeof process,\n};\n\nexport class ConsoleStream {\n verbose: boolean;\n isCapturing: boolean;\n capturedMessages: Array<string>;\n\n constructor({ verbose = false }: ConsoleStreamParams = {}) {\n this.verbose = verbose;\n this.isCapturing = false;\n this.capturedMessages = [];\n }\n\n format({ name, msg, level }: BunyanLogEntry): string {\n const prefix = this.verbose ? `[${name}][${nameFromLevel[level]}] ` : '';\n return `${prefix}${msg}\\n`;\n }\n\n makeVerbose() {\n this.verbose = true;\n }\n\n write(\n packet: BunyanLogEntry,\n { localProcess = process }: ConsoleOptions = {}\n ): void {\n const thisLevel: BunyanLogLevel = this.verbose ? bunyan.TRACE : bunyan.INFO;\n if (packet.level >= thisLevel) {\n const msg = this.format(packet);\n if (this.isCapturing) {\n this.capturedMessages.push(msg);\n } else {\n localProcess.stdout.write(msg);\n }\n }\n }\n\n startCapturing() {\n this.isCapturing = true;\n }\n\n stopCapturing() {\n this.isCapturing = false;\n this.capturedMessages = [];\n }\n\n flushCapturedLogs({ localProcess = process }: ConsoleOptions = {}) {\n for (const msg of this.capturedMessages) {\n localProcess.stdout.write(msg);\n }\n this.capturedMessages = [];\n }\n}\n\nexport const consoleStream: ConsoleStream = new ConsoleStream();\n\n// createLogger types and implementation.\n\nexport type BunyanStreamConfig = {\n type: string,\n stream: ConsoleStream,\n};\n\nexport type CreateBunyanLogParams = {\n name: string,\n level: BunyanLogLevel,\n streams: Array<BunyanStreamConfig>,\n};\n\nexport type CreateBunyanLogFn = (params: CreateBunyanLogParams) => Logger;\n\nexport type CreateLoggerOptions = {\n createBunyanLog: CreateBunyanLogFn,\n};\n\nexport function createLogger(\n moduleURL?: string,\n { createBunyanLog = defaultLogCreator }: CreateLoggerOptions = {}\n): Logger {\n return createBunyanLog({\n // Strip the leading src/ from file names (which is in all file names) to\n // make the name less redundant.\n name: moduleURL\n ? fileURLToPath(moduleURL).replace(/^src\\//, '')\n : 'unknown-module',\n // Capture all log levels and let the stream filter them.\n level: bunyan.TRACE,\n streams: [\n {\n type: 'raw',\n stream: consoleStream,\n },\n ],\n });\n}\n"],"mappings":"AACA,SAASA,aAAa,QAAQ,KAAK;AAEnC,OAAOC,MAAM,IACXC,aAAa,EACbC,YAAY,IAAIC,iBAAiB,QAC5B,QAAQ;;AAEf;;AAwBA;;AAUA,OAAO,MAAMC,aAAa,CAAC;EAKzBC,WAAWA,CAAC;IAAEC,OAAO,GAAG;EAA2B,CAAC,GAAG,CAAC,CAAC,EAAE;IACzD,IAAI,CAACA,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAC,MAAMA,CAAC;IAAEC,IAAI;IAAEC,GAAG;IAAEC;EAAsB,CAAC,EAAU;IACnD,MAAMC,MAAM,GAAG,IAAI,CAACP,OAAO,GAAI,IAAGI,IAAK,KAAIT,aAAa,CAACW,KAAK,CAAE,IAAG,GAAG,EAAE;IACxE,OAAQ,GAAEC,MAAO,GAAEF,GAAI,IAAG;EAC5B;EAEAG,WAAWA,CAAA,EAAG;IACZ,IAAI,CAACR,OAAO,GAAG,IAAI;EACrB;EAEAS,KAAKA,CACHC,MAAsB,EACtB;IAAEC,YAAY,GAAGC;EAAwB,CAAC,GAAG,CAAC,CAAC,EACzC;IACN,MAAMC,SAAyB,GAAG,IAAI,CAACb,OAAO,GAAGN,MAAM,CAACoB,KAAK,GAAGpB,MAAM,CAACqB,IAAI;IAC3E,IAAIL,MAAM,CAACJ,KAAK,IAAIO,SAAS,EAAE;MAC7B,MAAMR,GAAG,GAAG,IAAI,CAACF,MAAM,CAACO,MAAM,CAAC;MAC/B,IAAI,IAAI,CAACT,WAAW,EAAE;QACpB,IAAI,CAACC,gBAAgB,CAACc,IAAI,CAACX,GAAG,CAAC;MACjC,CAAC,MAAM;QACLM,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;MAChC;IACF;EACF;EAEAa,cAAcA,CAAA,EAAG;IACf,IAAI,CAACjB,WAAW,GAAG,IAAI;EACzB;EAEAkB,aAAaA,CAAA,EAAG;IACd,IAAI,CAAClB,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAkB,iBAAiBA,CAAC;IAAET,YAAY,GAAGC;EAAwB,CAAC,GAAG,CAAC,CAAC,EAAE;IACjE,KAAK,MAAMP,GAAG,IAAI,IAAI,CAACH,gBAAgB,EAAE;MACvCS,YAAY,CAACM,MAAM,CAACR,KAAK,CAACJ,GAAG,CAAC;IAChC;IACA,IAAI,CAACH,gBAAgB,GAAG,EAAE;EAC5B;AACF;AAEA,OAAO,MAAMmB,aAA4B,GAAG,IAAIvB,aAAa,CAAC,CAAC;;AAE/D;;AAmBA,OAAO,SAASF,YAAYA,CAC1B0B,SAAkB,EAClB;EAAEC,eAAe,GAAG1B;AAAuC,CAAC,GAAG,CAAC,CAAC,EACzD;EACR,OAAO0B,eAAe,CAAC;IACrB;IACA;IACAnB,IAAI,EAAEkB,SAAS,GACX7B,aAAa,CAAC6B,SAAS,CAAC,CAACE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAC9C,gBAAgB;IACpB;IACAlB,KAAK,EAAEZ,MAAM,CAACoB,KAAK;IACnBW,OAAO,EAAE,CACP;MACEC,IAAI,EAAE,KAAK;MACXC,MAAM,EAAEN;IACV,CAAC;EAEL,CAAC,CAAC;AACJ"}
package/lib/util/manifest.js.map CHANGED
@@ -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":["/* @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,EAAC,CACjE;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,EAAC,CAChE;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,EAAC,CAC/D;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"}
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"}
package/lib/util/submit-addon.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"submit-addon.js","names":["createWriteStream","promises","fsPromises","pipeline","promisify","fetch","FormData","fileFromSync","Response","SignJWT","createLogger","log","import","meta","url","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","constructor","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","baseUrl","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","process","cwd","userAgentString","pathname","endsWith","URL","href","apiUrl","path","nodeFetch","method","headers","body","doUploadSubmit","xpiPath","channel","formData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","validation","valid","doNewAddonSubmit","metaDataJson","jsonData","version","upload","JSON","stringify","doNewAddonOrVersionSubmit","addonId","waitForApproval","versionId","file","status","errorMsg","response","statusText","data","json","ok","Authorization","Accept","downloadSignedFile","fileUrl","filename","split","pop","dest","saveToFile","error","id","downloadedFiles","contents","destPath","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","uploadUuid","versionObject","guid","newVersionId","putVersion","results","signAddon","amoBaseUrl","timeout","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","filePath","writeFile","toString","join","debug"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["/* @flow */\nimport { createWriteStream, promises as fsPromises } from 'fs';\nimport { pipeline } from 'stream';\nimport { promisify } from 'util';\n\n// eslint-disable-next-line no-shadow\nimport fetch, { FormData, fileFromSync, Response } from 'node-fetch';\nimport { SignJWT } from 'jose';\n\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport type SignResult = {|\n id: string,\n downloadedFiles: Array<string>,\n|};\n\nexport interface ApiAuth {\n getAuthHeader(): Promise<string>;\n}\n\nexport class JwtApiAuth {\n #apiKey: string;\n #apiSecret: string;\n #apiJwtExpiresIn: number;\n\n constructor({\n apiKey,\n apiSecret,\n apiJwtExpiresIn = 60 * 5, // 5 minutes\n }: {\n apiKey: string,\n apiSecret: string,\n apiJwtExpiresIn?: number,\n }) {\n this.#apiKey = apiKey;\n this.#apiSecret = apiSecret;\n this.#apiJwtExpiresIn = apiJwtExpiresIn;\n }\n\n async signJWT(): Promise<string> {\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(): Promise<string> {\n const authToken = await this.signJWT();\n return `JWT ${authToken}`;\n }\n}\n\ntype ClientConstructorParams = {|\n apiAuth: ApiAuth,\n baseUrl: URL,\n validationCheckInterval?: number,\n validationCheckTimeout?: number,\n approvalCheckInterval?: number,\n approvalCheckTimeout?: number,\n downloadDir?: string,\n userAgentString: string,\n|};\n\nexport default class Client {\n apiAuth: ApiAuth;\n apiUrl: URL;\n validationCheckInterval: number;\n validationCheckTimeout: number;\n approvalCheckInterval: number;\n approvalCheckTimeout: number;\n downloadDir: string;\n userAgentString: string;\n\n constructor({\n apiAuth,\n baseUrl,\n validationCheckInterval = 1000,\n validationCheckTimeout = 300000, // 5 minutes.\n approvalCheckInterval = 1000,\n approvalCheckTimeout = 900000, // 15 minutes.\n downloadDir = process.cwd(),\n userAgentString,\n }: ClientConstructorParams) {\n this.apiAuth = apiAuth;\n if (!baseUrl.pathname.endsWith('/')) {\n baseUrl = new URL(baseUrl.href);\n baseUrl.pathname += '/';\n }\n this.apiUrl = new URL('addons/', baseUrl);\n this.validationCheckInterval = validationCheckInterval;\n this.validationCheckTimeout = validationCheckTimeout;\n this.approvalCheckInterval = approvalCheckInterval;\n this.approvalCheckTimeout = approvalCheckTimeout;\n this.downloadDir = downloadDir;\n this.userAgentString = userAgentString;\n }\n\n fileFromSync(path: string): File {\n return fileFromSync(path);\n }\n\n nodeFetch(\n url: URL,\n {\n method,\n headers,\n body,\n }: {\n method: string,\n headers: { [key: string]: string },\n body?: typeof FormData | string,\n }\n ): Promise<typeof Response> {\n return fetch(url, { method, headers, body });\n }\n\n async doUploadSubmit(xpiPath: string, channel: string): Promise<string> {\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(url, 'POST', formData);\n return this.waitForValidation(uuid);\n }\n\n waitRetry(\n successFunc: (detailResponseData: any) => string | null,\n checkUrl: URL,\n checkInterval: number,\n abortInterval: number,\n context: string\n ): Promise<string> {\n let checkTimeout;\n\n return new Promise((resolve, reject) => {\n const abortTimeout = setTimeout(() => {\n clearTimeout(checkTimeout);\n reject(new Error(`${context}: timeout.`));\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: string): Promise<string> {\n log.info('Waiting for Validation...');\n return this.waitRetry(\n (detailResponseData): string | null => {\n if (!detailResponseData.processed) {\n return null;\n }\n\n log.info('Validation results:', detailResponseData.validation);\n if (detailResponseData.valid) {\n return detailResponseData.uuid;\n }\n\n log.info('Validation failed.');\n throw new Error(\n 'Validation failed, open the following URL for more information: ' +\n `${detailResponseData.url}`\n );\n },\n new URL(`upload/${uuid}/`, this.apiUrl),\n this.validationCheckInterval,\n this.validationCheckTimeout,\n 'Validation'\n );\n }\n\n async doNewAddonSubmit(uuid: string, metaDataJson: Object): Promise<any> {\n const url = new URL('addon/', this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(url, 'POST', JSON.stringify(jsonData));\n }\n\n doNewAddonOrVersionSubmit(\n addonId: string,\n uuid: string,\n metaDataJson: Object\n ): Promise<typeof Response> {\n const url = new URL(`addon/${addonId}/`, this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetch(url, 'PUT', JSON.stringify(jsonData));\n }\n\n waitForApproval(addonId: string, versionId: number): Promise<string> {\n log.info('Waiting for Approval...');\n return this.waitRetry(\n (detailResponseData): string | null => {\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 );\n }\n\n async fetchJson(\n url: URL,\n method: string = 'GET',\n body?: typeof FormData | string,\n errorMsg: string = 'Bad Request'\n ): Promise<any> {\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 log.info('Server Response:', data);\n throw new Error(\n `${errorMsg}: ${response.statusText || response.status}.`\n );\n }\n return data;\n }\n\n async fetch(\n url: URL,\n method: string = 'GET',\n body?: typeof FormData | string\n ): Promise<typeof Response> {\n log.info(`Fetching 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 return this.nodeFetch(url, { method, body, headers });\n }\n\n async downloadSignedFile(fileUrl: URL, addonId: string): Promise<SignResult> {\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 return {\n id: addonId,\n downloadedFiles: [filename],\n };\n }\n\n async saveToFile(\n contents: typeof Response.body,\n destPath: string\n ): Promise<any> {\n return promisify(pipeline)(contents, createWriteStream(destPath));\n }\n\n async postNewAddon(\n xpiPath: string,\n channel: string,\n savedIdPath: string,\n metaDataJson: Object,\n saveIdToFileFunc: (string, string) => Promise<void> = saveIdToFile\n ): Promise<SignResult> {\n const uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n\n const versionObject =\n channel === 'listed' ? 'current_version' : 'latest_unlisted_version';\n const {\n guid: addonId,\n [versionObject]: { id: newVersionId },\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 const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));\n\n return this.downloadSignedFile(fileUrl, addonId);\n }\n\n async putVersion(\n xpiPath: string,\n channel: string,\n addonId: string,\n metaDataJson: Object\n ): Promise<SignResult> {\n const uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n\n await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n const url = new URL(\n `addon/${addonId}/versions/?filter=all_with_unlisted`,\n this.apiUrl\n );\n const {\n results: [{ id: newVersionId }],\n } = await this.fetchJson(url);\n\n const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));\n\n return this.downloadSignedFile(fileUrl, addonId);\n }\n}\n\ntype signAddonParams = {|\n apiKey: string,\n apiSecret: string,\n amoBaseUrl: string,\n timeout: number,\n id?: string,\n xpiPath: string,\n downloadDir: string,\n channel: string,\n savedIdPath: string,\n metaDataJson?: Object,\n userAgentString: string,\n SubmitClient?: typeof Client,\n ApiAuthClass?: typeof JwtApiAuth,\n|};\n\nexport async function signAddon({\n apiKey,\n apiSecret,\n amoBaseUrl,\n timeout,\n id,\n xpiPath,\n downloadDir,\n channel,\n savedIdPath,\n metaDataJson = {},\n userAgentString,\n SubmitClient = Client,\n ApiAuthClass = JwtApiAuth,\n}: signAddonParams): Promise<SignResult> {\n try {\n const stats = await fsPromises.stat(xpiPath);\n\n if (!stats.isFile()) {\n throw new Error(`not a file: ${xpiPath}`);\n }\n } catch (statError) {\n throw new Error(`error with ${xpiPath}: ${statError}`);\n }\n\n let baseUrl;\n try {\n baseUrl = new URL(amoBaseUrl);\n } catch (err) {\n throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n }\n\n const client = new SubmitClient({\n apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n baseUrl,\n validationCheckTimeout: timeout,\n approvalCheckTimeout: timeout,\n downloadDir,\n userAgentString,\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(xpiPath, channel, savedIdPath, metaDataJson);\n }\n\n return client.putVersion(xpiPath, channel, id, metaDataJson);\n}\n\nexport async function saveIdToFile(\n filePath: string,\n id: string\n): Promise<void> {\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"],"mappings":"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"}
1
+ {"version":3,"file":"submit-addon.js","names":["createWriteStream","promises","fsPromises","pipeline","promisify","fetch","FormData","fileFromSync","Response","SignJWT","createLogger","log","import","meta","url","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","constructor","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","baseUrl","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","process","cwd","userAgentString","pathname","endsWith","URL","href","apiUrl","path","nodeFetch","method","headers","body","doUploadSubmit","xpiPath","channel","formData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","validation","valid","doNewAddonSubmit","metaDataJson","jsonData","version","upload","JSON","stringify","doNewAddonOrVersionSubmit","addonId","waitForApproval","versionId","file","status","errorMsg","response","statusText","data","json","ok","Authorization","Accept","downloadSignedFile","fileUrl","filename","split","pop","dest","saveToFile","error","id","downloadedFiles","contents","destPath","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","uploadUuid","versionObject","guid","newVersionId","putVersion","results","signAddon","amoBaseUrl","timeout","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","filePath","writeFile","toString","join","debug"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["/* @flow */\nimport { createWriteStream, promises as fsPromises } from 'fs';\nimport { pipeline } from 'stream';\nimport { promisify } from 'util';\n\n// eslint-disable-next-line no-shadow\nimport fetch, { FormData, fileFromSync, Response } from 'node-fetch';\nimport { SignJWT } from 'jose';\n\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport type SignResult = {|\n id: string,\n downloadedFiles: Array<string>,\n|};\n\nexport interface ApiAuth {\n getAuthHeader(): Promise<string>;\n}\n\nexport class JwtApiAuth {\n #apiKey: string;\n #apiSecret: string;\n #apiJwtExpiresIn: number;\n\n constructor({\n apiKey,\n apiSecret,\n apiJwtExpiresIn = 60 * 5, // 5 minutes\n }: {\n apiKey: string,\n apiSecret: string,\n apiJwtExpiresIn?: number,\n }) {\n this.#apiKey = apiKey;\n this.#apiSecret = apiSecret;\n this.#apiJwtExpiresIn = apiJwtExpiresIn;\n }\n\n async signJWT(): Promise<string> {\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(): Promise<string> {\n const authToken = await this.signJWT();\n return `JWT ${authToken}`;\n }\n}\n\ntype ClientConstructorParams = {|\n apiAuth: ApiAuth,\n baseUrl: URL,\n validationCheckInterval?: number,\n validationCheckTimeout?: number,\n approvalCheckInterval?: number,\n approvalCheckTimeout?: number,\n downloadDir?: string,\n userAgentString: string,\n|};\n\nexport default class Client {\n apiAuth: ApiAuth;\n apiUrl: URL;\n validationCheckInterval: number;\n validationCheckTimeout: number;\n approvalCheckInterval: number;\n approvalCheckTimeout: number;\n downloadDir: string;\n userAgentString: string;\n\n constructor({\n apiAuth,\n baseUrl,\n validationCheckInterval = 1000,\n validationCheckTimeout = 300000, // 5 minutes.\n approvalCheckInterval = 1000,\n approvalCheckTimeout = 900000, // 15 minutes.\n downloadDir = process.cwd(),\n userAgentString,\n }: ClientConstructorParams) {\n this.apiAuth = apiAuth;\n if (!baseUrl.pathname.endsWith('/')) {\n baseUrl = new URL(baseUrl.href);\n baseUrl.pathname += '/';\n }\n this.apiUrl = new URL('addons/', baseUrl);\n this.validationCheckInterval = validationCheckInterval;\n this.validationCheckTimeout = validationCheckTimeout;\n this.approvalCheckInterval = approvalCheckInterval;\n this.approvalCheckTimeout = approvalCheckTimeout;\n this.downloadDir = downloadDir;\n this.userAgentString = userAgentString;\n }\n\n fileFromSync(path: string): File {\n return fileFromSync(path);\n }\n\n nodeFetch(\n url: URL,\n {\n method,\n headers,\n body,\n }: {\n method: string,\n headers: { [key: string]: string },\n body?: typeof FormData | string,\n }\n ): Promise<typeof Response> {\n return fetch(url, { method, headers, body });\n }\n\n async doUploadSubmit(xpiPath: string, channel: string): Promise<string> {\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(url, 'POST', formData);\n return this.waitForValidation(uuid);\n }\n\n waitRetry(\n successFunc: (detailResponseData: any) => string | null,\n checkUrl: URL,\n checkInterval: number,\n abortInterval: number,\n context: string\n ): Promise<string> {\n let checkTimeout;\n\n return new Promise((resolve, reject) => {\n const abortTimeout = setTimeout(() => {\n clearTimeout(checkTimeout);\n reject(new Error(`${context}: timeout.`));\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: string): Promise<string> {\n log.info('Waiting for Validation...');\n return this.waitRetry(\n (detailResponseData): string | null => {\n if (!detailResponseData.processed) {\n return null;\n }\n\n log.info('Validation results:', detailResponseData.validation);\n if (detailResponseData.valid) {\n return detailResponseData.uuid;\n }\n\n log.info('Validation failed.');\n throw new Error(\n 'Validation failed, open the following URL for more information: ' +\n `${detailResponseData.url}`\n );\n },\n new URL(`upload/${uuid}/`, this.apiUrl),\n this.validationCheckInterval,\n this.validationCheckTimeout,\n 'Validation'\n );\n }\n\n async doNewAddonSubmit(uuid: string, metaDataJson: Object): Promise<any> {\n const url = new URL('addon/', this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(url, 'POST', JSON.stringify(jsonData));\n }\n\n doNewAddonOrVersionSubmit(\n addonId: string,\n uuid: string,\n metaDataJson: Object\n ): Promise<typeof Response> {\n const url = new URL(`addon/${addonId}/`, this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetch(url, 'PUT', JSON.stringify(jsonData));\n }\n\n waitForApproval(addonId: string, versionId: number): Promise<string> {\n log.info('Waiting for Approval...');\n return this.waitRetry(\n (detailResponseData): string | null => {\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 );\n }\n\n async fetchJson(\n url: URL,\n method: string = 'GET',\n body?: typeof FormData | string,\n errorMsg: string = 'Bad Request'\n ): Promise<any> {\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 log.info('Server Response:', data);\n throw new Error(\n `${errorMsg}: ${response.statusText || response.status}.`\n );\n }\n return data;\n }\n\n async fetch(\n url: URL,\n method: string = 'GET',\n body?: typeof FormData | string\n ): Promise<typeof Response> {\n log.info(`Fetching 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 return this.nodeFetch(url, { method, body, headers });\n }\n\n async downloadSignedFile(fileUrl: URL, addonId: string): Promise<SignResult> {\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 return {\n id: addonId,\n downloadedFiles: [filename],\n };\n }\n\n async saveToFile(\n contents: typeof Response.body,\n destPath: string\n ): Promise<any> {\n return promisify(pipeline)(contents, createWriteStream(destPath));\n }\n\n async postNewAddon(\n xpiPath: string,\n channel: string,\n savedIdPath: string,\n metaDataJson: Object,\n saveIdToFileFunc: (string, string) => Promise<void> = saveIdToFile\n ): Promise<SignResult> {\n const uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n\n const versionObject =\n channel === 'listed' ? 'current_version' : 'latest_unlisted_version';\n const {\n guid: addonId,\n [versionObject]: { id: newVersionId },\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 const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));\n\n return this.downloadSignedFile(fileUrl, addonId);\n }\n\n async putVersion(\n xpiPath: string,\n channel: string,\n addonId: string,\n metaDataJson: Object\n ): Promise<SignResult> {\n const uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n\n await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n const url = new URL(\n `addon/${addonId}/versions/?filter=all_with_unlisted`,\n this.apiUrl\n );\n const {\n results: [{ id: newVersionId }],\n } = await this.fetchJson(url);\n\n const fileUrl = new URL(await this.waitForApproval(addonId, newVersionId));\n\n return this.downloadSignedFile(fileUrl, addonId);\n }\n}\n\ntype signAddonParams = {|\n apiKey: string,\n apiSecret: string,\n amoBaseUrl: string,\n timeout: number,\n id?: string,\n xpiPath: string,\n downloadDir: string,\n channel: string,\n savedIdPath: string,\n metaDataJson?: Object,\n userAgentString: string,\n SubmitClient?: typeof Client,\n ApiAuthClass?: typeof JwtApiAuth,\n|};\n\nexport async function signAddon({\n apiKey,\n apiSecret,\n amoBaseUrl,\n timeout,\n id,\n xpiPath,\n downloadDir,\n channel,\n savedIdPath,\n metaDataJson = {},\n userAgentString,\n SubmitClient = Client,\n ApiAuthClass = JwtApiAuth,\n}: signAddonParams): Promise<SignResult> {\n try {\n const stats = await fsPromises.stat(xpiPath);\n\n if (!stats.isFile()) {\n throw new Error(`not a file: ${xpiPath}`);\n }\n } catch (statError) {\n throw new Error(`error with ${xpiPath}: ${statError}`);\n }\n\n let baseUrl;\n try {\n baseUrl = new URL(amoBaseUrl);\n } catch (err) {\n throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n }\n\n const client = new SubmitClient({\n apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n baseUrl,\n validationCheckTimeout: timeout,\n approvalCheckTimeout: timeout,\n downloadDir,\n userAgentString,\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(xpiPath, channel, savedIdPath, metaDataJson);\n }\n\n return client.putVersion(xpiPath, channel, id, metaDataJson);\n}\n\nexport async function saveIdToFile(\n filePath: string,\n id: string\n): Promise<void> {\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"],"mappings":"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"}
package/lib/util/temp-dir.js.map CHANGED
@@ -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","constructor","_path","undefined","_removeTempDir","prefix","unsafeCleanup","tmpPath","removeTempDir","Promise","resolve","reject","next","err","debug","path","Error","error","remove","promiseResult"],"sources":["../../src/util/temp-dir.js"],"sourcesContent":["/* @flow */\nimport { 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\nexport type MakePromiseCallback = (tmpDir: TempDir) => any;\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: MakePromiseCallback): Promise<any> {\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: string | void;\n _removeTempDir: Function | void;\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(): Promise<TempDir> {\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(): string {\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(): Function {\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(): Function {\n return async (promiseResult) => {\n await this.remove();\n return promiseResult;\n };\n }\n\n /*\n * Remove the temp directory.\n */\n remove(): Promise<void> | void {\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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"}
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","constructor","_path","undefined","_removeTempDir","prefix","unsafeCleanup","tmpPath","removeTempDir","Promise","resolve","reject","next","err","debug","path","Error","error","remove","promiseResult"],"sources":["../../src/util/temp-dir.js"],"sourcesContent":["/* @flow */\nimport { 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\nexport type MakePromiseCallback = (tmpDir: TempDir) => any;\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: MakePromiseCallback): Promise<any> {\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: string | void;\n _removeTempDir: Function | void;\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(): Promise<TempDir> {\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(): string {\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(): Function {\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(): Function {\n return async (promiseResult) => {\n await this.remove();\n return promiseResult;\n };\n }\n\n /*\n * Remove the temp directory.\n */\n remove(): Promise<void> | void {\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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"}
package/lib/util/updates.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"updates.js","names":["defaultUpdateNotifier","checkForUpdates","version","updateNotifier","pkg","name","updateCheckInterval","notify"],"sources":["../../src/util/updates.js"],"sourcesContent":["/* @flow */\nimport defaultUpdateNotifier from 'update-notifier';\n\ntype CheckForUpdatesParams = {|\n version: string,\n updateNotifier?: typeof defaultUpdateNotifier,\n|};\n\nexport function checkForUpdates({\n version,\n updateNotifier = defaultUpdateNotifier,\n}: CheckForUpdatesParams) {\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":"AACA,OAAOA,qBAAqB,MAAM,iBAAiB;AAOnD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,OAAO;EACPC,cAAc,GAAGH;AACI,CAAC,EAAE;EACxB,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,EAAE;AACb"}
1
+ {"version":3,"file":"updates.js","names":["defaultUpdateNotifier","checkForUpdates","version","updateNotifier","pkg","name","updateCheckInterval","notify"],"sources":["../../src/util/updates.js"],"sourcesContent":["/* @flow */\nimport defaultUpdateNotifier from 'update-notifier';\n\ntype CheckForUpdatesParams = {|\n version: string,\n updateNotifier?: typeof defaultUpdateNotifier,\n|};\n\nexport function checkForUpdates({\n version,\n updateNotifier = defaultUpdateNotifier,\n}: CheckForUpdatesParams) {\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":"AACA,OAAOA,qBAAqB,MAAM,iBAAiB;AAOnD,OAAO,SAASC,eAAeA,CAAC;EAC9BC,OAAO;EACPC,cAAc,GAAGH;AACI,CAAC,EAAE;EACxB,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"}
package/lib/watcher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"watcher.js","names":["fs","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","existsSync","lstatSync","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport { createLogger } from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// onSourceChange types and implementation\n\nexport type ShouldWatchFn = (filePath: string) => boolean;\n\nexport type OnChangeFn = () => any;\n\nexport type OnSourceChangeParams = {|\n sourceDir: string,\n watchFile?: Array<string>,\n watchIgnored?: Array<string>,\n artifactsDir: string,\n onChange: OnChangeFn,\n shouldWatchFile: ShouldWatchFn,\n debounceTime?: number,\n|};\n\nexport type OnSourceChangeFn = (params: OnSourceChangeParams) => Watchpack;\n\nexport default function onSourceChange({\n sourceDir,\n watchFile,\n watchIgnored,\n artifactsDir,\n onChange,\n shouldWatchFile,\n debounceTime = 500,\n}: OnSourceChangeParams): Watchpack {\n // When running on Windows, transform the ignored paths and globs\n // as Watchpack does translate the changed files path internally\n // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n const ignored =\n watchIgnored && process.platform === 'win32'\n ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n : watchIgnored;\n\n // TODO: For network disks, we would need to add {poll: true}.\n const watcher = ignored ? new Watchpack({ ignored }) : new Watchpack();\n\n // Allow multiple files to be changed before reloading the extension\n const executeImmediately = false;\n onChange = debounce(onChange, debounceTime, executeImmediately);\n\n watcher.on('change', (filePath) => {\n proxyFileChanges({ artifactsDir, onChange, filePath, shouldWatchFile });\n });\n\n log.debug(\n `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`\n );\n\n const watchedDirs = [];\n const watchedFiles = [];\n\n if (watchFile) {\n for (const filePath of watchFile) {\n if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {\n throw new UsageError(\n 'Invalid --watch-file value: ' + `\"${filePath}\" is not a file.`\n );\n }\n\n watchedFiles.push(filePath);\n }\n } else {\n watchedDirs.push(sourceDir);\n }\n\n watcher.watch({\n files: watchedFiles,\n directories: watchedDirs,\n missing: [],\n startTime: Date.now(),\n });\n\n // TODO: support interrupting the watcher on Windows.\n // https://github.com/mozilla/web-ext/issues/225\n process.on('SIGINT', () => watcher.close());\n return watcher;\n}\n\n// proxyFileChanges types and implementation.\n\nexport type ProxyFileChangesParams = {|\n artifactsDir: string,\n onChange: OnChangeFn,\n filePath: string,\n shouldWatchFile: ShouldWatchFn,\n|};\n\nexport function proxyFileChanges({\n artifactsDir,\n onChange,\n filePath,\n shouldWatchFile,\n}: ProxyFileChangesParams): void {\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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"}
1
+ {"version":3,"file":"watcher.js","names":["fs","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","existsSync","lstatSync","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["/* @flow */\nimport { fs } from 'mz';\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport { createLogger } from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// onSourceChange types and implementation\n\nexport type ShouldWatchFn = (filePath: string) => boolean;\n\nexport type OnChangeFn = () => any;\n\nexport type OnSourceChangeParams = {|\n sourceDir: string,\n watchFile?: Array<string>,\n watchIgnored?: Array<string>,\n artifactsDir: string,\n onChange: OnChangeFn,\n shouldWatchFile: ShouldWatchFn,\n debounceTime?: number,\n|};\n\nexport type OnSourceChangeFn = (params: OnSourceChangeParams) => Watchpack;\n\nexport default function onSourceChange({\n sourceDir,\n watchFile,\n watchIgnored,\n artifactsDir,\n onChange,\n shouldWatchFile,\n debounceTime = 500,\n}: OnSourceChangeParams): Watchpack {\n // When running on Windows, transform the ignored paths and globs\n // as Watchpack does translate the changed files path internally\n // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n const ignored =\n watchIgnored && process.platform === 'win32'\n ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n : watchIgnored;\n\n // TODO: For network disks, we would need to add {poll: true}.\n const watcher = ignored ? new Watchpack({ ignored }) : new Watchpack();\n\n // Allow multiple files to be changed before reloading the extension\n const executeImmediately = false;\n onChange = debounce(onChange, debounceTime, executeImmediately);\n\n watcher.on('change', (filePath) => {\n proxyFileChanges({ artifactsDir, onChange, filePath, shouldWatchFile });\n });\n\n log.debug(\n `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`\n );\n\n const watchedDirs = [];\n const watchedFiles = [];\n\n if (watchFile) {\n for (const filePath of watchFile) {\n if (fs.existsSync(filePath) && !fs.lstatSync(filePath).isFile()) {\n throw new UsageError(\n 'Invalid --watch-file value: ' + `\"${filePath}\" is not a file.`\n );\n }\n\n watchedFiles.push(filePath);\n }\n } else {\n watchedDirs.push(sourceDir);\n }\n\n watcher.watch({\n files: watchedFiles,\n directories: watchedDirs,\n missing: [],\n startTime: Date.now(),\n });\n\n // TODO: support interrupting the watcher on Windows.\n // https://github.com/mozilla/web-ext/issues/225\n process.on('SIGINT', () => watcher.close());\n return watcher;\n}\n\n// proxyFileChanges types and implementation.\n\nexport type ProxyFileChangesParams = {|\n artifactsDir: string,\n onChange: OnChangeFn,\n filePath: string,\n shouldWatchFile: ShouldWatchFn,\n|};\n\nexport function proxyFileChanges({\n artifactsDir,\n onChange,\n filePath,\n shouldWatchFile,\n}: ProxyFileChangesParams): void {\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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "web-ext",
3
- "version": "7.6.2",
3
+ "version": "7.8.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",
@@ -60,7 +60,7 @@
60
60
  "dependencies": {
61
61
  "@babel/runtime": "7.21.0",
62
62
  "@devicefarmer/adbkit": "3.2.3",
63
- "addons-linter": "5.32.0",
63
+ "addons-linter": "6.13.0",
64
64
  "bunyan": "1.8.15",
65
65
  "camelcase": "7.0.1",
66
66
  "chrome-launcher": "0.15.1",
@@ -107,7 +107,7 @@
107
107
  "copy-dir": "1.3.0",
108
108
  "cross-env": "7.0.3",
109
109
  "deepcopy": "2.1.0",
110
- "eslint": "8.36.0",
110
+ "eslint": "8.48.0",
111
111
  "eslint-plugin-async-await": "0.0.0",
112
112
  "eslint-plugin-ft-flow": "2.0.3",
113
113
  "eslint-plugin-import": "2.27.5",