web-ext 8.1.0 → 8.3.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.
- package/lib/cmd/build.js +1 -1
- package/lib/cmd/build.js.map +1 -1
- package/lib/cmd/run.js +5 -2
- package/lib/cmd/run.js.map +1 -1
- package/lib/config.js +1 -1
- package/lib/config.js.map +1 -1
- package/lib/extension-runners/chromium.js +10 -5
- package/lib/extension-runners/chromium.js.map +1 -1
- package/lib/extension-runners/firefox-android.js +1 -1
- package/lib/extension-runners/firefox-android.js.map +1 -1
- package/lib/firefox/index.js +1 -1
- package/lib/firefox/index.js.map +1 -1
- package/lib/firefox/preferences.js +1 -1
- package/lib/firefox/preferences.js.map +1 -1
- package/lib/firefox/rdp-client.js +2 -2
- package/lib/firefox/rdp-client.js.map +1 -1
- package/lib/program.js +2 -2
- package/lib/program.js.map +1 -1
- package/lib/util/adb.js +1 -1
- package/lib/util/adb.js.map +1 -1
- package/lib/util/artifacts.js +5 -4
- package/lib/util/artifacts.js.map +1 -1
- package/lib/util/file-exists.js +1 -1
- package/lib/util/file-exists.js.map +1 -1
- package/lib/util/is-directory.js +1 -1
- package/lib/util/is-directory.js.map +1 -1
- package/lib/util/logger.js +10 -13
- package/lib/util/logger.js.map +1 -1
- package/lib/util/manifest.js +1 -1
- package/lib/util/manifest.js.map +1 -1
- package/lib/util/submit-addon.js +29 -6
- package/lib/util/submit-addon.js.map +1 -1
- package/lib/watcher.js +2 -2
- package/lib/watcher.js.map +1 -1
- package/package.json +23 -26
package/lib/util/adb.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adb.js","names":["ADBKit","isErrorWithCode","UsageError","WebExtError","createLogger","packageIdentifiers","defaultApkComponents","DEVICE_DIR_BASE","ARTIFACTS_DIR_PREFIX","defaultADB","default","log","import","meta","url","wrapADBCall","asyncFn","error","message","includes","ADBUtils","params","adb","adbClient","artifactsDirMap","userAbortDiscovery","constructor","adbBin","adbHost","adbPort","createClient","bin","host","port","Map","runShellCommand","deviceId","cmd","debug","JSON","stringify","getDevice","shell","then","util","readAll","res","toString","discoverDevices","devices","listDevices","map","dev","id","getCurrentUser","currentUser","userId","parseInt","trim","isNaN","discoverInstalledFirefoxAPKs","firefoxApk","pmList","split","line","replace","filter","browser","startsWith","amForceStopAPK","apk","getOrCreateArtifactsDir","artifactsDir","get","Date","now","testDirOut","set","detectOrRemoveOldArtifacts","removeArtifactDirs","files","readdir","found","file","isDirectory","name","clearArtifactsDir","delete","pushFile","localPath","devicePath","push","transfer","Promise","resolve","on","startFirefoxAPK","apkComponent","deviceProfileDir","extras","key","value","component","startActivity","wait","action","category","setUserAbortDiscovery","discoverRDPUnixSocket","maxDiscoveryTime","retryInterval","rdpUnixSockets","discoveryStartedAt","msg","length","info","endsWith","setTimeout","pop","setupForward","remote","local","forward","listADBDevices","adbUtils","listADBFirefoxAPKs"],"sources":["../../src/util/adb.js"],"sourcesContent":["import ADBKit from '@devicefarmer/adbkit';\n\nimport { isErrorWithCode, UsageError, WebExtError } from '../errors.js';\nimport { createLogger } from '../util/logger.js';\nimport packageIdentifiers, {\n defaultApkComponents,\n} from '../firefox/package-identifiers.js';\n\nexport const DEVICE_DIR_BASE = '/data/local/tmp/';\nexport const ARTIFACTS_DIR_PREFIX = 'web-ext-artifacts-';\n\nconst defaultADB = ADBKit.default;\n\nconst log = createLogger(import.meta.url);\n\n// Helper function used to raise an UsageError when the adb binary has not been found.\nasync function wrapADBCall(asyncFn) {\n try {\n return await asyncFn();\n } catch (error) {\n if (\n isErrorWithCode('ENOENT', error) &&\n error.message.includes('spawn adb')\n ) {\n throw new UsageError(\n 'No adb executable has been found. ' +\n 'You can Use --adb-bin, --adb-host/--adb-port ' +\n 'to configure it manually if needed.',\n );\n }\n\n throw error;\n }\n}\n\nexport default class ADBUtils {\n params;\n adb;\n adbClient;\n\n // Map<deviceId -> artifactsDir>\n artifactsDirMap;\n // Toggled when the user wants to abort the RDP Unix Socket discovery loop\n // while it is still executing.\n userAbortDiscovery;\n\n constructor(params) {\n this.params = params;\n\n const { adb, adbBin, adbHost, adbPort } = params;\n\n this.adb = adb || defaultADB;\n\n this.adbClient = this.adb.createClient({\n bin: adbBin,\n host: adbHost,\n port: adbPort,\n });\n\n this.artifactsDirMap = new Map();\n\n this.userAbortDiscovery = false;\n }\n\n runShellCommand(deviceId, cmd) {\n const { adb, adbClient } = this;\n\n log.debug(`Run adb shell command on ${deviceId}: ${JSON.stringify(cmd)}`);\n\n return wrapADBCall(async () => {\n return await adbClient\n .getDevice(deviceId)\n .shell(cmd)\n .then(adb.util.readAll);\n }).then((res) => res.toString());\n }\n\n async discoverDevices() {\n const { adbClient } = this;\n\n let devices = [];\n\n log.debug('Listing android devices');\n devices = await wrapADBCall(async () => adbClient.listDevices());\n\n return devices.map((dev) => dev.id);\n }\n\n async getCurrentUser(deviceId) {\n log.debug(`Retrieving current user on ${deviceId}`);\n\n const currentUser = await this.runShellCommand(deviceId, [\n 'am',\n 'get-current-user',\n ]);\n\n const userId = parseInt(currentUser.trim());\n if (isNaN(userId)) {\n throw new WebExtError(`Unable to retrieve current user on ${deviceId}`);\n }\n return userId;\n }\n\n async discoverInstalledFirefoxAPKs(deviceId, firefoxApk) {\n const userId = await this.getCurrentUser(deviceId);\n\n log.debug(`Listing installed Firefox APKs on ${deviceId}`);\n const pmList = await this.runShellCommand(deviceId, [\n 'pm',\n 'list',\n 'packages',\n '--user',\n `${userId}`,\n ]);\n\n return pmList\n .split('\\n')\n .map((line) => line.replace('package:', '').trim())\n .filter((line) => {\n // Look for an exact match if firefoxApk is defined.\n if (firefoxApk) {\n return line === firefoxApk;\n }\n // Match any package name that starts with the package name of a Firefox for Android browser.\n for (const browser of packageIdentifiers) {\n if (line.startsWith(browser)) {\n return true;\n }\n }\n\n return false;\n });\n }\n\n async amForceStopAPK(deviceId, apk) {\n await this.runShellCommand(deviceId, ['am', 'force-stop', apk]);\n }\n\n async getOrCreateArtifactsDir(deviceId) {\n let artifactsDir = this.artifactsDirMap.get(deviceId);\n\n if (artifactsDir) {\n return artifactsDir;\n }\n\n artifactsDir = `${DEVICE_DIR_BASE}${ARTIFACTS_DIR_PREFIX}${Date.now()}`;\n\n const testDirOut = (\n await this.runShellCommand(deviceId, `test -d ${artifactsDir} ; echo $?`)\n ).trim();\n\n if (testDirOut !== '1') {\n throw new WebExtError(\n `Cannot create artifacts directory ${artifactsDir} ` +\n `because it exists on ${deviceId}.`,\n );\n }\n\n await this.runShellCommand(deviceId, ['mkdir', '-p', artifactsDir]);\n\n this.artifactsDirMap.set(deviceId, artifactsDir);\n\n return artifactsDir;\n }\n\n async detectOrRemoveOldArtifacts(deviceId, removeArtifactDirs = false) {\n const { adbClient } = this;\n\n log.debug('Checking adb device for existing web-ext artifacts dirs');\n\n return wrapADBCall(async () => {\n const files = await adbClient\n .getDevice(deviceId)\n .readdir(DEVICE_DIR_BASE);\n let found = false;\n\n for (const file of files) {\n if (\n !file.isDirectory() ||\n !file.name.startsWith(ARTIFACTS_DIR_PREFIX)\n ) {\n continue;\n }\n\n // Return earlier if we only need to warn the user that some\n // existing artifacts dirs have been found on the adb device.\n if (!removeArtifactDirs) {\n return true;\n }\n\n found = true;\n\n const artifactsDir = `${DEVICE_DIR_BASE}${file.name}`;\n\n log.debug(\n `Removing artifacts directory ${artifactsDir} from device ${deviceId}`,\n );\n\n await this.runShellCommand(deviceId, ['rm', '-rf', artifactsDir]);\n }\n\n return found;\n });\n }\n\n async clearArtifactsDir(deviceId) {\n const artifactsDir = this.artifactsDirMap.get(deviceId);\n\n if (!artifactsDir) {\n // nothing to do here.\n return;\n }\n\n this.artifactsDirMap.delete(deviceId);\n\n log.debug(\n `Removing ${artifactsDir} artifacts directory on ${deviceId} device`,\n );\n\n await this.runShellCommand(deviceId, ['rm', '-rf', artifactsDir]);\n }\n\n async pushFile(deviceId, localPath, devicePath) {\n const { adbClient } = this;\n\n log.debug(`Pushing ${localPath} to ${devicePath} on ${deviceId}`);\n\n await wrapADBCall(async () => {\n await adbClient\n .getDevice(deviceId)\n .push(localPath, devicePath)\n .then(function (transfer) {\n return new Promise((resolve) => {\n transfer.on('end', resolve);\n });\n });\n });\n }\n\n async startFirefoxAPK(deviceId, apk, apkComponent, deviceProfileDir) {\n const { adbClient } = this;\n\n log.debug(`Starting ${apk} on ${deviceId}`);\n\n // Fenix does ignore the -profile parameter, on the contrary Fennec\n // would run using the given path as the profile to be used during\n // this execution.\n const extras = [\n {\n key: 'args',\n value: `-profile ${deviceProfileDir}`,\n },\n ];\n\n if (!apkComponent) {\n apkComponent = '.App';\n if (defaultApkComponents[apk]) {\n apkComponent = defaultApkComponents[apk];\n }\n } else if (!apkComponent.includes('.')) {\n apkComponent = `.${apkComponent}`;\n }\n\n // If `apk` is a browser package or the `apk` has a browser package prefix:\n // prepend the package identifier before `apkComponent`.\n if (apkComponent.startsWith('.')) {\n for (const browser of packageIdentifiers) {\n if (apk === browser || apk.startsWith(`${browser}.`)) {\n apkComponent = browser + apkComponent;\n break;\n }\n }\n }\n\n // If `apkComponent` starts with a '.', then adb will expand the following\n // to: `${apk}/${apk}.${apkComponent}`\n let component = `${apk}`;\n if (apkComponent) {\n component += `/${apkComponent}`;\n }\n\n await wrapADBCall(async () => {\n try {\n // TODO: once Fenix (release) uses Android 13, we can get rid of this\n // call and only use the second call in the `catch` block.\n await adbClient.getDevice(deviceId).startActivity({\n wait: true,\n action: 'android.activity.MAIN',\n component,\n extras,\n });\n } catch {\n // Android 13+ requires a different action/category but we still need\n // to support older Fenix builds.\n await adbClient.getDevice(deviceId).startActivity({\n wait: true,\n action: 'android.intent.action.MAIN',\n category: 'android.intent.category.LAUNCHER',\n component,\n extras,\n });\n }\n });\n }\n\n setUserAbortDiscovery(value) {\n this.userAbortDiscovery = value;\n }\n\n async discoverRDPUnixSocket(\n deviceId,\n apk,\n { maxDiscoveryTime, retryInterval } = {},\n ) {\n let rdpUnixSockets = [];\n\n const discoveryStartedAt = Date.now();\n const msg =\n `Waiting for ${apk} Remote Debugging Server...` +\n '\\nMake sure to enable \"Remote Debugging via USB\" ' +\n 'from Settings -> Developer Tools if it is not yet enabled.';\n\n while (rdpUnixSockets.length === 0) {\n log.info(msg);\n if (this.userAbortDiscovery) {\n throw new UsageError(\n 'Exiting Firefox Remote Debugging socket discovery on user request',\n );\n }\n\n if (Date.now() - discoveryStartedAt > maxDiscoveryTime) {\n throw new WebExtError(\n 'Timeout while waiting for the Android Firefox Debugger Socket',\n );\n }\n\n rdpUnixSockets = (\n await this.runShellCommand(deviceId, ['cat', '/proc/net/unix'])\n )\n .split('\\n')\n .filter((line) => {\n // The RDP unix socket is expected to be a path in the form:\n // /data/data/org.mozilla.fennec_rpl/firefox-debugger-socket\n return line.trim().endsWith(`${apk}/firefox-debugger-socket`);\n });\n\n if (rdpUnixSockets.length === 0) {\n await new Promise((resolve) => setTimeout(resolve, retryInterval));\n }\n }\n\n // Convert into an array of unix socket filenames.\n rdpUnixSockets = rdpUnixSockets.map((line) => {\n return line.trim().split(/\\s/).pop();\n });\n\n if (rdpUnixSockets.length > 1) {\n throw new WebExtError(\n 'Unexpected multiple RDP sockets: ' +\n `${JSON.stringify(rdpUnixSockets)}`,\n );\n }\n\n return rdpUnixSockets[0];\n }\n\n async setupForward(deviceId, remote, local) {\n const { adbClient } = this;\n\n // TODO(rpl): we should use adb.listForwards and reuse the existing one if any (especially\n // because adbkit doesn't seem to support `adb forward --remote` yet).\n log.debug(`Configuring ADB forward for ${deviceId}: ${remote} -> ${local}`);\n\n await wrapADBCall(async () => {\n await adbClient.getDevice(deviceId).forward(local, remote);\n });\n }\n}\n\nexport async function listADBDevices(adbBin) {\n const adbUtils = new ADBUtils({ adbBin });\n return adbUtils.discoverDevices();\n}\n\nexport async function listADBFirefoxAPKs(deviceId, adbBin) {\n const adbUtils = new ADBUtils({ adbBin });\n return adbUtils.discoverInstalledFirefoxAPKs(deviceId);\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"adb.js","names":["ADBKit","isErrorWithCode","UsageError","WebExtError","createLogger","packageIdentifiers","defaultApkComponents","DEVICE_DIR_BASE","ARTIFACTS_DIR_PREFIX","defaultADB","default","log","import","meta","url","wrapADBCall","asyncFn","error","message","includes","ADBUtils","params","adb","adbClient","artifactsDirMap","userAbortDiscovery","constructor","adbBin","adbHost","adbPort","createClient","bin","host","port","Map","runShellCommand","deviceId","cmd","debug","JSON","stringify","getDevice","shell","then","util","readAll","res","toString","discoverDevices","devices","listDevices","map","dev","id","getCurrentUser","currentUser","userId","parseInt","trim","isNaN","discoverInstalledFirefoxAPKs","firefoxApk","pmList","split","line","replace","filter","browser","startsWith","amForceStopAPK","apk","getOrCreateArtifactsDir","artifactsDir","get","Date","now","testDirOut","set","detectOrRemoveOldArtifacts","removeArtifactDirs","files","readdir","found","file","isDirectory","name","clearArtifactsDir","delete","pushFile","localPath","devicePath","push","transfer","Promise","resolve","on","startFirefoxAPK","apkComponent","deviceProfileDir","extras","key","value","component","startActivity","wait","action","category","setUserAbortDiscovery","discoverRDPUnixSocket","maxDiscoveryTime","retryInterval","rdpUnixSockets","discoveryStartedAt","msg","length","info","endsWith","setTimeout","pop","setupForward","remote","local","forward","listADBDevices","adbUtils","listADBFirefoxAPKs"],"sources":["../../src/util/adb.js"],"sourcesContent":["import ADBKit from '@devicefarmer/adbkit';\n\nimport { isErrorWithCode, UsageError, WebExtError } from '../errors.js';\nimport { createLogger } from '../util/logger.js';\nimport packageIdentifiers, {\n defaultApkComponents,\n} from '../firefox/package-identifiers.js';\n\nexport const DEVICE_DIR_BASE = '/data/local/tmp/';\nexport const ARTIFACTS_DIR_PREFIX = 'web-ext-artifacts-';\n\nconst defaultADB = ADBKit.default;\n\nconst log = createLogger(import.meta.url);\n\n// Helper function used to raise an UsageError when the adb binary has not been found.\nasync function wrapADBCall(asyncFn) {\n try {\n return await asyncFn();\n } catch (error) {\n if (\n isErrorWithCode('ENOENT', error) &&\n error.message.includes('spawn adb')\n ) {\n throw new UsageError(\n 'No adb executable has been found. ' +\n 'You can Use --adb-bin, --adb-host/--adb-port ' +\n 'to configure it manually if needed.',\n );\n }\n\n throw error;\n }\n}\n\nexport default class ADBUtils {\n params;\n adb;\n adbClient;\n\n // Map<deviceId -> artifactsDir>\n artifactsDirMap;\n // Toggled when the user wants to abort the RDP Unix Socket discovery loop\n // while it is still executing.\n userAbortDiscovery;\n\n constructor(params) {\n this.params = params;\n\n const { adb, adbBin, adbHost, adbPort } = params;\n\n this.adb = adb || defaultADB;\n\n this.adbClient = this.adb.createClient({\n bin: adbBin,\n host: adbHost,\n port: adbPort,\n });\n\n this.artifactsDirMap = new Map();\n\n this.userAbortDiscovery = false;\n }\n\n async runShellCommand(deviceId, cmd) {\n const { adb, adbClient } = this;\n\n log.debug(`Run adb shell command on ${deviceId}: ${JSON.stringify(cmd)}`);\n\n return wrapADBCall(async () => {\n return await adbClient\n .getDevice(deviceId)\n .shell(cmd)\n .then(adb.util.readAll);\n }).then((res) => res.toString());\n }\n\n async discoverDevices() {\n const { adbClient } = this;\n\n let devices = [];\n\n log.debug('Listing android devices');\n devices = await wrapADBCall(async () => adbClient.listDevices());\n\n return devices.map((dev) => dev.id);\n }\n\n async getCurrentUser(deviceId) {\n log.debug(`Retrieving current user on ${deviceId}`);\n\n const currentUser = await this.runShellCommand(deviceId, [\n 'am',\n 'get-current-user',\n ]);\n\n const userId = parseInt(currentUser.trim());\n if (isNaN(userId)) {\n throw new WebExtError(`Unable to retrieve current user on ${deviceId}`);\n }\n return userId;\n }\n\n async discoverInstalledFirefoxAPKs(deviceId, firefoxApk) {\n const userId = await this.getCurrentUser(deviceId);\n\n log.debug(`Listing installed Firefox APKs on ${deviceId}`);\n const pmList = await this.runShellCommand(deviceId, [\n 'pm',\n 'list',\n 'packages',\n '--user',\n `${userId}`,\n ]);\n\n return pmList\n .split('\\n')\n .map((line) => line.replace('package:', '').trim())\n .filter((line) => {\n // Look for an exact match if firefoxApk is defined.\n if (firefoxApk) {\n return line === firefoxApk;\n }\n // Match any package name that starts with the package name of a Firefox for Android browser.\n for (const browser of packageIdentifiers) {\n if (line.startsWith(browser)) {\n return true;\n }\n }\n\n return false;\n });\n }\n\n async amForceStopAPK(deviceId, apk) {\n await this.runShellCommand(deviceId, ['am', 'force-stop', apk]);\n }\n\n async getOrCreateArtifactsDir(deviceId) {\n let artifactsDir = this.artifactsDirMap.get(deviceId);\n\n if (artifactsDir) {\n return artifactsDir;\n }\n\n artifactsDir = `${DEVICE_DIR_BASE}${ARTIFACTS_DIR_PREFIX}${Date.now()}`;\n\n const testDirOut = (\n await this.runShellCommand(deviceId, `test -d ${artifactsDir} ; echo $?`)\n ).trim();\n\n if (testDirOut !== '1') {\n throw new WebExtError(\n `Cannot create artifacts directory ${artifactsDir} ` +\n `because it exists on ${deviceId}.`,\n );\n }\n\n await this.runShellCommand(deviceId, ['mkdir', '-p', artifactsDir]);\n\n this.artifactsDirMap.set(deviceId, artifactsDir);\n\n return artifactsDir;\n }\n\n async detectOrRemoveOldArtifacts(deviceId, removeArtifactDirs = false) {\n const { adbClient } = this;\n\n log.debug('Checking adb device for existing web-ext artifacts dirs');\n\n return wrapADBCall(async () => {\n const files = await adbClient\n .getDevice(deviceId)\n .readdir(DEVICE_DIR_BASE);\n let found = false;\n\n for (const file of files) {\n if (\n !file.isDirectory() ||\n !file.name.startsWith(ARTIFACTS_DIR_PREFIX)\n ) {\n continue;\n }\n\n // Return earlier if we only need to warn the user that some\n // existing artifacts dirs have been found on the adb device.\n if (!removeArtifactDirs) {\n return true;\n }\n\n found = true;\n\n const artifactsDir = `${DEVICE_DIR_BASE}${file.name}`;\n\n log.debug(\n `Removing artifacts directory ${artifactsDir} from device ${deviceId}`,\n );\n\n await this.runShellCommand(deviceId, ['rm', '-rf', artifactsDir]);\n }\n\n return found;\n });\n }\n\n async clearArtifactsDir(deviceId) {\n const artifactsDir = this.artifactsDirMap.get(deviceId);\n\n if (!artifactsDir) {\n // nothing to do here.\n return;\n }\n\n this.artifactsDirMap.delete(deviceId);\n\n log.debug(\n `Removing ${artifactsDir} artifacts directory on ${deviceId} device`,\n );\n\n await this.runShellCommand(deviceId, ['rm', '-rf', artifactsDir]);\n }\n\n async pushFile(deviceId, localPath, devicePath) {\n const { adbClient } = this;\n\n log.debug(`Pushing ${localPath} to ${devicePath} on ${deviceId}`);\n\n await wrapADBCall(async () => {\n await adbClient\n .getDevice(deviceId)\n .push(localPath, devicePath)\n .then(function (transfer) {\n return new Promise((resolve) => {\n transfer.on('end', resolve);\n });\n });\n });\n }\n\n async startFirefoxAPK(deviceId, apk, apkComponent, deviceProfileDir) {\n const { adbClient } = this;\n\n log.debug(`Starting ${apk} on ${deviceId}`);\n\n // Fenix does ignore the -profile parameter, on the contrary Fennec\n // would run using the given path as the profile to be used during\n // this execution.\n const extras = [\n {\n key: 'args',\n value: `-profile ${deviceProfileDir}`,\n },\n ];\n\n if (!apkComponent) {\n apkComponent = '.App';\n if (defaultApkComponents[apk]) {\n apkComponent = defaultApkComponents[apk];\n }\n } else if (!apkComponent.includes('.')) {\n apkComponent = `.${apkComponent}`;\n }\n\n // If `apk` is a browser package or the `apk` has a browser package prefix:\n // prepend the package identifier before `apkComponent`.\n if (apkComponent.startsWith('.')) {\n for (const browser of packageIdentifiers) {\n if (apk === browser || apk.startsWith(`${browser}.`)) {\n apkComponent = browser + apkComponent;\n break;\n }\n }\n }\n\n // If `apkComponent` starts with a '.', then adb will expand the following\n // to: `${apk}/${apk}.${apkComponent}`\n let component = `${apk}`;\n if (apkComponent) {\n component += `/${apkComponent}`;\n }\n\n await wrapADBCall(async () => {\n try {\n // TODO: once Fenix (release) uses Android 13, we can get rid of this\n // call and only use the second call in the `catch` block.\n await adbClient.getDevice(deviceId).startActivity({\n wait: true,\n action: 'android.activity.MAIN',\n component,\n extras,\n });\n } catch {\n // Android 13+ requires a different action/category but we still need\n // to support older Fenix builds.\n await adbClient.getDevice(deviceId).startActivity({\n wait: true,\n action: 'android.intent.action.MAIN',\n category: 'android.intent.category.LAUNCHER',\n component,\n extras,\n });\n }\n });\n }\n\n setUserAbortDiscovery(value) {\n this.userAbortDiscovery = value;\n }\n\n async discoverRDPUnixSocket(\n deviceId,\n apk,\n { maxDiscoveryTime, retryInterval } = {},\n ) {\n let rdpUnixSockets = [];\n\n const discoveryStartedAt = Date.now();\n const msg =\n `Waiting for ${apk} Remote Debugging Server...` +\n '\\nMake sure to enable \"Remote Debugging via USB\" ' +\n 'from Settings -> Developer Tools if it is not yet enabled.';\n\n while (rdpUnixSockets.length === 0) {\n log.info(msg);\n if (this.userAbortDiscovery) {\n throw new UsageError(\n 'Exiting Firefox Remote Debugging socket discovery on user request',\n );\n }\n\n if (Date.now() - discoveryStartedAt > maxDiscoveryTime) {\n throw new WebExtError(\n 'Timeout while waiting for the Android Firefox Debugger Socket',\n );\n }\n\n rdpUnixSockets = (\n await this.runShellCommand(deviceId, ['cat', '/proc/net/unix'])\n )\n .split('\\n')\n .filter((line) => {\n // The RDP unix socket is expected to be a path in the form:\n // /data/data/org.mozilla.fennec_rpl/firefox-debugger-socket\n return line.trim().endsWith(`${apk}/firefox-debugger-socket`);\n });\n\n if (rdpUnixSockets.length === 0) {\n await new Promise((resolve) => setTimeout(resolve, retryInterval));\n }\n }\n\n // Convert into an array of unix socket filenames.\n rdpUnixSockets = rdpUnixSockets.map((line) => {\n return line.trim().split(/\\s/).pop();\n });\n\n if (rdpUnixSockets.length > 1) {\n throw new WebExtError(\n 'Unexpected multiple RDP sockets: ' +\n `${JSON.stringify(rdpUnixSockets)}`,\n );\n }\n\n return rdpUnixSockets[0];\n }\n\n async setupForward(deviceId, remote, local) {\n const { adbClient } = this;\n\n // TODO(rpl): we should use adb.listForwards and reuse the existing one if any (especially\n // because adbkit doesn't seem to support `adb forward --remote` yet).\n log.debug(`Configuring ADB forward for ${deviceId}: ${remote} -> ${local}`);\n\n await wrapADBCall(async () => {\n await adbClient.getDevice(deviceId).forward(local, remote);\n });\n }\n}\n\nexport async function listADBDevices(adbBin) {\n const adbUtils = new ADBUtils({ adbBin });\n return adbUtils.discoverDevices();\n}\n\nexport async function listADBFirefoxAPKs(deviceId, adbBin) {\n const adbUtils = new ADBUtils({ adbBin });\n return adbUtils.discoverInstalledFirefoxAPKs(deviceId);\n}\n"],"mappings":"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","ignoreList":[]}
|
package/lib/util/artifacts.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import
|
|
2
|
-
import defaultAsyncMkdirp from 'mkdirp';
|
|
1
|
+
import fs from 'fs/promises';
|
|
3
2
|
import { UsageError, isErrorWithCode } from '../errors.js';
|
|
4
3
|
import { createLogger } from './logger.js';
|
|
5
4
|
const log = createLogger(import.meta.url);
|
|
6
5
|
const defaultAsyncFsAccess = fs.access.bind(fs);
|
|
7
6
|
export async function prepareArtifactsDir(artifactsDir, {
|
|
8
|
-
asyncMkdirp =
|
|
7
|
+
asyncMkdirp = dirPath => fs.mkdir(dirPath, {
|
|
8
|
+
recursive: true
|
|
9
|
+
}),
|
|
9
10
|
asyncFsAccess = defaultAsyncFsAccess
|
|
10
11
|
} = {}) {
|
|
11
12
|
try {
|
|
@@ -15,7 +16,7 @@ export async function prepareArtifactsDir(artifactsDir, {
|
|
|
15
16
|
}
|
|
16
17
|
// If the artifactsDir already exists, check that we have the write permissions on it.
|
|
17
18
|
try {
|
|
18
|
-
await asyncFsAccess(artifactsDir, fs.W_OK);
|
|
19
|
+
await asyncFsAccess(artifactsDir, fs.constants.W_OK);
|
|
19
20
|
} catch (accessErr) {
|
|
20
21
|
if (isErrorWithCode('EACCES', accessErr)) {
|
|
21
22
|
throw new UsageError(`--artifacts-dir="${artifactsDir}" exists but the user lacks ` + 'permissions on it.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","names":["fs","
|
|
1
|
+
{"version":3,"file":"artifacts.js","names":["fs","UsageError","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsAccess","access","bind","prepareArtifactsDir","artifactsDir","asyncMkdirp","dirPath","mkdir","recursive","asyncFsAccess","stats","stat","isDirectory","constants","W_OK","accessErr","error","debug","mkdirErr"],"sources":["../../src/util/artifacts.js"],"sourcesContent":["import fs from 'fs/promises';\n\nimport { UsageError, isErrorWithCode } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\nconst defaultAsyncFsAccess = fs.access.bind(fs);\n\nexport async function prepareArtifactsDir(\n artifactsDir,\n {\n asyncMkdirp = (dirPath) => fs.mkdir(dirPath, { recursive: true }),\n asyncFsAccess = defaultAsyncFsAccess,\n } = {},\n) {\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.constants.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":"AAAA,OAAOA,EAAE,MAAM,aAAa;AAE5B,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,oBAAoB,GAAGR,EAAE,CAACS,MAAM,CAACC,IAAI,CAACV,EAAE,CAAC;AAE/C,OAAO,eAAeW,mBAAmBA,CACvCC,YAAY,EACZ;EACEC,WAAW,GAAIC,OAAO,IAAKd,EAAE,CAACe,KAAK,CAACD,OAAO,EAAE;IAAEE,SAAS,EAAE;EAAK,CAAC,CAAC;EACjEC,aAAa,GAAGT;AAClB,CAAC,GAAG,CAAC,CAAC,EACN;EACA,IAAI;IACF,MAAMU,KAAK,GAAG,MAAMlB,EAAE,CAACmB,IAAI,CAACP,YAAY,CAAC;IACzC,IAAI,CAACM,KAAK,CAACE,WAAW,CAAC,CAAC,EAAE;MACxB,MAAM,IAAInB,UAAU,CAClB,oBAAoBW,YAAY,qCAClC,CAAC;IACH;IACA;IACA,IAAI;MACF,MAAMK,aAAa,CAACL,YAAY,EAAEZ,EAAE,CAACqB,SAAS,CAACC,IAAI,CAAC;IACtD,CAAC,CAAC,OAAOC,SAAS,EAAE;MAClB,IAAIrB,eAAe,CAAC,QAAQ,EAAEqB,SAAS,CAAC,EAAE;QACxC,MAAM,IAAItB,UAAU,CAClB,oBAAoBW,YAAY,8BAA8B,GAC5D,oBACJ,CAAC;MACH,CAAC,MAAM;QACL,MAAMW,SAAS;MACjB;IACF;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,IAAItB,eAAe,CAAC,QAAQ,EAAEsB,KAAK,CAAC,EAAE;MACpC;MACA,MAAM,IAAIvB,UAAU,CAClB,kCAAkCW,YAAY,qBAAqB,GACjE,sBAAsBY,KAAK,EAC/B,CAAC;IACH,CAAC,MAAM,IAAItB,eAAe,CAAC,QAAQ,EAAEsB,KAAK,CAAC,EAAE;MAC3C;MACA,IAAI;QACFpB,GAAG,CAACqB,KAAK,CAAC,iCAAiCb,YAAY,EAAE,CAAC;QAC1D,MAAMC,WAAW,CAACD,YAAY,CAAC;MACjC,CAAC,CAAC,OAAOc,QAAQ,EAAE;QACjB,IAAIxB,eAAe,CAAC,QAAQ,EAAEwB,QAAQ,CAAC,EAAE;UACvC;UACA,MAAM,IAAIzB,UAAU,CAClB,kCAAkCW,YAAY,gBAAgB,GAC5D,2BAA2Bc,QAAQ,EACvC,CAAC;QACH,CAAC,MAAM;UACL,MAAMA,QAAQ;QAChB;MACF;IACF,CAAC,MAAM;MACL,MAAMF,KAAK;IACb;EACF;EAEA,OAAOZ,YAAY;AACrB","ignoreList":[]}
|
package/lib/util/file-exists.js
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":["import
|
|
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":["import fs from 'fs/promises';\n\nimport { isErrorWithCode } from '../errors.js';\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,\n { fileIsReadable = (f) => fs.access(f, fs.constants.R_OK) } = {},\n) {\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":"AAAA,OAAOA,EAAE,MAAM,aAAa;AAE5B,SAASC,eAAe,QAAQ,cAAc;;AAE9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,eAAeC,UAAUA,CACtCC,IAAI,EACJ;EAAEC,cAAc,GAAIC,CAAC,IAAKL,EAAE,CAACM,MAAM,CAACD,CAAC,EAAEL,EAAE,CAACO,SAAS,CAACC,IAAI;AAAE,CAAC,GAAG,CAAC,CAAC,EAChE;EACA,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","ignoreList":[]}
|
package/lib/util/is-directory.js
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":["import
|
|
1
|
+
{"version":3,"file":"is-directory.js","names":["fs","onlyErrorsWithCode","isDirectory","path","stat","then","stats","catch"],"sources":["../../src/util/is-directory.js"],"sourcesContent":["import fs from 'fs/promises';\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) {\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":"AAAA,OAAOA,EAAE,MAAM,aAAa;AAE5B,SAASC,kBAAkB,QAAQ,cAAc;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASC,WAAWA,CAACC,IAAI,EAAE;EACxC,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","ignoreList":[]}
|
package/lib/util/logger.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { fileURLToPath } from 'url';
|
|
2
|
-
import
|
|
2
|
+
import pino, { levels as logLevels } from 'pino';
|
|
3
3
|
export class ConsoleStream {
|
|
4
4
|
verbose;
|
|
5
5
|
isCapturing;
|
|
@@ -16,21 +16,22 @@ export class ConsoleStream {
|
|
|
16
16
|
msg,
|
|
17
17
|
level
|
|
18
18
|
}) {
|
|
19
|
-
const prefix = this.verbose ? `[${name}][${
|
|
19
|
+
const prefix = this.verbose ? `[${name}][${logLevels.labels[level]}] ` : '';
|
|
20
20
|
return `${prefix}${msg}\n`;
|
|
21
21
|
}
|
|
22
22
|
makeVerbose() {
|
|
23
23
|
this.verbose = true;
|
|
24
24
|
}
|
|
25
|
-
write(
|
|
25
|
+
write(jsonString, {
|
|
26
26
|
localProcess = process
|
|
27
27
|
} = {}) {
|
|
28
|
-
const
|
|
28
|
+
const packet = JSON.parse(jsonString);
|
|
29
|
+
const thisLevel = this.verbose ? logLevels.values.trace : logLevels.values.info;
|
|
29
30
|
if (packet.level >= thisLevel) {
|
|
30
31
|
const msg = this.format(packet);
|
|
31
32
|
if (this.isCapturing) {
|
|
32
33
|
this.capturedMessages.push(msg);
|
|
33
|
-
} else if (packet.level >
|
|
34
|
+
} else if (packet.level > logLevels.values.info) {
|
|
34
35
|
localProcess.stderr.write(msg);
|
|
35
36
|
} else {
|
|
36
37
|
localProcess.stdout.write(msg);
|
|
@@ -58,18 +59,14 @@ export const consoleStream = new ConsoleStream();
|
|
|
58
59
|
// createLogger types and implementation.
|
|
59
60
|
|
|
60
61
|
export function createLogger(moduleURL, {
|
|
61
|
-
|
|
62
|
+
createPinoLog = pino
|
|
62
63
|
} = {}) {
|
|
63
|
-
return
|
|
64
|
+
return createPinoLog({
|
|
64
65
|
// Strip the leading src/ from file names (which is in all file names) to
|
|
65
66
|
// make the name less redundant.
|
|
66
67
|
name: moduleURL ? fileURLToPath(moduleURL).replace(/^src\//, '') : 'unknown-module',
|
|
67
68
|
// Capture all log levels and let the stream filter them.
|
|
68
|
-
level:
|
|
69
|
-
|
|
70
|
-
type: 'raw',
|
|
71
|
-
stream: consoleStream
|
|
72
|
-
}]
|
|
73
|
-
});
|
|
69
|
+
level: logLevels.values.trace
|
|
70
|
+
}, consoleStream);
|
|
74
71
|
}
|
|
75
72
|
//# sourceMappingURL=logger.js.map
|
package/lib/util/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","names":["fileURLToPath","
|
|
1
|
+
{"version":3,"file":"logger.js","names":["fileURLToPath","pino","levels","logLevels","ConsoleStream","verbose","isCapturing","capturedMessages","constructor","format","name","msg","level","prefix","labels","makeVerbose","write","jsonString","localProcess","process","packet","JSON","parse","thisLevel","values","trace","info","push","stderr","stdout","startCapturing","stopCapturing","flushCapturedLogs","consoleStream","createLogger","moduleURL","createPinoLog","replace"],"sources":["../../src/util/logger.js"],"sourcesContent":["import { fileURLToPath } from 'url';\n\nimport pino, { levels as logLevels } from 'pino';\n\nexport class ConsoleStream {\n verbose;\n isCapturing;\n capturedMessages;\n\n constructor({ verbose = false } = {}) {\n this.verbose = verbose;\n this.isCapturing = false;\n this.capturedMessages = [];\n }\n\n format({ name, msg, level }) {\n const prefix = this.verbose ? `[${name}][${logLevels.labels[level]}] ` : '';\n return `${prefix}${msg}\\n`;\n }\n\n makeVerbose() {\n this.verbose = true;\n }\n\n write(jsonString, { localProcess = process } = {}) {\n const packet = JSON.parse(jsonString);\n const thisLevel = this.verbose\n ? logLevels.values.trace\n : logLevels.values.info;\n if (packet.level >= thisLevel) {\n const msg = this.format(packet);\n if (this.isCapturing) {\n this.capturedMessages.push(msg);\n } else if (packet.level > logLevels.values.info) {\n localProcess.stderr.write(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 } = {}) {\n for (const msg of this.capturedMessages) {\n localProcess.stdout.write(msg);\n }\n this.capturedMessages = [];\n }\n}\n\nexport const consoleStream = new ConsoleStream();\n\n// createLogger types and implementation.\n\nexport function createLogger(moduleURL, { createPinoLog = pino } = {}) {\n return createPinoLog(\n {\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: logLevels.values.trace,\n },\n consoleStream,\n );\n}\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,KAAK;AAEnC,OAAOC,IAAI,IAAIC,MAAM,IAAIC,SAAS,QAAQ,MAAM;AAEhD,OAAO,MAAMC,aAAa,CAAC;EACzBC,OAAO;EACPC,WAAW;EACXC,gBAAgB;EAEhBC,WAAWA,CAAC;IAAEH,OAAO,GAAG;EAAM,CAAC,GAAG,CAAC,CAAC,EAAE;IACpC,IAAI,CAACA,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAE,MAAMA,CAAC;IAAEC,IAAI;IAAEC,GAAG;IAAEC;EAAM,CAAC,EAAE;IAC3B,MAAMC,MAAM,GAAG,IAAI,CAACR,OAAO,GAAG,IAAIK,IAAI,KAAKP,SAAS,CAACW,MAAM,CAACF,KAAK,CAAC,IAAI,GAAG,EAAE;IAC3E,OAAO,GAAGC,MAAM,GAAGF,GAAG,IAAI;EAC5B;EAEAI,WAAWA,CAAA,EAAG;IACZ,IAAI,CAACV,OAAO,GAAG,IAAI;EACrB;EAEAW,KAAKA,CAACC,UAAU,EAAE;IAAEC,YAAY,GAAGC;EAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;IACjD,MAAMC,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACL,UAAU,CAAC;IACrC,MAAMM,SAAS,GAAG,IAAI,CAAClB,OAAO,GAC1BF,SAAS,CAACqB,MAAM,CAACC,KAAK,GACtBtB,SAAS,CAACqB,MAAM,CAACE,IAAI;IACzB,IAAIN,MAAM,CAACR,KAAK,IAAIW,SAAS,EAAE;MAC7B,MAAMZ,GAAG,GAAG,IAAI,CAACF,MAAM,CAACW,MAAM,CAAC;MAC/B,IAAI,IAAI,CAACd,WAAW,EAAE;QACpB,IAAI,CAACC,gBAAgB,CAACoB,IAAI,CAAChB,GAAG,CAAC;MACjC,CAAC,MAAM,IAAIS,MAAM,CAACR,KAAK,GAAGT,SAAS,CAACqB,MAAM,CAACE,IAAI,EAAE;QAC/CR,YAAY,CAACU,MAAM,CAACZ,KAAK,CAACL,GAAG,CAAC;MAChC,CAAC,MAAM;QACLO,YAAY,CAACW,MAAM,CAACb,KAAK,CAACL,GAAG,CAAC;MAChC;IACF;EACF;EAEAmB,cAAcA,CAAA,EAAG;IACf,IAAI,CAACxB,WAAW,GAAG,IAAI;EACzB;EAEAyB,aAAaA,CAAA,EAAG;IACd,IAAI,CAACzB,WAAW,GAAG,KAAK;IACxB,IAAI,CAACC,gBAAgB,GAAG,EAAE;EAC5B;EAEAyB,iBAAiBA,CAAC;IAAEd,YAAY,GAAGC;EAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;IACjD,KAAK,MAAMR,GAAG,IAAI,IAAI,CAACJ,gBAAgB,EAAE;MACvCW,YAAY,CAACW,MAAM,CAACb,KAAK,CAACL,GAAG,CAAC;IAChC;IACA,IAAI,CAACJ,gBAAgB,GAAG,EAAE;EAC5B;AACF;AAEA,OAAO,MAAM0B,aAAa,GAAG,IAAI7B,aAAa,CAAC,CAAC;;AAEhD;;AAEA,OAAO,SAAS8B,YAAYA,CAACC,SAAS,EAAE;EAAEC,aAAa,GAAGnC;AAAK,CAAC,GAAG,CAAC,CAAC,EAAE;EACrE,OAAOmC,aAAa,CAClB;IACE;IACA;IACA1B,IAAI,EAAEyB,SAAS,GACXnC,aAAa,CAACmC,SAAS,CAAC,CAACE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,GAC9C,gBAAgB;IACpB;IACAzB,KAAK,EAAET,SAAS,CAACqB,MAAM,CAACC;EAC1B,CAAC,EACDQ,aACF,CAAC;AACH","ignoreList":[]}
|
package/lib/util/manifest.js
CHANGED
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":["import path from 'path';\
|
|
1
|
+
{"version":3,"file":"manifest.js","names":["path","fs","parseJSON","stripBom","stripJsonComments","InvalidManifest","createLogger","log","import","meta","url","getValidatedManifest","sourceDir","manifestFile","join","debug","manifestContents","readFile","encoding","error","manifestData","errors","name","push","version","applications","gecko","length","getManifestId","manifestApps","browser_specific_settings","apps","id","undefined"],"sources":["../../src/util/manifest.js"],"sourcesContent":["import path from 'path';\nimport fs from 'fs/promises';\n\nimport parseJSON from 'parse-json';\nimport stripBom from 'strip-bom';\nimport stripJsonComments from 'strip-json-comments';\n\nimport { InvalidManifest } from '../errors.js';\nimport { createLogger } from './logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// getValidatedManifest helper types and implementation\n\nexport default async function getValidatedManifest(sourceDir) {\n const manifestFile = path.join(sourceDir, 'manifest.json');\n log.debug(`Validating manifest at ${manifestFile}`);\n\n let manifestContents;\n\n try {\n manifestContents = await fs.readFile(manifestFile, { encoding: 'utf-8' });\n } catch (error) {\n throw new InvalidManifest(\n `Could not read manifest.json file at ${manifestFile}: ${error}`,\n );\n }\n\n manifestContents = stripBom(manifestContents);\n\n let manifestData;\n\n try {\n manifestData = parseJSON(stripJsonComments(manifestContents));\n } catch (error) {\n throw new InvalidManifest(\n `Error parsing manifest.json file at ${manifestFile}: ${error}`,\n );\n }\n\n const errors = [];\n // This is just some basic validation of what web-ext needs, not\n // what Firefox will need to run the extension.\n // TODO: integrate with the addons-linter for actual validation.\n if (!manifestData.name) {\n errors.push('missing \"name\" property');\n }\n if (!manifestData.version) {\n errors.push('missing \"version\" property');\n }\n\n if (manifestData.applications && !manifestData.applications.gecko) {\n // Since the applications property only applies to gecko, make\n // sure 'gecko' exists when 'applications' is defined. This should\n // make introspection of gecko properties easier.\n errors.push('missing \"applications.gecko\" property');\n }\n\n if (errors.length) {\n throw new InvalidManifest(\n `Manifest at ${manifestFile} is invalid: ${errors.join('; ')}`,\n );\n }\n\n return manifestData;\n}\n\nexport function getManifestId(manifestData) {\n const manifestApps = [\n manifestData.browser_specific_settings,\n manifestData.applications,\n ];\n for (const apps of manifestApps) {\n // If both bss and applications contain a defined gecko property,\n // we prefer bss even if the id property isn't available.\n // This match what Firefox does in this particular scenario, see\n // https://searchfox.org/mozilla-central/rev/828f2319c0195d7f561ed35533aef6fe183e68e3/toolkit/mozapps/extensions/internal/XPIInstall.jsm#470-474,488\n if (apps?.gecko) {\n return apps.gecko.id;\n }\n }\n\n return undefined;\n}\n"],"mappings":"AAAA,OAAOA,IAAI,MAAM,MAAM;AACvB,OAAOC,EAAE,MAAM,aAAa;AAE5B,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,QAAQ,MAAM,WAAW;AAChC,OAAOC,iBAAiB,MAAM,qBAAqB;AAEnD,SAASC,eAAe,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;;AAEzC;;AAEA,eAAe,eAAeC,oBAAoBA,CAACC,SAAS,EAAE;EAC5D,MAAMC,YAAY,GAAGb,IAAI,CAACc,IAAI,CAACF,SAAS,EAAE,eAAe,CAAC;EAC1DL,GAAG,CAACQ,KAAK,CAAC,0BAA0BF,YAAY,EAAE,CAAC;EAEnD,IAAIG,gBAAgB;EAEpB,IAAI;IACFA,gBAAgB,GAAG,MAAMf,EAAE,CAACgB,QAAQ,CAACJ,YAAY,EAAE;MAAEK,QAAQ,EAAE;IAAQ,CAAC,CAAC;EAC3E,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACvB,wCAAwCQ,YAAY,KAAKM,KAAK,EAChE,CAAC;EACH;EAEAH,gBAAgB,GAAGb,QAAQ,CAACa,gBAAgB,CAAC;EAE7C,IAAII,YAAY;EAEhB,IAAI;IACFA,YAAY,GAAGlB,SAAS,CAACE,iBAAiB,CAACY,gBAAgB,CAAC,CAAC;EAC/D,CAAC,CAAC,OAAOG,KAAK,EAAE;IACd,MAAM,IAAId,eAAe,CACvB,uCAAuCQ,YAAY,KAAKM,KAAK,EAC/D,CAAC;EACH;EAEA,MAAME,MAAM,GAAG,EAAE;EACjB;EACA;EACA;EACA,IAAI,CAACD,YAAY,CAACE,IAAI,EAAE;IACtBD,MAAM,CAACE,IAAI,CAAC,yBAAyB,CAAC;EACxC;EACA,IAAI,CAACH,YAAY,CAACI,OAAO,EAAE;IACzBH,MAAM,CAACE,IAAI,CAAC,4BAA4B,CAAC;EAC3C;EAEA,IAAIH,YAAY,CAACK,YAAY,IAAI,CAACL,YAAY,CAACK,YAAY,CAACC,KAAK,EAAE;IACjE;IACA;IACA;IACAL,MAAM,CAACE,IAAI,CAAC,uCAAuC,CAAC;EACtD;EAEA,IAAIF,MAAM,CAACM,MAAM,EAAE;IACjB,MAAM,IAAItB,eAAe,CACvB,eAAeQ,YAAY,gBAAgBQ,MAAM,CAACP,IAAI,CAAC,IAAI,CAAC,EAC9D,CAAC;EACH;EAEA,OAAOM,YAAY;AACrB;AAEA,OAAO,SAASQ,aAAaA,CAACR,YAAY,EAAE;EAC1C,MAAMS,YAAY,GAAG,CACnBT,YAAY,CAACU,yBAAyB,EACtCV,YAAY,CAACK,YAAY,CAC1B;EACD,KAAK,MAAMM,IAAI,IAAIF,YAAY,EAAE;IAC/B;IACA;IACA;IACA;IACA,IAAIE,IAAI,aAAJA,IAAI,eAAJA,IAAI,CAAEL,KAAK,EAAE;MACf,OAAOK,IAAI,CAACL,KAAK,CAACM,EAAE;IACtB;EACF;EAEA,OAAOC,SAAS;AAClB","ignoreList":[]}
|
package/lib/util/submit-addon.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
|
+
import { basename } from 'path';
|
|
1
2
|
import { createHash } from 'crypto';
|
|
2
|
-
import { createWriteStream, promises as fsPromises } from 'fs';
|
|
3
|
+
import { createWriteStream, promises as fsPromises, readFileSync } from 'fs';
|
|
3
4
|
import { promises as streamPromises } from 'stream';
|
|
4
|
-
|
|
5
|
-
// eslint-disable-next-line no-shadow
|
|
6
|
-
import fetch, { FormData, fileFromSync } from 'node-fetch';
|
|
7
5
|
import { SignJWT } from 'jose';
|
|
8
6
|
import JSZip from 'jszip';
|
|
9
7
|
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
@@ -11,6 +9,26 @@ import { isErrorWithCode } from '../errors.js';
|
|
|
11
9
|
import { createLogger } from './../util/logger.js';
|
|
12
10
|
const log = createLogger(import.meta.url);
|
|
13
11
|
export const defaultAsyncFsReadFile = fsPromises.readFile;
|
|
12
|
+
|
|
13
|
+
// Used by fileFromSync method to make sure the form-data entry will
|
|
14
|
+
// include a filename derived from the file path.
|
|
15
|
+
//
|
|
16
|
+
// TODO: Get rid of this hack when we will bump the web-ext nodejs
|
|
17
|
+
// version required to nodejs v20 (where the native File constructor
|
|
18
|
+
// exists).
|
|
19
|
+
export class FileBlob extends Blob {
|
|
20
|
+
#name = '';
|
|
21
|
+
constructor(fileBits, fileName, options) {
|
|
22
|
+
super(fileBits, options);
|
|
23
|
+
this.#name = String(fileName);
|
|
24
|
+
}
|
|
25
|
+
get name() {
|
|
26
|
+
return this.#name;
|
|
27
|
+
}
|
|
28
|
+
get [Symbol.toStringTag]() {
|
|
29
|
+
return 'File';
|
|
30
|
+
}
|
|
31
|
+
}
|
|
14
32
|
export class JwtApiAuth {
|
|
15
33
|
#apiKey;
|
|
16
34
|
#apiSecret;
|
|
@@ -79,8 +97,13 @@ export default class Client {
|
|
|
79
97
|
this.downloadDir = downloadDir;
|
|
80
98
|
this.userAgentString = userAgentString;
|
|
81
99
|
}
|
|
82
|
-
fileFromSync(
|
|
83
|
-
|
|
100
|
+
fileFromSync(filePath) {
|
|
101
|
+
// create a File blob from a file path, and ensure it to have the file path basename
|
|
102
|
+
// as the associated filename, the AMO server API will be checking it on the form-data
|
|
103
|
+
// submitted and fail with the error message:
|
|
104
|
+
// "Unsupported file type, please upload a supported file (.crx, .xpi, .zip)."
|
|
105
|
+
const fileData = readFileSync(filePath);
|
|
106
|
+
return new FileBlob([fileData], basename(filePath));
|
|
84
107
|
}
|
|
85
108
|
nodeFetch(url, {
|
|
86
109
|
method,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit-addon.js","names":["createHash","createWriteStream","promises","fsPromises","streamPromises","fetch","FormData","fileFromSync","SignJWT","JSZip","HttpsProxyAgent","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsReadFile","readFile","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","constructor","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","apiProxy","apiUr","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","userAgentString","baseUrl","process","cwd","pathname","endsWith","URL","href","apiUrl","path","nodeFetch","method","headers","body","agent","doUploadSubmit","xpiPath","channel","formData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","editUrl","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","errorMessage","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","debug","validation","valid","JSON","stringify","join","doNewAddonSubmit","metaDataJson","jsonData","version","upload","doNewAddonOrVersionSubmit","addonId","doFormDataPatch","data","versionId","patchUrl","field","response","ok","status","error","warn","Object","keys","doAfterSubmit","newVersionId","patchData","returnResult","fileUrl","waitForApproval","downloadSignedFile","file","errorMsg","statusText","json","Authorization","Accept","downloadedFiles","id","filename","split","pop","dest","saveToFile","contents","destPath","pipeline","hashXpiCrcs","filePath","asyncFsReadFile","zip","loadAsync","createFolders","hash","entries","forEach","relativePath","entry","_entry$_data","replace","dir","push","crc32","_data","sort","a","b","update","digest","getPreviousUuidOrUploadXpi","savedUploadUuidPath","saveUploadUuidToFileFunc","saveUploadUuidToFile","getUploadUuidFromFileFunc","getUploadUuidFromFile","uploadUuid","previousUuid","previousChannel","xpiCrcHash","previousHash","all","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","guid","edit_url","putVersion","signAddon","amoBaseUrl","submissionSource","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","stats2","source","writeFile","toString","content","parse"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["import { createHash } from 'crypto';\nimport { createWriteStream, promises as fsPromises } from 'fs';\nimport { promises as streamPromises } from 'stream';\n\n// eslint-disable-next-line no-shadow\nimport fetch, { FormData, fileFromSync } from 'node-fetch';\nimport { SignJWT } from 'jose';\nimport JSZip from 'jszip';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\n\nimport { isErrorWithCode } from '../errors.js';\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport const defaultAsyncFsReadFile = fsPromises.readFile;\n\nexport class JwtApiAuth {\n #apiKey;\n #apiSecret;\n #apiJwtExpiresIn;\n\n constructor({\n apiKey,\n apiSecret,\n apiJwtExpiresIn = 60 * 5, // 5 minutes\n }) {\n this.#apiKey = apiKey;\n this.#apiSecret = apiSecret;\n this.#apiJwtExpiresIn = apiJwtExpiresIn;\n }\n\n async signJWT() {\n return (\n new SignJWT({ iss: this.#apiKey })\n .setProtectedHeader({ alg: 'HS256' })\n .setIssuedAt()\n // jose expects either:\n // a number, which is treated an absolute timestamp - so must be after now, or\n // a string, which is parsed as a relative time from now.\n .setExpirationTime(`${this.#apiJwtExpiresIn}seconds`)\n .sign(Uint8Array.from(Buffer.from(this.#apiSecret, 'utf8')))\n );\n }\n\n async getAuthHeader() {\n const authToken = await this.signJWT();\n return `JWT ${authToken}`;\n }\n}\n\nexport default class Client {\n apiAuth;\n apiProxy;\n apiUr;\n validationCheckInterval;\n validationCheckTimeout;\n approvalCheckInterval;\n approvalCheckTimeout;\n downloadDir;\n userAgentString;\n\n constructor({\n apiAuth,\n apiProxy,\n baseUrl,\n validationCheckInterval = 1000,\n validationCheckTimeout = 300000, // 5 minutes.\n approvalCheckInterval = 1000,\n approvalCheckTimeout = 900000, // 15 minutes.\n downloadDir = process.cwd(),\n userAgentString,\n }) {\n this.apiAuth = apiAuth;\n if (apiProxy) {\n this.apiProxy = apiProxy;\n }\n if (!baseUrl.pathname.endsWith('/')) {\n baseUrl = new URL(baseUrl.href);\n baseUrl.pathname += '/';\n }\n this.apiUrl = new URL('addons/', baseUrl);\n this.validationCheckInterval = validationCheckInterval;\n this.validationCheckTimeout = validationCheckTimeout;\n this.approvalCheckInterval = approvalCheckInterval;\n this.approvalCheckTimeout = approvalCheckTimeout;\n this.downloadDir = downloadDir;\n this.userAgentString = userAgentString;\n }\n\n fileFromSync(path) {\n return fileFromSync(path);\n }\n\n nodeFetch(url, { method, headers, body, agent }) {\n return fetch(url, { method, headers, body, agent });\n }\n\n async doUploadSubmit(xpiPath, channel) {\n const url = new URL('upload/', this.apiUrl);\n const formData = new FormData();\n formData.set('channel', channel);\n formData.set('upload', this.fileFromSync(xpiPath));\n const { uuid } = await this.fetchJson(\n url,\n 'POST',\n formData,\n 'Upload failed',\n );\n return this.waitForValidation(uuid);\n }\n\n waitRetry(\n successFunc,\n checkUrl,\n checkInterval,\n abortInterval,\n context,\n editUrl = null,\n ) {\n let checkTimeout;\n\n return new Promise((resolve, reject) => {\n const abortTimeout = setTimeout(() => {\n clearTimeout(checkTimeout);\n\n let errorMessage = `${context}: timeout exceeded.`;\n if (editUrl) {\n errorMessage += ` When approved the signed XPI file can be downloaded from ${editUrl}`;\n }\n\n reject(new Error(errorMessage));\n }, abortInterval);\n\n const pollStatus = async () => {\n try {\n const responseData = await this.fetchJson(\n checkUrl,\n 'GET',\n undefined,\n 'Getting details failed',\n );\n\n const success = successFunc(responseData);\n if (success) {\n clearTimeout(abortTimeout);\n resolve(success);\n } else {\n // Still in progress, so wait for a while and try again.\n checkTimeout = setTimeout(pollStatus, checkInterval);\n }\n } catch (err) {\n clearTimeout(abortTimeout);\n reject(err);\n }\n };\n\n pollStatus();\n });\n }\n\n waitForValidation(uuid) {\n log.info('Waiting for validation...');\n return this.waitRetry(\n (detailResponseData) => {\n if (!detailResponseData.processed) {\n return null;\n }\n\n log.debug('Validation results:', detailResponseData.validation);\n if (detailResponseData.valid) {\n return detailResponseData.uuid;\n }\n\n throw new Error(\n [\n 'Validation failed:\\n',\n JSON.stringify(detailResponseData.validation, null, 2),\n ].join(''),\n );\n },\n new URL(`upload/${uuid}/`, this.apiUrl),\n this.validationCheckInterval,\n this.validationCheckTimeout,\n 'Validation',\n );\n }\n\n async doNewAddonSubmit(uuid, metaDataJson) {\n const url = new URL('addon/', this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(\n url,\n 'POST',\n JSON.stringify(jsonData),\n 'Submission failed (1)',\n );\n }\n\n doNewAddonOrVersionSubmit(addonId, uuid, metaDataJson) {\n const url = new URL(`addon/${addonId}/`, this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(\n url,\n 'PUT',\n JSON.stringify(jsonData),\n 'Submission failed (2)',\n );\n }\n\n async doFormDataPatch(data, addonId, versionId) {\n const patchUrl = new URL(\n `addon/${addonId}/versions/${versionId}/`,\n this.apiUrl,\n );\n try {\n const formData = new FormData();\n for (const field in data) {\n formData.set(field, data[field]);\n }\n\n const response = await this.fetch(patchUrl, 'PATCH', formData);\n if (!response.ok) {\n throw new Error(`response status was ${response.status}`);\n }\n } catch (error) {\n log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);\n throw new Error(`Uploading ${Object.keys(data)} failed`);\n }\n }\n\n async doAfterSubmit(addonId, newVersionId, editUrl, patchData) {\n if (patchData && patchData.version) {\n log.info(`Submitting ${Object.keys(patchData.version)} to version`);\n await this.doFormDataPatch(patchData.version, addonId, newVersionId);\n }\n\n if (this.approvalCheckTimeout === 0) {\n log.info(\n [\n 'Waiting for approval and download of signed XPI skipped.',\n `When approved the signed XPI file can be downloaded from ${editUrl}`,\n ].join(' '),\n );\n return this.returnResult(addonId);\n }\n\n const fileUrl = new URL(\n await this.waitForApproval(addonId, newVersionId, editUrl),\n );\n return this.downloadSignedFile(fileUrl, addonId);\n }\n\n waitForApproval(addonId, versionId, editUrl) {\n log.info('Waiting for approval...');\n return this.waitRetry(\n (detailResponseData) => {\n const { file } = detailResponseData;\n if (file && file.status === 'public') {\n return file.url;\n }\n\n return null;\n },\n new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl),\n this.approvalCheckInterval,\n this.approvalCheckTimeout,\n 'Approval',\n editUrl,\n );\n }\n\n async fetchJson(url, method = 'GET', body, errorMsg = 'Bad Request') {\n const response = await this.fetch(url, method, body);\n if (response.status < 200 || response.status >= 500) {\n throw new Error(\n `${errorMsg}: ${response.statusText || response.status}.`,\n );\n }\n const data = await response.json();\n\n if (!response.ok) {\n throw new Error(\n [\n `${errorMsg}: ${response.statusText || response.status}`,\n JSON.stringify(data, null, 2),\n ].join('\\n'),\n );\n }\n return data;\n }\n\n async fetch(url, method = 'GET', body) {\n log.debug(`${method}ing URL: ${url.href}`);\n let headers = {\n Authorization: await this.apiAuth.getAuthHeader(),\n Accept: 'application/json',\n 'User-Agent': this.userAgentString,\n };\n if (typeof body === 'string') {\n headers = {\n ...headers,\n 'Content-Type': 'application/json',\n };\n }\n let agent;\n if (this.apiProxy) {\n agent = new HttpsProxyAgent(this.apiProxy);\n }\n return this.nodeFetch(url, { method, body, headers, agent });\n }\n\n returnResult(addonId, downloadedFiles) {\n return {\n id: addonId,\n downloadedFiles,\n };\n }\n\n async downloadSignedFile(fileUrl, addonId) {\n const filename = fileUrl.pathname.split('/').pop(); // get the name from fileUrl\n const dest = `${this.downloadDir}/${filename}`;\n try {\n const response = await this.fetch(fileUrl);\n if (!response.ok || !response.body) {\n throw new Error(`response status was ${response.status}`);\n }\n await this.saveToFile(response.body, dest);\n } catch (error) {\n log.info(`Download of signed xpi failed: ${error}.`);\n throw new Error(`Downloading ${filename} failed`);\n }\n log.info(`Signed xpi downloaded: ${dest}`);\n return this.returnResult(addonId, [filename]);\n }\n\n async saveToFile(contents, destPath) {\n return streamPromises.pipeline(contents, createWriteStream(destPath));\n }\n\n /*\n This function aims to quickly hash the contents of the zip file that's being uploaded,\n to compare it to the previous zip file that was uploaded, so we can skip the upload for\n efficiency.\n\n CRCs are used from the zip to avoid having to extract and hash all the files.\n\n Two zips that have different byte contents in their files must have a different hash;\n but returning a different hash when the contents are the same in some cases is acceptable\n - a false mismatch does not result in lost data.\n */\n async hashXpiCrcs(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {\n const zip = await JSZip.loadAsync(\n asyncFsReadFile(filePath, { createFolders: true }),\n );\n const hash = createHash('sha256');\n const entries = [];\n zip.forEach((relativePath, entry) => {\n let path = relativePath.replace(/\\/+$/, '');\n if (entry.dir) {\n path += '/';\n }\n // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0\n entries.push({ path, crc32: entry._data?.crc32 || 0 });\n });\n entries.sort((a, b) => (a.path === b.path ? 0 : a.path > b.path ? 1 : -1));\n hash.update(JSON.stringify(entries));\n return hash.digest('hex');\n }\n\n async getPreviousUuidOrUploadXpi(\n xpiPath,\n channel,\n savedUploadUuidPath,\n saveUploadUuidToFileFunc = saveUploadUuidToFile,\n getUploadUuidFromFileFunc = getUploadUuidFromFile,\n ) {\n const [\n {\n uploadUuid: previousUuid,\n channel: previousChannel,\n xpiCrcHash: previousHash,\n },\n xpiCrcHash,\n ] = await Promise.all([\n getUploadUuidFromFileFunc(savedUploadUuidPath),\n this.hashXpiCrcs(xpiPath),\n ]);\n\n let uploadUuid;\n if (previousChannel !== channel || xpiCrcHash !== previousHash) {\n uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n await saveUploadUuidToFileFunc(savedUploadUuidPath, {\n uploadUuid,\n channel,\n xpiCrcHash,\n });\n } else {\n uploadUuid = previousUuid;\n }\n return uploadUuid;\n }\n\n async postNewAddon(\n uploadUuid,\n savedIdPath,\n metaDataJson,\n patchData,\n saveIdToFileFunc = saveIdToFile,\n ) {\n const {\n guid: addonId,\n version: { id: newVersionId, edit_url: editUrl },\n } = await this.doNewAddonSubmit(uploadUuid, metaDataJson);\n\n await saveIdToFileFunc(savedIdPath, addonId);\n log.info(`Generated extension ID: ${addonId}.`);\n log.info('You must add the following to your manifest:');\n log.info(`\"browser_specific_settings\": {\"gecko\": {\"id\": \"${addonId}\"}}`);\n\n return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n }\n\n async putVersion(uploadUuid, addonId, metaDataJson, patchData) {\n const {\n version: { id: newVersionId, edit_url: editUrl },\n } = await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n }\n}\n\nexport async function signAddon({\n apiKey,\n apiSecret,\n apiProxy,\n amoBaseUrl,\n validationCheckTimeout,\n approvalCheckTimeout,\n id,\n xpiPath,\n downloadDir,\n channel,\n savedIdPath,\n savedUploadUuidPath,\n metaDataJson = {},\n submissionSource,\n userAgentString,\n SubmitClient = Client,\n ApiAuthClass = JwtApiAuth,\n}) {\n try {\n const stats = await fsPromises.stat(xpiPath);\n\n if (!stats.isFile()) {\n throw new Error('not a file');\n }\n } catch (statError) {\n throw new Error(`error with ${xpiPath}: ${statError}`);\n }\n\n let baseUrl;\n try {\n baseUrl = new URL(amoBaseUrl);\n } catch (err) {\n throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n }\n\n const client = new SubmitClient({\n apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n apiProxy,\n baseUrl,\n validationCheckTimeout,\n approvalCheckTimeout,\n downloadDir,\n userAgentString,\n });\n const uploadUuid = await client.getPreviousUuidOrUploadXpi(\n xpiPath,\n channel,\n savedUploadUuidPath,\n );\n const patchData = {};\n // if we have a source file we need to upload we patch after the create\n if (submissionSource) {\n try {\n const stats2 = await fsPromises.stat(submissionSource);\n\n if (!stats2.isFile()) {\n throw new Error('not a file');\n }\n } catch (statError) {\n throw new Error(`error with ${submissionSource}: ${statError}`);\n }\n patchData.version = { source: client.fileFromSync(submissionSource) };\n }\n\n // We specifically need to know if `id` has not been passed as a parameter because\n // it's the indication that a new add-on should be created, rather than a new version.\n if (id === undefined) {\n return client.postNewAddon(\n uploadUuid,\n savedIdPath,\n metaDataJson,\n patchData,\n );\n }\n\n return client.putVersion(uploadUuid, id, metaDataJson, patchData);\n}\n\nexport async function saveIdToFile(filePath, id) {\n await fsPromises.writeFile(\n filePath,\n [\n '# This file was created by https://github.com/mozilla/web-ext',\n '# Your auto-generated extension ID for addons.mozilla.org is:',\n id.toString(),\n ].join('\\n'),\n );\n\n log.debug(`Saved auto-generated ID ${id} to ${filePath}`);\n}\n\nexport async function saveUploadUuidToFile(\n filePath,\n { uploadUuid, channel, xpiCrcHash },\n) {\n await fsPromises.writeFile(\n filePath,\n JSON.stringify({ uploadUuid, channel, xpiCrcHash }),\n );\n log.debug(\n `Saved upload UUID ${uploadUuid}, xpi crc hash ${xpiCrcHash}, and channel ${channel} to ${filePath}`,\n );\n}\n\nexport async function getUploadUuidFromFile(\n filePath,\n asyncFsReadFile = defaultAsyncFsReadFile,\n) {\n try {\n const content = await asyncFsReadFile(filePath, 'utf-8');\n const { uploadUuid, channel, xpiCrcHash } = JSON.parse(content);\n log.debug(\n `Found upload uuid:${uploadUuid}, channel:${channel}, hash:${xpiCrcHash} in ${filePath}`,\n );\n return { uploadUuid, channel, xpiCrcHash };\n } catch (error) {\n if (isErrorWithCode('ENOENT', error)) {\n log.debug(`No upload uuid file found at: ${filePath}`);\n } else {\n log.debug(`Invalid upload uuid file contents in ${filePath}: ${error}`);\n }\n }\n\n return { uploadUuid: '', channel: '', xpiCrcHash: '' };\n}\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,QAAQ;AACnC,SAASC,iBAAiB,EAAEC,QAAQ,IAAIC,UAAU,QAAQ,IAAI;AAC9D,SAASD,QAAQ,IAAIE,cAAc,QAAQ,QAAQ;;AAEnD;AACA,OAAOC,KAAK,IAAIC,QAAQ,EAAEC,YAAY,QAAQ,YAAY;AAC1D,SAASC,OAAO,QAAQ,MAAM;AAC9B,OAAOC,KAAK,MAAM,OAAO;AACzB,SAASC,eAAe,QAAQ,mBAAmB;AAEnD,SAASC,eAAe,QAAQ,cAAc;AAC9C,SAASC,YAAY,QAAQ,qBAAqB;AAElD,MAAMC,GAAG,GAAGD,YAAY,CAACE,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;AAEzC,OAAO,MAAMC,sBAAsB,GAAGd,UAAU,CAACe,QAAQ;AAEzD,OAAO,MAAMC,UAAU,CAAC;EACtB,CAACC,MAAM;EACP,CAACC,SAAS;EACV,CAACC,eAAe;EAEhBC,WAAWA,CAAC;IACVH,MAAM;IACNC,SAAS;IACTC,eAAe,GAAG,EAAE,GAAG,CAAC,CAAE;EAC5B,CAAC,EAAE;IACD,IAAI,CAAC,CAACF,MAAM,GAAGA,MAAM;IACrB,IAAI,CAAC,CAACC,SAAS,GAAGA,SAAS;IAC3B,IAAI,CAAC,CAACC,eAAe,GAAGA,eAAe;EACzC;EAEA,MAAME,OAAOA,CAAA,EAAG;IACd,OACE,IAAIhB,OAAO,CAAC;MAAEiB,GAAG,EAAE,IAAI,CAAC,CAACL;IAAO,CAAC,CAAC,CAC/BM,kBAAkB,CAAC;MAAEC,GAAG,EAAE;IAAQ,CAAC,CAAC,CACpCC,WAAW,CAAC;IACb;IACA;IACA;IAAA,CACCC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAACP,eAAe,SAAS,CAAC,CACpDQ,IAAI,CAACC,UAAU,CAACC,IAAI,CAACC,MAAM,CAACD,IAAI,CAAC,IAAI,CAAC,CAACX,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;EAElE;EAEA,MAAMa,aAAaA,CAAA,EAAG;IACpB,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACX,OAAO,CAAC,CAAC;IACtC,OAAO,OAAOW,SAAS,EAAE;EAC3B;AACF;AAEA,eAAe,MAAMC,MAAM,CAAC;EAC1BC,OAAO;EACPC,QAAQ;EACRC,KAAK;EACLC,uBAAuB;EACvBC,sBAAsB;EACtBC,qBAAqB;EACrBC,oBAAoB;EACpBC,WAAW;EACXC,eAAe;EAEftB,WAAWA,CAAC;IACVc,OAAO;IACPC,QAAQ;IACRQ,OAAO;IACPN,uBAAuB,GAAG,IAAI;IAC9BC,sBAAsB,GAAG,MAAM;IAAE;IACjCC,qBAAqB,GAAG,IAAI;IAC5BC,oBAAoB,GAAG,MAAM;IAAE;IAC/BC,WAAW,GAAGG,OAAO,CAACC,GAAG,CAAC,CAAC;IAC3BH;EACF,CAAC,EAAE;IACD,IAAI,CAACR,OAAO,GAAGA,OAAO;IACtB,IAAIC,QAAQ,EAAE;MACZ,IAAI,CAACA,QAAQ,GAAGA,QAAQ;IAC1B;IACA,IAAI,CAACQ,OAAO,CAACG,QAAQ,CAACC,QAAQ,CAAC,GAAG,CAAC,EAAE;MACnCJ,OAAO,GAAG,IAAIK,GAAG,CAACL,OAAO,CAACM,IAAI,CAAC;MAC/BN,OAAO,CAACG,QAAQ,IAAI,GAAG;IACzB;IACA,IAAI,CAACI,MAAM,GAAG,IAAIF,GAAG,CAAC,SAAS,EAAEL,OAAO,CAAC;IACzC,IAAI,CAACN,uBAAuB,GAAGA,uBAAuB;IACtD,IAAI,CAACC,sBAAsB,GAAGA,sBAAsB;IACpD,IAAI,CAACC,qBAAqB,GAAGA,qBAAqB;IAClD,IAAI,CAACC,oBAAoB,GAAGA,oBAAoB;IAChD,IAAI,CAACC,WAAW,GAAGA,WAAW;IAC9B,IAAI,CAACC,eAAe,GAAGA,eAAe;EACxC;EAEAtC,YAAYA,CAAC+C,IAAI,EAAE;IACjB,OAAO/C,YAAY,CAAC+C,IAAI,CAAC;EAC3B;EAEAC,SAASA,CAACvC,GAAG,EAAE;IAAEwC,MAAM;IAAEC,OAAO;IAAEC,IAAI;IAAEC;EAAM,CAAC,EAAE;IAC/C,OAAOtD,KAAK,CAACW,GAAG,EAAE;MAAEwC,MAAM;MAAEC,OAAO;MAAEC,IAAI;MAAEC;IAAM,CAAC,CAAC;EACrD;EAEA,MAAMC,cAAcA,CAACC,OAAO,EAAEC,OAAO,EAAE;IACrC,MAAM9C,GAAG,GAAG,IAAImC,GAAG,CAAC,SAAS,EAAE,IAAI,CAACE,MAAM,CAAC;IAC3C,MAAMU,QAAQ,GAAG,IAAIzD,QAAQ,CAAC,CAAC;IAC/ByD,QAAQ,CAACC,GAAG,CAAC,SAAS,EAAEF,OAAO,CAAC;IAChCC,QAAQ,CAACC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAACzD,YAAY,CAACsD,OAAO,CAAC,CAAC;IAClD,MAAM;MAAEI;IAAK,CAAC,GAAG,MAAM,IAAI,CAACC,SAAS,CACnClD,GAAG,EACH,MAAM,EACN+C,QAAQ,EACR,eACF,CAAC;IACD,OAAO,IAAI,CAACI,iBAAiB,CAACF,IAAI,CAAC;EACrC;EAEAG,SAASA,CACPC,WAAW,EACXC,QAAQ,EACRC,aAAa,EACbC,aAAa,EACbC,OAAO,EACPC,OAAO,GAAG,IAAI,EACd;IACA,IAAIC,YAAY;IAEhB,OAAO,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MACtC,MAAMC,YAAY,GAAGC,UAAU,CAAC,MAAM;QACpCC,YAAY,CAACN,YAAY,CAAC;QAE1B,IAAIO,YAAY,GAAG,GAAGT,OAAO,qBAAqB;QAClD,IAAIC,OAAO,EAAE;UACXQ,YAAY,IAAI,6DAA6DR,OAAO,EAAE;QACxF;QAEAI,MAAM,CAAC,IAAIK,KAAK,CAACD,YAAY,CAAC,CAAC;MACjC,CAAC,EAAEV,aAAa,CAAC;MAEjB,MAAMY,UAAU,GAAG,MAAAA,CAAA,KAAY;QAC7B,IAAI;UACF,MAAMC,YAAY,GAAG,MAAM,IAAI,CAACnB,SAAS,CACvCI,QAAQ,EACR,KAAK,EACLgB,SAAS,EACT,wBACF,CAAC;UAED,MAAMC,OAAO,GAAGlB,WAAW,CAACgB,YAAY,CAAC;UACzC,IAAIE,OAAO,EAAE;YACXN,YAAY,CAACF,YAAY,CAAC;YAC1BF,OAAO,CAACU,OAAO,CAAC;UAClB,CAAC,MAAM;YACL;YACAZ,YAAY,GAAGK,UAAU,CAACI,UAAU,EAAEb,aAAa,CAAC;UACtD;QACF,CAAC,CAAC,OAAOiB,GAAG,EAAE;UACZP,YAAY,CAACF,YAAY,CAAC;UAC1BD,MAAM,CAACU,GAAG,CAAC;QACb;MACF,CAAC;MAEDJ,UAAU,CAAC,CAAC;IACd,CAAC,CAAC;EACJ;EAEAjB,iBAAiBA,CAACF,IAAI,EAAE;IACtBpD,GAAG,CAAC4E,IAAI,CAAC,2BAA2B,CAAC;IACrC,OAAO,IAAI,CAACrB,SAAS,CAClBsB,kBAAkB,IAAK;MACtB,IAAI,CAACA,kBAAkB,CAACC,SAAS,EAAE;QACjC,OAAO,IAAI;MACb;MAEA9E,GAAG,CAAC+E,KAAK,CAAC,qBAAqB,EAAEF,kBAAkB,CAACG,UAAU,CAAC;MAC/D,IAAIH,kBAAkB,CAACI,KAAK,EAAE;QAC5B,OAAOJ,kBAAkB,CAACzB,IAAI;MAChC;MAEA,MAAM,IAAIkB,KAAK,CACb,CACE,sBAAsB,EACtBY,IAAI,CAACC,SAAS,CAACN,kBAAkB,CAACG,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CACvD,CAACI,IAAI,CAAC,EAAE,CACX,CAAC;IACH,CAAC,EACD,IAAI9C,GAAG,CAAC,UAAUc,IAAI,GAAG,EAAE,IAAI,CAACZ,MAAM,CAAC,EACvC,IAAI,CAACb,uBAAuB,EAC5B,IAAI,CAACC,sBAAsB,EAC3B,YACF,CAAC;EACH;EAEA,MAAMyD,gBAAgBA,CAACjC,IAAI,EAAEkC,YAAY,EAAE;IACzC,MAAMnF,GAAG,GAAG,IAAImC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAACE,MAAM,CAAC;IAC1C,MAAM+C,QAAQ,GAAG;MACf,GAAGD,YAAY;MACfE,OAAO,EAAE;QAAEC,MAAM,EAAErC,IAAI;QAAE,GAAGkC,YAAY,CAACE;MAAQ;IACnD,CAAC;IACD,OAAO,IAAI,CAACnC,SAAS,CACnBlD,GAAG,EACH,MAAM,EACN+E,IAAI,CAACC,SAAS,CAACI,QAAQ,CAAC,EACxB,uBACF,CAAC;EACH;EAEAG,yBAAyBA,CAACC,OAAO,EAAEvC,IAAI,EAAEkC,YAAY,EAAE;IACrD,MAAMnF,GAAG,GAAG,IAAImC,GAAG,CAAC,SAASqD,OAAO,GAAG,EAAE,IAAI,CAACnD,MAAM,CAAC;IACrD,MAAM+C,QAAQ,GAAG;MACf,GAAGD,YAAY;MACfE,OAAO,EAAE;QAAEC,MAAM,EAAErC,IAAI;QAAE,GAAGkC,YAAY,CAACE;MAAQ;IACnD,CAAC;IACD,OAAO,IAAI,CAACnC,SAAS,CACnBlD,GAAG,EACH,KAAK,EACL+E,IAAI,CAACC,SAAS,CAACI,QAAQ,CAAC,EACxB,uBACF,CAAC;EACH;EAEA,MAAMK,eAAeA,CAACC,IAAI,EAAEF,OAAO,EAAEG,SAAS,EAAE;IAC9C,MAAMC,QAAQ,GAAG,IAAIzD,GAAG,CACtB,SAASqD,OAAO,aAAaG,SAAS,GAAG,EACzC,IAAI,CAACtD,MACP,CAAC;IACD,IAAI;MACF,MAAMU,QAAQ,GAAG,IAAIzD,QAAQ,CAAC,CAAC;MAC/B,KAAK,MAAMuG,KAAK,IAAIH,IAAI,EAAE;QACxB3C,QAAQ,CAACC,GAAG,CAAC6C,KAAK,EAAEH,IAAI,CAACG,KAAK,CAAC,CAAC;MAClC;MAEA,MAAMC,QAAQ,GAAG,MAAM,IAAI,CAACzG,KAAK,CAACuG,QAAQ,EAAE,OAAO,EAAE7C,QAAQ,CAAC;MAC9D,IAAI,CAAC+C,QAAQ,CAACC,EAAE,EAAE;QAChB,MAAM,IAAI5B,KAAK,CAAC,uBAAuB2B,QAAQ,CAACE,MAAM,EAAE,CAAC;MAC3D;IACF,CAAC,CAAC,OAAOC,KAAK,EAAE;MACdpG,GAAG,CAACqG,IAAI,CAAC,aAAaC,MAAM,CAACC,IAAI,CAACV,IAAI,CAAC,YAAYO,KAAK,GAAG,CAAC;MAC5D,MAAM,IAAI9B,KAAK,CAAC,aAAagC,MAAM,CAACC,IAAI,CAACV,IAAI,CAAC,SAAS,CAAC;IAC1D;EACF;EAEA,MAAMW,aAAaA,CAACb,OAAO,EAAEc,YAAY,EAAE5C,OAAO,EAAE6C,SAAS,EAAE;IAC7D,IAAIA,SAAS,IAAIA,SAAS,CAAClB,OAAO,EAAE;MAClCxF,GAAG,CAAC4E,IAAI,CAAC,cAAc0B,MAAM,CAACC,IAAI,CAACG,SAAS,CAAClB,OAAO,CAAC,aAAa,CAAC;MACnE,MAAM,IAAI,CAACI,eAAe,CAACc,SAAS,CAAClB,OAAO,EAAEG,OAAO,EAAEc,YAAY,CAAC;IACtE;IAEA,IAAI,IAAI,CAAC3E,oBAAoB,KAAK,CAAC,EAAE;MACnC9B,GAAG,CAAC4E,IAAI,CACN,CACE,0DAA0D,EAC1D,4DAA4Df,OAAO,EAAE,CACtE,CAACuB,IAAI,CAAC,GAAG,CACZ,CAAC;MACD,OAAO,IAAI,CAACuB,YAAY,CAAChB,OAAO,CAAC;IACnC;IAEA,MAAMiB,OAAO,GAAG,IAAItE,GAAG,CACrB,MAAM,IAAI,CAACuE,eAAe,CAAClB,OAAO,EAAEc,YAAY,EAAE5C,OAAO,CAC3D,CAAC;IACD,OAAO,IAAI,CAACiD,kBAAkB,CAACF,OAAO,EAAEjB,OAAO,CAAC;EAClD;EAEAkB,eAAeA,CAAClB,OAAO,EAAEG,SAAS,EAAEjC,OAAO,EAAE;IAC3C7D,GAAG,CAAC4E,IAAI,CAAC,yBAAyB,CAAC;IACnC,OAAO,IAAI,CAACrB,SAAS,CAClBsB,kBAAkB,IAAK;MACtB,MAAM;QAAEkC;MAAK,CAAC,GAAGlC,kBAAkB;MACnC,IAAIkC,IAAI,IAAIA,IAAI,CAACZ,MAAM,KAAK,QAAQ,EAAE;QACpC,OAAOY,IAAI,CAAC5G,GAAG;MACjB;MAEA,OAAO,IAAI;IACb,CAAC,EACD,IAAImC,GAAG,CAAC,SAASqD,OAAO,aAAaG,SAAS,GAAG,EAAE,IAAI,CAACtD,MAAM,CAAC,EAC/D,IAAI,CAACX,qBAAqB,EAC1B,IAAI,CAACC,oBAAoB,EACzB,UAAU,EACV+B,OACF,CAAC;EACH;EAEA,MAAMR,SAASA,CAAClD,GAAG,EAAEwC,MAAM,GAAG,KAAK,EAAEE,IAAI,EAAEmE,QAAQ,GAAG,aAAa,EAAE;IACnE,MAAMf,QAAQ,GAAG,MAAM,IAAI,CAACzG,KAAK,CAACW,GAAG,EAAEwC,MAAM,EAAEE,IAAI,CAAC;IACpD,IAAIoD,QAAQ,CAACE,MAAM,GAAG,GAAG,IAAIF,QAAQ,CAACE,MAAM,IAAI,GAAG,EAAE;MACnD,MAAM,IAAI7B,KAAK,CACb,GAAG0C,QAAQ,KAAKf,QAAQ,CAACgB,UAAU,IAAIhB,QAAQ,CAACE,MAAM,GACxD,CAAC;IACH;IACA,MAAMN,IAAI,GAAG,MAAMI,QAAQ,CAACiB,IAAI,CAAC,CAAC;IAElC,IAAI,CAACjB,QAAQ,CAACC,EAAE,EAAE;MAChB,MAAM,IAAI5B,KAAK,CACb,CACE,GAAG0C,QAAQ,KAAKf,QAAQ,CAACgB,UAAU,IAAIhB,QAAQ,CAACE,MAAM,EAAE,EACxDjB,IAAI,CAACC,SAAS,CAACU,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAC9B,CAACT,IAAI,CAAC,IAAI,CACb,CAAC;IACH;IACA,OAAOS,IAAI;EACb;EAEA,MAAMrG,KAAKA,CAACW,GAAG,EAAEwC,MAAM,GAAG,KAAK,EAAEE,IAAI,EAAE;IACrC7C,GAAG,CAAC+E,KAAK,CAAC,GAAGpC,MAAM,YAAYxC,GAAG,CAACoC,IAAI,EAAE,CAAC;IAC1C,IAAIK,OAAO,GAAG;MACZuE,aAAa,EAAE,MAAM,IAAI,CAAC3F,OAAO,CAACH,aAAa,CAAC,CAAC;MACjD+F,MAAM,EAAE,kBAAkB;MAC1B,YAAY,EAAE,IAAI,CAACpF;IACrB,CAAC;IACD,IAAI,OAAOa,IAAI,KAAK,QAAQ,EAAE;MAC5BD,OAAO,GAAG;QACR,GAAGA,OAAO;QACV,cAAc,EAAE;MAClB,CAAC;IACH;IACA,IAAIE,KAAK;IACT,IAAI,IAAI,CAACrB,QAAQ,EAAE;MACjBqB,KAAK,GAAG,IAAIjD,eAAe,CAAC,IAAI,CAAC4B,QAAQ,CAAC;IAC5C;IACA,OAAO,IAAI,CAACiB,SAAS,CAACvC,GAAG,EAAE;MAAEwC,MAAM;MAAEE,IAAI;MAAED,OAAO;MAAEE;IAAM,CAAC,CAAC;EAC9D;EAEA6D,YAAYA,CAAChB,OAAO,EAAE0B,eAAe,EAAE;IACrC,OAAO;MACLC,EAAE,EAAE3B,OAAO;MACX0B;IACF,CAAC;EACH;EAEA,MAAMP,kBAAkBA,CAACF,OAAO,EAAEjB,OAAO,EAAE;IACzC,MAAM4B,QAAQ,GAAGX,OAAO,CAACxE,QAAQ,CAACoF,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpD,MAAMC,IAAI,GAAG,GAAG,IAAI,CAAC3F,WAAW,IAAIwF,QAAQ,EAAE;IAC9C,IAAI;MACF,MAAMtB,QAAQ,GAAG,MAAM,IAAI,CAACzG,KAAK,CAACoH,OAAO,CAAC;MAC1C,IAAI,CAACX,QAAQ,CAACC,EAAE,IAAI,CAACD,QAAQ,CAACpD,IAAI,EAAE;QAClC,MAAM,IAAIyB,KAAK,CAAC,uBAAuB2B,QAAQ,CAACE,MAAM,EAAE,CAAC;MAC3D;MACA,MAAM,IAAI,CAACwB,UAAU,CAAC1B,QAAQ,CAACpD,IAAI,EAAE6E,IAAI,CAAC;IAC5C,CAAC,CAAC,OAAOtB,KAAK,EAAE;MACdpG,GAAG,CAAC4E,IAAI,CAAC,kCAAkCwB,KAAK,GAAG,CAAC;MACpD,MAAM,IAAI9B,KAAK,CAAC,eAAeiD,QAAQ,SAAS,CAAC;IACnD;IACAvH,GAAG,CAAC4E,IAAI,CAAC,0BAA0B8C,IAAI,EAAE,CAAC;IAC1C,OAAO,IAAI,CAACf,YAAY,CAAChB,OAAO,EAAE,CAAC4B,QAAQ,CAAC,CAAC;EAC/C;EAEA,MAAMI,UAAUA,CAACC,QAAQ,EAAEC,QAAQ,EAAE;IACnC,OAAOtI,cAAc,CAACuI,QAAQ,CAACF,QAAQ,EAAExI,iBAAiB,CAACyI,QAAQ,CAAC,CAAC;EACvE;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EAGE,MAAME,WAAWA,CAACC,QAAQ,EAAEC,eAAe,GAAG7H,sBAAsB,EAAE;IACpE,MAAM8H,GAAG,GAAG,MAAMtI,KAAK,CAACuI,SAAS,CAC/BF,eAAe,CAACD,QAAQ,EAAE;MAAEI,aAAa,EAAE;IAAK,CAAC,CACnD,CAAC;IACD,MAAMC,IAAI,GAAGlJ,UAAU,CAAC,QAAQ,CAAC;IACjC,MAAMmJ,OAAO,GAAG,EAAE;IAClBJ,GAAG,CAACK,OAAO,CAAC,CAACC,YAAY,EAAEC,KAAK,KAAK;MAAA,IAAAC,YAAA;MACnC,IAAIjG,IAAI,GAAG+F,YAAY,CAACG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;MAC3C,IAAIF,KAAK,CAACG,GAAG,EAAE;QACbnG,IAAI,IAAI,GAAG;MACb;MACA;MACA6F,OAAO,CAACO,IAAI,CAAC;QAAEpG,IAAI;QAAEqG,KAAK,EAAE,EAAAJ,YAAA,GAAAD,KAAK,CAACM,KAAK,cAAAL,YAAA,uBAAXA,YAAA,CAAaI,KAAK,KAAI;MAAE,CAAC,CAAC;IACxD,CAAC,CAAC;IACFR,OAAO,CAACU,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAMD,CAAC,CAACxG,IAAI,KAAKyG,CAAC,CAACzG,IAAI,GAAG,CAAC,GAAGwG,CAAC,CAACxG,IAAI,GAAGyG,CAAC,CAACzG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAE,CAAC;IAC1E4F,IAAI,CAACc,MAAM,CAACjE,IAAI,CAACC,SAAS,CAACmD,OAAO,CAAC,CAAC;IACpC,OAAOD,IAAI,CAACe,MAAM,CAAC,KAAK,CAAC;EAC3B;EAEA,MAAMC,0BAA0BA,CAC9BrG,OAAO,EACPC,OAAO,EACPqG,mBAAmB,EACnBC,wBAAwB,GAAGC,oBAAoB,EAC/CC,yBAAyB,GAAGC,qBAAqB,EACjD;IACA,MAAM,CACJ;MACEC,UAAU,EAAEC,YAAY;MACxB3G,OAAO,EAAE4G,eAAe;MACxBC,UAAU,EAAEC;IACd,CAAC,EACDD,UAAU,CACX,GAAG,MAAM/F,OAAO,CAACiG,GAAG,CAAC,CACpBP,yBAAyB,CAACH,mBAAmB,CAAC,EAC9C,IAAI,CAACvB,WAAW,CAAC/E,OAAO,CAAC,CAC1B,CAAC;IAEF,IAAI2G,UAAU;IACd,IAAIE,eAAe,KAAK5G,OAAO,IAAI6G,UAAU,KAAKC,YAAY,EAAE;MAC9DJ,UAAU,GAAG,MAAM,IAAI,CAAC5G,cAAc,CAACC,OAAO,EAAEC,OAAO,CAAC;MACxD,MAAMsG,wBAAwB,CAACD,mBAAmB,EAAE;QAClDK,UAAU;QACV1G,OAAO;QACP6G;MACF,CAAC,CAAC;IACJ,CAAC,MAAM;MACLH,UAAU,GAAGC,YAAY;IAC3B;IACA,OAAOD,UAAU;EACnB;EAEA,MAAMM,YAAYA,CAChBN,UAAU,EACVO,WAAW,EACX5E,YAAY,EACZoB,SAAS,EACTyD,gBAAgB,GAAGC,YAAY,EAC/B;IACA,MAAM;MACJC,IAAI,EAAE1E,OAAO;MACbH,OAAO,EAAE;QAAE8B,EAAE,EAAEb,YAAY;QAAE6D,QAAQ,EAAEzG;MAAQ;IACjD,CAAC,GAAG,MAAM,IAAI,CAACwB,gBAAgB,CAACsE,UAAU,EAAErE,YAAY,CAAC;IAEzD,MAAM6E,gBAAgB,CAACD,WAAW,EAAEvE,OAAO,CAAC;IAC5C3F,GAAG,CAAC4E,IAAI,CAAC,2BAA2Be,OAAO,GAAG,CAAC;IAC/C3F,GAAG,CAAC4E,IAAI,CAAC,8CAA8C,CAAC;IACxD5E,GAAG,CAAC4E,IAAI,CAAC,kDAAkDe,OAAO,KAAK,CAAC;IAExE,OAAO,IAAI,CAACa,aAAa,CAACb,OAAO,EAAEc,YAAY,EAAE5C,OAAO,EAAE6C,SAAS,CAAC;EACtE;EAEA,MAAM6D,UAAUA,CAACZ,UAAU,EAAEhE,OAAO,EAAEL,YAAY,EAAEoB,SAAS,EAAE;IAC7D,MAAM;MACJlB,OAAO,EAAE;QAAE8B,EAAE,EAAEb,YAAY;QAAE6D,QAAQ,EAAEzG;MAAQ;IACjD,CAAC,GAAG,MAAM,IAAI,CAAC6B,yBAAyB,CAACC,OAAO,EAAEgE,UAAU,EAAErE,YAAY,CAAC;IAE3E,OAAO,IAAI,CAACkB,aAAa,CAACb,OAAO,EAAEc,YAAY,EAAE5C,OAAO,EAAE6C,SAAS,CAAC;EACtE;AACF;AAEA,OAAO,eAAe8D,SAASA,CAAC;EAC9BjK,MAAM;EACNC,SAAS;EACTiB,QAAQ;EACRgJ,UAAU;EACV7I,sBAAsB;EACtBE,oBAAoB;EACpBwF,EAAE;EACFtE,OAAO;EACPjB,WAAW;EACXkB,OAAO;EACPiH,WAAW;EACXZ,mBAAmB;EACnBhE,YAAY,GAAG,CAAC,CAAC;EACjBoF,gBAAgB;EAChB1I,eAAe;EACf2I,YAAY,GAAGpJ,MAAM;EACrBqJ,YAAY,GAAGtK;AACjB,CAAC,EAAE;EACD,IAAI;IACF,MAAMuK,KAAK,GAAG,MAAMvL,UAAU,CAACwL,IAAI,CAAC9H,OAAO,CAAC;IAE5C,IAAI,CAAC6H,KAAK,CAACE,MAAM,CAAC,CAAC,EAAE;MACnB,MAAM,IAAIzG,KAAK,CAAC,YAAY,CAAC;IAC/B;EACF,CAAC,CAAC,OAAO0G,SAAS,EAAE;IAClB,MAAM,IAAI1G,KAAK,CAAC,cAActB,OAAO,KAAKgI,SAAS,EAAE,CAAC;EACxD;EAEA,IAAI/I,OAAO;EACX,IAAI;IACFA,OAAO,GAAG,IAAIK,GAAG,CAACmI,UAAU,CAAC;EAC/B,CAAC,CAAC,OAAO9F,GAAG,EAAE;IACZ,MAAM,IAAIL,KAAK,CAAC,6BAA6BmG,UAAU,EAAE,CAAC;EAC5D;EAEA,MAAMQ,MAAM,GAAG,IAAIN,YAAY,CAAC;IAC9BnJ,OAAO,EAAE,IAAIoJ,YAAY,CAAC;MAAErK,MAAM;MAAEC;IAAU,CAAC,CAAC;IAChDiB,QAAQ;IACRQ,OAAO;IACPL,sBAAsB;IACtBE,oBAAoB;IACpBC,WAAW;IACXC;EACF,CAAC,CAAC;EACF,MAAM2H,UAAU,GAAG,MAAMsB,MAAM,CAAC5B,0BAA0B,CACxDrG,OAAO,EACPC,OAAO,EACPqG,mBACF,CAAC;EACD,MAAM5C,SAAS,GAAG,CAAC,CAAC;EACpB;EACA,IAAIgE,gBAAgB,EAAE;IACpB,IAAI;MACF,MAAMQ,MAAM,GAAG,MAAM5L,UAAU,CAACwL,IAAI,CAACJ,gBAAgB,CAAC;MAEtD,IAAI,CAACQ,MAAM,CAACH,MAAM,CAAC,CAAC,EAAE;QACpB,MAAM,IAAIzG,KAAK,CAAC,YAAY,CAAC;MAC/B;IACF,CAAC,CAAC,OAAO0G,SAAS,EAAE;MAClB,MAAM,IAAI1G,KAAK,CAAC,cAAcoG,gBAAgB,KAAKM,SAAS,EAAE,CAAC;IACjE;IACAtE,SAAS,CAAClB,OAAO,GAAG;MAAE2F,MAAM,EAAEF,MAAM,CAACvL,YAAY,CAACgL,gBAAgB;IAAE,CAAC;EACvE;;EAEA;EACA;EACA,IAAIpD,EAAE,KAAK7C,SAAS,EAAE;IACpB,OAAOwG,MAAM,CAAChB,YAAY,CACxBN,UAAU,EACVO,WAAW,EACX5E,YAAY,EACZoB,SACF,CAAC;EACH;EAEA,OAAOuE,MAAM,CAACV,UAAU,CAACZ,UAAU,EAAErC,EAAE,EAAEhC,YAAY,EAAEoB,SAAS,CAAC;AACnE;AAEA,OAAO,eAAe0D,YAAYA,CAACpC,QAAQ,EAAEV,EAAE,EAAE;EAC/C,MAAMhI,UAAU,CAAC8L,SAAS,CACxBpD,QAAQ,EACR,CACE,+DAA+D,EAC/D,+DAA+D,EAC/DV,EAAE,CAAC+D,QAAQ,CAAC,CAAC,CACd,CAACjG,IAAI,CAAC,IAAI,CACb,CAAC;EAEDpF,GAAG,CAAC+E,KAAK,CAAC,2BAA2BuC,EAAE,OAAOU,QAAQ,EAAE,CAAC;AAC3D;AAEA,OAAO,eAAewB,oBAAoBA,CACxCxB,QAAQ,EACR;EAAE2B,UAAU;EAAE1G,OAAO;EAAE6G;AAAW,CAAC,EACnC;EACA,MAAMxK,UAAU,CAAC8L,SAAS,CACxBpD,QAAQ,EACR9C,IAAI,CAACC,SAAS,CAAC;IAAEwE,UAAU;IAAE1G,OAAO;IAAE6G;EAAW,CAAC,CACpD,CAAC;EACD9J,GAAG,CAAC+E,KAAK,CACP,qBAAqB4E,UAAU,kBAAkBG,UAAU,iBAAiB7G,OAAO,OAAO+E,QAAQ,EACpG,CAAC;AACH;AAEA,OAAO,eAAe0B,qBAAqBA,CACzC1B,QAAQ,EACRC,eAAe,GAAG7H,sBAAsB,EACxC;EACA,IAAI;IACF,MAAMkL,OAAO,GAAG,MAAMrD,eAAe,CAACD,QAAQ,EAAE,OAAO,CAAC;IACxD,MAAM;MAAE2B,UAAU;MAAE1G,OAAO;MAAE6G;IAAW,CAAC,GAAG5E,IAAI,CAACqG,KAAK,CAACD,OAAO,CAAC;IAC/DtL,GAAG,CAAC+E,KAAK,CACP,qBAAqB4E,UAAU,aAAa1G,OAAO,UAAU6G,UAAU,OAAO9B,QAAQ,EACxF,CAAC;IACD,OAAO;MAAE2B,UAAU;MAAE1G,OAAO;MAAE6G;IAAW,CAAC;EAC5C,CAAC,CAAC,OAAO1D,KAAK,EAAE;IACd,IAAItG,eAAe,CAAC,QAAQ,EAAEsG,KAAK,CAAC,EAAE;MACpCpG,GAAG,CAAC+E,KAAK,CAAC,iCAAiCiD,QAAQ,EAAE,CAAC;IACxD,CAAC,MAAM;MACLhI,GAAG,CAAC+E,KAAK,CAAC,wCAAwCiD,QAAQ,KAAK5B,KAAK,EAAE,CAAC;IACzE;EACF;EAEA,OAAO;IAAEuD,UAAU,EAAE,EAAE;IAAE1G,OAAO,EAAE,EAAE;IAAE6G,UAAU,EAAE;EAAG,CAAC;AACxD","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"submit-addon.js","names":["basename","createHash","createWriteStream","promises","fsPromises","readFileSync","streamPromises","SignJWT","JSZip","HttpsProxyAgent","isErrorWithCode","createLogger","log","import","meta","url","defaultAsyncFsReadFile","readFile","FileBlob","Blob","name","constructor","fileBits","fileName","options","String","Symbol","toStringTag","JwtApiAuth","apiKey","apiSecret","apiJwtExpiresIn","signJWT","iss","setProtectedHeader","alg","setIssuedAt","setExpirationTime","sign","Uint8Array","from","Buffer","getAuthHeader","authToken","Client","apiAuth","apiProxy","apiUr","validationCheckInterval","validationCheckTimeout","approvalCheckInterval","approvalCheckTimeout","downloadDir","userAgentString","baseUrl","process","cwd","pathname","endsWith","URL","href","apiUrl","fileFromSync","filePath","fileData","nodeFetch","method","headers","body","agent","fetch","doUploadSubmit","xpiPath","channel","formData","FormData","set","uuid","fetchJson","waitForValidation","waitRetry","successFunc","checkUrl","checkInterval","abortInterval","context","editUrl","checkTimeout","Promise","resolve","reject","abortTimeout","setTimeout","clearTimeout","errorMessage","Error","pollStatus","responseData","undefined","success","err","info","detailResponseData","processed","debug","validation","valid","JSON","stringify","join","doNewAddonSubmit","metaDataJson","jsonData","version","upload","doNewAddonOrVersionSubmit","addonId","doFormDataPatch","data","versionId","patchUrl","field","response","ok","status","error","warn","Object","keys","doAfterSubmit","newVersionId","patchData","returnResult","fileUrl","waitForApproval","downloadSignedFile","file","errorMsg","statusText","json","Authorization","Accept","downloadedFiles","id","filename","split","pop","dest","saveToFile","contents","destPath","pipeline","hashXpiCrcs","asyncFsReadFile","zip","loadAsync","createFolders","hash","entries","forEach","relativePath","entry","_entry$_data","path","replace","dir","push","crc32","_data","sort","a","b","update","digest","getPreviousUuidOrUploadXpi","savedUploadUuidPath","saveUploadUuidToFileFunc","saveUploadUuidToFile","getUploadUuidFromFileFunc","getUploadUuidFromFile","uploadUuid","previousUuid","previousChannel","xpiCrcHash","previousHash","all","postNewAddon","savedIdPath","saveIdToFileFunc","saveIdToFile","guid","edit_url","putVersion","signAddon","amoBaseUrl","submissionSource","SubmitClient","ApiAuthClass","stats","stat","isFile","statError","client","stats2","source","writeFile","toString","content","parse"],"sources":["../../src/util/submit-addon.js"],"sourcesContent":["import { basename } from 'path';\nimport { createHash } from 'crypto';\nimport { createWriteStream, promises as fsPromises, readFileSync } from 'fs';\nimport { promises as streamPromises } from 'stream';\n\nimport { SignJWT } from 'jose';\nimport JSZip from 'jszip';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\n\nimport { isErrorWithCode } from '../errors.js';\nimport { createLogger } from './../util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\nexport const defaultAsyncFsReadFile = fsPromises.readFile;\n\n// Used by fileFromSync method to make sure the form-data entry will\n// include a filename derived from the file path.\n//\n// TODO: Get rid of this hack when we will bump the web-ext nodejs\n// version required to nodejs v20 (where the native File constructor\n// exists).\nexport class FileBlob extends Blob {\n #name = '';\n\n constructor(fileBits, fileName, options) {\n super(fileBits, options);\n this.#name = String(fileName);\n }\n\n get name() {\n return this.#name;\n }\n\n get [Symbol.toStringTag]() {\n return 'File';\n }\n}\n\nexport class JwtApiAuth {\n #apiKey;\n #apiSecret;\n #apiJwtExpiresIn;\n\n constructor({\n apiKey,\n apiSecret,\n apiJwtExpiresIn = 60 * 5, // 5 minutes\n }) {\n this.#apiKey = apiKey;\n this.#apiSecret = apiSecret;\n this.#apiJwtExpiresIn = apiJwtExpiresIn;\n }\n\n async signJWT() {\n return (\n new SignJWT({ iss: this.#apiKey })\n .setProtectedHeader({ alg: 'HS256' })\n .setIssuedAt()\n // jose expects either:\n // a number, which is treated an absolute timestamp - so must be after now, or\n // a string, which is parsed as a relative time from now.\n .setExpirationTime(`${this.#apiJwtExpiresIn}seconds`)\n .sign(Uint8Array.from(Buffer.from(this.#apiSecret, 'utf8')))\n );\n }\n\n async getAuthHeader() {\n const authToken = await this.signJWT();\n return `JWT ${authToken}`;\n }\n}\n\nexport default class Client {\n apiAuth;\n apiProxy;\n apiUr;\n validationCheckInterval;\n validationCheckTimeout;\n approvalCheckInterval;\n approvalCheckTimeout;\n downloadDir;\n userAgentString;\n\n constructor({\n apiAuth,\n apiProxy,\n baseUrl,\n validationCheckInterval = 1000,\n validationCheckTimeout = 300000, // 5 minutes.\n approvalCheckInterval = 1000,\n approvalCheckTimeout = 900000, // 15 minutes.\n downloadDir = process.cwd(),\n userAgentString,\n }) {\n this.apiAuth = apiAuth;\n if (apiProxy) {\n this.apiProxy = apiProxy;\n }\n if (!baseUrl.pathname.endsWith('/')) {\n baseUrl = new URL(baseUrl.href);\n baseUrl.pathname += '/';\n }\n this.apiUrl = new URL('addons/', baseUrl);\n this.validationCheckInterval = validationCheckInterval;\n this.validationCheckTimeout = validationCheckTimeout;\n this.approvalCheckInterval = approvalCheckInterval;\n this.approvalCheckTimeout = approvalCheckTimeout;\n this.downloadDir = downloadDir;\n this.userAgentString = userAgentString;\n }\n\n fileFromSync(filePath) {\n // create a File blob from a file path, and ensure it to have the file path basename\n // as the associated filename, the AMO server API will be checking it on the form-data\n // submitted and fail with the error message:\n // \"Unsupported file type, please upload a supported file (.crx, .xpi, .zip).\"\n const fileData = readFileSync(filePath);\n return new FileBlob([fileData], basename(filePath));\n }\n\n nodeFetch(url, { method, headers, body, agent }) {\n return fetch(url, { method, headers, body, agent });\n }\n\n async doUploadSubmit(xpiPath, channel) {\n const url = new URL('upload/', this.apiUrl);\n const formData = new FormData();\n formData.set('channel', channel);\n formData.set('upload', this.fileFromSync(xpiPath));\n const { uuid } = await this.fetchJson(\n url,\n 'POST',\n formData,\n 'Upload failed',\n );\n return this.waitForValidation(uuid);\n }\n\n waitRetry(\n successFunc,\n checkUrl,\n checkInterval,\n abortInterval,\n context,\n editUrl = null,\n ) {\n let checkTimeout;\n\n return new Promise((resolve, reject) => {\n const abortTimeout = setTimeout(() => {\n clearTimeout(checkTimeout);\n\n let errorMessage = `${context}: timeout exceeded.`;\n if (editUrl) {\n errorMessage += ` When approved the signed XPI file can be downloaded from ${editUrl}`;\n }\n\n reject(new Error(errorMessage));\n }, abortInterval);\n\n const pollStatus = async () => {\n try {\n const responseData = await this.fetchJson(\n checkUrl,\n 'GET',\n undefined,\n 'Getting details failed',\n );\n\n const success = successFunc(responseData);\n if (success) {\n clearTimeout(abortTimeout);\n resolve(success);\n } else {\n // Still in progress, so wait for a while and try again.\n checkTimeout = setTimeout(pollStatus, checkInterval);\n }\n } catch (err) {\n clearTimeout(abortTimeout);\n reject(err);\n }\n };\n\n pollStatus();\n });\n }\n\n waitForValidation(uuid) {\n log.info('Waiting for validation...');\n return this.waitRetry(\n (detailResponseData) => {\n if (!detailResponseData.processed) {\n return null;\n }\n\n log.debug('Validation results:', detailResponseData.validation);\n if (detailResponseData.valid) {\n return detailResponseData.uuid;\n }\n\n throw new Error(\n [\n 'Validation failed:\\n',\n JSON.stringify(detailResponseData.validation, null, 2),\n ].join(''),\n );\n },\n new URL(`upload/${uuid}/`, this.apiUrl),\n this.validationCheckInterval,\n this.validationCheckTimeout,\n 'Validation',\n );\n }\n\n async doNewAddonSubmit(uuid, metaDataJson) {\n const url = new URL('addon/', this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(\n url,\n 'POST',\n JSON.stringify(jsonData),\n 'Submission failed (1)',\n );\n }\n\n doNewAddonOrVersionSubmit(addonId, uuid, metaDataJson) {\n const url = new URL(`addon/${addonId}/`, this.apiUrl);\n const jsonData = {\n ...metaDataJson,\n version: { upload: uuid, ...metaDataJson.version },\n };\n return this.fetchJson(\n url,\n 'PUT',\n JSON.stringify(jsonData),\n 'Submission failed (2)',\n );\n }\n\n async doFormDataPatch(data, addonId, versionId) {\n const patchUrl = new URL(\n `addon/${addonId}/versions/${versionId}/`,\n this.apiUrl,\n );\n try {\n const formData = new FormData();\n for (const field in data) {\n formData.set(field, data[field]);\n }\n\n const response = await this.fetch(patchUrl, 'PATCH', formData);\n if (!response.ok) {\n throw new Error(`response status was ${response.status}`);\n }\n } catch (error) {\n log.warn(`Upload of ${Object.keys(data)} failed: ${error}.`);\n throw new Error(`Uploading ${Object.keys(data)} failed`);\n }\n }\n\n async doAfterSubmit(addonId, newVersionId, editUrl, patchData) {\n if (patchData && patchData.version) {\n log.info(`Submitting ${Object.keys(patchData.version)} to version`);\n await this.doFormDataPatch(patchData.version, addonId, newVersionId);\n }\n\n if (this.approvalCheckTimeout === 0) {\n log.info(\n [\n 'Waiting for approval and download of signed XPI skipped.',\n `When approved the signed XPI file can be downloaded from ${editUrl}`,\n ].join(' '),\n );\n return this.returnResult(addonId);\n }\n\n const fileUrl = new URL(\n await this.waitForApproval(addonId, newVersionId, editUrl),\n );\n return this.downloadSignedFile(fileUrl, addonId);\n }\n\n waitForApproval(addonId, versionId, editUrl) {\n log.info('Waiting for approval...');\n return this.waitRetry(\n (detailResponseData) => {\n const { file } = detailResponseData;\n if (file && file.status === 'public') {\n return file.url;\n }\n\n return null;\n },\n new URL(`addon/${addonId}/versions/${versionId}/`, this.apiUrl),\n this.approvalCheckInterval,\n this.approvalCheckTimeout,\n 'Approval',\n editUrl,\n );\n }\n\n async fetchJson(url, method = 'GET', body, errorMsg = 'Bad Request') {\n const response = await this.fetch(url, method, body);\n if (response.status < 200 || response.status >= 500) {\n throw new Error(\n `${errorMsg}: ${response.statusText || response.status}.`,\n );\n }\n const data = await response.json();\n\n if (!response.ok) {\n throw new Error(\n [\n `${errorMsg}: ${response.statusText || response.status}`,\n JSON.stringify(data, null, 2),\n ].join('\\n'),\n );\n }\n return data;\n }\n\n async fetch(url, method = 'GET', body) {\n log.debug(`${method}ing URL: ${url.href}`);\n let headers = {\n Authorization: await this.apiAuth.getAuthHeader(),\n Accept: 'application/json',\n 'User-Agent': this.userAgentString,\n };\n if (typeof body === 'string') {\n headers = {\n ...headers,\n 'Content-Type': 'application/json',\n };\n }\n let agent;\n if (this.apiProxy) {\n agent = new HttpsProxyAgent(this.apiProxy);\n }\n return this.nodeFetch(url, { method, body, headers, agent });\n }\n\n returnResult(addonId, downloadedFiles) {\n return {\n id: addonId,\n downloadedFiles,\n };\n }\n\n async downloadSignedFile(fileUrl, addonId) {\n const filename = fileUrl.pathname.split('/').pop(); // get the name from fileUrl\n const dest = `${this.downloadDir}/${filename}`;\n try {\n const response = await this.fetch(fileUrl);\n if (!response.ok || !response.body) {\n throw new Error(`response status was ${response.status}`);\n }\n await this.saveToFile(response.body, dest);\n } catch (error) {\n log.info(`Download of signed xpi failed: ${error}.`);\n throw new Error(`Downloading ${filename} failed`);\n }\n log.info(`Signed xpi downloaded: ${dest}`);\n return this.returnResult(addonId, [filename]);\n }\n\n async saveToFile(contents, destPath) {\n return streamPromises.pipeline(contents, createWriteStream(destPath));\n }\n\n /*\n This function aims to quickly hash the contents of the zip file that's being uploaded,\n to compare it to the previous zip file that was uploaded, so we can skip the upload for\n efficiency.\n\n CRCs are used from the zip to avoid having to extract and hash all the files.\n\n Two zips that have different byte contents in their files must have a different hash;\n but returning a different hash when the contents are the same in some cases is acceptable\n - a false mismatch does not result in lost data.\n */\n async hashXpiCrcs(filePath, asyncFsReadFile = defaultAsyncFsReadFile) {\n const zip = await JSZip.loadAsync(\n asyncFsReadFile(filePath, { createFolders: true }),\n );\n const hash = createHash('sha256');\n const entries = [];\n zip.forEach((relativePath, entry) => {\n let path = relativePath.replace(/\\/+$/, '');\n if (entry.dir) {\n path += '/';\n }\n // if the file is 0 bytes or a dir `_data` is missing so assume crc is 0\n entries.push({ path, crc32: entry._data?.crc32 || 0 });\n });\n entries.sort((a, b) => (a.path === b.path ? 0 : a.path > b.path ? 1 : -1));\n hash.update(JSON.stringify(entries));\n return hash.digest('hex');\n }\n\n async getPreviousUuidOrUploadXpi(\n xpiPath,\n channel,\n savedUploadUuidPath,\n saveUploadUuidToFileFunc = saveUploadUuidToFile,\n getUploadUuidFromFileFunc = getUploadUuidFromFile,\n ) {\n const [\n {\n uploadUuid: previousUuid,\n channel: previousChannel,\n xpiCrcHash: previousHash,\n },\n xpiCrcHash,\n ] = await Promise.all([\n getUploadUuidFromFileFunc(savedUploadUuidPath),\n this.hashXpiCrcs(xpiPath),\n ]);\n\n let uploadUuid;\n if (previousChannel !== channel || xpiCrcHash !== previousHash) {\n uploadUuid = await this.doUploadSubmit(xpiPath, channel);\n await saveUploadUuidToFileFunc(savedUploadUuidPath, {\n uploadUuid,\n channel,\n xpiCrcHash,\n });\n } else {\n uploadUuid = previousUuid;\n }\n return uploadUuid;\n }\n\n async postNewAddon(\n uploadUuid,\n savedIdPath,\n metaDataJson,\n patchData,\n saveIdToFileFunc = saveIdToFile,\n ) {\n const {\n guid: addonId,\n version: { id: newVersionId, edit_url: editUrl },\n } = await this.doNewAddonSubmit(uploadUuid, metaDataJson);\n\n await saveIdToFileFunc(savedIdPath, addonId);\n log.info(`Generated extension ID: ${addonId}.`);\n log.info('You must add the following to your manifest:');\n log.info(`\"browser_specific_settings\": {\"gecko\": {\"id\": \"${addonId}\"}}`);\n\n return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n }\n\n async putVersion(uploadUuid, addonId, metaDataJson, patchData) {\n const {\n version: { id: newVersionId, edit_url: editUrl },\n } = await this.doNewAddonOrVersionSubmit(addonId, uploadUuid, metaDataJson);\n\n return this.doAfterSubmit(addonId, newVersionId, editUrl, patchData);\n }\n}\n\nexport async function signAddon({\n apiKey,\n apiSecret,\n apiProxy,\n amoBaseUrl,\n validationCheckTimeout,\n approvalCheckTimeout,\n id,\n xpiPath,\n downloadDir,\n channel,\n savedIdPath,\n savedUploadUuidPath,\n metaDataJson = {},\n submissionSource,\n userAgentString,\n SubmitClient = Client,\n ApiAuthClass = JwtApiAuth,\n}) {\n try {\n const stats = await fsPromises.stat(xpiPath);\n\n if (!stats.isFile()) {\n throw new Error('not a file');\n }\n } catch (statError) {\n throw new Error(`error with ${xpiPath}: ${statError}`);\n }\n\n let baseUrl;\n try {\n baseUrl = new URL(amoBaseUrl);\n } catch (err) {\n throw new Error(`Invalid AMO API base URL: ${amoBaseUrl}`);\n }\n\n const client = new SubmitClient({\n apiAuth: new ApiAuthClass({ apiKey, apiSecret }),\n apiProxy,\n baseUrl,\n validationCheckTimeout,\n approvalCheckTimeout,\n downloadDir,\n userAgentString,\n });\n const uploadUuid = await client.getPreviousUuidOrUploadXpi(\n xpiPath,\n channel,\n savedUploadUuidPath,\n );\n const patchData = {};\n // if we have a source file we need to upload we patch after the create\n if (submissionSource) {\n try {\n const stats2 = await fsPromises.stat(submissionSource);\n\n if (!stats2.isFile()) {\n throw new Error('not a file');\n }\n } catch (statError) {\n throw new Error(`error with ${submissionSource}: ${statError}`);\n }\n patchData.version = { source: client.fileFromSync(submissionSource) };\n }\n\n // We specifically need to know if `id` has not been passed as a parameter because\n // it's the indication that a new add-on should be created, rather than a new version.\n if (id === undefined) {\n return client.postNewAddon(\n uploadUuid,\n savedIdPath,\n metaDataJson,\n patchData,\n );\n }\n\n return client.putVersion(uploadUuid, id, metaDataJson, patchData);\n}\n\nexport async function saveIdToFile(filePath, id) {\n await fsPromises.writeFile(\n filePath,\n [\n '# This file was created by https://github.com/mozilla/web-ext',\n '# Your auto-generated extension ID for addons.mozilla.org is:',\n id.toString(),\n ].join('\\n'),\n );\n\n log.debug(`Saved auto-generated ID ${id} to ${filePath}`);\n}\n\nexport async function saveUploadUuidToFile(\n filePath,\n { uploadUuid, channel, xpiCrcHash },\n) {\n await fsPromises.writeFile(\n filePath,\n JSON.stringify({ uploadUuid, channel, xpiCrcHash }),\n );\n log.debug(\n `Saved upload UUID ${uploadUuid}, xpi crc hash ${xpiCrcHash}, and channel ${channel} to ${filePath}`,\n );\n}\n\nexport async function getUploadUuidFromFile(\n filePath,\n asyncFsReadFile = defaultAsyncFsReadFile,\n) {\n try {\n const content = await asyncFsReadFile(filePath, 'utf-8');\n const { uploadUuid, channel, xpiCrcHash } = JSON.parse(content);\n log.debug(\n `Found upload uuid:${uploadUuid}, channel:${channel}, hash:${xpiCrcHash} in ${filePath}`,\n );\n return { uploadUuid, channel, xpiCrcHash };\n } catch (error) {\n if (isErrorWithCode('ENOENT', error)) {\n log.debug(`No upload uuid file found at: ${filePath}`);\n } else {\n log.debug(`Invalid upload uuid file contents in ${filePath}: ${error}`);\n }\n }\n\n return { uploadUuid: '', channel: '', xpiCrcHash: '' };\n}\n"],"mappings":"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","ignoreList":[]}
|
package/lib/watcher.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { existsSync, lstatSync } from 'fs';
|
|
2
2
|
import Watchpack from 'watchpack';
|
|
3
3
|
import debounce from 'debounce';
|
|
4
4
|
import { UsageError } from './errors.js';
|
|
@@ -42,7 +42,7 @@ export default function onSourceChange({
|
|
|
42
42
|
const watchedFiles = [];
|
|
43
43
|
if (watchFile) {
|
|
44
44
|
for (const filePath of watchFile) {
|
|
45
|
-
if (
|
|
45
|
+
if (existsSync(filePath) && !lstatSync(filePath).isFile()) {
|
|
46
46
|
throw new UsageError('Invalid --watch-file value: ' + `"${filePath}" is not a file.`);
|
|
47
47
|
}
|
|
48
48
|
watchedFiles.push(filePath);
|
package/lib/watcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.js","names":["
|
|
1
|
+
{"version":3,"file":"watcher.js","names":["existsSync","lstatSync","Watchpack","debounce","UsageError","createLogger","log","import","meta","url","onSourceChange","sourceDir","watchFile","watchIgnored","artifactsDir","onChange","shouldWatchFile","debounceTime","ignored","process","platform","map","it","replace","watcher","executeImmediately","on","filePath","proxyFileChanges","debug","join","watchedDirs","watchedFiles","isFile","push","watch","files","directories","missing","startTime","Date","now","close","indexOf","toTimeString"],"sources":["../src/watcher.js"],"sourcesContent":["import { existsSync, lstatSync } from 'fs';\n\nimport Watchpack from 'watchpack';\nimport debounce from 'debounce';\n\nimport { UsageError } from './errors.js';\nimport { createLogger } from './util/logger.js';\n\nconst log = createLogger(import.meta.url);\n\n// onSourceChange types and implementation\n\nexport default function onSourceChange({\n sourceDir,\n watchFile,\n watchIgnored,\n artifactsDir,\n onChange,\n shouldWatchFile,\n debounceTime = 500,\n}) {\n // When running on Windows, transform the ignored paths and globs\n // as Watchpack does translate the changed files path internally\n // (See https://github.com/webpack/watchpack/blob/v2.1.1/lib/DirectoryWatcher.js#L99-L103).\n const ignored =\n watchIgnored && process.platform === 'win32'\n ? watchIgnored.map((it) => it.replace(/\\\\/g, '/'))\n : watchIgnored;\n\n // TODO: For network disks, we would need to add {poll: true}.\n const watcher = ignored ? new Watchpack({ ignored }) : new Watchpack();\n\n // Allow multiple files to be changed before reloading the extension\n const executeImmediately = false;\n onChange = debounce(onChange, debounceTime, executeImmediately);\n\n watcher.on('change', (filePath) => {\n proxyFileChanges({ artifactsDir, onChange, filePath, shouldWatchFile });\n });\n\n log.debug(\n `Watching ${watchFile ? watchFile.join(',') : sourceDir} for changes`,\n );\n\n const watchedDirs = [];\n const watchedFiles = [];\n\n if (watchFile) {\n for (const filePath of watchFile) {\n if (existsSync(filePath) && !lstatSync(filePath).isFile()) {\n throw new UsageError(\n 'Invalid --watch-file value: ' + `\"${filePath}\" is not a file.`,\n );\n }\n\n watchedFiles.push(filePath);\n }\n } else {\n watchedDirs.push(sourceDir);\n }\n\n watcher.watch({\n files: watchedFiles,\n directories: watchedDirs,\n missing: [],\n startTime: Date.now(),\n });\n\n // TODO: support interrupting the watcher on Windows.\n // https://github.com/mozilla/web-ext/issues/225\n process.on('SIGINT', () => watcher.close());\n return watcher;\n}\n\n// proxyFileChanges types and implementation.\n\nexport function proxyFileChanges({\n artifactsDir,\n onChange,\n filePath,\n shouldWatchFile,\n}) {\n if (filePath.indexOf(artifactsDir) === 0 || !shouldWatchFile(filePath)) {\n log.debug(`Ignoring change to: ${filePath}`);\n } else {\n log.debug(`Changed: ${filePath}`);\n log.debug(`Last change detection: ${new Date().toTimeString()}`);\n onChange();\n }\n}\n"],"mappings":"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","ignoreList":[]}
|